Request 1681 (accepted)

gmerlin.changes Changed

@@ -1,4 +1,20 @@
 -------------------------------------------------------------------
+Wed Feb 25 08:15:40 UTC 2015 - avvissu@yandex.ru
+
+- Update to svn4256
+- Remove all patches (fixed in upstream):
+ * gmerlin-1.0.0-desktop_files.patch
+ * gmerlin-1.2.0-texinfo-5.0.patch
+ * gmerlin-1.2.0-underlinking.patch
+- Fix build error (gmerlin-4256-write_frame_jack.patch) 
+- Update to gmerlin-1.2.0-cdio.patch
+- Add BuildRequires: pkgconfig(alsa) pkgconfig(sqlite3) pkgconfig(uuid)
+- Add package gmerlin instead of gmerlin-plugins
+- Add Requires: gmerlin for all packages gmerlin-*
+- Add packages plugincfg and gavf-tools
+- Set default permission for FHS directories
+
+-------------------------------------------------------------------
 Sat Feb 21 16:29:47 UTC 2015 - avvissu@yandex.ru
 
 - Fix build on openSUSE 13.2 (gmerlin-1.2.0-texinfo-5.0.patch)
@@ -9,7 +25,7 @@
   * remove Requires: %{name} = %{version} from libgmerlin
 - Fix file-contains-date-and-time: add HTML_TIMESTAMP = NO  
 - Add %suse_update_desktop_file and %icon_theme_cache*
-- Add packages for plugins and docs 
+- Add packages for plugins and docs  
 
 -------------------------------------------------------------------
 Fri Mar 28 21:40:10 UTC 2014 - seife+obs@b1-systems.com

gmerlin.spec Changed

@@ -17,22 +17,24 @@
 
 
 %define soname 0
+%define rev     4256
+
 Name:           gmerlin
-Version:        1.2.0
+Version:        1.2.0rsvn%{rev}
 Release:        0
 Summary:        Multimedia architecture for Linux
 License:        GPL-2.0+
 Group:          System/Libraries
 Url:            http://gmerlin.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/project/gmerlin/gmerlin/%{version}/gmerlin-%{version}.tar.gz
+#svn checkout svn://svn.code.sf.net/p/gmerlin/code/trunk/gmerlin/
+Source0:        gmerlin-%{rev}.tar.gz
 # PATCH-FIX-OPENSUSE gmerlin-1.0.0-icon_link.patch reddwarf@opensuse.org -- Fix icon symlinks
 Patch0:         gmerlin-1.0.0-icon_link.patch
-# PATCH-FIX-UPSTREAM gmerlin-1.0.0-desktop_files.patch gmerlin-general_ML_2011-01-09 10:25 reddwarf@opensuse.org -- Update desktop files to current standard
-Patch1:         gmerlin-1.0.0-desktop_files.patch
+# PATCH-FIX-UPSTREAM write_frame_jack.patch avvissu@yandex.ru --  Remove cruft from the audio output API
+Patch1:         gmerlin-4256-write_frame_jack.patch
 Patch2:         gmerlin-1.2.0-cdio.patch
-Patch3:         gmerlin-1.2.0-underlinking.patch
-# PATCH-FIX-UPSTREAM texinfo-5.0.patch avvissu@yandex.ru -- Fix build with texinfo >= 5.0
-Patch4:         gmerlin-1.2.0-texinfo-5.0.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
@@ -40,6 +42,7 @@
 BuildRequires:  libmusicbrainz-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  texinfo
 BuildRequires:  update-desktop-files
@@ -65,27 +68,20 @@
 BuildRequires:  pkgconfig(libv4lconvert)
 BuildRequires:  pkgconfig(libvisual-0.4)
 BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(xv)
-Requires:       %{name}-plugins = %{version}
 Requires(post): info
 Requires(postun): info
 
 %description
 Multimedia architecture consisting of libraries and applications.
 
-%package        plugins
-Summary:        Gmerlin plugins
-Group:          Productivity/Multimedia/Other
-Requires:       lib%{name}%{soname} = %{version}
-
-%description plugins
-Plugins for gmerlin applications.
-
-%package -n libgmerlin%{soname}
+%package -n 	libgmerlin%{soname}
 Summary:        Base library for gmerlin applications
 Group:          System/Libraries
 
@@ -93,7 +89,7 @@
 This package contain the library needed to run a programs compiled
 using libgmerlin.
 
-%package -n libgmerlin-devel
+%package -n 	libgmerlin-devel
 Summary:        Development files for gmerlin
 Group:          Development/Libraries/C and C++
 Requires:       libgmerlin%{soname} = %{version}
@@ -101,7 +97,7 @@
 %description -n libgmerlin-devel
 Header files for compiling gmerlin applications and plugins.
 
-%package -n libgmerlin_gtk%{soname}
+%package -n 	libgmerlin_gtk%{soname}
 Summary:        Gtk support library for gmerlin
 Group:          System/Libraries
 
@@ -109,7 +105,7 @@
 This package contain the library needed to run a programs compiled
 using libgmerlin_gtk.
 
-%package -n libgmerlin_gtk-devel
+%package -n 	libgmerlin_gtk-devel
 Summary:        Development files for gmerlin gtk
 Group:          Development/Libraries/C and C++
 Requires:       libgmerlin_gtk%{soname} = %{version}
@@ -117,64 +113,98 @@
 %description -n libgmerlin_gtk-devel
 Header files for compiling gmerlin gtk applications.
 
-%package player
+%package 		player
 Summary:        Multiformat media player
 Group:          Productivity/Multimedia/Video/Players
+Requires:       %{name} = %{version}
 
-%description player
+%description 	player
 Multiformat media player for package gmerlin.
 
-%package recorder
+%package 		plugincfg
+Summary:        Gmerlin Plugin configurator
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+
+%description 	plugincfg
+This program to write a command line application, which uses gmerlin plugins.
+It lets you configure all plugin options and save them at a location, where
+other applications can find them.
+
+%package 		recorder
 Summary:        Multiformat recorder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
+Requires:       %{name} = %{version}
 
-%description recorder
+%description 	recorder
 Is a small application, which records audio and video from hardware devices.
 
-%package alsamixer
+%package 		alsamixer
 Summary:        Alsa mixer
 Group:          Productivity/Multimedia/Sound/Mixers
+Requires:       %{name} = %{version}
 
-%description alsamixer
+%description 	alsamixer
 This lets you configure your soundcard even if it has more than 100 controls.
 Multiple cards are supported as well.
 
-%package transcoder
+%package        gavf-tools
+Summary:        Tools for gavf multimedia format
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+
+%description    gavf-tools
+This package contains command line programs for work with gavf.
+gavf: A multimedia container format for gmerlin
+
+%package 		transcoder
 Summary:        Audio/Video transcoder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
+Requires:       %{name} = %{version}
 
 %description transcoder
 Lets you configure the options for each track.
 
-%package visualizer
+%package 		visualizer
 Summary:        Visualization app
 Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
 
-%description visualizer
+%description 	visualizer
 This program runs visualization plugins with audio coming from the soundcard.
 
-%package utils
+%package 		utils
 Summary:        Utilities for gmerlin
 Group:          Productivity/Multimedia/Other
-
-%description utils
-Utilities for package gmerlin.
-
-%package kbd
+Requires:       %{name} = %{version}
+
+%description 	utils
+This package contains command line programs:
+	* gmerlin_imgconvert - Image converter
+    * gmerlin_{imgdiff,vpsnr,ssim} - compare two images
+    * gmerlin_player - Commandline Multimedia player
+    * gmerlin-record - record audio and video from hardware devices
+	* gmerlin_vanalyze - compare two videos
+    * gmerlin-video-thumbnailer - Video thumbnailer
+    * etc
+
+%package 		kbd
 Summary:        Keyboard daemon for gmerlin
 Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
 
-%description kbd
+%description 	kbd
 Keyboard daemon for package gmerlin.
 
-%package jack
+%package 		jack
 Summary:        Jack plugins for gmerlin
 Group:          System/Libraries
+Requires:       %{name} = %{version}
 
-%description jack
+%description 	jack
 Jack plugins for package gmerlin.
 
-%package doc
+%package 		doc
 Summary:        Documentation for %{name}
 Group:          Documentation/HTML
 BuildArch:      noarch
@@ -185,32 +215,29 @@
 %lang_package
 
 %prep
-%setup -q
-%patch0
-#%patch1
-%patch2
-%patch3
-%patch4 -p1
-
-%if 0%{?suse_version} > 1320
-cp doc/gmerlin.info-3 gmerlin.info-3
-%endif
+%setup -q -n %{name}
+
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
-#Do not compile in DATE and TIME
+# nmjedit/Makefile.in not found
+sed -i '/apps\/nmjedit/d' configure.ac
+
+# Do not compile in DATE and TIME
 echo 'HTML_TIMESTAMP = NO' >> doc/Doxyfile.in
 
 %build
-%configure --with-cpuflags=none --docdir=%{_defaultdocdir}/%{name}
-make %{?_smp_mflags}
+./autogen.sh
+%configure \
+	--with-cpuflags=none \
+	--docdir=%{_defaultdocdir}/%{name}
+
+make V=1 %{?_smp_mflags}
 
 %install
 %make_install
 
-%if 0%{?suse_version} > 1320
-install -D -m 644 gmerlin.info-3 %{buildroot}%{_infodir}/gmerlin.info-3
-install-info --info-dir='%{buildroot}%{_datadir}/info' '%{buildroot}%{_infodir}/%{name}.info'
-%endif
-
 %suse_update_desktop_file -r %{name}-alsamixer  AudioVideo Mixer
 %suse_update_desktop_file -r %{name}-kbd        AudioVideo AudioVideoEditing
 %suse_update_desktop_file -r %{name}-player     AudioVideo Player
@@ -224,14 +251,14 @@
 	sed -i -e 's|.png||g' *.desktop
 popd
 
+rm %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}-camelot.png
+
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %fdupes -s %{buildroot}
 
 %find_lang %{name}
 
-rm %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}-camelot.png
-
 %post   -n libgmerlin%{soname} -p /sbin/ldconfig
 
 %postun -n libgmerlin%{soname} -p /sbin/ldconfig
@@ -247,6 +274,7 @@
 %post	-n %{name}-recorder %icon_theme_cache_post
 %post	-n %{name}-transcoder %icon_theme_cache_post
 %post	-n %{name}-visualizer %icon_theme_cache_post
+%post	-n %{name}-plugincfg %icon_theme_cache_post
 
 %postun	-n %{name}-alsamixer %icon_theme_cache_postun
 %postun -n %{name}-kbd %icon_theme_cache_postun
@@ -255,46 +283,54 @@
 %postun -n %{name}-recorder %icon_theme_cache_postun
 %postun -n %{name}-transcoder %icon_theme_cache_postun
 %postun -n %{name}-visualizer %icon_theme_cache_postun
+%postun -n %{name}-plugincfg %icon_theme_cache_postun
 
-%post	-n %{name}-plugins
+%post	-n %{name}
 %info_add gmerlin.info
 %info_add gmerlin.info-1
 %info_add gmerlin.info-2
+%if 0%{?suse_version} <= 1320
 %info_add gmerlin.info-3
+%endif
 
-%postun	-n %{name}-plugins
+%postun	-n %{name}
 if [ $1 = 0 ]; then
   %info_del gmerlin.info
   %info_del gmerlin.info-1
   %info_del gmerlin.info-2
+  %if 0%{?suse_version} <= 1320
   %info_del gmerlin.info-3
+  %endif  
 fi
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
+%defattr(0644,root,root)
 
-%files plugins
-%defattr(0644, root ,root, 0755)
+%files
+%defattr(0644,root,root,0755)
 %{_libdir}/gmerlin
 %exclude %{_libdir}/gmerlin/plugins/*_jack.so
+%exclude %{_libdir}/%{name}/bin/gmerlin_visualizer_slave
 %{_datadir}/gmerlin
 %exclude %{_datadir}/gmerlin/skins
 %exclude %{_datadir}/gmerlin/plugin.sym
 %{_infodir}/gmerlin.info%{ext_info}
 %{_infodir}/gmerlin.info-1%{ext_info}
 %{_infodir}/gmerlin.info-2%{ext_info}
+%if 0%{?suse_version} <= 1320
 %{_infodir}/gmerlin.info-3%{ext_info}
+%endif
 
 %files jack
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root,0755)
 %{_libdir}/gmerlin/plugins/*_jack.so
 
 %files -n libgmerlin%{soname}
-%defattr(0644, root ,root, 0755)
+%defattr(0644, root ,root)
 %{_libdir}/libgmerlin.so.%{soname}*
 
 %files -n libgmerlin-devel
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root,0755)
 %{_docdir}/%{name}/apiref
 %{_libdir}/libgmerlin.so
 %{_includedir}/gmerlin
@@ -303,31 +339,45 @@
 %{_datadir}/gmerlin/plugin.sym
 
 %files -n libgmerlin_gtk%{soname}
-%defattr(0644, root ,root, 0755)
+%defattr(0644, root ,root)
 %{_libdir}/libgmerlin_gtk.so.%{soname}*
 
 %files -n libgmerlin_gtk-devel
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root,0755)
 %dir %{_includedir}/gmerlin
 %{_libdir}/libgmerlin_gtk.so
 %{_includedir}/gmerlin/gui_gtk
 %{_libdir}/pkgconfig/gmerlin-gtk.pc
 
 %files alsamixer
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_alsamixer
 %{_datadir}/applications/gmerlin-alsamixer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
 
+%files gavf-tools
+%defattr(0755,root,root,0755)
+%attr(0644,root,root) %doc README.gavftools
+%{_bindir}/gavf-decode
+%{_bindir}/gavf-demux
+%{_bindir}/gavf-encode
+%{_bindir}/gavf-filter
+%{_bindir}/gavf-info
+%{_bindir}/gavf-mux
+%{_bindir}/gavf-play
+%{_bindir}/gavf-recompress
+%{_bindir}/gavf-record
+%{_bindir}/gavf-tee
+
 %files kbd
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_kbd
 %attr(0755,root,root) %{_bindir}/gmerlin_kbd_config
 %{_datadir}/applications/gmerlin-kbd.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-kbd.png
 
 %files player
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/gmerlin
 %attr(0755,root,root) %{_bindir}/gmerlin_remote
 %attr(0755,root,root) %{_bindir}/gmerlin_launcher
@@ -338,14 +388,20 @@
 %{_mandir}/man1/gmerlin_remote.1*
 %{_mandir}/man1/gmerlin_remote.1*
 
+%files plugincfg
+%defattr(0644,root,root)
+%attr(0755,root,root) %{_bindir}/gmerlin_plugincfg
+%{_datadir}/applications/gmerlin-plugincfg.desktop
+%{_datadir}/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
+
 %files recorder
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_recorder
 %{_datadir}/applications/gmerlin-recorder.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-recorder.png
 
 %files transcoder
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_transcoder
 %attr(0755,root,root) %{_bindir}/gmerlin_transcoder_remote
 %{_datadir}/applications/gmerlin-transcoder.desktop
@@ -354,34 +410,37 @@
 %doc %{_mandir}/man1/gmerlin_transcoder_remote.1*
 
 %files visualizer
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/gmerlin_visualize
 %attr(0755,root,root) %{_bindir}/gmerlin_visualizer
-%attr(0755,root,root) %{_bindir}/gmerlin_visualizer_slave
+%attr(0755,root,root) %{_libdir}/%{name}/bin/gmerlin_visualizer_slave
 %{_datadir}/applications/gmerlin-visualizer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-visualizer.png
 
 %files utils
-%defattr(0644, root ,root, 0755)
-%attr(0755,root,root) %{_bindir}/album2m3u
-%attr(0755,root,root) %{_bindir}/album2pls
-%attr(0755,root,root) %{_bindir}/gmerlin_imgconvert
-%attr(0755,root,root) %{_bindir}/gmerlin_imgdiff
-%attr(0755,root,root) %{_bindir}/gmerlin_play
-%attr(0755,root,root) %{_bindir}/gmerlin_plugincfg
-%attr(0755,root,root) %{_bindir}/gmerlin_psnr
-%attr(0755,root,root) %{_bindir}/gmerlin-record
-%attr(0755,root,root) %{_bindir}/gmerlin_ssim
-%attr(0755,root,root) %{_bindir}/gmerlin_vanalyze
-%attr(0755,root,root) %{_bindir}/gmerlin-video-thumbnailer
-%attr(0755,root,root) %{_bindir}/gmerlin_vpsnr
-%{_mandir}/man1/gmerlin_play.1*
-%{_mandir}/man1/gmerlin-record.1*
-%{_datadir}/applications/gmerlin-plugincfg.desktop
-%{_datadir}/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
+%defattr(0755,root,root)
+%{_bindir}/album2m3u
+%{_bindir}/album2pls
+%{_bindir}/gmerlin-db2nmj
+%{_bindir}/gmerlin-dbedit
+%{_bindir}/gmerlin_imgconvert
+%{_bindir}/gmerlin_imgdiff
+%{_bindir}/gmerlin_play
+%{_bindir}/gmerlin_psnr
+%{_bindir}/gmerlin-record
+%{_bindir}/gmerlin_ssim
+%{_bindir}/gmerlin-savemeta
+%{_bindir}/gmerlin-server
+%{_bindir}/gmerlin-upnp-discover
+%{_bindir}/gmerlin_vanalyze
+%{_bindir}/gmerlin-video-thumbnailer
+%{_bindir}/gmerlin_vpsnr
+%{_bindir}/gmerlin_imgsplit
+%attr(0644,root,root) %{_mandir}/man1/gmerlin_play.1*
+%attr(0644,root,root) %{_mandir}/man1/gmerlin-record.1*
 
 %files doc
-%defattr(0644, root ,root, 0755)
+%defattr(0644,root,root,0755)
 %{_docdir}/%{name}
 %exclude %{_docdir}/%{name}/apiref

gmerlin-1.0.0-desktop_files.patch Deleted

@@ -1,64 +0,0 @@
-Index: apps/plugincfg/gmerlin-plugincfg.desktop
-===================================================================
---- apps/plugincfg/gmerlin-plugincfg.desktop.orig
-+++ apps/plugincfg/gmerlin-plugincfg.desktop
-@@ -6,4 +6,4 @@ Comment[de]=Gmerlin Plugins konfiguriere
- Exec=gmerlin_plugincfg
- Icon=gmerlin-plugincfg
- Type=Application
--Categories=Audio
-+Categories=Utility;Settings;
-Index: apps/recorder/gmerlin-recorder.desktop
-===================================================================
---- apps/recorder/gmerlin-recorder.desktop.orig
-+++ apps/recorder/gmerlin-recorder.desktop
-@@ -1,11 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin recorder
- Name[de]=Gmerlin recorder
- Comment=Audio/video recorder
- Comment[de]=Audio/video recorder
- Exec=gmerlin_recorder
--Icon=gmerlin-recorder.png
-+Icon=gmerlin-recorder
- Type=Application
--Categories=Application;AudioVideo;
--
-+Categories=AudioVideo;Recorder;
-Index: apps/transcoder/gmerlin-transcoder.desktop
-===================================================================
---- apps/transcoder/gmerlin-transcoder.desktop.orig
-+++ apps/transcoder/gmerlin-transcoder.desktop
-@@ -1,11 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin transcoder
- Name[de]=Gmerlin transcoder
- Comment=Gmerlin multimedia transcoder
- Comment[de]=Gmerlin multimedia transcoder
- Exec=gmerlin_transcoder
--Icon=gmerlin-transcoder.png
-+Icon=gmerlin-transcoder
- Type=Application
--Categories=Application;AudioVideo;
--
-+Categories=AudioVideo;AudioVideoEditing;
-Index: apps/visualizer/gmerlin-visualizer.desktop
-===================================================================
---- apps/visualizer/gmerlin-visualizer.desktop.orig
-+++ apps/visualizer/gmerlin-visualizer.desktop
-@@ -1,11 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin visualizer
- Name[de]=Gmerlin visualisierer
- Comment=Run visualization plugins
- Comment[de]=Visualisierungs Plugins laufen lassen
- Exec=gmerlin_visualizer
--Icon=gmerlin-visualizer.png
-+Icon=gmerlin-visualizer
- Type=Application
--Categories=Application;AudioVideo;
--
-+Categories=AudioVideo;Player;

gmerlin-1.0.0-icon_link.patch Changed

@@ -1,38 +1,10 @@
-Index: icons/Makefile.am
-===================================================================
---- icons/Makefile.am.orig
-+++ icons/Makefile.am
-@@ -109,14 +109,14 @@ dist_pkgdata_DATA = $(icons)
+diff -U 3 -H -d -r -N -- gmerlin.orig/icons/Makefile.am gmerlin/icons/Makefile.am
+--- gmerlin.orig/icons/Makefile.am	2015-02-23 02:44:26.644798539 +0300
++++ gmerlin/icons/Makefile.am	2015-02-23 10:24:13.689595307 +0300
+@@ -109,14 +109,14 @@
  
  install-data-hook:
- 	test -z $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps || $(mkdir_p) $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
--	ln -sf $(DESTDIR)$(pkgdatadir)/mixer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/player_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/transcoder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/camelot_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-camelot.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/kbd_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-kbd.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/plugincfg_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/recorder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-recorder.png
--	ln -sf $(DESTDIR)$(pkgdatadir)/visualizer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
-+	ln -sf ../../../../../..$(pkgdatadir)/mixer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
-+	ln -sf ../../../../../..$(pkgdatadir)/player_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
-+	ln -sf ../../../../../..$(pkgdatadir)/transcoder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
-+	ln -sf ../../../../../..$(pkgdatadir)/camelot_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-camelot.png
-+	ln -sf ../../../../../..$(pkgdatadir)/kbd_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-kbd.png
-+	ln -sf ../../../../../..$(pkgdatadir)/plugincfg_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
-+	ln -sf ../../../../../..$(pkgdatadir)/recorder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-recorder.png
-+	ln -sf ../../../../../..$(pkgdatadir)/visualizer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
- 
- uninstall-local:
- 	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
-Index: icons/Makefile.in
-===================================================================
---- icons/Makefile.in.orig
-+++ icons/Makefile.in
-@@ -631,14 +631,14 @@ uninstall-am: uninstall-dist_pkgdataDATA
- 
- install-data-hook:
- 	test -z $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps || $(mkdir_p) $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
+ 	test -z $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps || $(MKDIR_P) $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
 -	ln -sf $(DESTDIR)$(pkgdatadir)/mixer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
 -	ln -sf $(DESTDIR)$(pkgdatadir)/player_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
 -	ln -sf $(DESTDIR)$(pkgdatadir)/transcoder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png

gmerlin-1.2.0-cdio.patch Changed

@@ -1,8 +1,7 @@
-Index: plugins/cdaudio/cdtext.c
-===================================================================
---- plugins/cdaudio/cdtext.c.orig
-+++ plugins/cdaudio/cdtext.c
-@@ -34,7 +34,7 @@
+diff -U 3 -H -d -r -N -- gmerlin.orig/plugins/cdaudio/cdtext.c gmerlin/plugins/cdaudio/cdtext.c
+--- gmerlin.orig/plugins/cdaudio/cdtext.c	2015-02-23 01:41:32.975585479 +0300
++++ gmerlin/plugins/cdaudio/cdtext.c	2015-02-25 02:21:21.859139216 +0300
+@@ -44,7 +44,7 @@
  #include "cdaudio.h"
  
  #define GET_FIELD(dst, key) \
@@ -11,7 +10,7 @@
  
  #define GET_FIELD_DEFAULT(dst,key)                                      \
    field = cdtext_get_const(key, cdtext);                                \
-@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+@@ -74,30 +74,27 @@
  
    /* Get information for the whole disc */
    
@@ -44,13 +43,13 @@
 -      cdtext = cdio_get_cdtext (cdio, i+1);
 -      if(!cdtext)
 -        return 0;
--      
+       
 -      GET_FIELD(title, CDTEXT_TITLE);
 +      GET_FIELD(title, CDTEXT_FIELD_TITLE);
        
        if(!title)
          return 0;
-@@ -95,7 +91,7 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+@@ -105,7 +102,7 @@
        gavl_metadata_set(&info[idx->tracks[i].index].metadata,
                          GAVL_META_TITLE, title);
  
@@ -59,7 +58,7 @@
          gavl_metadata_set(&info[idx->tracks[i].index].metadata,
                            GAVL_META_ARTIST, field);
        else
-@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+@@ -113,10 +110,10 @@
                            GAVL_META_ARTIST, artist);
  
  
@@ -72,7 +71,7 @@
          gavl_metadata_set(&info[idx->tracks[i].index].metadata,
                            GAVL_META_AUTHOR, field);
        else if(author)
-@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+@@ -124,14 +121,14 @@
                            GAVL_META_AUTHOR, author);

gmerlin-1.2.0-texinfo-5.0.patch Deleted

gmerlin-1.2.0-underlinking.patch Deleted

@@ -1,363 +0,0 @@
-Index: lib/Makefile.am
-===================================================================
---- lib/Makefile.am.orig
-+++ lib/Makefile.am
-@@ -49,7 +49,7 @@ libgmerlin_la_LIBADD = $(x11_libadd) @FO
- bin_PROGRAMS = gmerlin_visualizer_slave
- 
- gmerlin_visualizer_slave_SOURCES = visualize_slave.c
--gmerlin_visualizer_slave_LDADD = libgmerlin.la
-+gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
- 
- lib_LTLIBRARIES = libgmerlin.la
- libgmerlin_la_SOURCES = \
-Index: lib/Makefile.in
-===================================================================
---- lib/Makefile.in.orig
-+++ lib/Makefile.in
-@@ -427,7 +427,7 @@ $(lv_cflags)
- libgmerlin_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ -export-symbols-regex ^bg_
- libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread
- gmerlin_visualizer_slave_SOURCES = visualize_slave.c
--gmerlin_visualizer_slave_LDADD = libgmerlin.la
-+gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
- lib_LTLIBRARIES = libgmerlin.la
- libgmerlin_la_SOURCES = \
- $(lv_sources) \
-Index: tests/Makefile.am
-===================================================================
---- tests/Makefile.am.orig
-+++ tests/Makefile.am
-@@ -130,7 +130,7 @@ chapter_SOURCES = chapter.c
- chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
- 
- vumeter_SOURCES = vumeter.c
--vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-+vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- 
- 
- v4ltest_SOURCES = v4ltest.c
-@@ -143,7 +143,7 @@ visualization_SOURCES = visualization.c
- visualization_LDADD = ../lib/libgmerlin.la
- 
- scrolltext_SOURCES = scrolltext.c
--scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-+scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- 
- question_SOURCES = question.c
- question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-@@ -155,7 +155,7 @@ message_SOURCES = message.c
- message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
- 
- playtree_SOURCES = playtree.c
--playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-+playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- 
- server_SOURCES = server.c
- server_LDADD = ../lib/libgmerlin.la
-Index: tests/Makefile.in
-===================================================================
---- tests/Makefile.in.orig
-+++ tests/Makefile.in
-@@ -504,7 +504,7 @@ cfgtest_LDADD = ../lib/libgmerlin.la ../
- chapter_SOURCES = chapter.c
- chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
- vumeter_SOURCES = vumeter.c
--vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-+vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- v4ltest_SOURCES = v4ltest.c
- v4ltest_LDADD = ../lib/libgmerlin.la
- v4ldump_SOURCES = v4ldump.c
-@@ -512,7 +512,7 @@ v4ldump_LDADD = ../lib/libgmerlin.la
- visualization_SOURCES = visualization.c
- visualization_LDADD = ../lib/libgmerlin.la
- scrolltext_SOURCES = scrolltext.c
--scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-+scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- question_SOURCES = question.c
- question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
- auth_SOURCES = auth.c
-@@ -520,7 +520,7 @@ auth_LDADD = ../lib/libgmerlin.la ../lib
- message_SOURCES = message.c
- message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
- playtree_SOURCES = playtree.c
--playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-+playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- server_SOURCES = server.c
- server_LDADD = ../lib/libgmerlin.la
- client_SOURCES = client.c
-Index: apps/player/Makefile.am
-===================================================================
---- apps/player/Makefile.am.orig
-+++ apps/player/Makefile.am
-@@ -38,7 +38,7 @@ gmerlin.h \
- player_remote.h \
- playerwindow.h
- 
--gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
-+gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
- gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
- 
- EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
-Index: apps/player/Makefile.in
-===================================================================
---- apps/player/Makefile.in.orig
-+++ apps/player/Makefile.in
-@@ -361,7 +361,7 @@ gmerlin.h \
- player_remote.h \
- playerwindow.h
- 
--gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
-+gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
- gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
- EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
- all: all-am
-Index: apps/plugincfg/Makefile.am
-===================================================================
---- apps/plugincfg/Makefile.am.orig
-+++ apps/plugincfg/Makefile.am
-@@ -18,6 +18,6 @@ Desktop_DATA = gmerlin-plugincfg.desktop
- gmerlin_plugincfg_SOURCES = gmerlin_plugincfg.c
- gmerlin_plugincfg_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
- 
- EXTRA_DIST = gmerlin-plugincfg.desktop
-Index: apps/plugincfg/Makefile.in
-===================================================================
---- apps/plugincfg/Makefile.in.orig
-+++ apps/plugincfg/Makefile.in
-@@ -328,7 +328,7 @@ Desktop_DATA = gmerlin-plugincfg.desktop
- gmerlin_plugincfg_SOURCES = gmerlin_plugincfg.c
- gmerlin_plugincfg_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
- 
- EXTRA_DIST = gmerlin-plugincfg.desktop
- all: all-am
-Index: apps/alsamixer/Makefile.am
-===================================================================
---- apps/alsamixer/Makefile.am.orig
-+++ apps/alsamixer/Makefile.am
-@@ -18,7 +18,7 @@ Desktop_DATA = gmerlin-alsamixer.desktop
- bin_PROGRAMS = gmerlin_alsamixer
- 
- gmerlin_alsamixer_SOURCES = card.c main.c mixer.c g_control.c g_card.c g_mixer.c
--gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread
-+gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread @GTK_LIBS@
- 
- noinst_HEADERS = alsamixer.h gui.h
- 
-Index: apps/alsamixer/Makefile.in
-===================================================================
---- apps/alsamixer/Makefile.in.orig
-+++ apps/alsamixer/Makefile.in
-@@ -331,7 +331,7 @@ AM_CFLAGS = \
- Desktopdir = $(datadir)/applications
- Desktop_DATA = gmerlin-alsamixer.desktop
- gmerlin_alsamixer_SOURCES = card.c main.c mixer.c g_control.c g_card.c g_mixer.c
--gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread
-+gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread @GTK_LIBS@
- noinst_HEADERS = alsamixer.h gui.h
- EXTRA_DIST = gmerlin-alsamixer.desktop
- all: all-am
-Index: apps/recorder/Makefile.am
-===================================================================
---- apps/recorder/Makefile.am.orig
-+++ apps/recorder/Makefile.am
-@@ -20,7 +20,7 @@ gmerlin_recorder_SOURCES = gmerlin_recor
- 
- gmerlin_recorder_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
- 
- noinst_HEADERS = recorder_window.h
- 
-Index: apps/recorder/Makefile.in
-===================================================================
---- apps/recorder/Makefile.in.orig
-+++ apps/recorder/Makefile.in
-@@ -332,7 +332,7 @@ Desktop_DATA = gmerlin-recorder.desktop
- gmerlin_recorder_SOURCES = gmerlin_recorder.c recorder_window.c
- gmerlin_recorder_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
- 
- noinst_HEADERS = recorder_window.h
- EXTRA_DIST = gmerlin-recorder.desktop
-Index: apps/transcoder/Makefile.am
-===================================================================
---- apps/transcoder/Makefile.am.orig
-+++ apps/transcoder/Makefile.am
-@@ -28,7 +28,7 @@ gmerlin_transcoder_remote_SOURCES = gmer
- 
- gmerlin_transcoder_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
- 
- gmerlin_transcoder_remote_LDADD = \
- $(top_builddir)/lib/libgmerlin.la
-Index: apps/transcoder/Makefile.in
-===================================================================
---- apps/transcoder/Makefile.in.orig
-+++ apps/transcoder/Makefile.in
-@@ -354,7 +354,7 @@ tracklist.c
- gmerlin_transcoder_remote_SOURCES = gmerlin_transcoder_remote.c
- gmerlin_transcoder_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
- 
- gmerlin_transcoder_remote_LDADD = \
- $(top_builddir)/lib/libgmerlin.la
-Index: apps/kbd/Makefile.am
-===================================================================
---- apps/kbd/Makefile.am.orig
-+++ apps/kbd/Makefile.am
-@@ -34,6 +34,6 @@ kbd.h \
- kbd_remote.h
- 
- gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@ @XML2_LIBS@
--gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
-+gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @X_LIBS@ @XML2_LIBS@ @GTK_LIBS@
- 
- EXTRA_DIST = gmerlin-kbd.desktop
-Index: apps/kbd/Makefile.in
-===================================================================
---- apps/kbd/Makefile.in.orig
-+++ apps/kbd/Makefile.in
-@@ -350,7 +350,7 @@ kbd.h \
- kbd_remote.h
- 
- gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@ @XML2_LIBS@
--gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
-+gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @X_LIBS@ @XML2_LIBS@ @GTK_LIBS@
- EXTRA_DIST = gmerlin-kbd.desktop
- all: all-am
- 
-Index: apps/visualizer/Makefile.am
-===================================================================
---- apps/visualizer/Makefile.am.orig
-+++ apps/visualizer/Makefile.am
-@@ -18,6 +18,6 @@ bin_PROGRAMS = gmerlin_visualizer
- gmerlin_visualizer_SOURCES = \
- gmerlin_visualizer.c
- 
--gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
-+gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- 
- EXTRA_DIST = gmerlin-visualizer.desktop
-Index: apps/visualizer/Makefile.in
-===================================================================
---- apps/visualizer/Makefile.in.orig
-+++ apps/visualizer/Makefile.in
-@@ -327,7 +327,7 @@ Desktop_DATA = gmerlin-visualizer.deskto
- gmerlin_visualizer_SOURCES = \
- gmerlin_visualizer.c
- 
--gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
-+gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
- EXTRA_DIST = gmerlin-visualizer.desktop
- all: all-am
- 
-Index: plugins/videofilters/Makefile.am
-===================================================================
---- plugins/videofilters/Makefile.am.orig
-+++ plugins/videofilters/Makefile.am
-@@ -36,7 +36,7 @@ fv_transform.la \
- fv_zoom.la
- 
- fv_blur_la_SOURCES  = fv_blur.c
--fv_blur_la_LIBADD = @MODULE_LIBADD@
-+fv_blur_la_LIBADD = @MODULE_LIBADD@ @LIBM@
- 
- fv_colormatrix_rgb_la_SOURCES  = fv_colormatrix_rgb.c colormatrix.c
- fv_colormatrix_rgb_la_LIBADD = @MODULE_LIBADD@
-@@ -71,7 +71,7 @@ fv_tctweak_la_SOURCES  = fv_tctweak.c
- fv_tctweak_la_LIBADD = @MODULE_LIBADD@
- 
- fv_transform_la_SOURCES  = fv_transform.c
--fv_transform_la_LIBADD = @MODULE_LIBADD@
-+fv_transform_la_LIBADD = @MODULE_LIBADD@ @LIBM@
- 
- fv_cropscale_la_SOURCES  = fv_cropscale.c
- fv_cropscale_la_LIBADD = @MODULE_LIBADD@
-@@ -91,9 +91,11 @@ fv_deinterlace_la_LIBADD   = @MODULE_LIB
- fv_deinterlace_la_SOURCES  = fv_deinterlace.c bgyadif.c
- 
- fv_equalizer_la_SOURCES  = fv_equalizer.c colormatrix.c
--fv_equalizer_la_LIBADD = @MODULE_LIBADD@
-+fv_equalizer_la_LIBADD = @MODULE_LIBADD@ @LIBM@
- 
- fv_zoom_la_SOURCES  = fv_zoom.c
- fv_zoom_la_LIBADD = @MODULE_LIBADD@
- 
-+fv_swapfields_la_LIBADD = @MODULE_LIBADD@
-+
- noinst_HEADERS = bgyadif.h colormatrix.h deinterlace.h
-Index: plugins/videofilters/Makefile.in
-===================================================================
---- plugins/videofilters/Makefile.in.orig
-+++ plugins/videofilters/Makefile.in
-@@ -441,7 +441,7 @@ fv_transform.la \
- fv_zoom.la
- 
- fv_blur_la_SOURCES = fv_blur.c
--fv_blur_la_LIBADD = @MODULE_LIBADD@
-+fv_blur_la_LIBADD = @MODULE_LIBADD@ @LIBM@
- fv_colormatrix_rgb_la_SOURCES = fv_colormatrix_rgb.c colormatrix.c
- fv_colormatrix_rgb_la_LIBADD = @MODULE_LIBADD@
- fv_colormatrix_yuv_la_SOURCES = fv_colormatrix_yuv.c colormatrix.c
-@@ -465,7 +465,7 @@ fv_textlogo_la_LIBADD = @MODULE_LIBADD@
- fv_tctweak_la_SOURCES = fv_tctweak.c
- fv_tctweak_la_LIBADD = @MODULE_LIBADD@
- fv_transform_la_SOURCES = fv_transform.c
--fv_transform_la_LIBADD = @MODULE_LIBADD@
-+fv_transform_la_LIBADD = @MODULE_LIBADD@ @LIBM@
- fv_cropscale_la_SOURCES = fv_cropscale.c
- fv_cropscale_la_LIBADD = @MODULE_LIBADD@
- fv_framerate_la_SOURCES = fv_framerate.c
-@@ -478,9 +478,10 @@ fv_deinterlace_la_CFLAGS = -DLOCALE_DIR=
- fv_deinterlace_la_LIBADD = @MODULE_LIBADD@
- fv_deinterlace_la_SOURCES = fv_deinterlace.c bgyadif.c
- fv_equalizer_la_SOURCES = fv_equalizer.c colormatrix.c
--fv_equalizer_la_LIBADD = @MODULE_LIBADD@
-+fv_equalizer_la_LIBADD = @MODULE_LIBADD@ @LIBM@
- fv_zoom_la_SOURCES = fv_zoom.c
- fv_zoom_la_LIBADD = @MODULE_LIBADD@
-+fv_swapfields_la_LIBADD = @MODULE_LIBADD@
- noinst_HEADERS = bgyadif.h colormatrix.h deinterlace.h
- all: all-am
- 
-Index: plugins/cdaudio/Makefile.am
-===================================================================
---- plugins/cdaudio/Makefile.am.orig
-+++ plugins/cdaudio/Makefile.am
-@@ -56,6 +56,7 @@ $(cddb_libs) \
- @CDIO_LIBS@ \
- @CDIO_CDDA_LIBS@ \
- @CDIO_PARANOIA_LIBS@ \
--@MODULE_LIBADD@
-+@MODULE_LIBADD@ \
-+@XML2_LIBS@
- 
- noinst_HEADERS = cdaudio.h sha1.h
-Index: plugins/cdaudio/Makefile.in
-===================================================================
---- plugins/cdaudio/Makefile.in.orig
-+++ plugins/cdaudio/Makefile.in
-@@ -363,7 +363,8 @@ $(cddb_libs) \
- @CDIO_LIBS@ \
- @CDIO_CDDA_LIBS@ \
- @CDIO_PARANOIA_LIBS@ \
--@MODULE_LIBADD@
-+@MODULE_LIBADD@ \
-+@XML2_LIBS@
- 
- noinst_HEADERS = cdaudio.h sha1.h
- all: all-am

gmerlin-4256-write_frame_jack.patch Added

@@ -0,0 +1,30 @@
+diff -U 3 -H -d -r -N -- gmerlin.orig/plugins/jack/oa_jack.c gmerlin/plugins/jack/oa_jack.c
+--- gmerlin.orig/plugins/jack/oa_jack.c	2015-02-23 02:44:23.000000000 +0300
++++ gmerlin/plugins/jack/oa_jack.c	2015-02-23 09:31:25.789886541 +0300
+@@ -178,12 +178,11 @@
+   return GAVL_SINK_OK;
+   }
+ 
+-static void
+-write_frame_jack(void * p, gavl_audio_frame_t * f)
+-  {
+-  jack_t * priv = p;
+-  gavl_audio_sink_put_frame(priv->sink, f);
+-  }
++//static void write_frame_jack(void * p, gavl_audio_frame_t * f)
++//  {
++//  jack_t * priv = p;
++//  gavl_audio_sink_put_frame(priv->sink, f);
++//  }
+ 
+ static int open_jack(void * data, gavl_audio_format_t * format)
+   {
+@@ -295,7 +294,7 @@
+     .open =          open_jack,
+     .get_sink =      get_sink_jack,
+     .start =         bg_jack_start,
+-    .write_audio =   write_frame_jack,
++//    .write_audio =   write_frame_jack,
+     .stop =          bg_jack_stop,
+     .close =         close_jack,
+     .get_delay =     get_delay_jack,

gmerlin-1.2.0.tar.gz/COPYING Deleted

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

gmerlin-1.2.0.tar.gz/Makefile.in Deleted

@@ -1,916 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/gmerlin-gtk.pc.in $(srcdir)/gmerlin.pc.in \
-	$(srcdir)/gmerlin.spec.in $(top_srcdir)/configure ABOUT-NLS \
-	AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
-	config.rpath config.sub depcomp install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES = gmerlin.spec gmerlin.pc gmerlin-gtk.pc
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdatadir)" \
-	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgdatadir)"
-DATA = $(dist_pkgdata_DATA) $(pkgconfig_DATA) $(pkgdata_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$[^/]*$/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/$[^/]*$$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-pkgdatadir = $(datadir)/gmerlin/
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# aclocal Path
-ACLOCAL_AMFLAGS = -I m4
-@HAVE_GTK_FALSE@gtk_pc = 
-@HAVE_GTK_TRUE@gtk_pc = gmerlin-gtk.pc
-SUBDIRS = po lib plugins tests apps icons skins include doc m4 utils osd
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gmerlin.pc $(gtk_pc) 
-pkgdata_DATA = plugin.sym
-dist_pkgdata_DATA = plugin.sym
-EXTRA_DIST = config.rpath gmerlin.spec.in gmerlin.pc.in autogen.sh cvs_clean.sh cpuinfo.sh make_potfiles 
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-gmerlin.spec: $(top_builddir)/config.status $(srcdir)/gmerlin.spec.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-gmerlin.pc: $(top_builddir)/config.status $(srcdir)/gmerlin.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-gmerlin-gtk.pc: $(top_builddir)/config.status $(srcdir)/gmerlin-gtk.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-dist_pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-dist_pkgdataDATA install-pkgconfigDATA \
-	install-pkgdataDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-dist_pkgdataDATA uninstall-pkgconfigDATA \
-	uninstall-pkgdataDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_pkgdataDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pkgconfigDATA \
-	install-pkgdataDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-dist_pkgdataDATA uninstall-pkgconfigDATA \
-	uninstall-pkgdataDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/aclocal.m4 Deleted

@@ -1,9296 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[["`\\]]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *$.*$$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $lib[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]$$symcode$symcode*$[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  xl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='echo'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=echo
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='echo'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${F77-"f77"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${FC-"f95"}
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^$-[[^=]]*$=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
-    ;;
-  esac
-])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 3017 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 4 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([m4/check_funcs.m4])
-m4_include([m4/gavl_simd.m4])
-m4_include([m4/gettext.m4])
-m4_include([m4/iconv.m4])
-m4_include([m4/lib-ld.m4])
-m4_include([m4/lib-link.m4])
-m4_include([m4/lib-prefix.m4])
-m4_include([m4/lqt_opt_cflags.m4])
-m4_include([m4/nls.m4])
-m4_include([m4/po.m4])
-m4_include([m4/progtest.m4])
-m4_include([acinclude.m4])

gmerlin-1.2.0.tar.gz/apps/Makefile.in Deleted

@@ -1,698 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = apps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = player cmdlineplayer cmdlinerecorder plugincfg \
-	alsamixer nmjedit recorder transcoder thumbnailer kbd \
-	visualizer
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$[^/]*$/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/$[^/]*$$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_PLAYER_FALSE@player_subdirs = 
-@HAVE_PLAYER_TRUE@player_subdirs = player
-@HAVE_PLUGINCFG_FALSE@plugincfg_subdirs = 
-@HAVE_PLUGINCFG_TRUE@plugincfg_subdirs = plugincfg
-@HAVE_ALSAMIXER_FALSE@alsamixer_subdirs = 
-@HAVE_ALSAMIXER_TRUE@alsamixer_subdirs = alsamixer
-@HAVE_TRANSCODER_FALSE@transcoder_subdirs = 
-
-#if HAVE_CAMELOT
-#camelot_subdirs = camelot
-#else
-#camelot_subdirs =
-#endif
-@HAVE_TRANSCODER_TRUE@transcoder_subdirs = transcoder
-@HAVE_RECORDER_FALSE@recorder_subdirs = 
-@HAVE_RECORDER_TRUE@recorder_subdirs = recorder
-@HAVE_KBD_FALSE@kbd_subdirs = 
-@HAVE_KBD_TRUE@kbd_subdirs = kbd
-@HAVE_VISUALIZER_FALSE@visualizer_subdirs = 
-@HAVE_VISUALIZER_TRUE@visualizer_subdirs = visualizer
-@HAVE_THUMBNAILER_FALSE@thumbnailer_subdirs = 
-@HAVE_THUMBNAILER_TRUE@thumbnailer_subdirs = thumbnailer
-@HAVE_NMJEDIT_FALSE@nmjedit_subdirs = 
-@HAVE_NMJEDIT_TRUE@nmjedit_subdirs = nmjedit
-SUBDIRS = $(player_subdirs) \
-cmdlineplayer \
-cmdlinerecorder \
-$(plugincfg_subdirs) \
-$(alsamixer_subdirs) \
-$(nmjedit_subdirs) \
-$(camelot_subdirs) \
-$(recorder_subdirs) \
-$(transcoder_subdirs) \
-$(thumbnailer_subdirs) \
-$(kbd_subdirs) \
-$(visualizer_subdirs)
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/alsamixer/Makefile.in Deleted

@@ -1,681 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_alsamixer$(EXEEXT)
-subdir = apps/alsamixer
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_alsamixer_OBJECTS = card.$(OBJEXT) main.$(OBJEXT) \
-	mixer.$(OBJEXT) g_control.$(OBJEXT) g_card.$(OBJEXT) \
-	g_mixer.$(OBJEXT)
-gmerlin_alsamixer_OBJECTS = $(am_gmerlin_alsamixer_OBJECTS)
-gmerlin_alsamixer_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_alsamixer_SOURCES)
-DIST_SOURCES = $(gmerlin_alsamixer_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(Desktop_DATA)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
-@ALSA_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-alsamixer.desktop
-gmerlin_alsamixer_SOURCES = card.c main.c mixer.c g_control.c g_card.c g_mixer.c
-gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread
-noinst_HEADERS = alsamixer.h gui.h
-EXTRA_DIST = gmerlin-alsamixer.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/alsamixer/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/alsamixer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_alsamixer$(EXEEXT): $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_DEPENDENCIES) 
-	@rm -f gmerlin_alsamixer$(EXEEXT)
-	$(LINK) $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/card.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_card.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_control.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_mixer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mixer.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-DesktopDATA uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/cmdlineplayer/Makefile.in Deleted

@@ -1,699 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_play$(EXEEXT)
-subdir = apps/cmdlineplayer
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-PROGRAMS = $(bin_PROGRAMS)
-gmerlin_play_SOURCES = gmerlin_play.c
-gmerlin_play_OBJECTS = gmerlin_play.$(OBJEXT)
-gmerlin_play_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = gmerlin_play.c
-DIST_SOURCES = gmerlin_play.c
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man_MANS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-dist_man_MANS = gmerlin_play.1
-gmerlin_play_LDADD = $(top_builddir)/lib/libgmerlin.la -ldl
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/cmdlineplayer/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/cmdlineplayer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_play$(EXEEXT): $(gmerlin_play_OBJECTS) $(gmerlin_play_DEPENDENCIES) 
-	@rm -f gmerlin_play$(EXEEXT)
-	$(LINK) $(gmerlin_play_OBJECTS) $(gmerlin_play_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_play.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(dist_man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-man \
-	uninstall-man1
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/cmdlinerecorder/Makefile.in Deleted

@@ -1,700 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin-record$(EXEEXT)
-subdir = apps/cmdlinerecorder
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_record_OBJECTS = gmerlin-record.$(OBJEXT)
-gmerlin_record_OBJECTS = $(am_gmerlin_record_OBJECTS)
-gmerlin_record_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_record_SOURCES)
-DIST_SOURCES = $(gmerlin_record_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man_MANS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-dist_man_MANS = gmerlin-record.1
-gmerlin_record_LDADD = $(top_builddir)/lib/libgmerlin.la -ldl
-gmerlin_record_SOURCES = gmerlin-record.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/cmdlinerecorder/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/cmdlinerecorder/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin-record$(EXEEXT): $(gmerlin_record_OBJECTS) $(gmerlin_record_DEPENDENCIES) 
-	@rm -f gmerlin-record$(EXEEXT)
-	$(LINK) $(gmerlin_record_OBJECTS) $(gmerlin_record_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin-record.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(dist_man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-man \
-	uninstall-man1
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/kbd/Makefile.in Deleted

@@ -1,702 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_kbd$(EXEEXT) gmerlin_kbd_config$(EXEEXT)
-subdir = apps/kbd
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_kbd_OBJECTS = kbd_daemon.$(OBJEXT) keys.$(OBJEXT) \
-	kbd.$(OBJEXT) keys_xml.$(OBJEXT)
-gmerlin_kbd_OBJECTS = $(am_gmerlin_kbd_OBJECTS)
-gmerlin_kbd_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la
-am_gmerlin_kbd_config_OBJECTS = kbd.$(OBJEXT) keys.$(OBJEXT) \
-	kbd_config.$(OBJEXT) kbd_remote.$(OBJEXT) keys_xml.$(OBJEXT)
-gmerlin_kbd_config_OBJECTS = $(am_gmerlin_kbd_config_OBJECTS)
-gmerlin_kbd_config_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_kbd_SOURCES) $(gmerlin_kbd_config_SOURCES)
-DIST_SOURCES = $(gmerlin_kbd_SOURCES) $(gmerlin_kbd_config_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(Desktop_DATA)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-kbd.desktop
-gmerlin_kbd_config_SOURCES = \
-kbd.c \
-keys.c \
-kbd_config.c \
-kbd_remote.c \
-keys_xml.c
-
-gmerlin_kbd_SOURCES = \
-kbd_daemon.c \
-keys.c \
-kbd.c \
-keys_xml.c
-
-noinst_HEADERS = \
-kbd.h \
-kbd_remote.h
-
-gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@ @XML2_LIBS@
-gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
-EXTRA_DIST = gmerlin-kbd.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/kbd/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/kbd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_kbd$(EXEEXT): $(gmerlin_kbd_OBJECTS) $(gmerlin_kbd_DEPENDENCIES) 
-	@rm -f gmerlin_kbd$(EXEEXT)
-	$(LINK) $(gmerlin_kbd_OBJECTS) $(gmerlin_kbd_LDADD) $(LIBS)
-gmerlin_kbd_config$(EXEEXT): $(gmerlin_kbd_config_OBJECTS) $(gmerlin_kbd_config_DEPENDENCIES) 
-	@rm -f gmerlin_kbd_config$(EXEEXT)
-	$(LINK) $(gmerlin_kbd_config_OBJECTS) $(gmerlin_kbd_config_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbd_config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbd_daemon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbd_remote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keys.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keys_xml.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-DesktopDATA uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/nmjedit/Makefile.am Deleted

gmerlin-1.2.0.tar.gz/apps/nmjedit/Makefile.in Deleted

@@ -1,643 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin-nmjedit$(EXEEXT)
-subdir = apps/nmjedit
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_nmjedit_OBJECTS = album.$(OBJEXT) bgalbum.$(OBJEXT) \
-	create.$(OBJEXT) dir.$(OBJEXT) gmerlin-nmjedit.$(OBJEXT) \
-	file.$(OBJEXT) nmjedit.$(OBJEXT) song.$(OBJEXT)
-gmerlin_nmjedit_OBJECTS = $(am_gmerlin_nmjedit_OBJECTS)
-gmerlin_nmjedit_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_nmjedit_SOURCES)
-DIST_SOURCES = $(gmerlin_nmjedit_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-# dist_man_MANS = gmerlin-record.1
-gmerlin_nmjedit_LDADD = $(top_builddir)/lib/libgmerlin.la @SQLITE3_LIBS@ -ldl
-gmerlin_nmjedit_SOURCES = \
-album.c \
-bgalbum.c \
-create.c \
-dir.c \
-gmerlin-nmjedit.c \
-file.c \
-nmjedit.c \
-song.c
-
-noinst_HEADERS = nmjedit.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/nmjedit/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/nmjedit/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin-nmjedit$(EXEEXT): $(gmerlin_nmjedit_OBJECTS) $(gmerlin_nmjedit_DEPENDENCIES) 
-	@rm -f gmerlin-nmjedit$(EXEEXT)
-	$(LINK) $(gmerlin_nmjedit_OBJECTS) $(gmerlin_nmjedit_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/album.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgalbum.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin-nmjedit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmjedit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/song.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/nmjedit/album.c Deleted

@@ -1,403 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include "nmjedit.h"
-#include <string.h>
-#include <gmerlin/utils.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "nmjedit.album"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-void bg_nmj_album_init(bg_nmj_album_t * a)
-  {
-  memset(a, 0, sizeof(*a));
-  a->id = -1;
-  }
-
-void bg_nmj_album_free(bg_nmj_album_t * a)
-  {
-  MY_FREE(a->title);
-  MY_FREE(a->search_title);
-  MY_FREE(a->total_item);
-  MY_FREE(a->release_date);
-  MY_FREE(a->update_state); // 3??
-  }
-
-void bg_nmj_album_dump(bg_nmj_album_t * a)
-  {
-  bg_dprintf("Album:\n");
-  bg_dprintf("  ID:           %"PRId64"\n", a->id);
-  bg_dprintf("  title:        %s\n", a->title);
-  bg_dprintf("  search_title: %s\n", a->search_title);
-  bg_dprintf("  total_item:   %s\n", a->total_item);
-  bg_dprintf("  release_date: %s\n", a->release_date);
-  bg_dprintf("  update_state: %s\n", a->update_state);
-  bg_dprintf("  genre_id:     %"PRId64"\n", a->genre_id);
-  bg_dprintf("  artist_id:    %"PRId64"\n", a->artist_id);
-  }
-
-static int album_query_callback(void * data, int argc, char **argv, char **azColName)
-  {
-  int i;
-  bg_nmj_album_t * ret = data;
-  
-  for(i = 0; i < argc; i++)
-    {
-    //    fprintf(stderr, "col: %s, val: %s\n", azColName[i], argv[i]);
-    SET_QUERY_INT("ID", id);
-    SET_QUERY_STRING("TITLE", title);
-    SET_QUERY_STRING("SEARCH_TITLE", search_title);
-    SET_QUERY_STRING("TOTAL_ITEM", total_item );
-    SET_QUERY_STRING("RELEASE_DATE", release_date);
-    SET_QUERY_STRING("UPDATE_STATE", update_state );
-    }
-  ret->found = 1;
-  return 0;
-  }
-
-int bg_nmj_album_query(sqlite3 * db, bg_nmj_album_t * a)
-  {
-  char * sql;
-  int result;
-
-  sql = sqlite3_mprintf("select * from SONG_ALBUMS where ID = %"PRId64";", a->id);
-  result = bg_sqlite_exec(db, sql, album_query_callback, a);
-  sqlite3_free(sql);
-  if(!a->found)
-    return 0;
-
-  /* Get Genre */
-  a->genre_id = bg_nmj_id_to_id(db,
-                                "SONG_GENRES_SONG_ALBUMS",
-                                "GENRES_ID",
-                                "ALBUMS_ID",
-                                a->id);
-
-  /* Get Artist */
-  a->artist_id = bg_nmj_id_to_id(db,
-                                 "SONG_PERSONS_SONG_ALBUMS",
-                                 "PERSONS_ID",
-                                 "ALBUMS_ID",
-                                 a->id);
-  return 1;
-  }
-
-int bg_nmj_album_add(bg_plugin_registry_t * plugin_reg,
-                     sqlite3 * db, bg_nmj_album_t * a, bg_nmj_song_t * song)
-  {
-  char * sql;
-  int result;
-  int64_t id;
-  int64_t group_id;
-  char * cover;
-  
-  if(a->id < 0)
-    {
-    char * artist;
-    
-    a->id = bg_nmj_get_next_id(db, "SONG_ALBUMS");
-    a->title = bg_strdup(a->title, song->album);
-    a->search_title = bg_nmj_make_search_string(a->title);
-    a->total_item = bg_sprintf("%d", 1);
-    a->release_date = bg_strdup(a->release_date, song->release_date);
-    a->update_state = bg_sprintf("%d", 3);
-    a->genre_id = song->genre_id;
-    a->artist_id = song->albumartist_id;
-
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding album %s", a->title);
-    
-    /* Insert */
-
-    sql = sqlite3_mprintf("INSERT INTO SONG_ALBUMS "
-                          "( ID, TITLE, SEARCH_TITLE, TOTAL_ITEM, "
-                          "RELEASE_DATE, UPDATE_STATE ) VALUES "
-                          "( %"PRId64", %Q, %Q, %Q, %Q, %Q );",
-                          a->id, a->title, a->search_title, a->total_item,
-                          a->release_date, a->update_state);
-    
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return result;
-
-    /* Set Genre */
-    if(song->genre_id >= 0)
-      {
-      id = bg_nmj_get_next_id(db, "SONG_GENRES_SONG_ALBUMS");
-      sql = sqlite3_mprintf("INSERT INTO SONG_GENRES_SONG_ALBUMS "
-                           "( ID, ALBUMS_ID, GENRES_ID ) VALUES "
-                           "( %"PRId64", %"PRId64", %"PRId64" );",
-                           id, a->id, song->genre_id);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      }
-    
-    /* Set Artist */
-    id = bg_nmj_get_next_id(db, "SONG_PERSONS_SONG_ALBUMS");
-    sql = sqlite3_mprintf("INSERT INTO SONG_PERSONS_SONG_ALBUMS "
-                         "( ID, PERSONS_ID, ALBUMS_ID, PERSON_TYPE ) VALUES "
-                         "( %"PRId64", %"PRId64", %"PRId64", %Q );",
-                          id, a->artist_id, a->id, "ARTIST");
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return result;
-
-    /* Get group */
-
-    group_id = -1;
-    artist = bg_nmj_id_to_string(db, "SONG_PERSONS", "NAME", "ID", a->artist_id);
-    
-    if(artist)
-      {
-      group_id = bg_nmj_get_group(db, "SONG_GROUPS", artist);
-      free(artist);
-      }
-    
-    if(group_id >= 0)
-      {
-      id = bg_nmj_get_next_id(db, "SONG_GROUPS_SONG_ALBUMS");
-      sql = sqlite3_mprintf("INSERT INTO SONG_GROUPS_SONG_ALBUMS "
-                            "( ID, GROUPS_ID, ALBUMS_ID ) VALUES "
-                            "( %"PRId64", %"PRId64", %"PRId64" );",
-                            id, group_id, a->id);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      }
-    
-    /* Check for Cover */
-    cover = bg_nmj_song_get_cover(song);
-    if(cover)
-      {
-      char * poster;
-      char * thumb;
-      uint8_t * poster_buf;
-      char time_string[BG_NMJ_TIME_STRING_LEN];
-      int poster_len;
-      struct stat st;
-
-      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using thumbnail %s",
-             cover);
-      
-      if(stat(cover, &st))
-        return 0;
-
-      bg_nmj_time_to_string(st.st_mtime, time_string);
-      
-      poster = bg_sprintf("nmj_database/media/music/poster/poster_a_%"PRId64".jpg", a->id);
-      thumb = bg_sprintf("nmj_database/media/music/thumbnail/thumbnail_%"PRId64".jpg", a->id);
-      
-      poster_buf = bg_read_file(cover, &poster_len);
-      if(!poster_buf || !bg_write_file(poster, poster_buf, poster_len))
-        {
-        // Error
-        }
-      
-      /* Create thumbnail */
-      bg_nmj_make_thumbnail(plugin_reg, poster, thumb, 248);
-      
-      sql = sqlite3_mprintf("INSERT INTO SONG_ALBUM_POSTERS "
-                            "( ID, POSTER, THUMBNAIL, CREATE_TIME ) VALUES "
-                            "( %"PRId64", %Q, %Q, %Q );",
-                            a->id, poster, thumb, time_string);
-      
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-
-      free(poster);
-      free(thumb);
-      free(cover);
-      if(poster_buf)
-        free(poster_buf);
-      }
-    }
-  else
-    {
-    int64_t ti;
-    bg_nmj_album_query(db, a);
-
-    /* Increment total items */
-    ti = strtoll(a->total_item, NULL, 10);
-    ti++;
-    free(a->total_item);
-    a->total_item = bg_sprintf("%"PRId64, ti);
-
-    sql = sqlite3_mprintf("UPDATE SONG_ALBUMS SET TOTAL_ITEM = %Q WHERE ID = %"PRId64";",
-                          a->total_item, a->id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return result;
-
-    /* If the song has a different release date, clear the release date of the
-       album */
-    if(strcmp(a->release_date, "9999-01-01") &&
-       strcmp(a->release_date, song->release_date))
-      {
-      a->release_date = bg_strdup(a->release_date, "9999-01-01");
-
-      sql = sqlite3_mprintf("UPDATE SONG_ALBUMS SET RELEASE_DATE = %Q WHERE ID = %"PRId64";",
-                            a->release_date, a->id);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      }
-    }
-  
-  /* Add this song */
-  id = bg_nmj_get_next_id(db, "SONG_ALBUMS_SONGS");
-
-  sql = sqlite3_mprintf("INSERT INTO SONG_ALBUMS_SONGS "
-                       "( ID, ALBUMS_ID, SONGS_ID, SEQUENCE ) VALUES "
-                       "( %"PRId64", %"PRId64", %"PRId64", %"PRId64" );",
-                       id, a->id, song->id, song->track_position );
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return result;
-  return 1;
-  }
-
-static int remove_album(sqlite3 * db, int64_t album_id)
-  {
-  char * image;
-  char * tmp_string;
-  char * sql;
-  int result;
-
-  tmp_string = bg_nmj_id_to_string(db,
-                                   "SONG_ALBUMS",
-                                   "TITLE",
-                                   "ID",
-                                   album_id);
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty album %s",
-         tmp_string);
-  free(tmp_string);
-  
-  /* Delete from SONG_ALBUMS */
-  sql = sqlite3_mprintf("DELETE FROM SONG_ALBUMS WHERE ID = %"PRId64";", album_id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-
-  /* Delete thumbnails & posters */
-
-  image  = bg_nmj_id_to_string(db, "SONG_ALBUM_POSTERS", "THUMBNAIL", "ID", album_id);
-  if(image)
-    {
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing thumbnail %s", image);
-    remove(image);
-    free(image);
-    }
-  image  = bg_nmj_id_to_string(db, "SONG_ALBUM_POSTERS", "POSTER", "ID", album_id);
-  if(image)
-    {
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing poster %s", image);
-    remove(image);
-    free(image);
-    }
-  sql = sqlite3_mprintf("DELETE FROM SONG_ALBUM_POSTERS WHERE ID = %"PRId64";", album_id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-  
-  /* Delete from persons */
-  sql = sqlite3_mprintf("DELETE FROM SONG_PERSONS_SONG_ALBUMS WHERE ALBUMS_ID = %"PRId64";", album_id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-
-  /* Delete from genres */
-  sql = sqlite3_mprintf("DELETE FROM SONG_GENRES_SONG_ALBUMS WHERE ALBUMS_ID = %"PRId64";", album_id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-
-  /* Delete from Groups */
-  sql = sqlite3_mprintf("DELETE FROM SONG_GROUPS_SONG_ALBUMS WHERE ALBUMS_ID = %"PRId64";", album_id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-  
-  return 1;
-  }
-
-int bg_nmj_album_delete(sqlite3 * db, int64_t album_id, bg_nmj_song_t * song)
-  {
-  char * total_item;
-  int64_t ti;
-  char * sql;
-  int result;
-  
-  /* Delete from track list */
-  
-  sql = sqlite3_mprintf("DELETE FROM SONG_ALBUMS_SONGS WHERE SONGS_ID = %"PRId64";",
-                        song->id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-  
-  /* Decretment total count */
-  total_item = bg_nmj_id_to_string(db, "SONG_ALBUMS", "TOTAL_ITEM", "ID", album_id);
-
-  if(!total_item)
-    return 1;
-  
-  ti = strtoll(total_item, NULL, 10);
-  ti--;
-
-  if(!ti)
-    remove_album(db, album_id);
-  else
-    {
-    free(total_item);
-    total_item = bg_sprintf("%"PRId64, ti);
-    
-    sql = sqlite3_mprintf("UPDATE SONG_ALBUMS SET TOTAL_ITEM = %Q WHERE ID = %"PRId64";",
-                          total_item, album_id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-
-    free(total_item);
-
-    if(!result)
-      return result;
-    }
-  
-  return 1;
-  }

gmerlin-1.2.0.tar.gz/apps/nmjedit/bgalbum.c Deleted

@@ -1,165 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <string.h>
-
-#include "nmjedit.h"
-#include <gmerlin/utils.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "nmjedit.gmerlinalbum"
-
-#include <gmerlin/tree.h>
-
-int bg_nmj_add_album(sqlite3 * db, const char * album)
-  {
-  bg_album_entry_t * entries;
-  bg_album_entry_t * e;
-  char * album_xml;
-  int skip_chars = -1;
-  char * pos;
-  char * dir;
-  char * name;
-  int64_t pls_id;
-  char * sql;
-  int result;
-  int64_t song_id;
-  int64_t item_id;
-  int64_t num;
-  
-  album_xml = bg_read_file(album, NULL);
-  if(!album_xml)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s could not be opened", album);
-    return 0;
-    }
-
-  entries = bg_album_entries_new_from_xml(album_xml);
-  free(album_xml);
-
-  if(!entries)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s contains no entries",
-           album);
-    return 0;
-    }
-
-  /* Figure out how many characters must be skipped from the album. This does not
-     work for insane directory structures */
-  
-  dir = bg_nmj_find_dir(db, entries->location);
-  if(!dir || !(pos = strstr(entries->location, dir)))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No directory found for location %s",
-           (char*)entries->location);
-    return 0;
-    }
-
-  skip_chars = pos - (char*)entries->location;
-  
-  /* Get the playlist name */
-  pos = strrchr(album, '/');
-  if(!pos)
-    name = bg_strdup(NULL, album);
-  else
-    name = bg_strdup(NULL, pos+1);
-  
-  pos = strrchr(name, '.');
-  if(pos)
-    *pos = '\0';
-
-  pls_id = bg_nmj_string_to_id(db, "SONG_PLS", "ID", "NAME", name);
-  if(pls_id >= 0)
-    {
-    /* Playlist already exists: Clear everything inside */
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Clearing existent playlist %s", name);
-    sql = sqlite3_mprintf("DELETE FROM SONG_PLS_ITEM WHERE PLS_ID = %"PRId64";", pls_id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return 0;
-    }
-  else
-    {
-    char * pls_path;
-    char time_str[BG_NMJ_TIME_STRING_LEN];
-    
-    pls_path = bg_sprintf("MUSIC/PLAYLISTS/%s.M3U", name);
-    bg_nmj_time_to_string(time(NULL), time_str);
-    
-    /* Playlist doesn't exist: Create a new one */
-    pls_id = bg_nmj_get_next_id(db, "SONG_PLS");
-
-    sql = sqlite3_mprintf("INSERT INTO SONG_PLS "
-                         "( ID, NAME, PATH, TOTAL_ITEM, "
-                         "CREATE_TIME ) VALUES "
-                         "( %"PRId64", %Q, %Q, 0, %Q );",
-                          pls_id, name, pls_path, time_str);
-    
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return result;
-    
-    free(pls_path);
-    }
-
-  /* Add entries */
-  e = entries;
-  num = 0;
-  while(e)
-    {
-    pos = ((char*)e->location) + skip_chars;
-    song_id = bg_nmj_string_to_id(db, "SONGS", "ID", "PATH", pos);
-
-    if(song_id >= 0)
-      {
-      item_id = bg_nmj_get_next_id(db, "SONG_PLS_ITEM");
-      
-      sql = sqlite3_mprintf("INSERT INTO SONG_PLS_ITEM "
-                            "( ID, PLS_ID, SONGS_ID, SEQUENCE) "
-                            " VALUES "
-                            "( %"PRId64", %"PRId64", %"PRId64", %"PRId64" );",
-                            item_id, pls_id, song_id, num+1);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      num++;
-      }
-    else
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Song %s not found",
-             pos);
-    
-    e = e->next;
-    }
-
-  /* Update total entries */
-  sql = sqlite3_mprintf("UPDATE SONG_PLS SET TOTAL_ITEM = %"PRId64" WHERE ID = %"PRId64";",
-                        num, pls_id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return result;
-  
-  bg_album_entries_destroy(entries);
-  return 1;
-  }

gmerlin-1.2.0.tar.gz/apps/nmjedit/create.c Deleted

@@ -1,201 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include "nmjedit.h"
-#include <gmerlin/utils.h>
-#define LOG_DOMAIN "nmjedit.create"
-
-#include <unistd.h>
-
-static const char * create_commands[] =
-  {
-    "CREATE TABLE FAVOURITES (ID INTEGER PRIMARY KEY, TYPE TEXT, MEDIA_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE DB_VERSION (ID INTEGER PRIMARY KEY, VERSION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT)",
-    "CREATE TABLE SCAN_DIRS (ID INTEGER PRIMARY KEY, DIRECTORY TEXT, NAME TEXT, SCAN_TIME TEXT, SIZE INTEGER, CATEGORY INTEGER, STATUS TEXT DEFAULT 0, SEQUENCE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SCAN_SYSTEM (ID INTEGER PRIMARY KEY, TYPE TEXT, VALUE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE CONTENT_PROVIDERS ( ID INTEGER PRIMARY KEY, NAME TEXT, DESCRIPTION TEXT, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONGS (ID INTEGER PRIMARY KEY, TITLE TEXT, SEARCH_TITLE TEXT, PATH TEXT, SCAN_DIRS_ID INTEGER, FOLDERS_ID INTEGER, RUNTIME TEXT, FORMAT TEXT, LYRIC TEXT, RATING INTEGER DEFAULT 0, HASH TEXT, SIZE INTEGER, PLAY_COUNT INTEGER DEFAULT 0, BIT_RATE TEXT, TRACK_POSITION INTEGER, RELEASE_DATE TEXT DEFAULT '9999-01-01', CREATE_TIME TEXT, UPDATE_STATE TEXT, FILE_STATUS TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_ALBUMS (ID INTEGER PRIMARY KEY, TITLE TEXT, LANGUAGE TEXT, SEARCH_TITLE TEXT, TOTAL_ITEM TEXT DEFAULT 0, RELEASE_DATE TEXT DEFAULT '9999-01-01', UPDATE_STATE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_ALBUMS_SONGS (ID INTEGER PRIMARY KEY, ALBUMS_ID INTEGER , SONGS_ID INTEGER, SEQUENCE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_FOLDERS (ID INTEGER PRIMARY KEY, FOLDER TEXT, TOTAL_ITEM TEXT DEFAULT 0, PATH TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_GENRES_SONGS (ID INTEGER PRIMARY KEY, SONGS_ID INTEGER, GENRES_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_GENRES (ID INTEGER PRIMARY KEY, NAME TEXT, DESCRIPTION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_GENRES_SONG_ALBUMS (ID INTEGER PRIMARY KEY, ALBUMS_ID INTEGER, GENRES_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_GROUPS_SONG_ALBUMS (ID INTEGER PRIMARY KEY, GROUPS_ID INTEGER, ALBUMS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_GROUPS (ID INTEGER PRIMARY KEY, NAME TEXT, LANGUAGE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_PLS (ID INTEGER PRIMARY KEY, NAME TEXT, PATH TEXT, FORMAT TEXT, SCAN_DIRS_ID INTEGER, SIZE INTEGER, TOTAL_ITEM TEXT DEFAULT 0, CREATE_TIME TEXT, UPDATE_STATE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_PLS_ITEM (ID INTEGER PRIMARY KEY, PLS_ID INTEGER , SONGS_ID INTEGER , SEQUENCE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_LAST_OPEN (ID INTEGER PRIMARY KEY, SONGS_ID INTEGER , CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_PERSONS_SONGS (ID INTEGER PRIMARY KEY, PERSONS_ID INTEGER, SONGS_ID INTEGER, PERSON_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_PERSONS_SONG_ALBUMS (ID INTEGER PRIMARY KEY, PERSONS_ID INTEGER , ALBUMS_ID INTEGER, PERSON_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_PERSONS (ID INTEGER PRIMARY KEY, NAME TEXT , POSTER TEXT, THUMBNAIL TEXT, BIOGRAPHY TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SONG_ALBUM_POSTERS (ID INTEGER PRIMARY KEY, POSTER TEXT, POSTER_HASH TEXT, THUMBNAIL TEXT, THUMBNAIL_HASH TEXT, TYPE TEXT, CREATE_TIME TEXT, MODIFY_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE PHOTOS (ID INTEGER PRIMARY KEY, TITLE TEXT , SEARCH_TITLE TEXT , PATH TEXT, SCAN_DIRS_ID INTEGER, THUMBNAIL TEXT, PREVIEW TEXT, FORMAT TEXT, WIDTH TEXT, HEIGHT TEXT, CAPTURE_TIME TEXT DEFAULT '9999-01-01', F_NUMBER TEXT, SHUTTLE_SPEED TEXT, FOCAL_LENGTH TEXT, ISO_SPEED TEXT, FLASH TEXT, MODEL TEXT, SIZE INTEGER, CREATE_TIME TEXT, UPDATE_STATE TEXT, FILE_STATUS TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE PHOTO_ALBUMS (ID INTEGER PRIMARY KEY, TITLE TEXT, SEARCH_TITLE TEXT, PATH TEXT, TOTAL_ITEM INTEGER, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE PHOTO_ALBUMS_PHOTOS (ID INTEGER PRIMARY KEY, PHOTO_ALBUMS_ID INTEGER , PHOTOS_ID INTEGER, SEQUENCE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE PHOTO_DATE (ID INTEGER PRIMARY KEY, CAPTURE_TIME TEXT , TOTAL_ITEM INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE PHOTO_LAST_OPEN (ID INTEGER PRIMARY KEY, PHOTOS_ID INTEGER , CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEOS (ID INTEGER PRIMARY KEY, PATH TEXT, FILE_TYPE TEXT, SCAN_DIRS_ID INTEGER, CREATE_TIME TEXT, UPDATE_STATE TEXT, FILE_STATUS TEXT, HASH TEXT, SIZE INTEGER, THREE_D INTEGER DEFAULT 0, RESOLUTION TEXT, PLAY_COUNT INTEGER DEFAULT 0, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOWS (ID INTEGER PRIMARY KEY, TITLE TEXT , SEARCH_TITLE TEXT , LAST_PLAY_ITEM TEXT, TOTAL_ITEM INTEGER DEFAULT 0, YEAR TEXT DEFAULT '9999', RELEASE_DATE TEXT DEFAULT '9999-01-01', POSTERS_ID INTEGER, RATING INTEGER DEFAULT 0, RESOLUTION TEXT, PARENTAL_CONTROL TEXT, RUNTIME INTEGER DEFAULT 0, CREATE_TIME TEXT, TTID TEXT, UPDATE_STATE TEXT, TITLE_TYPE TEXT, CONTENT_ID INTEGER, CONTENT_TTID INTEGER, THREE_D INTEGER DEFAULT 0, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEO_SUBTITLES ( ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, FILE_NAME TEXT , LANGUAGE TEXT, SIZE INTEGER, CREATE_TIME TEXT, TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOW_GROUPS_SHOWS ( ID INTEGER PRIMARY KEY, GROUPS_ID INTEGER , SHOWS_ID INTEGER, TITLE_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOW_GROUPS (ID INTEGER PRIMARY KEY, NAME TEXT , GROUP_TYPE TEXT, LANGUAGE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE EPISODES ( ID INTEGER PRIMARY KEY, EPISODE_ID INTEGER, SERIES_ID INTEGER, SEASON_ID INTEGER, SEASON INTEGER, EPISODE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SYNOPSISES ( ID INTEGER PRIMARY KEY, SUMMARY TEXT, TAGLINE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOWS_PERSONS ( ID INTEGER PRIMARY KEY, PERSONS_ID INTEGER, SHOWS_ID INTEGER, PERSON_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEO_PERSONS ( ID INTEGER PRIMARY KEY, NAME TEXT, POSTER TEXT, THUMBNAIL TEXT, BIOGRAPHY TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOWS_GENRES ( ID INTEGER PRIMARY KEY, GENRES_ID INTEGER , SHOWS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEO_GENRES ( ID INTEGER PRIMARY KEY, NAME TEXT , DESCRIPTION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEO_BOOKMARKS (ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, TITLE TEXT, SEARCH_TITLE TEXT, BOOKMARK_TIME INTEGER, THUMBNAIL TEXT, TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEO_POSTERS ( ID INTEGER PRIMARY KEY, POSTER TEXT , POSTER_HASH TEXT, THUMBNAIL TEXT, THUMBNAIL_HASH TEXT, WALLPAPER TEXT, TYPE TEXT, CREATE_TIME TEXT, MODIFY_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE TV_LAST_OPEN (ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE MOVIE_LAST_OPEN (ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE KEYWORDS (ID INTEGER PRIMARY KEY, KEYWORD TEXT, DESCRIPTION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOWS_KEYWORDS ( ID INTEGER PRIMARY KEY, KEYWORDS_ID INTEGER , SHOWS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE SHOWS_VIDEOS ( ID INTEGER PRIMARY KEY, SHOWS_ID INTEGER , VIDEOS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE TABLE VIDEO_PROPERTIES (ID INTEGER PRIMARY KEY, RUNTIME INTEGER DEFAULT 0, RESOLUTION TEXT, WIDTH TEXT, HEIGHT TEXT, ASPECT_RATIO TEXT, SYSTEM TEXT, VIDEO_CODEC TEXT, FPS TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
-    "CREATE INDEX IDX_VIDEOS_SCAN_DIRS_ID ON VIDEOS(SCAN_DIRS_ID ASC)",
-    "CREATE INDEX IDX_SONGS_SCAN_DIRS_ID ON SONGS(SCAN_DIRS_ID ASC)",
-    "CREATE INDEX IDX_PHOTOS_SCAN_DIRS_ID ON PHOTOS(SCAN_DIRS_ID ASC)",
-    "CREATE INDEX IDX_SHOWS_CONTENT_TTID ON SHOWS(CONTENT_TTID ASC)",
-    "CREATE INDEX IDX_SHOWS_TITLE ON SHOWS(TITLE ASC)",
-    "CREATE INDEX IDX_SHOWS_SEARCH_TITLE ON SHOWS(SEARCH_TITLE ASC)",
-    "CREATE INDEX IDX_SHOWS_YEAR ON SHOWS(YEAR ASC)",
-    "CREATE INDEX IDX_SHOWS_RATING ON SHOWS(RATING ASC)",
-    "CREATE INDEX IDX_SHOWS_PARENTAL_CONTROL ON SHOWS(PARENTAL_CONTROL ASC)",
-    "CREATE INDEX IDX_VIDEO_SUBTITLES_VIDEOS_ID ON VIDEO_SUBTITLES(VIDEOS_ID ASC)",
-    "CREATE INDEX IDX_SONGS_TITLE ON SONGS(TITLE ASC)",
-    "CREATE INDEX IDX_SONGS_SEARCH_TITLE ON SONGS(SEARCH_TITLE ASC)",
-    "CREATE INDEX IDX_SONGS_RATING ON SONGS(RATING ASC)",
-    "CREATE INDEX IDX_SONGS_RELEASE_DATE ON SONGS(RELEASE_DATE ASC)",
-    "CREATE INDEX IDX_SONG_ALBUMS_TITLE ON SONG_ALBUMS(TITLE ASC)",
-    "CREATE INDEX IDX_SONG_ALBUMS_SEARCH_TITLE ON SONG_ALBUMS(SEARCH_TITLE ASC)",
-    "CREATE INDEX IDX_SONG_ALBUMS_RELEASE_DATE ON SONG_ALBUMS(RELEASE_DATE ASC)",
-    "CREATE INDEX IDX_SONG_ALBUM_SONGS_ALBUMS_ID ON SONG_ALBUMS_SONGS(ALBUMS_ID ASC)",
-    "CREATE INDEX IDX_SONG_ALBUM_SONGS_SONGS_ID ON SONG_ALBUMS_SONGS(SONGS_ID ASC)",
-    "CREATE INDEX IDX_SONG_GENRES_SONGS_GENRES_ID ON SONG_GENRES_SONGS(GENRES_ID ASC)",
-    "CREATE INDEX IDX_SONG_GENRES_SONGS_SONGS_ID ON SONG_GENRES_SONGS(SONGS_ID ASC)",
-    "CREATE INDEX IDX_SONG_GENRES_SONG_ALBUMS_ALBUMS_ID ON SONG_GENRES_SONG_ALBUMS(ALBUMS_ID ASC)",
-    "CREATE INDEX IDX_SONG_GENRES_SONG_ALBUMS_GENRES_ID ON SONG_GENRES_SONG_ALBUMS(GENRES_ID ASC)",
-    "CREATE INDEX IDX_SONG_GROUPS_SONG_ALBUMS_GROUPS_ID ON SONG_GROUPS_SONG_ALBUMS(GROUPS_ID ASC)",
-    "CREATE INDEX IDX_SONG_GROUPS_SONG_ALBUMS_ALBUMS_ID ON SONG_GROUPS_SONG_ALBUMS(ALBUMS_ID ASC)",
-    "CREATE INDEX IDX_SONG_PERSONS_SONGS_PERSONS_ID ON SONG_PERSONS_SONGS(PERSONS_ID ASC)",
-    "CREATE INDEX IDX_SONG_PERSONS_SONGS_SONGS_ID ON SONG_PERSONS_SONGS(SONGS_ID ASC)",
-    "CREATE INDEX IDX_SONG_PERSONS_SONG_ALBUMS_PERSONS_ID ON SONG_PERSONS_SONG_ALBUMS(PERSONS_ID ASC)",
-    "CREATE INDEX IDX_SONG_PERSONS_SONG_ALBUMS_ALBUMS_ID ON SONG_PERSONS_SONG_ALBUMS(ALBUMS_ID ASC)",
-    "CREATE INDEX IDX_PHOTOS_TITLE ON PHOTOS(TITLE ASC)",
-    "CREATE INDEX IDX_PHOTOS_SEARCH_TITLE ON PHOTOS(SEARCH_TITLE ASC)",
-    "CREATE INDEX IDX_PHOTO_DATE_CAPTURE_TIME ON PHOTO_DATE(CAPTURE_TIME ASC)",
-    "CREATE INDEX IDX_PHOTO_ALBUMS_PHOTOS_PHOTO_ALBUMS_ID ON PHOTO_ALBUMS_PHOTOS(PHOTO_ALBUMS_ID ASC)",
-    "CREATE INDEX IDX_PHOTO_ALBUMS_PHOTOS_PHOTOS_ID ON PHOTO_ALBUMS_PHOTOS(PHOTOS_ID ASC)",
-    "CREATE UNIQUE INDEX UIDX_SHOWS_GENRES_GENRES_ID ON SHOWS_GENRES(SHOWS_ID ASC, GENRES_ID ASC)",
-    "CREATE UNIQUE INDEX UIDX_SHOWS_PERSONS_PERSONS_ID ON SHOWS_PERSONS(PERSONS_ID ASC, SHOWS_ID ASC, PERSON_TYPE ASC)",
-    "CREATE UNIQUE INDEX UIDX_EPISODES_ID ON EPISODES(EPISODE_ID ASC, SERIES_ID ASC, SEASON_ID ASC)",
-    "CREATE UNIQUE INDEX UIDX_SONGS_PATH ON SONGS(PATH ASC)",
-    "CREATE UNIQUE INDEX UIDX_PHOTOS_PATH ON PHOTOS(PATH ASC)",
-    NULL,
-  };
-
-const char * directories[] =
-  {
-    "nmj_database",
-    "nmj_database/media",
-    "nmj_database/media/photo",
-    "nmj_database/media/photo/preview",
-    "nmj_database/media/photo/thumbnail",
-    "nmj_database/media/video",
-    "nmj_database/media/video/poster",
-    "nmj_database/media/video/preview",
-    "nmj_database/media/video/thumbnail",
-    "nmj_database/media/music",
-    "nmj_database/media/music/poster",
-    "nmj_database/media/music/preview",
-    "nmj_database/media/music/thumbnail",
-    NULL,
-  };
-
-void bg_nmj_create_new()
-  {
-  int i;
-  int result;
-  sqlite3 * db;
-  int64_t id;
-  char * sql;
-  
-  if(!access("nmj_database", R_OK | W_OK))
-    {
-    fprintf(stderr, "Directory nmj_database already exists, delete it before recreating it\n");
-    return;
-    }
-  
-  i = 0;
-  while(directories[i])
-    {
-    if(!bg_ensure_directory(directories[i]))
-      return;
-    i++;
-    }
-
-  /* Create database */
-
-  result = sqlite3_open(DATABASE_FILE, &db);
-  if(result)
-    {
-    fprintf(stderr, "Can't open database %s: %s\n",
-            DATABASE_FILE, sqlite3_errmsg(db));
-    sqlite3_close(db);
-    return;
-    }
-  
-  i = 0;
-  while(create_commands[i])
-    {
-    if(!bg_sqlite_exec(db, create_commands[i], NULL, NULL))
-      return;
-    i++;
-    }
-  /* Set version number */
-  if(!bg_sqlite_exec(db, "INSERT INTO DB_VERSION ( ID, VERSION ) VALUES ( 1, '"DATABASE_VERSION"' );",
-                     NULL, NULL))
-    return;
-
-  /* Set SCAN_SYSTEM */
-  if(!bg_sqlite_exec(db, "INSERT INTO SCAN_SYSTEM ( ID, TYPE, VALUE ) VALUES ( 1, 'RUNNING_STATUS', 0 );",
-                     NULL, NULL))
-    return;
-
-  /* Create album groups */
-
-  i = 0;
-  while(bg_nmj_album_groups[i])
-    {
-    id = bg_nmj_get_next_id(db, "SONG_GROUPS");
-    sql = sqlite3_mprintf("INSERT INTO SONG_GROUPS "
-                          "( ID, NAME, LANGUAGE ) VALUES "
-                          "( %"PRId64", %Q, 'EN' );",
-                          id, bg_nmj_album_groups[i]);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return;
-    i++;
-    }
-  }

gmerlin-1.2.0.tar.gz/apps/nmjedit/dir.c Deleted

@@ -1,137 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-/* Dir */
-
-#include "nmjedit.h"
-#include <string.h>
-#include <gmerlin/utils.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "nmjedit.dir"
-
-#if 0
-typedef struct
-  {
-  int64_t id;
-  char * directory; // Relative path
-  char * name;      // Absolute path??
-  char * scan_time; // NULL?
-  int64_t size;     // Sum of all file sizes in bytes
-  int64_t category; // 40 for Music
-  char * status;    // 3 (??)
-
-  int found;
-  } bg_nmj_dir_t;
-#endif
-
-/* Directory */
-
-void bg_nmj_dir_init(bg_nmj_dir_t * dir)
-  {
-  memset(dir, 0, sizeof(*dir));
-  dir->id   = -1;
-  dir->size = -1;
-  }
-
-void bg_nmj_dir_free(bg_nmj_dir_t *  dir)
-  {
-  MY_FREE(dir->directory);
-  MY_FREE(dir->name);
-  MY_FREE(dir->status);
-  MY_FREE(dir->scan_time);
-  }
-
-void bg_nmj_dir_dump(bg_nmj_dir_t*  dir)
-  {
-  bg_dprintf("Directory\n");
-  bg_dprintf("  ID:        %"PRId64"\n", dir->id);
-  bg_dprintf("  Directory: %s\n",        dir->directory);
-  bg_dprintf("  Name:      %s\n",        dir->name);
-  bg_dprintf("  ScanTime:  %s\n",        dir->scan_time);
-  bg_dprintf("  Size:      %"PRId64"\n", dir->size);
-  bg_dprintf("  Category:  %"PRId64"\n", dir->category);
-  bg_dprintf("  Status:    %s\n",        dir->status);
-  }
-
-static int dir_query_callback(void * data, int argc, char **argv, char **azColName)
-  {
-  int i;
-  bg_nmj_dir_t * ret = data;
-  
-  for(i = 0; i < argc; i++)
-    {
-    //    fprintf(stderr, "col: %s, val: %s\n", azColName[i], argv[i]);
-    SET_QUERY_INT("ID", id);
-    SET_QUERY_STRING("DIRECTORY", directory);
-    SET_QUERY_STRING("NAME", name);
-    SET_QUERY_INT("SIZE", size);
-    SET_QUERY_INT("CATEGORY", category);
-    SET_QUERY_STRING("STATUS", status);
-    }
-  ret->found = 1;
-  return 0;
-  }
-
-int bg_nmj_dir_query(sqlite3 * db, bg_nmj_dir_t * dir)
-  {
-  char * sql;
-  int result;
-  
-  if(dir->directory)
-    {
-    sql = sqlite3_mprintf("select * from SCAN_DIRS where DIRECTORY = %Q;", dir->directory);
-    result = bg_sqlite_exec(db, sql, dir_query_callback, dir);
-    sqlite3_free(sql);
-    return dir->found;
-    }
-  else if(dir->id >= 0)
-    {
-    sql = sqlite3_mprintf("select * from SCAN_DIRS where ID = %"PRId64";", dir->id);
-    result = bg_sqlite_exec(db, sql, dir_query_callback, dir);
-    sqlite3_free(sql);
-    return dir->found;
-    }
-  else
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Either ID or path must be set in directory\n");
-    return 0;
-    }
-  }
-
-int bg_nmj_dir_add(sqlite3* db, bg_nmj_dir_t * dir)
-  {
-  int result;
-  char * sql;
-
-  dir->id = bg_nmj_get_next_id(db, "SCAN_DIRS");
-  if(!dir->name)
-    dir->name = bg_strdup(dir->name, dir->directory);
- 
-  sql = sqlite3_mprintf("INSERT INTO SCAN_DIRS ( ID, DIRECTORY, NAME, SIZE, CATEGORY, STATUS ) VALUES "
-                       "( %"PRId64", %Q, %Q, %"PRId64", %"PRId64", %Q )",
-                       dir->id, dir->directory, dir->name, dir->size, dir->category, dir->status );
-
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  return result;
-  }
-

gmerlin-1.2.0.tar.gz/apps/nmjedit/file.c Deleted

@@ -1,166 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-
-#include "nmjedit.h"
-
-#include <gmerlin/utils.h>
-
-#include <gmerlin/translation.h>
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "nmjedit.file"
-
-
-
-static bg_nmj_file_t * file_scan_internal(const char * directory,
-                                          const char * extensions,
-                                          bg_nmj_file_t * files,
-                                          int * num_p, int * alloc_p,
-                                          int64_t * size)
-  {
-  char * filename;
-  DIR * d;
-  struct dirent * e;
-  struct stat st;
-  char * pos;
-  bg_nmj_file_t * file;
-  int num = *num_p;
-  int alloc = *alloc_p;
-  
-  d = opendir(directory);
-  if(!d)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Opening directory %s failed: %s",
-           directory, strerror(errno));
-    return files;
-    }
-
-  while((e = readdir(d)))
-    {
-    /* Skip hidden files and "." and ".." */
-    if(e->d_name[0] == '.')
-      continue;
-    
-    filename = bg_sprintf("%s/%s", directory, e->d_name);
-    if(!stat(filename, &st))
-      {
-      /* Check for directory */
-      if(S_ISDIR(st.st_mode))
-        {
-        files = file_scan_internal(filename,
-                                   extensions,
-                                   files, &num, &alloc, size);
-        }
-      else if(S_ISREG(st.st_mode))
-        {
-        pos = strrchr(filename, '.');
-        if(pos && bg_string_match(pos+1, extensions))
-          {
-          /* Add file to list */
-          if(num + 2 > alloc)
-            {
-            alloc += 256;
-            files = realloc(files, alloc * sizeof(*files));
-            memset(files + num, 0,
-                   (alloc - num) * sizeof(*files));
-            }
-          file = files + num;
-
-          file->path = filename;
-          filename = NULL;
-          file->size = st.st_size;
-          file->time = st.st_mtime;
-          num += 1;
-          }
-        *size += st.st_size;
-        }
-      }
-    if(filename)
-      free(filename);
-    }
-  
-  closedir(d);
-  *num_p = num;
-  *alloc_p = alloc;
-  return files;
-  }
-
-bg_nmj_file_t * bg_nmj_file_scan(const char * directory,
-                                 const char * extensions,
-                                 int64_t * size, int * num)
-  {
-  bg_nmj_file_t * ret = NULL;
-  int num_ret = 0;
-  int ret_alloc = 0;
-  *size = 0;
-  ret = file_scan_internal(directory,
-                           extensions,
-                           ret,
-                           &num_ret, &ret_alloc, size);
-  *num = num_ret;
-  return ret;
-  }
-
-bg_nmj_file_t * bg_nmj_file_lookup(bg_nmj_file_t * files,
-                                   const char * path)
-  {
-  int i = 0;
-  while(files[i].path)
-    {
-    if(!strcmp(files[i].path, path))
-      return &files[i];
-    i++;
-    }
-  return NULL;
-  }
-
-void bg_nmj_file_destroy(bg_nmj_file_t * files)
-  {
-  int i = 0;
-  while(files[i].path)
-    {
-    free(files[i].path);
-    i++;
-    }
-  free(files);
-  }
-
-void bg_nmj_file_remove(bg_nmj_file_t * files,
-                        bg_nmj_file_t * file)
-  {
-  /* Count entries after this one */
-  int num = 1;
-  
-  while(file[num].path)
-    num++;
-
-  free(file->path);
-  memmove(file, file+1, num * sizeof(*file));
-  
-  }

gmerlin-1.2.0.tar.gz/apps/nmjedit/gmerlin-nmjedit.c Deleted

@@ -1,266 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <string.h>
-
-
-#include <config.h>
-#include <gmerlin/recorder.h>
-#include <gmerlin/pluginregistry.h>
-#include <gavl/gavl.h>
-#include <gmerlin/utils.h>
-#include <gmerlin/cmdline.h>
-#include <gmerlin/log.h>
-#include <gmerlin/translation.h>
-
-#include "nmjedit.h"
-
-char ** add_dirs = NULL;
-int num_add_dirs = 0;
-
-char ** del_dirs = NULL;
-int num_del_dirs = 0;
-
-char ** add_albums = NULL;
-int num_add_albums = 0;
-
-int list_dirs = 0;
-int do_create = 0;
-
-static void opt_add(void * data, int * argc, char *** _argv, int arg)
-  {
-  if(arg >= *argc)
-    {
-    fprintf(stderr, "Option -add requires an argument\n");
-    exit(-1);
-    }
-  
-  add_dirs = realloc(add_dirs, (num_add_dirs+1)*sizeof(*add_dirs));
-  add_dirs[num_add_dirs] = bg_strdup(NULL, (*_argv)[arg]);
-  num_add_dirs++;
-  bg_cmdline_remove_arg(argc, _argv, arg);
-  }
-
-static void opt_add_album(void * data, int * argc, char *** _argv, int arg)
-  {
-  if(arg >= *argc)
-    {
-    fprintf(stderr, "Option -add-album requires an argument\n");
-    exit(-1);
-    }
-  
-  add_albums = realloc(add_albums, (num_add_albums+1)*sizeof(*add_albums));
-  add_albums[num_add_albums] = bg_strdup(NULL, (*_argv)[arg]);
-  num_add_albums++;
-  bg_cmdline_remove_arg(argc, _argv, arg);
-  }
-
-
-static void opt_del(void * data, int * argc, char *** _argv, int arg)
-  {
-  if(arg >= *argc)
-    {
-    fprintf(stderr, "Option -del requires an argument\n");
-    exit(-1);
-    }
-  
-  del_dirs = realloc(del_dirs, (num_del_dirs+1)*sizeof(*del_dirs));
-  del_dirs[num_del_dirs] = bg_strdup(NULL, (*_argv)[arg]);
-  num_del_dirs++;
-  bg_cmdline_remove_arg(argc, _argv, arg);
-  }
-
-static void opt_list_dirs(void * data, int * argc, char *** _argv, int arg)
-  {
-  list_dirs = 1;
-  }
-
-static void opt_create(void * data, int * argc, char *** _argv, int arg)
-  {
-  do_create = 1;
-  }
-
-static void opt_v(void * data, int * argc, char *** _argv, int arg)
-  {
-  int val, verbose = 0;
-
-  if(arg >= *argc)
-    {
-    fprintf(stderr, "Option -v requires an argument\n");
-    exit(-1);
-    }
-  val = atoi((*_argv)[arg]);  
-  
-  if(val > 0)
-    verbose |= BG_LOG_ERROR;
-  if(val > 1)
-    verbose |= BG_LOG_WARNING;
-  if(val > 2)
-    verbose |= BG_LOG_INFO;
-  if(val > 3)
-    verbose |= BG_LOG_DEBUG;
-  bg_log_set_verbose(verbose);
-  bg_cmdline_remove_arg(argc, _argv, arg);
-  }
-
-static bg_cmdline_arg_t global_options[] =
-  {
-    {
-      .arg =         "-add",
-      .help_arg =    "<directory>",
-      .help_string = "Add directory",
-      .callback =    opt_add,
-    },
-    {
-      .arg =         "-del",
-      .help_arg =    "<directory>",
-      .help_string = "Delete directory",
-      .callback =    opt_del,
-    },
-    {
-      .arg =         "-add-album",
-      .help_arg =    "<album>",
-      .help_string = "Add album as a playlist",
-      .callback =    opt_add_album,
-    },
-    {
-      .arg =         "-v",
-      .help_arg =    "level",
-      .help_string = "Set verbosity level (0..4)",
-      .callback =    opt_v,
-    },
-    {
-      .arg =         "-list-dirs",
-      .help_string = "List directories",
-      .callback =    opt_list_dirs,
-    },
-    {
-      .arg =         "-create",
-      .help_string = "Create new and empty database",
-      .callback =    opt_create,
-    },
-    { /* End */ },
-  };
-
-const bg_cmdline_app_data_t app_data =
-  {
-    .package =  PACKAGE,
-    .version =  VERSION,
-    .name =     "gmerlin-nmjedit",
-    .synopsis = TRS("[options]\n"),
-    .help_before = TRS("Editor for NMJ2 databases\n"),
-    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
-                                       {  } },
-    .files = (bg_cmdline_ext_doc_t[])
-    { { "~/.gmerlin/plugins.xml",
-        TRS("Cache of the plugin registry (shared by all applicatons)") },
-      { "~/.gmerlin/generic/config.xml",
-        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
-      { /* End */ }
-    },
-    
-  };
-
-#define DATABASE_FILE "nmj_database/media.db"
-
-#define TYPES BG_NMJ_MEDIA_TYPE_AUDIO
-
-int main(int argc, char ** argv)
-  {
-  bg_cfg_section_t * cfg_section;
-  char * tmp_path;
-  bg_plugin_registry_t * plugin_reg;
-  bg_cfg_registry_t * cfg_reg;
-  sqlite3 * db;
-  int result;
-  char * dir;
-  int i;
-
-  bg_cmdline_init(&app_data);
-  bg_cmdline_parse(global_options, &argc, &argv, NULL);
-
-  if(do_create)
-    {
-    bg_nmj_create_new();
-    return 0;
-    }
-  
-  /* Make database connection */
-  
-  result = sqlite3_open(DATABASE_FILE, &db);
-  if(result)
-    {
-    fprintf(stderr, "Can't open database %s: %s\n",
-            DATABASE_FILE, sqlite3_errmsg(db));
-    sqlite3_close(db);
-    return 1;
-    }
-  
-  /* Create plugin registry */
-  
-  cfg_reg = bg_cfg_registry_create();
-  tmp_path =  bg_search_file_read("generic", "config.xml");
-  bg_cfg_registry_load(cfg_reg, tmp_path);
-  if(tmp_path)
-    free(tmp_path);
-  
-  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
-  plugin_reg = bg_plugin_registry_create(cfg_section);
-
-  if(list_dirs)
-    {
-    bg_nmj_list_dirs(db);
-    }
-  
-  /* Add directories */
-  for(i = 0; i < num_add_dirs; i++)
-    {
-    dir = add_dirs[i];
-    
-    if(dir[strlen(dir)-1] == '/')
-      dir[strlen(dir)-1] = '\0';
-    bg_nmj_add_directory(plugin_reg, db, dir, TYPES);
-    }
-
-  /* Delete directories */
-  for(i = 0; i < num_del_dirs; i++)
-    {
-    dir = del_dirs[i];
-    
-    if(dir[strlen(dir)-1] == '/')
-      dir[strlen(dir)-1] = '\0';
-    bg_nmj_remove_directory(db, dir);
-    }
-
-  /* Add albums */
-  for(i = 0; i < num_add_albums; i++)
-    {
-    dir = add_albums[i];
-    bg_nmj_add_album(db, dir);
-    }
-  
-  bg_nmj_cleanup(db);
-  
-  /* Close sql connection */
-  sqlite3_close(db);
-  
-  return 0;
-  }

gmerlin-1.2.0.tar.gz/apps/nmjedit/nmjedit.c Deleted

@@ -1,913 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include "nmjedit.h"
-
-#include <gmerlin/log.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/utils.h>
-#define LOG_DOMAIN "nmjedit"
-
-#include <string.h>
-#include <ctype.h>
-
-int
-bg_sqlite_exec(sqlite3 * db,                              /* An open database */
-               const char *sql,                           /* SQL to be evaluated */
-               int (*callback)(void*,int,char**,char**),  /* Callback function */
-               void * data)                               /* 1st argument to callback */
-  {
-  char * err_msg;
-  int err;
-
-  err = sqlite3_exec(db, sql, callback, data, &err_msg);
-
-  //  fprintf(stderr, "Sending %s\n", sql);
-
-  if(err)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "SQL query: \"%s\" failed: %s",
-           sql, err_msg);
-    sqlite3_free(err_msg);
-    return 0;
-    }
-  return 1;
-  }
-
-/* Callbacks */
-
-static int id_callback(void * data, int argc, char **argv, char **azColName)
-  {
-  int64_t * ret = data;
-  if(argv[0])
-    *ret = strtoll(argv[0], NULL, 10);
-  return 0;
-  }
-
-static int string_callback(void * data, int argc, char **argv, char **azColName)
-  {
-  char ** ret = data;
-  if((argv[0]) && (*(argv[0]) != '\0'))
-    *ret = strdup(argv[0]);
-  return 0;
-  }
-
-typedef struct
-  {
-  int64_t * val;
-  int val_alloc;
-  int num_val;
-  } append_int_t;
-
-static int
-append_int_callback(void * data, int argc, char **argv, char **azColName)
-  {
-  int64_t ret;
-  append_int_t * val = data;
-  if(argv[0])
-    {
-    ret = strtoll(argv[0], NULL, 10);
-    if(val->num_val + 1 > val->val_alloc)
-      {
-      val->val_alloc = val->num_val + 128;
-      val->val = realloc(val->val, val->val_alloc * sizeof(*val->val));
-      }
-    val->val[val->num_val] = ret;
-    val->num_val++;
-    }
-  return 0;
-  }
-
-int64_t bg_nmj_string_to_id(sqlite3 * db,
-                            const char * table,
-                            const char * id_row,
-                            const char * string_row,
-                            const char * str)
-  {
-  char * buf;
-  int64_t ret = -1;
-  int result;
-  buf = sqlite3_mprintf("select %s from %s where %s = %Q;",
-                        id_row, table, string_row, str);
-  result = bg_sqlite_exec(db, buf, id_callback, &ret);
-  sqlite3_free(buf);
-  return result ? ret : -1 ;
-  }
-
-char * bg_nmj_id_to_string(sqlite3 * db,
-                           const char * table,
-                           const char * string_row,
-                           const char * id_row,
-                           int64_t id)
-  {
-  char * buf;
-  char * ret = NULL;
-  int result;
-  buf = sqlite3_mprintf("select %s from %s where %s = %"PRId64";",
-                        string_row, table, id_row, id);
-  result = bg_sqlite_exec(db, buf, string_callback, &ret);
-  return result ? ret : NULL;
-  }
-
-int64_t bg_nmj_id_to_id(sqlite3 * db,
-                        const char * table,
-                        const char * dst_row,
-                        const char * src_row,
-                        int64_t id)
-  {
-  char * buf;
-  int64_t ret = -1;
-  int result;
-  buf = sqlite3_mprintf("select %s from %s where %s = %"PRId64";",
-                        dst_row, table, src_row, id);
-  result = bg_sqlite_exec(db, buf, id_callback, &ret);
-  return result ? ret : -1;
-  }
-
-int64_t bg_nmj_get_next_id(sqlite3 * db, const char * table)
-  {
-  int result;
-  char * sql;
-  int64_t ret = 0;
-
-  sql = sqlite3_mprintf("select max(id) from %s;", table);
-  result = bg_sqlite_exec(db, sql, id_callback, &ret);
-  sqlite3_free(sql);
-  if(!result)
-    return -1;
-
-  if(ret < 0)
-    return -1;
-
-  return ret + 1;
-  }
-
-int64_t bg_nmj_count_id(sqlite3 * db,
-                        const char * table,
-                        const char * id_row,
-                        int64_t id)
-  {
-  int result;
-  char * sql;
-  int64_t ret = 0;
-
-  sql = sqlite3_mprintf("select count(*) from %s where %s = %"PRId64";",
-                        table, id_row, id);
-  result = bg_sqlite_exec(db, sql, id_callback, &ret);
-  sqlite3_free(sql);
-  if(!result)
-    return -1;
-  return ret;
-  }
-
-static const struct
-  {
-  char c;
-  char * escaped;
-  }
-escape_rules[] =
-  {
-    { '\'', "&apos;" },
-    { '&',  "&amp;" },
-    { /* End */      }
-  };
-  
-char * bg_nmj_escape_string(const char * str)
-  {
-  int done;
-  int i;
-  const char * pos;
-  char * ret = NULL;
-  char buf[2];
-
-  if(!str)
-    return NULL;
-  
-  buf[1] = '\0';
-
-  pos = str;
-  while(*pos != '\0')
-    {
-    done = 0;
-    i = 0;
-    while(escape_rules[i].escaped)
-      {
-      if(escape_rules[i].c == *pos)
-        {
-        ret = bg_strcat(ret, escape_rules[i].escaped);
-        done = 1;
-        break;
-        }
-      i++;
-      }
-    if(!done)
-      {
-      buf[0] = *pos;
-      ret = bg_strcat(ret, buf);
-      }
-    pos++;
-    }
-  return ret;
-  }
-
-int64_t bg_nmj_get_group(sqlite3 * db, const char * table, char * str)
-  {
-  char * group;
-  char * sql;
-  int ret = -1;
-  int i;
-  int result;
-  int first = toupper(str[0]);
-  
-  append_int_t tab;
-  memset(&tab, 0, sizeof(tab));
-
-  sql =
-    sqlite3_mprintf("select ID from %s;", table);
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-
-  for(i = 0; i < tab.num_val; i++)
-    {
-    group = bg_nmj_id_to_string(db, table, "NAME", "ID", tab.val[i]);
-    if(strlen(group) == 1)
-      {
-      if(first == group[0])
-        ret = tab.val[i];
-      }
-    else if(strlen(group) == 3)
-      {
-      if((first >= group[0]) && (first <= group[2]))
-        ret = tab.val[i];
-      }
-    free(group);
-    if(ret >= 0)
-      break;
-    }
-  if((ret < 0) && tab.num_val)
-    ret = tab.val[tab.num_val-1];
-  if(tab.val)
-    free(tab.val);
-  return ret;
-  }
-
-static const char * search_string_skip[] =
-  {
-    "a ",
-    "the ",
-    "&apos;", // 'Round Midnight
-    NULL
-  };
-
-char * bg_nmj_make_search_string(const char * str)
-  {
-  int i, len;
-  const char * pos = str;
-
-  i = 0;
-  while(search_string_skip[i])
-    {
-    len = strlen(search_string_skip[i]);
-    if(!strncasecmp(str, search_string_skip[i], len))
-      {
-      pos = str + len;
-      break;
-      }
-    i++;
-    }
-  return bg_strdup(NULL, pos);
-  }
-
-
-int64_t bg_nmj_album_lookup(sqlite3 * db,
-                            int64_t artist_id, const char * title)
-  {
-  int i;
-  int64_t ret = -1;
-  append_int_t tab;
-  char * sql;
-  int result;
-  
-  memset(&tab, 0, sizeof(tab));
-
-  sql =
-    sqlite3_mprintf("select ID from SONG_ALBUMS where TITLE = %Q;",
-                    title);
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-  
-  if(!result)
-    goto fail;
-  
-  for(i = 0; i < tab.num_val; i++)
-    {
-    if(bg_nmj_id_to_id(db, "SONG_PERSONS_SONG_ALBUMS",
-                       "PERSONS_ID",
-                       "ALBUMS_ID", tab.val[i]) == artist_id)
-      {
-      ret = tab.val[i];
-      break;
-      }
-    }
-  
-  fail:
-  if(tab.val)
-    free(tab.val);
-  return ret;
-  }
-
-
-#if 0
-char * bg_nmj_unescape_string(const char * str)
-  {
-  
-  }
-#endif
-
-
-/* Album */
-
-/* Main entry points */
-
-static const char * audio_extensions = "mp3 flac ogg";
-static const char * video_extensions = "avi mov mkv flv";
-static const char * image_extensions = "jpg";
-
-static char * make_extensions(int type)
-  {
-  char * ret = NULL;
-  if(type & BG_NMJ_MEDIA_TYPE_AUDIO)
-    {
-    if(ret)
-      ret = bg_strcat(ret, " ");
-    ret = bg_strcat(ret, audio_extensions);
-    }
-  if(type & BG_NMJ_MEDIA_TYPE_VIDEO)
-    {
-    if(ret)
-      ret = bg_strcat(ret, " ");
-    ret = bg_strcat(ret, video_extensions);
-    }
-  if(type & BG_NMJ_MEDIA_TYPE_PHOTO)
-    {
-    if(ret)
-      ret = bg_strcat(ret, " ");
-    ret = bg_strcat(ret, image_extensions);
-    }
-  return ret;
-  }
-
-// YYYY-MM-DD HH:MM:SS
-#define TIME_FORMAT "%Y-%m-%d %H:%M:%S"
-
-#define BG_NMJ_TIME_STRING_LEN 20
-time_t bg_nmj_string_to_time(const char * str)
-  {
-  struct tm tm;
-  memset(&tm, 0, sizeof(tm));
-  strptime(str, TIME_FORMAT, &tm); 
-  return timegm(&tm);
-  }
-
-void bg_nmj_time_to_string(time_t time, char * str)
-  {
-  struct tm tm;
-  memset(&tm, 0, sizeof(tm));
-  gmtime_r(&time, &tm);
-  strftime(str, BG_NMJ_TIME_STRING_LEN, TIME_FORMAT, &tm);
-  }
-
-/*
- *  Categories are summed up from the following:
- *  
- *   3: Video
- *   4: Video (private)
- *  16: Photo
- *  40: Music
- */
-
-static int category_from_types(int types)
-  {
-  int ret = 0;
-  if(types & BG_NMJ_MEDIA_TYPE_AUDIO)
-    ret += 40;
-  if(types & BG_NMJ_MEDIA_TYPE_VIDEO)
-    ret += 3;
-  if(types & BG_NMJ_MEDIA_TYPE_VIDEO_PRIVATE)
-    ret += 4;
-  if(types & BG_NMJ_MEDIA_TYPE_PHOTO)
-    ret += 16;
-  return ret;
-  }
-
-static int add_directory(bg_plugin_registry_t * plugin_reg,
-                         sqlite3 * db, bg_nmj_dir_t * dir, int types)
-  {
-  bg_nmj_file_t * files;
-  char * extensions;
-  int i;
-  bg_nmj_song_t song;
-  int64_t size = 0;
-  int num = 0;
-  
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding %s", dir->directory);
-  
-  /* Scan */
-  extensions = make_extensions(types);
-  files = bg_nmj_file_scan(dir->directory, extensions, &size, &num);
-
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Scanned %d files", num);
-  
-  /* Add directory */
-
-  dir->size = size;
-  dir->category = category_from_types(types);
-  dir->status = bg_sprintf("%d", 3); // Whatever that means
-
-  if(!bg_nmj_dir_add(db, dir))
-    return 0;
-  
-  /* Add songs */
-  
-  i = 0;
-  while(files[i].path)
-    {
-    bg_nmj_song_init(&song);
-    bg_nmj_song_get_info(db, plugin_reg, dir, &files[i], &song);
-    //    fprintf(stderr, "Got song:\n");
-    //    bg_nmj_song_dump(&song);
-    //    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding song %s", song.title);
-    bg_nmj_song_add(plugin_reg, db, &song);
-    i++;
-    }
-  
-  return 0;
-  }
-
-static int update_directory(bg_plugin_registry_t * plugin_reg,
-                            sqlite3 * db, bg_nmj_dir_t * dir, int type)
-  {
-  append_int_t tab;
-  char * sql;
-  int result;
-  int i;
-  bg_nmj_song_t song;
-  bg_nmj_file_t * files;
-  int64_t size = 0;
-  int ret = 0;
-  char * extensions;
-  bg_nmj_file_t * file;
-  int num = 0;
-  
-  memset(&tab, 0, sizeof(tab));
-
-  extensions = make_extensions(type);
-
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Updating %s", dir->directory);
-  
-  files = bg_nmj_file_scan(dir->directory, extensions, &size, &num);
-
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Scanned %d files", num);
-    
-  /* 1. Query all files in the database and check if they changed or were deleted */
-  sql =
-    sqlite3_mprintf("select ID from SONGS where SCAN_DIRS_ID = %"PRId64";",
-                    dir->id);
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-  
-  if(!result)
-    goto fail;
-
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Found %d files in database", tab.num_val);
-    
-  for(i = 0; i < tab.num_val; i++)
-    {
-    bg_nmj_song_init(&song);
-    song.id = tab.val[i];
-    
-    if(!bg_nmj_song_query(db, &song))
-      return 0;
-    
-    //    fprintf(stderr, "Got song\n");
-    //    bg_nmj_song_dump(&song);
-    
-    /* Check if song is still current */
-
-    file = bg_nmj_file_lookup(files, song.path);
-    if(!file)
-      {
-      /* File disappeared */
-      bg_nmj_song_delete(db, &song);
-      }
-    else if(file->time != bg_nmj_string_to_time(song.create_time))
-      {
-      /* File changed, will be re-added later */
-      bg_nmj_song_delete(db, &song);
-      }
-    /* Remove from array */
-    else
-      bg_nmj_file_remove(files, file);
-    
-    bg_nmj_song_free(&song);
-    }
-  
-  /* 2. Check for newly added files */
-  i = 0;
-  while(files[i].path)
-    {
-    bg_nmj_song_t new_song;
-    bg_nmj_song_init(&new_song);
-    if(!bg_nmj_song_get_info(db, plugin_reg, dir, &files[i], 
-                             &new_song))
-      return 0;
-
-    //    fprintf(stderr, "Got new song\n");
-    //    bg_nmj_song_dump(&new_song);
-    bg_nmj_song_add(plugin_reg, db, &new_song);
-    i++;
-    }
-
-  ret = 1;
-  fail:
-  
-  if(files)
-    bg_nmj_file_destroy(files);
-  if(extensions)
-    free(extensions);
-  
-  return ret;
-  }
-
-int bg_nmj_add_directory(bg_plugin_registry_t * plugin_reg,
-                         sqlite3 * db, const char * directory, int types)
-  {
-  int result;
-  /* Check if the directory already exists */
-  bg_nmj_dir_t dir;
-  bg_nmj_dir_init(&dir);
-  dir.directory = bg_strdup(NULL, directory);
-
-  if(bg_nmj_dir_query(db, &dir))
-    {
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Directory %s exists", directory);
-    result = update_directory(plugin_reg, db, &dir, types);
-    }
-  else
-    {
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Directory %s doesn't exist", directory);
-    result = add_directory(plugin_reg, db, &dir, types);
-    }
-  
-  bg_nmj_dir_free(&dir);
-  
-  return result;
-  }
-
-int bg_nmj_remove_directory(sqlite3 * db, const char * directory)
-  {
-  bg_nmj_dir_t dir;
-  char * sql;
-  int result;
-  append_int_t tab;
-  bg_nmj_song_t song;
-  int ret = 0;
-  int i;
-  
-  bg_nmj_dir_init(&dir);
-  memset(&tab, 0, sizeof(tab));
-  dir.directory = bg_strdup(NULL, directory);
-
-  if(!bg_nmj_dir_query(db, &dir))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Directory %s doesn't exist", directory);
-    return 0;
-    }
-
-  /* Loop through all songs and remove them */
-  sql =
-    sqlite3_mprintf("select ID from SONGS where SCAN_DIRS_ID = %"PRId64";", dir.id);
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-  if(!result)
-    goto fail;
-
-  for(i = 0; i < tab.num_val; i++)
-    {
-    bg_nmj_song_init(&song);
-    song.id = tab.val[i];
-    if(bg_nmj_song_query(db, &song))
-      bg_nmj_song_delete(db, &song);
-    bg_nmj_song_free(&song);
-    }
-
-  /* Remove directory */
-  sql = sqlite3_mprintf("DELETE FROM SCAN_DIRS WHERE ID = %"PRId64";",
-                        dir.id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-
-  
-  ret = 1;
-  fail:
-
-  if(tab.val)
-    free(tab.val);
-  
-  return ret;
-  }
-
-int bg_nmj_make_thumbnail(bg_plugin_registry_t * plugin_reg,
-                          const char * in_file,
-                          const char * out_file,
-                          int thumb_size)
-  {
-  int ret = 0;
-  /* Formats */
-  
-  gavl_video_format_t input_format;
-  gavl_video_format_t output_format;
-  
-  /* Frames */
-  
-  gavl_video_frame_t * input_frame = NULL;
-  gavl_video_frame_t * output_frame = NULL;
-
-  gavl_video_converter_t * cnv = 0;
-  int do_convert;
-  bg_image_writer_plugin_t * output_plugin;
-  bg_plugin_handle_t * output_handle = NULL;
-  const bg_plugin_info_t * plugin_info;
-  
-  input_frame = bg_plugin_registry_load_image(plugin_reg,
-                                              in_file,
-                                              &input_format, NULL);
-
-  gavl_video_format_copy(&output_format, &input_format);
-
-  /* Scale the image to square pixels */
-  output_format.image_width *= output_format.pixel_width;
-  output_format.image_height *= output_format.pixel_height;
-  
-  if(output_format.image_width > input_format.image_height)
-    {
-    output_format.image_height = (thumb_size * output_format.image_height) /
-      output_format.image_width;
-    output_format.image_width = thumb_size;
-    }
-  else
-    {
-    output_format.image_width      = (thumb_size * output_format.image_width) /
-      output_format.image_height;
-    output_format.image_height = thumb_size;
-    }
-
-  output_format.pixel_width = 1;
-  output_format.pixel_height = 1;
-  output_format.interlace_mode = GAVL_INTERLACE_NONE;
-
-  output_format.frame_width = output_format.image_width;
-  output_format.frame_height = output_format.image_height;
-
-  plugin_info =
-    bg_plugin_find_by_name(plugin_reg, "iw_jpeg");
-
-  if(!plugin_info)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No plugin for %s", out_file);
-    goto fail;
-    }
-
-  output_handle = bg_plugin_load(plugin_reg, plugin_info);
-
-  if(!output_handle)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Loading %s failed", plugin_info->long_name);
-    goto fail;
-    }
-  
-  output_plugin = (bg_image_writer_plugin_t*)output_handle->plugin;
-
-  if(!output_plugin->write_header(output_handle->priv,
-                                  out_file, &output_format, NULL))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing image header failed");
-    return 0;
-    }
-
-  /* Initialize video converter */
-  cnv = gavl_video_converter_create();
-  do_convert = gavl_video_converter_init(cnv, &input_format, &output_format);
-
-  if(do_convert)
-    {
-    output_frame = gavl_video_frame_create(&output_format);
-    gavl_video_convert(cnv, input_frame, output_frame);
-    if(!output_plugin->write_image(output_handle->priv,
-                                   output_frame))
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing image failed");
-      goto fail;
-      }
-    }
-  else
-    {
-    if(!output_plugin->write_image(output_handle->priv,
-                                   input_frame))
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing image failed");
-      goto fail;
-      }
-    }
-  
-  ret = 1;
-  fail:
-
-  if(input_frame)
-    gavl_video_frame_destroy(input_frame);
-  if(output_frame)
-    gavl_video_frame_destroy(output_frame);
-  if(output_handle)
-    bg_plugin_unref(output_handle);
-  if(cnv)
-    gavl_video_converter_destroy(cnv);
-  return ret;
-  }
-
-void bg_nmj_list_dirs(sqlite3 * db)
-  {
-  append_int_t tab;
-  bg_nmj_dir_t dir;
-  int i;
-  char * sql;
-  int result;
-  
-  memset(&tab, 0, sizeof(tab));
-
-  sql =
-    sqlite3_mprintf("select ID from SCAN_DIRS;");
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-
-  if(!result)
-    return;
-
-  for(i = 0; i < tab.num_val; i++)
-    {
-    bg_nmj_dir_init(&dir);
-    dir.id = tab.val[i];
-    if(!bg_nmj_dir_query(db, &dir))
-      return;
-    bg_nmj_dir_dump(&dir);
-    bg_nmj_dir_free(&dir);
-    }
-  if(tab.val)
-    free(tab.val);
-  }
-
-char * bg_nmj_find_dir(sqlite3 * db, const char * path)
-  {
-  append_int_t tab;
-  char * sql;
-  int result;
-  char * dir;
-  int i;
-  
-  memset(&tab, 0, sizeof(tab));
-  sql =
-    sqlite3_mprintf("select * from SCAN_DIRS;");
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-
-  if(!result)
-    return NULL;
-  
-  for(i = 0; i < tab.num_val; i++)
-    {
-    dir = bg_nmj_id_to_string(db,
-                              "SCAN_DIRS",
-                              "DIRECTORY",
-                              "ID",
-                              tab.val[i]);
-    if(strstr(path, dir))
-      {
-      free(tab.val);
-      return dir;
-      }
-    free(dir);
-    }
-
-  if(tab.val)
-    free(tab.val);
-  return NULL;
-  }
-
-const char * bg_nmj_album_groups[] =
-  {
-    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P",
-    "Q-R", "S", "T", "U", "V", "W", "X-Y", "Z", "_OTHERS", NULL
-  };
-
-void bg_nmj_cleanup(sqlite3 * db)
-  {
-  int i;
-  int64_t count;
-  append_int_t tab;
-  char * tmp_string;
-  char * sql;
-  int result;
-  
-  memset(&tab, 0, sizeof(tab));
-  
-  /* Check for empty music genres */
-  sql =
-    sqlite3_mprintf("select ID from SONG_GENRES;");
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-  if(!result)
-    return;
-
-  for(i = 0; i < tab.num_val; i++)
-    {
-    count = bg_nmj_count_id(db,
-                            "SONG_GENRES_SONGS",
-                            "GENRES_ID",
-                            tab.val[i]);
-    count += bg_nmj_count_id(db,
-                            "SONG_GENRES_SONG_ALBUMS",
-                            "GENRES_ID",
-                            tab.val[i]);
-    if(!count)
-      {
-      tmp_string = bg_nmj_id_to_string(db, "SONG_GENRES", "NAME", "ID", tab.val[i]);
-      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty genre %s", tmp_string);
-      free(tmp_string);
-
-      sql = sqlite3_mprintf("DELETE FROM SONG_GENRES WHERE ID = %"PRId64";",
-                            tab.val[i]);
-      result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-      sqlite3_free(sql);
-      if(!result)
-        return;
-      }
-    }
-  
-  /* Check for empty music persons */
-
-  tab.num_val = 0;
-  sql =
-    sqlite3_mprintf("select ID from SONG_PERSONS;");
-  result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-  sqlite3_free(sql);
-  if(!result)
-    return;
-
-  for(i = 0; i < tab.num_val; i++)
-    {
-    count = bg_nmj_count_id(db,
-                            "SONG_PERSONS_SONGS",
-                            "PERSONS_ID",
-                            tab.val[i]);
-    count += bg_nmj_count_id(db,
-                            "SONG_PERSONS_SONG_ALBUMS",
-                            "PERSONS_ID",
-                            tab.val[i]);
-    if(!count)
-      {
-      tmp_string = bg_nmj_id_to_string(db, "SONG_PERSONS", "NAME", "ID", tab.val[i]);
-      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty person %s", tmp_string);
-      free(tmp_string);
-
-      sql = sqlite3_mprintf("DELETE FROM SONG_PERSONS WHERE ID = %"PRId64";",
-                            tab.val[i]);
-      result = bg_sqlite_exec(db, sql, append_int_callback, &tab);
-      sqlite3_free(sql);
-      if(!result)
-        return;
-
-      }
-    }
-  
-  /* Rebuild album groups */
-    
-  }

gmerlin-1.2.0.tar.gz/apps/nmjedit/nmjedit.h Deleted

@@ -1,251 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <config.h>
-
-#define _GNU_SOURCE
-#include <time.h>
-#include <sqlite3.h>
-#include <inttypes.h>
-
-#include <gmerlin/pluginregistry.h>
-
-#define DATABASE_FILE "nmj_database/media.db"
-#define DATABASE_VERSION "1.9.0"
-
-/* Utilits functions */
-
-
-
-#define MY_FREE(ptr) \
-  if(ptr) \
-    free(ptr);
-
-#define SET_QUERY_STRING(col, val)   \
-  if(!strcasecmp(azColName[i], col)) \
-    ret->val = bg_strdup(ret->val, argv[i]);
-
-#define SET_QUERY_INT(col, val)      \
-  if(!strcasecmp(azColName[i], col) && argv[i]) \
-    ret->val = strtoll(argv[i], NULL, 10);
-
-int
-bg_sqlite_exec(sqlite3 * db,                              /* An open database */
-               const char *sql,                           /* SQL to be evaluated */
-               int (*callback)(void*,int,char**,char**),  /* Callback function */
-               void * data);                              /* 1st argument to callback */
-
-
-#define BG_NMJ_TIME_STRING_LEN 20
-time_t bg_nmj_string_to_time(const char * str);
-void bg_nmj_time_to_string(time_t time, char * str);
-
-char * bg_nmj_escape_string(const char * str);
-// char * bg_nmj_unescape_string(const char * str);
-
-char * bg_nmj_make_search_string(const char * str);
-
-int64_t bg_nmj_string_to_id(sqlite3 * db,
-                            const char * table,
-                            const char * id_row,
-                            const char * string_row,
-                            const char * str);
-
-char * bg_nmj_id_to_string(sqlite3 * db,
-                           const char * table,
-                           const char * string_row,
-                           const char * id_row,
-                           int64_t id);
-
-int64_t bg_nmj_count_id(sqlite3 * db,
-                        const char * table,
-                        const char * id_row,
-                        int64_t id);
-
-
-int64_t bg_nmj_id_to_id(sqlite3 * db,
-                        const char * table,
-                        const char * dst_row,
-                        const char * src_row,
-                        int64_t id);
-
-int64_t bg_nmj_get_next_id(sqlite3 * db, const char * table);
-
-int bg_nmj_make_thumbnail(bg_plugin_registry_t * plugin_reg,
-                          const char * in_file,
-                          const char * out_file,
-                          int thumb_size);
-
-int64_t bg_nmj_get_group(sqlite3 * db, const char * table, char * str);
-
-char * bg_nmj_find_dir(sqlite3 * db, const char * path);
-
-
-/* Directory scanning utility */
-
-typedef struct
-  {
-  int checked;
-  char * path;
-  time_t time;
-  int64_t size;
-  } bg_nmj_file_t;
-
-bg_nmj_file_t * bg_nmj_file_scan(const char * directory,
-                                 const char * extensions, int64_t * size, int * num);
-
-bg_nmj_file_t * bg_nmj_file_lookup(bg_nmj_file_t * files,
-                                   const char * path);
-
-void bg_nmj_file_destroy(bg_nmj_file_t * files);
-
-void bg_nmj_file_remove(bg_nmj_file_t * files,
-                        bg_nmj_file_t * file);
-
-
-/* Directory */
-
-typedef struct
-  {
-  int64_t id;
-  char * directory; // Relative path
-  char * name;      // Absolute path??
-  char * scan_time; // NULL?
-  int64_t size;     // Sum of all file sizes in bytes
-  int64_t category; // 40 for Music
-  char * status;    // 3 (??)
-
-  int found;
-  } bg_nmj_dir_t;
-
-void bg_nmj_dir_init(bg_nmj_dir_t*);
-void bg_nmj_dir_free(bg_nmj_dir_t*);
-void bg_nmj_dir_dump(bg_nmj_dir_t*);
-int bg_nmj_dir_query(sqlite3*, bg_nmj_dir_t*);
-int bg_nmj_dir_add(sqlite3*, bg_nmj_dir_t*);
-int bg_nmj_dir_update(sqlite3*, bg_nmj_dir_t*);
-
-/* Song structure */
-
-typedef struct
-  {
-  /* SONGS */
-  int64_t id;
-  char * title;
-  char * search_title;
-  char * path;
-  int64_t scan_dirs_id;
-  int64_t folders_id;   // Unused? */
-  char * runtime;
-  char * format;
-  char * lyric;
-  int64_t rating;   // default: 0
-  char * hash;      // Unused?
-  int64_t size;
-  char * bit_rate;
-  int64_t track_position; // 1..
-  char * release_date;    // YYYY-01-01
-  char * create_time;     // 2012-03-21 23:43:16
-  char * update_state;    // "2" or "5"
-  char * filestatus;      // unused
-
-  /* Secondary info */
-  char * album;
-  char * genre;
-  char * artist;
-  char * albumartist;
-
-  int64_t album_id;
-  int64_t artist_id;
-  int64_t albumartist_id;
-  int64_t genre_id;
-  
-  int found;
-  
-  } bg_nmj_song_t;
-
-void bg_nmj_song_free(bg_nmj_song_t * song);
-void bg_nmj_song_init(bg_nmj_song_t * song);
-void bg_nmj_song_dump(bg_nmj_song_t * song);
-
-int bg_nmj_song_get_info(sqlite3 * db,
-                         bg_plugin_registry_t * plugin_reg,
-                         bg_nmj_dir_t * dir,
-                         bg_nmj_file_t * file,
-                         bg_nmj_song_t * song);
-
-int bg_nmj_song_query(sqlite3 * db, bg_nmj_song_t * song);
-
-int bg_nmj_song_add(bg_plugin_registry_t * plugin_reg,
-                    sqlite3 * db, bg_nmj_song_t * song);
-
-int bg_nmj_song_delete(sqlite3 * db, bg_nmj_song_t * song);
-
-char * bg_nmj_song_get_cover(bg_nmj_song_t * song);
-
-/* Album */
-
-extern const char * bg_nmj_album_groups[];
-
-typedef struct
-  {
-  int64_t id;
-  char * title;
-  char * search_title;
-  char * total_item;
-  char * release_date;
-  char * update_state; // 3??
-  
-  int64_t genre_id;
-  int64_t artist_id;
-  
-  int found;
-  } bg_nmj_album_t;
-
-void bg_nmj_album_init(bg_nmj_album_t *);
-void bg_nmj_album_free(bg_nmj_album_t *);
-void bg_nmj_album_dump(bg_nmj_album_t *);
-int bg_nmj_album_query(sqlite3 * db, bg_nmj_album_t *);
-int bg_nmj_album_add(bg_plugin_registry_t * plugin_reg,
-                     sqlite3 * db, bg_nmj_album_t *, bg_nmj_song_t * song);
-int bg_nmj_album_delete(sqlite3 * db, int64_t album_id, bg_nmj_song_t * song);
-
-int64_t bg_nmj_album_lookup(sqlite3 * db,
-                            int64_t artist, const char * title);
-
-
-/* Master functions */
-
-#define BG_NMJ_MEDIA_TYPE_AUDIO         (1<<0)
-#define BG_NMJ_MEDIA_TYPE_VIDEO         (1<<1)
-#define BG_NMJ_MEDIA_TYPE_VIDEO_PRIVATE (1<<2)
-#define BG_NMJ_MEDIA_TYPE_PHOTO         (1<<3)
-
-int bg_nmj_add_directory(bg_plugin_registry_t * plugin_reg,
-                         sqlite3 * db, const char * directory, int types);
-int bg_nmj_remove_directory(sqlite3 * db, const char * directory);
-
-void bg_nmj_list_dirs(sqlite3 * db);
-
-int bg_nmj_add_album(sqlite3 * db, const char * album);
-
-void bg_nmj_cleanup(sqlite3 * db);
-void bg_nmj_create_new();

gmerlin-1.2.0.tar.gz/apps/nmjedit/song.c Deleted

@@ -1,485 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-/* Song */
-
-#include "nmjedit.h"
-#include <string.h>
-#include <unistd.h>
-#include <gmerlin/utils.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "nmjedit.song"
-
-#include <gavl/metatags.h>
-
-void bg_nmj_song_free(bg_nmj_song_t * song)
-  {
-  MY_FREE(song->title);
-  MY_FREE(song->search_title);
-  MY_FREE(song->path);
-  MY_FREE(song->runtime);
-  MY_FREE(song->format);
-  MY_FREE(song->lyric);
-  MY_FREE(song->hash);
-  MY_FREE(song->bit_rate);
-  MY_FREE(song->release_date);
-  MY_FREE(song->create_time);
-  MY_FREE(song->update_state);
-  MY_FREE(song->filestatus);
-  MY_FREE(song->artist);
-  MY_FREE(song->genre);
-  MY_FREE(song->albumartist);
-  MY_FREE(song->album);
-  }
-
-void bg_nmj_song_init(bg_nmj_song_t * song)
-  {
-  memset(song, 0, sizeof(*song));
-  song->id = -1;
-  song->album_id = -1;
-  song->artist_id = -1;
-  song->albumartist_id = -1;
-  song->genre_id = -1;
-  }
-
-void bg_nmj_song_dump(bg_nmj_song_t * song)
-  {
-  bg_dprintf("Song:\n");
-  bg_dprintf("  ID:             %"PRId64"\n", song->id);
-  bg_dprintf("  title:          %s\n",        song->title);
-  bg_dprintf("  search_title:   %s\n",        song->search_title);
-  bg_dprintf("  path:           %s\n",        song->path);
-  bg_dprintf("  scan_dirs_id:   %"PRId64"\n", song->scan_dirs_id);
-  bg_dprintf("  folders_id:     %"PRId64"\n", song->folders_id);
-  bg_dprintf("  runtime:        %s\n",        song->runtime);
-  bg_dprintf("  format:         %s\n",        song->format);
-  bg_dprintf("  lyric:          %s\n",        song->lyric);
-  bg_dprintf("  rating:         %"PRId64"\n", song->rating);
-  bg_dprintf("  hash:           %s\n",        song->hash);
-  bg_dprintf("  size:           %"PRId64"\n",        song->size);
-  bg_dprintf("  bit_rate:       %s\n",        song->bit_rate);
-  bg_dprintf("  track_position: %"PRId64"\n",        song->track_position);
-  bg_dprintf("  release_date:   %s\n",        song->release_date);
-  bg_dprintf("  create_time:    %s\n",        song->create_time);
-  bg_dprintf("  update_state:   %s\n",        song->update_state);
-  bg_dprintf("  filestatus:     %s\n",        song->filestatus);
-  bg_dprintf("  album:          %s\n",        song->album);
-  bg_dprintf("  genre:          %s\n",        song->genre);
-  bg_dprintf("  artist:         %s\n",        song->artist);
-  bg_dprintf("  albumartist:    %s\n",        song->albumartist);
-  bg_dprintf("  genre_id:       %"PRId64"\n", song->genre_id);
-  bg_dprintf("  artist_id:      %"PRId64"\n", song->artist_id);
-  bg_dprintf("  albumartist_id: %"PRId64"\n", song->albumartist_id);
-  bg_dprintf("  album_id:       %"PRId64"\n",  song->album_id);
-  }
-
-static int song_query_callback(void * data, int argc, char **argv, char **azColName)
-  {
-  int i;
-  bg_nmj_song_t * ret = data;
-  
-  for(i = 0; i < argc; i++)
-    {
-    //    fprintf(stderr, "col: %s, val: %s\n", azColName[i], argv[i]);
-    SET_QUERY_INT("ID", id);
-    SET_QUERY_STRING("TITLE", title);
-    SET_QUERY_STRING("SEARCH_TITLE", search_title);
-    SET_QUERY_STRING("PATH", path);
-    SET_QUERY_INT("SCAN_DIRS_ID", scan_dirs_id);
-    SET_QUERY_INT("FOLDERS_ID", folders_id);
-    SET_QUERY_STRING("RUNTIME", runtime);
-    SET_QUERY_STRING("FORMAT", format);
-    SET_QUERY_STRING("LYRIC", lyric);
-    SET_QUERY_INT("RATING", rating);
-    SET_QUERY_STRING("HASH", hash);
-    SET_QUERY_INT("SIZE", size);
-    SET_QUERY_STRING("BIT_RATE", bit_rate);
-    SET_QUERY_INT("TRACK_POSITION", track_position);
-    SET_QUERY_STRING("RELEASE_DATE", release_date);
-    SET_QUERY_STRING("CREATE_TIME", create_time);
-    SET_QUERY_STRING("UPDATE_STATE", update_state );
-    SET_QUERY_STRING("FILESTATUS", filestatus );
-    }
-  ret->found = 1;
-  return 0;
-  }
-
-
-int bg_nmj_song_query(sqlite3 * db, bg_nmj_song_t * song)
-  {
-  char * sql;
-  int result;
-  if(song->path)
-    {
-    sql = sqlite3_mprintf("select * from SONGS where PATH = %Q;", song->path);
-    result = bg_sqlite_exec(db, sql, song_query_callback, song);
-    sqlite3_free(sql);
-    if(!song->found)
-      return 0;
-    }
-  else if(song->id >= 0)
-    {
-    sql = sqlite3_mprintf("select * from SONGS where ID = %"PRId64";", song->id);
-    result = bg_sqlite_exec(db, sql, song_query_callback, song);
-    sqlite3_free(sql);
-    if(!song->found)
-      return 0;
-    }
-  else
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
-           "Either ID or path must be set in directory");
-    return 0;
-    }
-
-  /* Get secondary stuff */
-  song->genre_id = bg_nmj_id_to_id(db, "SONG_GENRES_SONGS",
-                                   "GENRES_ID", "SONGS_ID", song->id);
-  if(song->genre_id >= 0)
-    song->genre = bg_nmj_id_to_string(db, "SONG_GENRES",
-                                      "NAME", "ID", song->genre_id);
-  
-  song->album_id = bg_nmj_id_to_id(db, "SONG_ALBUMS_SONGS",
-                                   "ALBUMS_ID", "SONGS_ID", song->id);
-  if(song->album_id >= 0)
-    song->album = bg_nmj_id_to_string(db, "SONG_ALBUMS",
-                                      "TITLE", "ID", song->album_id);
-
-  song->artist_id = bg_nmj_id_to_id(db, "SONG_PERSONS_SONGS",
-                                    "PERSONS_ID", "SONGS_ID", song->id);
-  if(song->artist_id >= 0)
-    song->artist = bg_nmj_id_to_string(db, "SONG_PERSONS",
-                                       "NAME", "ID", song->artist_id);
-  return 1;
-  }
-
-int bg_nmj_song_get_info(sqlite3 * db,
-                         bg_plugin_registry_t * plugin_reg,
-                         bg_nmj_dir_t * dir,
-                         bg_nmj_file_t * file,
-                         bg_nmj_song_t * song)
-  {
-  bg_plugin_handle_t * h = NULL;
-  bg_input_plugin_t * plugin = NULL;
-  int ret = 0;
-  bg_track_info_t * ti;
-  int year;
-  int tag_i;
-  
-  if(!bg_input_plugin_load(plugin_reg, file->path, NULL, &h, NULL, 0))
-    goto fail;
-
-  plugin = (bg_input_plugin_t *)h->plugin;
-
-  /* Only one track supported */
-  if(plugin->get_num_tracks && (plugin->get_num_tracks(h->priv) < 1))
-    goto fail;
-
-  ti = plugin->get_track_info(h->priv, 0);
-
-  if(!ti->num_audio_streams)
-    goto fail;
-    
-  if(plugin->set_track && !plugin->set_track(h->priv, 0))
-    goto fail;
-
-  if(!plugin->set_audio_stream(h->priv, 0, BG_STREAM_ACTION_DECODE))
-    goto fail;
-
-  if(!plugin->start(h->priv))
-    goto fail;
-
-  /* Fill in the data structure */
-  
-  song->title = bg_nmj_escape_string(gavl_metadata_get(&ti->metadata, GAVL_META_TITLE));
-  song->search_title = bg_nmj_make_search_string(song->title);
-  
-  song->path = bg_strdup(song->path, file->path);
-  song->scan_dirs_id = dir->id;
-  song->runtime = bg_sprintf("%d", (int)(ti->duration / GAVL_TIME_SCALE));
-
-  song->format  = bg_strdup(song->format,
-                            gavl_metadata_get(&ti->metadata, GAVL_META_FORMAT));
-  song->size    = file->size;
-  
-  if(gavl_metadata_get_int(&ti->audio_streams[0].m, GAVL_META_BITRATE, &tag_i))
-    song->bit_rate = bg_sprintf("%d", (int)(tag_i / 1000));
-  else
-    song->bit_rate = bg_strdup(song->bit_rate, "VBR");
-
-  if(gavl_metadata_get_int(&ti->metadata, GAVL_META_TRACKNUMBER, &tag_i))
-    song->track_position = tag_i;
-
-  year = bg_metadata_get_year(&ti->metadata);
-  if(year)
-    song->release_date = bg_sprintf("%d-01-01", year);
-  else
-    song->release_date = bg_strdup(NULL, "9999-01-01");
-  song->create_time = malloc(BG_NMJ_TIME_STRING_LEN);
-  bg_nmj_time_to_string(file->time, song->create_time);
-
-  song->album        =
-    bg_nmj_escape_string(gavl_metadata_get(&ti->metadata, GAVL_META_ALBUM));
-  song->artist       =
-    bg_nmj_escape_string(gavl_metadata_get(&ti->metadata, GAVL_META_ARTIST));
-  song->albumartist  =
-    bg_nmj_escape_string(gavl_metadata_get(&ti->metadata, GAVL_META_ALBUMARTIST));
-  song->genre        =
-    bg_nmj_escape_string(gavl_metadata_get(&ti->metadata, GAVL_META_GENRE));
-
-  /* Unknown stuff */
-  song->update_state = bg_sprintf("%d", 2);
-  
-  /* Get IDs */
-  if(song->genre)
-    song->genre_id     = bg_nmj_string_to_id(db, "SONG_GENRES", "ID",
-                                             "NAME", song->genre);
-  
-  if(song->albumartist)
-    song->albumartist_id    = bg_nmj_string_to_id(db, "SONG_PERSONS", "ID",
-                                                  "NAME", song->albumartist);
-  if(song->artist)
-    song->artist_id    = bg_nmj_string_to_id(db, "SONG_PERSONS", "ID",
-                                             "NAME", song->artist);
-  
-  /* Lookup album (title AND albumartist MUST match) */
-  if(song->album && (song->albumartist_id >= 0))
-    song->album_id = bg_nmj_album_lookup(db, song->albumartist_id, song->album);
-  
-  ret = 1;
-  fail:
-
-  if(plugin)
-    plugin->close(h->priv);
-  
-  if(h)
-    bg_plugin_unref(h);
-  return ret;
-  }
-
-int bg_nmj_song_add(bg_plugin_registry_t * plugin_reg,
-                    sqlite3 * db, bg_nmj_song_t * song)
-  {
-  int result;
-  char * sql;
-  int64_t id;
-
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding song %s", song->title);
-  
-  /* Get ID */
-  song->id = bg_nmj_get_next_id(db, "SONGS");
-  
-  /* Add Song */
-  sql = sqlite3_mprintf("INSERT INTO SONGS "
-                        "( ID, TITLE, SEARCH_TITLE, PATH, SCAN_DIRS_ID, "
-                        "RUNTIME, FORMAT, RATING, SIZE, PLAY_COUNT, BIT_RATE, "
-                        "TRACK_POSITION, RELEASE_DATE, CREATE_TIME, UPDATE_STATE ) VALUES "
-                        "( %"PRId64", %Q, %Q, %Q, %"PRId64","
-                        " %Q, %Q, %"PRId64", %"PRId64", %"PRId64", %Q, "
-                        " %"PRId64", %Q, %Q, %Q);",
-                        song->id, song->title, song->search_title, song->path, song->scan_dirs_id,
-                        song->runtime, song->format, song->rating, song->size, "0", song->bit_rate,
-                        song->track_position, song->release_date, song->create_time, song->update_state);
-  
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return result;
-  
-  if(song->genre)
-    {
-    /* Add new genre */
-    if(song->genre_id < 0)
-      {
-      song->genre_id = bg_nmj_get_next_id(db, "SONG_GENRES");
-      sql = sqlite3_mprintf("INSERT INTO SONG_GENRES ( ID, NAME ) VALUES ( %"PRId64", %Q );",
-                            song->genre_id, song->genre);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      }
-    /* Set Genre */
-    id = bg_nmj_get_next_id(db, "SONG_GENRES_SONGS");
-    sql = sqlite3_mprintf("INSERT INTO SONG_GENRES_SONGS ( ID, SONGS_ID, GENRES_ID ) VALUES "
-                          "( %"PRId64", %"PRId64", %"PRId64" );",
-                          id, song->id, song->genre_id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return result;
-    }
-  
-  if(song->artist)
-    {
-    /* Add new artist */
-    if(song->artist_id < 0)
-      {
-      song->artist_id = bg_nmj_get_next_id(db, "SONG_PERSONS");
-      sql = sqlite3_mprintf("INSERT INTO SONG_PERSONS ( ID, NAME ) VALUES ( %"PRId64", %Q );",
-                            song->artist_id, song->artist);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      }
-
-    /* Set artist */
-    id = bg_nmj_get_next_id(db, "SONG_PERSONS_SONGS");
-    sql = sqlite3_mprintf("INSERT INTO SONG_PERSONS_SONGS ( ID, PERSONS_ID, SONGS_ID, PERSON_TYPE ) VALUES "
-                          "( %"PRId64", %"PRId64", %"PRId64", %Q );",
-                          id, song->artist_id, song->id, "ARTIST");
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return result;
-    }
-  
-  if(song->albumartist)
-    {
-    if(!strcmp(song->artist, song->albumartist))
-      song->albumartist_id = song->artist_id;
-
-    /* Add new album artist */
-    if(song->albumartist_id < 0)
-      {
-      song->albumartist_id = bg_nmj_get_next_id(db, "SONG_PERSONS");
-      sql =
-        sqlite3_mprintf("INSERT INTO SONG_PERSONS ( ID, NAME ) VALUES ( %"PRId64", %Q );",
-                            song->albumartist_id, song->albumartist);
-      result = bg_sqlite_exec(db, sql, NULL, NULL);
-      sqlite3_free(sql);
-      if(!result)
-        return result;
-      }
-    }
-  
-  /* Album */
-
-  if(song->album && song->albumartist && (song->track_position > 0))
-    {
-    bg_nmj_album_t album;
-    bg_nmj_album_init(&album);
-    album.id = song->album_id;
-    bg_nmj_album_add(plugin_reg, db, &album, song);
-    bg_nmj_album_free(&album);
-    }
-  
-  return 1;
-  }
-
-char * bg_nmj_song_get_cover(bg_nmj_song_t * song)
-  {
-  char * pos;
-  char * ret;
-  char * directory = bg_strdup(NULL, song->path);
-  pos = strrchr(directory, '/');
-  if(!pos)
-    {
-    free(directory);
-    return NULL;
-    }
-  *pos = '\0';
-  ret = bg_sprintf("%s/cover.jpg", directory);
-  if(!access(ret, R_OK | W_OK))
-    {
-    free(directory);
-    return ret;
-    }
-  free(directory);
-  free(ret);
-  return NULL;
-  }
-
-#define APPEND_STRING(member, col) \
-  if(old_song->member && new_song->member && \
-     strcmp(old_song->member, new_song->member))        \
-    { \
-    if(num_cols)                                  \
-      sql = bg_strcat(sql, ","); \
-    tmp_string = sqlite3_mprintf(" " col " = %Q", new_song->member); \
-    sql = bg_strcat(sql, tmp_string);                               \
-    sqlite3_free(tmp_string); \
-    num_cols++; \
-    }
-
-#define APPEND_INT(member, col)           \
-  if(old_song->member != new_song->member)        \
-    { \
-    if(num_cols)                                  \
-      sql = bg_strcat(sql, ","); \
-    tmp_string = sqlite3_mprintf(" " col " = %"PRId64, new_song->member); \
-    sql = bg_strcat(sql, tmp_string);                               \
-    sqlite3_free(tmp_string); \
-    num_cols++; \
-    }
-
-
-int bg_nmj_song_delete(sqlite3 * db, bg_nmj_song_t * song)
-  {
-  char * sql;
-  int result;
-  /* Delete from SONGS */
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Deleting song %s", song->title);
-  
-  sql = sqlite3_mprintf("DELETE FROM SONGS WHERE ID = %"PRId64";", song->id);
-  result = bg_sqlite_exec(db, sql, NULL, NULL);
-  sqlite3_free(sql);
-  if(!result)
-    return 0;
-  
-  if(song->album_id >= 0)
-    {
-    /* Delete from album */
-    if(!bg_nmj_album_delete(db, song->album_id, song))
-      return 0;
-    }
-  
-  /* Delete from SONG_GENRES_SONGS */
-  if(song->genre_id >= 0)
-    {
-    sql = sqlite3_mprintf("DELETE FROM SONG_GENRES_SONGS WHERE SONGS_ID = %"PRId64";",
-                          song->id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return 0;
-    sql = sqlite3_mprintf("DELETE FROM SONG_GENRES_SONGS WHERE SONGS_ID = %"PRId64";",
-                          song->id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return 0;
-    }
-
-  /* Delete from SONG_PERSONS_SONGS */
-  if(song->artist_id >= 0)
-    {
-    sql = sqlite3_mprintf("DELETE FROM SONG_PERSONS_SONGS WHERE SONGS_ID = %"PRId64";",
-                          song->id);
-    result = bg_sqlite_exec(db, sql, NULL, NULL);
-    sqlite3_free(sql);
-    if(!result)
-      return 0;
-    }
-  return 1;
-  }

gmerlin-1.2.0.tar.gz/apps/player/Makefile.in Deleted

@@ -1,808 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin$(EXEEXT) gmerlin_remote$(EXEEXT)
-subdir = apps/player
-DIST_COMMON = $(dist_man_MANS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_OBJECTS = cfgdialog.$(OBJEXT) display.$(OBJEXT) \
-	gmerlin.$(OBJEXT) main.$(OBJEXT) mainmenu.$(OBJEXT) \
-	playerwindow.$(OBJEXT) remote.$(OBJEXT) skin.$(OBJEXT) \
-	skinbrowser.$(OBJEXT)
-gmerlin_OBJECTS = $(am_gmerlin_OBJECTS)
-gmerlin_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la
-am_gmerlin_remote_OBJECTS = gmerlin_remote.$(OBJEXT)
-gmerlin_remote_OBJECTS = $(am_gmerlin_remote_OBJECTS)
-gmerlin_remote_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_SOURCES) $(gmerlin_remote_SOURCES)
-DIST_SOURCES = $(gmerlin_SOURCES) $(gmerlin_remote_SOURCES)
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man_MANS)
-DATA = $(Desktop_DATA)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-player.desktop
-dist_man_MANS = gmerlin.1 gmerlin_remote.1
-bin_SCRIPTS = gmerlin_launcher
-gmerlin_SOURCES = \
-cfgdialog.c \
-display.c \
-gmerlin.c \
-main.c \
-mainmenu.c \
-playerwindow.c \
-remote.c \
-skin.c \
-skinbrowser.c
-
-gmerlin_remote_SOURCES = \
-gmerlin_remote.c
-
-noinst_HEADERS = \
-display.h \
-gmerlin.h \
-player_remote.h \
-playerwindow.h
-
-gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
-gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
-EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/player/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/player/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin$(EXEEXT): $(gmerlin_OBJECTS) $(gmerlin_DEPENDENCIES) 
-	@rm -f gmerlin$(EXEEXT)
-	$(LINK) $(gmerlin_OBJECTS) $(gmerlin_LDADD) $(LIBS)
-gmerlin_remote$(EXEEXT): $(gmerlin_remote_OBJECTS) $(gmerlin_remote_DEPENDENCIES) 
-	@rm -f gmerlin_remote$(EXEEXT)
-	$(LINK) $(gmerlin_remote_OBJECTS) $(gmerlin_remote_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_remote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainmenu.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playerwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skinbrowser.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(dist_man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-DesktopDATA uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man \
-	uninstall-man1
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/plugincfg/Makefile.in Deleted

@@ -1,673 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_plugincfg$(EXEEXT)
-subdir = apps/plugincfg
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_plugincfg_OBJECTS = gmerlin_plugincfg.$(OBJEXT)
-gmerlin_plugincfg_OBJECTS = $(am_gmerlin_plugincfg_OBJECTS)
-gmerlin_plugincfg_DEPENDENCIES =  \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-	$(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_plugincfg_SOURCES)
-DIST_SOURCES = $(gmerlin_plugincfg_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(Desktop_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-plugincfg.desktop
-gmerlin_plugincfg_SOURCES = gmerlin_plugincfg.c
-gmerlin_plugincfg_LDADD = \
-$(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-$(top_builddir)/lib/libgmerlin.la
-
-EXTRA_DIST = gmerlin-plugincfg.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/plugincfg/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/plugincfg/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_plugincfg$(EXEEXT): $(gmerlin_plugincfg_OBJECTS) $(gmerlin_plugincfg_DEPENDENCIES) 
-	@rm -f gmerlin_plugincfg$(EXEEXT)
-	$(LINK) $(gmerlin_plugincfg_OBJECTS) $(gmerlin_plugincfg_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_plugincfg.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-DesktopDATA uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/recorder/Makefile.in Deleted

@@ -1,679 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_recorder$(EXEEXT)
-subdir = apps/recorder
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_recorder_OBJECTS = gmerlin_recorder.$(OBJEXT) \
-	recorder_window.$(OBJEXT)
-gmerlin_recorder_OBJECTS = $(am_gmerlin_recorder_OBJECTS)
-gmerlin_recorder_DEPENDENCIES =  \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-	$(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_recorder_SOURCES)
-DIST_SOURCES = $(gmerlin_recorder_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(Desktop_DATA)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-recorder.desktop
-gmerlin_recorder_SOURCES = gmerlin_recorder.c recorder_window.c
-gmerlin_recorder_LDADD = \
-$(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-$(top_builddir)/lib/libgmerlin.la
-
-noinst_HEADERS = recorder_window.h
-EXTRA_DIST = gmerlin-recorder.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/recorder/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/recorder/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_recorder$(EXEEXT): $(gmerlin_recorder_OBJECTS) $(gmerlin_recorder_DEPENDENCIES) 
-	@rm -f gmerlin_recorder$(EXEEXT)
-	$(LINK) $(gmerlin_recorder_OBJECTS) $(gmerlin_recorder_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_recorder.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recorder_window.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-DesktopDATA uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/thumbnailer/Makefile.in Deleted

@@ -1,621 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin-video-thumbnailer$(EXEEXT)
-subdir = apps/thumbnailer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-gmerlin_video_thumbnailer_SOURCES = gmerlin-video-thumbnailer.c
-gmerlin_video_thumbnailer_OBJECTS =  \
-	gmerlin-video-thumbnailer.$(OBJEXT)
-gmerlin_video_thumbnailer_DEPENDENCIES =  \
-	$(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = gmerlin-video-thumbnailer.c
-DIST_SOURCES = gmerlin-video-thumbnailer.c
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-gmerlin_video_thumbnailer_LDADD = $(top_builddir)/lib/libgmerlin.la -ldl
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/thumbnailer/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/thumbnailer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin-video-thumbnailer$(EXEEXT): $(gmerlin_video_thumbnailer_OBJECTS) $(gmerlin_video_thumbnailer_DEPENDENCIES) 
-	@rm -f gmerlin-video-thumbnailer$(EXEEXT)
-	$(LINK) $(gmerlin_video_thumbnailer_OBJECTS) $(gmerlin_video_thumbnailer_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin-video-thumbnailer.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/transcoder/Makefile.in Deleted

@@ -1,772 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_transcoder$(EXEEXT) \
-	gmerlin_transcoder_remote$(EXEEXT)
-subdir = apps/transcoder
-DIST_COMMON = $(dist_man_MANS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_transcoder_OBJECTS = ppwidget.$(OBJEXT) main.$(OBJEXT) \
-	transcoder_window.$(OBJEXT) trackdialog.$(OBJEXT) \
-	tracklist.$(OBJEXT)
-gmerlin_transcoder_OBJECTS = $(am_gmerlin_transcoder_OBJECTS)
-gmerlin_transcoder_DEPENDENCIES =  \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-	$(top_builddir)/lib/libgmerlin.la
-am_gmerlin_transcoder_remote_OBJECTS =  \
-	gmerlin_transcoder_remote.$(OBJEXT)
-gmerlin_transcoder_remote_OBJECTS =  \
-	$(am_gmerlin_transcoder_remote_OBJECTS)
-gmerlin_transcoder_remote_DEPENDENCIES =  \
-	$(top_builddir)/lib/libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_transcoder_SOURCES) \
-	$(gmerlin_transcoder_remote_SOURCES)
-DIST_SOURCES = $(gmerlin_transcoder_SOURCES) \
-	$(gmerlin_transcoder_remote_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man_MANS)
-DATA = $(Desktop_DATA)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-transcoder.desktop
-dist_man_MANS = gmerlin_transcoder.1 gmerlin_transcoder_remote.1
-gmerlin_transcoder_SOURCES = \
-ppwidget.c \
-main.c \
-transcoder_window.c \
-trackdialog.c \
-tracklist.c
-
-gmerlin_transcoder_remote_SOURCES = gmerlin_transcoder_remote.c
-gmerlin_transcoder_LDADD = \
-$(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-$(top_builddir)/lib/libgmerlin.la
-
-gmerlin_transcoder_remote_LDADD = \
-$(top_builddir)/lib/libgmerlin.la
-
-noinst_HEADERS = \
-ppwidget.h \
-transcoder_remote.h \
-transcoder_window.h \
-tracklist.h \
-trackdialog.h
-
-EXTRA_DIST = gmerlin-transcoder.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/transcoder/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/transcoder/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_transcoder$(EXEEXT): $(gmerlin_transcoder_OBJECTS) $(gmerlin_transcoder_DEPENDENCIES) 
-	@rm -f gmerlin_transcoder$(EXEEXT)
-	$(LINK) $(gmerlin_transcoder_OBJECTS) $(gmerlin_transcoder_LDADD) $(LIBS)
-gmerlin_transcoder_remote$(EXEEXT): $(gmerlin_transcoder_remote_OBJECTS) $(gmerlin_transcoder_remote_DEPENDENCIES) 
-	@rm -f gmerlin_transcoder_remote$(EXEEXT)
-	$(LINK) $(gmerlin_transcoder_remote_OBJECTS) $(gmerlin_transcoder_remote_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_transcoder_remote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppwidget.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trackdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracklist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transcoder_window.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(dist_man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS \
-	uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-DesktopDATA uninstall-am uninstall-binPROGRAMS \
-	uninstall-man uninstall-man1
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/apps/visualizer/Makefile.in Deleted

@@ -1,671 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_visualizer$(EXEEXT)
-subdir = apps/visualizer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_visualizer_OBJECTS = gmerlin_visualizer.$(OBJEXT)
-gmerlin_visualizer_OBJECTS = $(am_gmerlin_visualizer_OBJECTS)
-gmerlin_visualizer_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la \
-	$(top_builddir)/lib/gtk/libgmerlin_gtk.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(gmerlin_visualizer_SOURCES)
-DIST_SOURCES = $(gmerlin_visualizer_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(Desktop_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@XML2_CFLAGS@ \
-@GTK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-Desktopdir = $(datadir)/applications
-Desktop_DATA = gmerlin-visualizer.desktop
-gmerlin_visualizer_SOURCES = \
-gmerlin_visualizer.c
-
-gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
-EXTRA_DIST = gmerlin-visualizer.desktop
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/visualizer/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu apps/visualizer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_visualizer$(EXEEXT): $(gmerlin_visualizer_OBJECTS) $(gmerlin_visualizer_DEPENDENCIES) 
-	@rm -f gmerlin_visualizer$(EXEEXT)
-	$(LINK) $(gmerlin_visualizer_OBJECTS) $(gmerlin_visualizer_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_visualizer.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-DesktopDATA: $(Desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(Desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(Desktopdir)"
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Desktopdir)" || exit $$?; \
-	done
-
-uninstall-DesktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(Desktop_DATA)'; test -n "$(Desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-DesktopDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-DesktopDATA uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-DesktopDATA \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-DesktopDATA uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/config.guess Deleted

@@ -1,1533 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-06-10'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd | genuineintel)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

gmerlin-1.2.0.tar.gz/config.sub Deleted

@@ -1,1693 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-06-11'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-        -bluegene*)
-	        os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

gmerlin-1.2.0.tar.gz/configure Deleted

@@ -1,20908 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$[^/][^/]*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="include/gmerlin/player.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-GMERLIN_PLUGIN_LDFLAGS
-TOP_SRCDIR
-MODULE_LIBADD
-INCLUDES
-HAVE_SSE2_FALSE
-HAVE_SSE2_TRUE
-HAVE_SSE_FALSE
-HAVE_SSE_TRUE
-HAVE_3DNOW_FALSE
-HAVE_3DNOW_TRUE
-HAVE_MMX_FALSE
-HAVE_MMX_TRUE
-HAVE_NMJEDIT_FALSE
-HAVE_NMJEDIT_TRUE
-HAVE_THUMBNAILER_FALSE
-HAVE_THUMBNAILER_TRUE
-HAVE_VISUALIZER_FALSE
-HAVE_VISUALIZER_TRUE
-HAVE_RECORDER_FALSE
-HAVE_RECORDER_TRUE
-HAVE_TRANSCODER_FALSE
-HAVE_TRANSCODER_TRUE
-HAVE_KBD_FALSE
-HAVE_KBD_TRUE
-HAVE_PLAYER_FALSE
-HAVE_PLAYER_TRUE
-HAVE_ALSAMIXER_FALSE
-HAVE_ALSAMIXER_TRUE
-HAVE_PLUGINCFG_FALSE
-HAVE_PLUGINCFG_TRUE
-HAVE_LIBTIFF_FALSE
-HAVE_LIBTIFF_TRUE
-TIFF_REQUIRED
-TIFF_LIBS
-TIFF_CFLAGS
-HAVE_LIBPNG_FALSE
-HAVE_LIBPNG_TRUE
-PNG_REQUIRED
-PNG_LIBS
-PNG_CFLAGS
-HAVE_LIBJPEG_FALSE
-HAVE_LIBJPEG_TRUE
-JPEG_REQUIRED
-JPEG_CFLAGS
-JPEG_LIBS
-HAVE_V4L2_FALSE
-HAVE_V4L2_TRUE
-HAVE_V4L_FALSE
-HAVE_V4L_TRUE
-HAVE_OSS_FALSE
-HAVE_OSS_TRUE
-HAVE_JACK_FALSE
-HAVE_JACK_TRUE
-JACK_REQUIRED
-JACK_LIBS
-JACK_CFLAGS
-ALSA_REQUIRED
-HAVE_ALSA_FALSE
-HAVE_ALSA_TRUE
-ALSA_LIBS
-ALSA_CFLAGS
-ESD_REQUIRED
-HAVE_ESD_FALSE
-HAVE_ESD_TRUE
-ESD_LIBS
-ESD_CFLAGS
-ESD_CONFIG
-LIBCDDB_REQUIRED
-HAVE_LIBCDDB_FALSE
-HAVE_LIBCDDB_TRUE
-CDDB_LIBS
-CDDB_CFLAGS
-MUSICBRAINZ_REQUIRED
-HAVE_MUSICBRAINZ_FALSE
-HAVE_MUSICBRAINZ_TRUE
-MUSICBRAINZ_LIBS
-MUSICBRAINZ_CFLAGS
-CDIO_REQUIRED
-HAVE_CDIO_FALSE
-HAVE_CDIO_TRUE
-CDIO_PARANOIA_LIBS
-CDIO_PARANOIA_CFLAGS
-CDIO_CDDA_LIBS
-CDIO_CDDA_CFLAGS
-CDIO_LIBS
-CDIO_CFLAGS
-LV_REQUIRED
-HAVE_LV_FALSE
-HAVE_LV_TRUE
-LV_LIBS
-LV_CFLAGS
-V4LCONVERT_REQUIRED
-HAVE_V4LVCONVERT_FALSE
-HAVE_V4LVCONVERT_TRUE
-V4LCONVERT_LIBS
-V4LCONVERT_CFLAGS
-HAVE_LIBEXIF_FALSE
-HAVE_LIBEXIF_TRUE
-LIBEXIF_LIBS
-LIBEXIF_CFLAGS
-LQT_REQUIRED
-HAVE_LQT_FALSE
-HAVE_LQT_TRUE
-LQT_LIBS
-LQT_CFLAGS
-XFIXES_LIBS
-XDPMS_LIBS
-HAVE_XV_FALSE
-HAVE_XV_TRUE
-XV_LIBS
-HAVE_XTEST_FALSE
-HAVE_XTEST_TRUE
-XTEST_LIBS
-XINERAMA_LIBS
-HAVE_PULSEAUDIO_FALSE
-HAVE_PULSEAUDIO_TRUE
-PULSEAUDIO_REQUIRED
-PULSEAUDIO_LIBS
-PULSEAUDIO_CFLAGS
-GLX_LIBS
-GLX_CFLAGS
-GL_LIBS
-GL_CFLAGS
-HAVE_GLX_FALSE
-HAVE_GLX_TRUE
-HAVE_GL_FALSE
-HAVE_GL_TRUE
-HAVE_X11_FALSE
-HAVE_X11_TRUE
-X_LIBS
-X_CFLAGS
-XMKMF
-GTK_REQUIRED
-HAVE_GTK_FALSE
-HAVE_GTK_TRUE
-GTK_LIBS
-GTK_CFLAGS
-SQLITE3_LIBS
-ICONV_LIBS
-FREETYPE_LIBS
-FREETYPE_CFLAGS
-FONTCONFIG_LIBS
-FONTCONFIG_CFLAGS
-GAVL_REQUIRED
-GAVL_LIBS
-GAVL_CFLAGS
-XML2_REQUIRED
-XML2_LIBS
-XML2_CFLAGS
-PKG_CONFIG
-LIBM
-TEXINFO
-HAVE_DOXYGEN_FALSE
-HAVE_DOXYGEN_TRUE
-DOXYGEN
-GMERLIN_DEP_LIBS
-POSUB
-LTLIBINTL
-LIBINTL
-INTLLIBS
-LTLIBICONV
-LIBICONV
-INTL_MACOSX_LIBS
-MSGMERGE
-XGETTEXT_015
-XGETTEXT
-GMSGFMT_015
-MSGFMT_015
-GMSGFMT
-MSGFMT
-USE_NLS
-HAVE_POSIX_SEMAPHORES_FALSE
-HAVE_POSIX_SEMAPHORES_TRUE
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-RANLIB
-AR
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-LTVERSION_AGE
-LTVERSION_REVISION
-LTVERSION_CURRENT
-BG_VERSION_MICRO
-BG_VERSION_MINOR
-BG_VERSION_MAJOR
-BG_VERSION
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_static
-enable_shared
-with_pic
-enable_fast_install
-enable_dependency_tracking
-with_gnu_ld
-enable_libtool_lock
-enable_nls
-enable_rpath
-with_libiconv_prefix
-with_libintl_prefix
-with_doxygen
-enable_gtktest
-with_x
-enable_pulseaudio
-enable_lqt
-enable_libvisual
-enable_libcdio
-enable_musicbrainz
-enable_cddb
-enable_esd
-with_esd_prefix
-with_esd_exec_prefix
-enable_esdtest
-enable_alsa
-with_alsa_prefix
-with_alsa_inc_prefix
-enable_alsatest
-enable_jack
-enable_oss
-enable_v4l
-enable_v4l2
-enable_libjpeg
-enable_libpng
-enable_libtiff
-enable_plugincfg
-enable_alsamixer
-enable_player
-enable_kbd
-enable_transcoder
-enable_recorder
-enable_visualizer
-enable_thumbnailer
-enable_nmjedit
-enable_debug
-with_cpuflags
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-PKG_CONFIG
-XML2_CFLAGS
-XML2_LIBS
-GAVL_CFLAGS
-GAVL_LIBS
-FONTCONFIG_CFLAGS
-FONTCONFIG_LIBS
-FREETYPE_CFLAGS
-FREETYPE_LIBS
-XMKMF
-X_CFLAGS
-X_LIBS
-PULSEAUDIO_CFLAGS
-PULSEAUDIO_LIBS
-LQT_CFLAGS
-LQT_LIBS
-LIBEXIF_CFLAGS
-LIBEXIF_LIBS
-V4LCONVERT_CFLAGS
-V4LCONVERT_LIBS
-LV_CFLAGS
-LV_LIBS
-CDIO_CFLAGS
-CDIO_LIBS
-CDIO_CDDA_CFLAGS
-CDIO_CDDA_LIBS
-CDIO_PARANOIA_CFLAGS
-CDIO_PARANOIA_LIBS
-MUSICBRAINZ_CFLAGS
-MUSICBRAINZ_LIBS
-CDDB_CFLAGS
-CDDB_LIBS
-JACK_CFLAGS
-JACK_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X$//$[^/]' \| \
-	 X"$as_myself" : 'X$//$$' \| \
-	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-X features:
-  --x-includes=DIR    X include files are in DIR
-  --x-libraries=DIR   X library files are in DIR
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-static[=PKGS]  build static libraries [default=no]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-nls           do not use Native Language Support
-  --disable-rpath         do not hardcode runtime library paths
-  --disable-gtktest       do not try to compile and run a test GTK+ program
-  --disable-pulseaudio    Disable pulseaudio (default: autodetect)
-  --disable-lqt           Disable Libquicktime support (default: autodetect)
-  --disable-v4lconvert    Disable libv4lconvert support (default: autodetect)
-  --disable-libvisual     Disable Libvisual support (default: autodetect)
-  --disable-libcdio       Disable libcdio (default: autodetect)
-  --disable-musicbrainz   Disable musicbrainz support (default: autodetect)
-  --disable-cddb          Disable cddb support (default: autodetect)
-  --disable-esd           Disable EsounD (default: autodetect)
-  --disable-esdtest       Do not try to compile and run a test ESD program
-  --disable-alsa          Disable Alsa (default: autodetect)
-  --disable-alsatest      Do not try to compile and run a test Alsa program
-  --disable-jack          Disable Jack (default: autodetect)
-  --disable-oss           Disable OSS (default: autodetect)
-  --disable-v4l           Disable Video4Linux (default: autodetect)
-  --disable-v4l2          Disable Video4Linux (default: autodetect)
-  --disable-libjpeg       Disable libjpeg (default: autodetect)
-  --disable-libpng        Disable libpng (default: autodetect)
-  --disable-libtiff       Disable libtiff (default: autodetect)
-  --disable-plugincfg     Disable plugin configurator (default: enabled)
-  --disable-alsamixer     Disable alsamixer (default: enabled)
-  --disable-player        Disable player (default: enabled)
-  --disable-kbd           Disable keyboard daemon (default: enabled)
-  --disable-transcoder    Disable transcoder (default: enabled)
-  --disable-recorder      Disable recorder (default: enabled)
-  --disable-visualizer    Disable visualizer (default: enabled)
-  --disable-thumbnailer   Disable thumbnailer (default: enabled)
-  --enable-nmjedit        Enable nmjedit (default: disabled)
-  --enable-debug          Enable debugging, disable optimization
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
-  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
-  --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --without-doxygen       disable doxygen documentation generation
-  --with-x                use the X Window System
-  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)
-  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)
-  --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)
-  --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)
-  --with-cpuflags         Set CPU specific compiler flags. Default is auto,
-                          which does autodetection. Specify none for compiling
-                          the most portable binaries
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  XML2_CFLAGS C compiler flags for XML2, overriding pkg-config
-  XML2_LIBS   linker flags for XML2, overriding pkg-config
-  GAVL_CFLAGS C compiler flags for GAVL, overriding pkg-config
-  GAVL_LIBS   linker flags for GAVL, overriding pkg-config
-  FONTCONFIG_CFLAGS
-              C compiler flags for FONTCONFIG, overriding pkg-config
-  FONTCONFIG_LIBS
-              linker flags for FONTCONFIG, overriding pkg-config
-  FREETYPE_CFLAGS
-              C compiler flags for FREETYPE, overriding pkg-config
-  FREETYPE_LIBS
-              linker flags for FREETYPE, overriding pkg-config
-  XMKMF       Path to xmkmf, Makefile generator for X Window System
-  X_CFLAGS    C compiler flags for X, overriding pkg-config
-  X_LIBS      linker flags for X, overriding pkg-config
-  PULSEAUDIO_CFLAGS
-              C compiler flags for PULSEAUDIO, overriding pkg-config
-  PULSEAUDIO_LIBS
-              linker flags for PULSEAUDIO, overriding pkg-config
-  LQT_CFLAGS  C compiler flags for LQT, overriding pkg-config
-  LQT_LIBS    linker flags for LQT, overriding pkg-config
-  LIBEXIF_CFLAGS
-              C compiler flags for LIBEXIF, overriding pkg-config
-  LIBEXIF_LIBS
-              linker flags for LIBEXIF, overriding pkg-config
-  V4LCONVERT_CFLAGS
-              C compiler flags for V4LCONVERT, overriding pkg-config
-  V4LCONVERT_LIBS
-              linker flags for V4LCONVERT, overriding pkg-config
-  LV_CFLAGS   C compiler flags for LV, overriding pkg-config
-  LV_LIBS     linker flags for LV, overriding pkg-config
-  CDIO_CFLAGS C compiler flags for CDIO, overriding pkg-config
-  CDIO_LIBS   linker flags for CDIO, overriding pkg-config
-  CDIO_CDDA_CFLAGS
-              C compiler flags for CDIO_CDDA, overriding pkg-config
-  CDIO_CDDA_LIBS
-              linker flags for CDIO_CDDA, overriding pkg-config
-  CDIO_PARANOIA_CFLAGS
-              C compiler flags for CDIO_PARANOIA, overriding pkg-config
-  CDIO_PARANOIA_LIBS
-              linker flags for CDIO_PARANOIA, overriding pkg-config
-  MUSICBRAINZ_CFLAGS
-              C compiler flags for MUSICBRAINZ, overriding pkg-config
-  MUSICBRAINZ_LIBS
-              linker flags for MUSICBRAINZ, overriding pkg-config
-  CDDB_CFLAGS C compiler flags for CDDB, overriding pkg-config
-  CDDB_LIBS   linker flags for CDDB, overriding pkg-config
-  JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
-  JACK_LIBS   linker flags for JACK, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.65
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $2
-  (void) $2;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-ac_config_headers="$ac_config_headers include/config.h"
-
-
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=gmerlin
- VERSION=1.2.0
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-BG_VERSION=$VERSION
-
-BG_VERSION_MAJOR=`echo $VERSION | cut -d . -f 1`
-BG_VERSION_MINOR=`echo $VERSION | cut -d . -f 2`
-BG_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1`
-
-LTVERSION_CURRENT="0"
-LTVERSION_REVISION="0"
-LTVERSION_AGE="0"
-
-
-
-
-
-
-
-
-
-SAVE_CFLAGS=$CFLAGS
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
-fi
-
-
-
-
-
-
-
-
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6b'
-macro_revision='1.3017'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5080: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:5083: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:5086: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$[_A-Za-z][_A-Za-z0-9]*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $lib[^ ]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]$$symcode$symcode*$[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 6292 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$["`$\\]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$["`\\]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7788: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7792: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8127: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:8131: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8232: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:8236: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8287: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:8291: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	link_all_deplibs=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *$.*$$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *$.*$$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo(void) {}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10671 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10767 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-CFLAGS=$SAVE_CFLAGS
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if test "${ac_cv_sizeof_float+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_float" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (float)
-See \`config.log' for more details." "$LINENO" 5; }; }
-   else
-     ac_cv_sizeof_float=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (double)
-See \`config.log' for more details." "$LINENO" 5; }; }
-   else
-     ac_cv_sizeof_double=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-_ACEOF
-
-
-
-for ac_func in vasprintf
-do :
-  ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
-if test "x$ac_cv_func_vasprintf" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VASPRINTF 1
-_ACEOF
-
-fi
-done
-
-for ac_func in canonicalize_file_name
-do :
-  ac_fn_c_check_func "$LINENO" "canonicalize_file_name" "ac_cv_func_canonicalize_file_name"
-if test "x$ac_cv_func_canonicalize_file_name" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CANONICALIZE_FILE_NAME 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrint" >&5
-$as_echo_n "checking for lrint... " >&6; }
-if test "${ac_cv_c99_lrint+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-lrint_save_CFLAGS=$CFLAGS
-CFLAGS="-O2 -lm"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define		_ISOC9X_SOURCE	1
-#define 	_ISOC99_SOURCE	1
-#define		__USE_ISOC99	1
-#define 	__USE_ISOC9X	1
-
-#include <math.h>
-
-int
-main ()
-{
-if (!lrint(3.14159)) lrint(2.7183);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_c99_lrint=yes
-else
-  ac_cv_c99_lrint=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-CFLAGS=$lrint_save_CFLAGS
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_lrint" >&5
-$as_echo "$ac_cv_c99_lrint" >&6; }
-
-if test "$ac_cv_c99_lrint" = yes; then
-
-$as_echo "#define HAVE_LRINT 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrintf" >&5
-$as_echo_n "checking for lrintf... " >&6; }
-if test "${ac_cv_c99_lrintf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-lrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-O2 -lm"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define		_ISOC9X_SOURCE	1
-#define 	_ISOC99_SOURCE	1
-#define		__USE_ISOC99	1
-#define 	__USE_ISOC9X	1
-
-#include <math.h>
-
-int
-main ()
-{
-if (!lrintf(3.14159)) lrintf(2.7183);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_c99_lrintf=yes
-else
-  ac_cv_c99_lrintf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-CFLAGS=$lrintf_save_CFLAGS
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_lrintf" >&5
-$as_echo "$ac_cv_c99_lrintf" >&6; }
-
-if test "$ac_cv_c99_lrintf" = yes; then
-
-$as_echo "#define HAVE_LRINTF 1" >>confdefs.h
-
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error "\"Cannot detect endianess\"" "$LINENO" 5 ;;
- esac
-
-
-for ac_header in sys/select.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_select_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SELECT_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-ac_fn_c_check_decl "$LINENO" "MSG_NOSIGNAL" "ac_cv_have_decl_MSG_NOSIGNAL" "#include <sys/types.h>
-	       #include <sys/socket.h>
-"
-if test "x$ac_cv_have_decl_MSG_NOSIGNAL" = x""yes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MSG_NOSIGNAL $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "SO_NOSIGPIPE" "ac_cv_have_decl_SO_NOSIGPIPE" "#include <sys/types.h>
-	       #include <sys/socket.h>
-"
-if test "x$ac_cv_have_decl_SO_NOSIGPIPE" = x""yes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SO_NOSIGPIPE $ac_have_decl
-_ACEOF
-
-
-
-
-
-
-have_posix_semaphores="false"
-
-OLD_LIBS=$LIBS
-LIBS="$LIBS -lpthread"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX unnamed semaphores" >&5
-$as_echo_n "checking for POSIX unnamed semaphores... " >&6; };
-
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-    #include <semaphore.h>
-
-    #include <stdio.h>
-    main()
-    {
-    int result;
-    sem_t s;
-    result = sem_init(&s, 0, 0);
-    if(result)
-      return -1;
-    return 0;
-    }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-    # program could be run
-    have_posix_semaphores="true"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    $as_echo "#define HAVE_POSIX_SEMAPHORES 1" >>confdefs.h
-
-
-else
-  # program could not be run
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-LIBS=$OLD_LIBS
-
-
- if test x$have_posix_semaphores = xtrue; then
-  HAVE_POSIX_SEMAPHORES_TRUE=
-  HAVE_POSIX_SEMAPHORES_FALSE='#'
-else
-  HAVE_POSIX_SEMAPHORES_TRUE='#'
-  HAVE_POSIX_SEMAPHORES_FALSE=
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGFMT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$XGETTEXT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-    rm -f messages.po
-
-    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGMERGE" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        test -n "$localedir" || localedir='${datadir}/locale'
-
-
-  ac_config_commands="$ac_config_commands po-directories"
-
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${acl_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
-      *)
-	test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-    # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath; :
-else
-  enable_rpath=yes
-fi
-
-
-
-                  acl_libdirstem=lib
-  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-  if test -n "$searchpath"; then
-    acl_save_IFS="${IFS= 	}"; IFS=":"
-    for searchdir in $searchpath; do
-      if test -d "$searchdir"; then
-        case "$searchdir" in
-          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-          *) searchdir=`cd "$searchdir" && pwd`
-             case "$searchdir" in
-               */lib64 ) acl_libdirstem=lib64 ;;
-             esac ;;
-        esac
-      fi
-    done
-    IFS="$acl_save_IFS"
-  fi
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
-  withval=$with_libiconv_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-
-fi
-
-      LIBICONV=
-  LTLIBICONV=
-  INCICONV=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='iconv '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$hardcode_direct" = yes; then
-                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
-              else
-                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
-                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFPreferencesCopyAppValue=yes
-else
-  gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
-
-  fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-
-
-
-
-
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-
-
-
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_gnugettext1_libc=yes
-else
-  gt_cv_func_gnugettext1_libc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5
-$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
-
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-
-
-
-
-
-          am_save_CPPFLAGS="$CPPFLAGS"
-
-  for element in $INCICONV; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
-    fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
-  if test "$am_cv_func_iconv" = yes; then
-
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
-  else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
-  withval=$with_libintl_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-
-fi
-
-      LIBINTL=
-  LTLIBINTL=
-  INCINTL=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='intl '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$hardcode_direct" = yes; then
-                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-              else
-                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-    done
-  fi
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_gnugettext1_libintl=yes
-else
-  gt_cv_func_gnugettext1_libintl=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5
-$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
-        fi
-
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-                    LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-  if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
-
-  for element in $INCINTL; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-      fi
-
-
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
-
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
-
-    fi
-
-        POSUB=po
-  fi
-
-
-
-    INTLLIBS="$LIBINTL"
-
-
-
-
-
-
-
-
-
-GMERLIN_DEP_DIR=/opt/gmerlin
-
-if test -d $GMERLIN_DEP_DIR; then
-  have_opt_gmerlin="true"
-  export PKG_CONFIG_PATH=$GMERLIN_DEP_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-  GMERLIN_DEP_CFLAGS="-I$GMERLIN_DEP_DIR/include"
-  GMERLIN_DEP_LDPATH="$GMERLIN_DEP_DIR/lib"
-  GMERLIN_DEP_LIBS="-L$GMERLIN_DEP_DIR/lib"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --rpath option" >&5
-$as_echo_n "checking for --rpath option... " >&6; }
-  OLD_LDFLAGS=$LDFLAGS
-  LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$GMERLIN_DEP_DIR/lib"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  GMERLIN_DEP_RPATH="-Wl,--rpath -Wl,$GMERLIN_DEP_DIR/lib"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Supported" >&5
-$as_echo "Supported" >&6; }
-else
-  GMERLIN_DEP_RPATH="";{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unsupported" >&5
-$as_echo "Unsupported" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$OLD_LDFLAGS
-else
-  have_opt_gmerlin="false"
-  GMERLIN_DEP_CFLAGS=""
-  GMERLIN_DEP_LDPATH=""
-  GMERLIN_DEP_LIBS=""
-  GMERLIN_DEP_RPATH=""
-fi
-
-LDFLAGS="$GMERLIN_DEP_RPATH"
-
-
-
-test_doxygen="true"
-have_doxygen="false"
-
-
-# Check whether --with-doxygen was given.
-if test "${with_doxygen+set}" = set; then :
-  withval=$with_doxygen; test_doxygen="false"
-fi
-
-
-if test "x$test_doxygen" = "xtrue"; then
-  # Extract the first word of "doxygen", so it can be a program name with args.
-set dummy doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DOXYGEN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DOXYGEN"; then
-  ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DOXYGEN=""doxygen""
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DOXYGEN=$ac_cv_prog_DOXYGEN
-if test -n "$DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  if test -z "$DOXYGEN"; then
-    as_fn_error "Doxygen not found, use --without-doxygen to disable documentation generation" "$LINENO" 5
-  else
-    have_doxygen="true"
-  fi
-fi
-
- if test "x$have_doxygen" = "xtrue"; then
-  HAVE_DOXYGEN_TRUE=
-  HAVE_DOXYGEN_FALSE='#'
-else
-  HAVE_DOXYGEN_TRUE='#'
-  HAVE_DOXYGEN_FALSE=
-fi
-
-
-
-have_texinfo="false"
-
-# Extract the first word of "makeinfo", so it can be a program name with args.
-set dummy makeinfo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_TEXINFO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$TEXINFO"; then
-  ac_cv_prog_TEXINFO="$TEXINFO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_TEXINFO=""makeinfo""
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-TEXINFO=$ac_cv_prog_TEXINFO
-if test -n "$TEXINFO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXINFO" >&5
-$as_echo "$TEXINFO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$TEXINFO"; then
-  as_fn_error "Texinfo not found" "$LINENO" 5
-fi
-
-
-
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
-$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
-if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmw  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _mwvalidcheckl ();
-int
-main ()
-{
-return _mwvalidcheckl ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mw__mwvalidcheckl=yes
-else
-  ac_cv_lib_mw__mwvalidcheckl=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
-$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
-if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
-  LIBM="-lmw"
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
-if test "${ac_cv_lib_m_cos+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cos ();
-int
-main ()
-{
-return cos ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_cos=yes
-else
-  ac_cv_lib_m_cos=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = x""yes; then :
-  LIBM="$LIBM -lm"
-fi
-
-  ;;
-*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
-if test "${ac_cv_lib_m_cos+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cos ();
-int
-main ()
-{
-return cos ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_cos=yes
-else
-  ac_cv_lib_m_cos=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = x""yes; then :
-  LIBM="-lm"
-fi
-
-  ;;
-esac
-
-
-
-XML2_REQUIRED="2.4.0"
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML2" >&5
-$as_echo_n "checking for XML2... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XML2_CFLAGS"; then
-        pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$XML2_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $XML2_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $XML2_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XML2_LIBS"; then
-        pkg_cv_XML2_LIBS="$XML2_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$XML2_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $XML2_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $XML2_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $XML2_REQUIRED"`
-        else
-	        XML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $XML2_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XML2_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                as_fn_error "\"libxml2 not found\"" "$LINENO" 5
-elif test $pkg_failed = untried; then
-	as_fn_error "\"libxml2 not found\"" "$LINENO" 5
-else
-	XML2_CFLAGS=$pkg_cv_XML2_CFLAGS
-	XML2_LIBS=$pkg_cv_XML2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-
-GAVL_REQUIRED="1.4.0"
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GAVL" >&5
-$as_echo_n "checking for GAVL... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GAVL_CFLAGS"; then
-        pkg_cv_GAVL_CFLAGS="$GAVL_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gavl >= \$GAVL_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gavl >= $GAVL_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GAVL_CFLAGS=`$PKG_CONFIG --cflags "gavl >= $GAVL_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GAVL_LIBS"; then
-        pkg_cv_GAVL_LIBS="$GAVL_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gavl >= \$GAVL_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gavl >= $GAVL_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GAVL_LIBS=`$PKG_CONFIG --libs "gavl >= $GAVL_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GAVL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gavl >= $GAVL_REQUIRED"`
-        else
-	        GAVL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gavl >= $GAVL_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GAVL_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                as_fn_error "\"gavl not found\"" "$LINENO" 5
-elif test $pkg_failed = untried; then
-	as_fn_error "\"gavl not found\"" "$LINENO" 5
-else
-	GAVL_CFLAGS=$pkg_cv_GAVL_CFLAGS
-	GAVL_LIBS=$pkg_cv_GAVL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-
-FONTCONFIG_REQUIRED="2.2.3"
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5
-$as_echo_n "checking for FONTCONFIG... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$FONTCONFIG_CFLAGS"; then
-        pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "fontconfig >= $FONTCONFIG_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= $FONTCONFIG_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$FONTCONFIG_LIBS"; then
-        pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "fontconfig >= $FONTCONFIG_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= $FONTCONFIG_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= $FONTCONFIG_REQUIRED"`
-        else
-	        FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= $FONTCONFIG_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FONTCONFIG_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                as_fn_error "\"fontconfig not found\"" "$LINENO" 5
-elif test $pkg_failed = untried; then
-	as_fn_error "\"fontconfig not found\"" "$LINENO" 5
-else
-	FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS
-	FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-FREETYPE_REQUIRED="9.7.3"
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
-$as_echo_n "checking for FREETYPE... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$FREETYPE_CFLAGS"; then
-        pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= \$FREETYPE_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "freetype2 >= $FREETYPE_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= $FREETYPE_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$FREETYPE_LIBS"; then
-        pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= \$FREETYPE_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "freetype2 >= $FREETYPE_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= $FREETYPE_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2 >= $FREETYPE_REQUIRED"`
-        else
-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2 >= $FREETYPE_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FREETYPE_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                as_fn_error "\"freetype2 not found\"" "$LINENO" 5
-elif test $pkg_failed = untried; then
-	as_fn_error "\"freetype2 not found\"" "$LINENO" 5
-else
-	FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
-	FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-ICONV_LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_close in -liconv" >&5
-$as_echo_n "checking for libiconv_close in -liconv... " >&6; }
-if test "${ac_cv_lib_iconv_libiconv_close+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char libiconv_close ();
-int
-main ()
-{
-return libiconv_close ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_iconv_libiconv_close=yes
-else
-  ac_cv_lib_iconv_libiconv_close=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_close" >&5
-$as_echo "$ac_cv_lib_iconv_libiconv_close" >&6; }
-if test "x$ac_cv_lib_iconv_libiconv_close" = x""yes; then :
-  ICONV_LIBS="-liconv"
-fi
-
-
-
-SQLITE3_LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_exec in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_exec in -lsqlite3... " >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_exec+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsqlite3  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sqlite3_exec ();
-int
-main ()
-{
-return sqlite3_exec ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_sqlite3_sqlite3_exec=yes
-else
-  ac_cv_lib_sqlite3_sqlite3_exec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_exec" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_exec" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_exec" = x""yes; then :
-  SQLITE3_LIBS="-lsqlite3"; have_sqlite3="true"
-else
-  have_sqlite3="false"
-fi
-
-
-
-
-
-GTK_REQUIRED="2.8.0"
-# Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then :
-  enableval=$enable_gtktest;
-else
-  enable_gtktest=yes
-fi
-
-
-  pkg_config_args=gtk+-2.0
-  for module in .
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=$GTK_REQUIRED
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
-$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then :
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
-     have_gtk=true
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
-   echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     have_gtk=false
-  fi
-
-
-  rm -f conf.gtktest
-
- if test x$have_gtk = xtrue; then
-  HAVE_GTK_TRUE=
-  HAVE_GTK_FALSE='#'
-else
-  HAVE_GTK_TRUE='#'
-  HAVE_GTK_FALSE=
-fi
-
-
-
-GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED"
-
-
-
-have_x="false"
-
-X_CFLAGS=""
-X_LIBS=""
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
-
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
-  withval=$with_x;
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  cat >Imakefile <<'_ACEOF'
-incroot:
-	@echo incroot='${INCROOT}'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ac_x_includes= ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -f -r conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R7/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R7
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R7/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R7
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
-  # First, try using that file with no special directory specified.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XrmInitialize ()
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
-    if test -r "$ac_dir/libX11.$ac_extension"; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
-esac
-fi
-;; #(
-    *) have_x=yes;;
-  esac
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes\
-	ac_x_includes='$x_includes'\
-	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-fi
-
-
-if test x$no_x != xyes; then
-  if test "x$x_includes" != "x"; then
-    X_CFLAGS="-I$x_includes"
-  elif test -d /usr/X11R6/include; then
-    X_CFLAGS="-I/usr/X11R6/include"
-  else
-    X_CFLAGS=""
-  fi
-
-  if test "x$x_libraries" != "x"; then
-    X_LIBS="-L$x_libraries -lX11"
-  else
-    X_LIBS="-lX11"
-  fi
-  have_x="true"
-else
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X_CFLAGS"; then
-        pkg_cv_X_CFLAGS="$X_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11 >= 1.0.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_X_CFLAGS=`$PKG_CONFIG --cflags "x11 >= 1.0.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X_LIBS"; then
-        pkg_cv_X_LIBS="$X_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11 >= 1.0.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_X_LIBS=`$PKG_CONFIG --libs "x11 >= 1.0.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        X_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 >= 1.0.0"`
-        else
-	        X_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 >= 1.0.0"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$X_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_x=false
-elif test $pkg_failed = untried; then
-	have_x=false
-else
-	X_CFLAGS=$pkg_cv_X_CFLAGS
-	X_LIBS=$pkg_cv_X_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_x=true
-fi
-fi
-
-if test x$have_x = xtrue; then
-  X_LIBS="$X_LIBS -lXext"
-else
-  as_fn_error "Gmerlin needs X11 headers" "$LINENO" 5
-fi
-
-
-
-
- if test x$have_x = xtrue; then
-  HAVE_X11_TRUE=
-  HAVE_X11_FALSE='#'
-else
-  HAVE_X11_TRUE='#'
-  HAVE_X11_FALSE=
-fi
-
-
-
-
-
-
-
-
-OLD_LIBS=$LIBS
-
-have_GL="true"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing glBegin" >&5
-$as_echo_n "checking for library containing glBegin... " >&6; }
-if test "${ac_cv_search_glBegin+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glBegin ();
-int
-main ()
-{
-return glBegin ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' GL; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_glBegin=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_glBegin+set}" = set; then :
-  break
-fi
-done
-if test "${ac_cv_search_glBegin+set}" = set; then :
-
-else
-  ac_cv_search_glBegin=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_glBegin" >&5
-$as_echo "$ac_cv_search_glBegin" >&6; }
-ac_res=$ac_cv_search_glBegin
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  have_GL="false"
-fi
-
-
-if test "x$have_GL" = "xtrue"; then
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <GL/gl.h>
-int main() { if(0) glBegin(GL_QUADS); return 0;}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  have_GL="false"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-GL_LIBS=$LIBS
-
-LIBS="$OLD_LIBS"
-
-
-OLD_LIBS=$LIBS
-
-have_GLX="true"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing glXCreateContext" >&5
-$as_echo_n "checking for library containing glXCreateContext... " >&6; }
-if test "${ac_cv_search_glXCreateContext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glXCreateContext ();
-int
-main ()
-{
-return glXCreateContext ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' GL glx; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_glXCreateContext=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_glXCreateContext+set}" = set; then :
-  break
-fi
-done
-if test "${ac_cv_search_glXCreateContext+set}" = set; then :
-
-else
-  ac_cv_search_glXCreateContext=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_glXCreateContext" >&5
-$as_echo "$ac_cv_search_glXCreateContext" >&6; }
-ac_res=$ac_cv_search_glXCreateContext
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  have_GLX="false"
-fi
-
-
-if test "x$have_GL" = "xtrue"; then
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <GL/glx.h>
-int main() { if(0) glXChooseFBConfig(NULL, 0,
-	NULL, NULL); return 0;}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  have_GLX="false"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-GLX_LIBS=$LIBS
-
-LIBS="$OLD_LIBS"
-
-if test "x$have_GL" = "xtrue"; then
-$as_echo "#define HAVE_GL 1" >>confdefs.h
-
-
-if test "x$have_GLX" = "xtrue"; then
-$as_echo "#define HAVE_GLX 1" >>confdefs.h
-
-fi
-
-fi
-
- if test x$have_GL = xtrue; then
-  HAVE_GL_TRUE=
-  HAVE_GL_FALSE='#'
-else
-  HAVE_GL_TRUE='#'
-  HAVE_GL_FALSE=
-fi
-
- if test x$have_GLX = xtrue; then
-  HAVE_GLX_TRUE=
-  HAVE_GLX_FALSE='#'
-else
-  HAVE_GLX_TRUE='#'
-  HAVE_GLX_FALSE=
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-have_pulseaudio="false"
-
-PULSEAUDIO_REQUIRED="0.9.6"
-
-# Check whether --enable-pulseaudio was given.
-if test "${enable_pulseaudio+set}" = set; then :
-  enableval=$enable_pulseaudio; case "${enableval}" in
-   yes) test_pulseaudio=true ;;
-   no)  test_pulseaudio=false ;;
-esac
-else
-  test_pulseaudio=true
-fi
-
-
-if test x$test_pulseaudio = xtrue; then
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5
-$as_echo_n "checking for PULSEAUDIO... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PULSEAUDIO_CFLAGS"; then
-        pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-simple >= \$PULSEAUDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse-simple >= $PULSEAUDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse-simple >= $PULSEAUDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PULSEAUDIO_LIBS"; then
-        pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-simple >= \$PULSEAUDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse-simple >= $PULSEAUDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse-simple >= $PULSEAUDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse-simple >= $PULSEAUDIO_REQUIRED"`
-        else
-	        PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse-simple >= $PULSEAUDIO_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PULSEAUDIO_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_pulseaudio="false"
-elif test $pkg_failed = untried; then
-	have_pulseaudio="false"
-else
-	PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS
-	PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_pulseaudio="true"
-fi
-
-fi
-
-
-
-
-
- if test x$have_pulseaudio = xtrue; then
-  HAVE_PULSEAUDIO_TRUE=
-  HAVE_PULSEAUDIO_FALSE='#'
-else
-  HAVE_PULSEAUDIO_TRUE='#'
-  HAVE_PULSEAUDIO_FALSE=
-fi
-
-
-if test "x$have_pulseaudio" = "xtrue"; then
-$as_echo "#define HAVE_PULSEAUDIO 1" >>confdefs.h
-
-fi
-
-
-
-
-
-
-have_xinerama="false"
-XINERAMA_LIBS=""
-
-if test x$have_x = xtrue; then
-
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-
-CFLAGS=$X_FLAGS
-LIBS="$X_LIBS -lXinerama"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xinerama" >&5
-$as_echo_n "checking for xinerama... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-             #include <X11/extensions/Xinerama.h>
-int
-main ()
-{
-int i = 0;
-             /* We ensure the function is here but never call it */
-             if(i)
-               XineramaQueryExtension(NULL, NULL, NULL);
-             return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  XINERAMA_LIBS="-lXinerama";have_xinerama=true;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes" >&5
-$as_echo "Yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: No" >&5
-$as_echo "No" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-if test x$have_xinerama = "xtrue"; then
-$as_echo "#define HAVE_LIBXINERAMA 1" >>confdefs.h
-
-fi
-
-
-
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
-
-fi
-
-
-
-
-have_xtest="false"
-XTEST_LIBS=""
-
-if test x$have_x = xtrue; then
-
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-
-CFLAGS=$X_FLAGS
-LIBS="$X_LIBS -lXtst"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xtest" >&5
-$as_echo_n "checking for xtest... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-             #include <X11/extensions/XTest.h>
-int
-main ()
-{
-int i = 0;
-             /* We ensure the function is here but never call it */
-             if(i)
-               XTestQueryExtension(NULL, NULL, NULL, NULL, NULL);
-             return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  XTEST_LIBS="-lXtst";have_xtest=true;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes" >&5
-$as_echo "Yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: No" >&5
-$as_echo "No" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-if test x$have_xtest = "xtrue"; then
-$as_echo "#define HAVE_XTEST 1" >>confdefs.h
-
-fi
-
-
-
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
-
-fi
-
- if test x$have_xtest = xtrue; then
-  HAVE_XTEST_TRUE=
-  HAVE_XTEST_FALSE='#'
-else
-  HAVE_XTEST_TRUE='#'
-  HAVE_XTEST_FALSE=
-fi
-
-
-
-
-
-have_xv="false"
-XV_LIBS=""
-
-if test x$have_x = xtrue; then
-
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-CFLAGS=$X_FLAGS
-LIBS="$X_LIBS -lXv"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xv" >&5
-$as_echo_n "checking for xv... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-             #include <X11/extensions/Xvlib.h>
-int
-main ()
-{
-int i = 0;
-             /* We ensure the function is here but never call it */
-             if(i)
-		 XvQueryExtension(NULL, NULL, NULL, NULL, NULL, NULL);
-             return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  XV_LIBS="-lXv";have_xv=true;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes" >&5
-$as_echo "Yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"No\"" >&5
-$as_echo "\"No\"" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-if test x$have_xv = "xtrue"; then
-$as_echo "#define HAVE_LIBXV 1" >>confdefs.h
-
-fi
-
-
-
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
-
-fi
-
- if test x$have_xv = xtrue; then
-  HAVE_XV_TRUE=
-  HAVE_XV_FALSE='#'
-else
-  HAVE_XV_TRUE='#'
-  HAVE_XV_FALSE=
-fi
-
-
-
-
-
-have_xdpms="false"
-XDPMS_LIBS=""
-
-if test x$have_x = xtrue; then
-
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-CFLAGS=$X_FLAGS
-LIBS="$X_LIBS -lXext"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 dpms" >&5
-$as_echo_n "checking for x11 dpms... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-             #include <X11/extensions/dpms.h>
-int
-main ()
-{
-int i = 0;
-             /* We ensure the function is here but never call it */
-             if(i)
-		 DPMSQueryExtension(NULL, NULL, NULL);
-             return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  XDPMS_LIBS="-lXext";have_xdpms=true;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes" >&5
-$as_echo "Yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"No\"" >&5
-$as_echo "\"No\"" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-if test x$have_xdpms = "xtrue"; then
-$as_echo "#define HAVE_XDPMS 1" >>confdefs.h
-
-fi
-
-
-
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
-
-fi
-
-
-
-
-have_xfixes="false"
-XFIXES_LIBS=""
-
-if test x$have_x = xtrue; then
-
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-CFLAGS=$X_FLAGS
-LIBS="$X_LIBS -lXfixes"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 dpms" >&5
-$as_echo_n "checking for x11 dpms... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-             #include <X11/extensions/Xfixes.h>
-int
-main ()
-{
-int i = 0;
-             /* We ensure the function is here but never call it */
-             if(i)
-		 XFixesQueryExtension(NULL, NULL, NULL);
-             return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  XFIXES_LIBS="-lXfixes";have_xfixes=true;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes" >&5
-$as_echo "Yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"No\"" >&5
-$as_echo "\"No\"" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-if test x$have_xfixes = "xtrue"; then
-$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
-
-fi
-
-
-
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
-
-fi
-
-
-
-LQT_REQUIRED="1.2.4"
-have_lqt=false
-# Check whether --enable-lqt was given.
-if test "${enable_lqt+set}" = set; then :
-  enableval=$enable_lqt; case "${enableval}" in
-                 yes) test_lqt=true ;;
-                 no) test_lqt=false ;;
-               esac
-else
-  test_lqt=true
-fi
-
-
-if test x$test_lqt = "xtrue"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LQT" >&5
-$as_echo_n "checking for LQT... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LQT_CFLAGS"; then
-        pkg_cv_LQT_CFLAGS="$LQT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libquicktime >= \$LQT_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libquicktime >= $LQT_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LQT_CFLAGS=`$PKG_CONFIG --cflags "libquicktime >= $LQT_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LQT_LIBS"; then
-        pkg_cv_LQT_LIBS="$LQT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libquicktime >= \$LQT_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libquicktime >= $LQT_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LQT_LIBS=`$PKG_CONFIG --libs "libquicktime >= $LQT_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LQT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libquicktime >= $LQT_REQUIRED"`
-        else
-	        LQT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libquicktime >= $LQT_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LQT_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_lqt=false
-elif test $pkg_failed = untried; then
-	have_lqt=false
-else
-	LQT_CFLAGS=$pkg_cv_LQT_CFLAGS
-	LQT_LIBS=$pkg_cv_LQT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_lqt=true
-fi
-fi
-
-
- if test x$have_lqt = xtrue; then
-  HAVE_LQT_TRUE=
-  HAVE_LQT_FALSE='#'
-else
-  HAVE_LQT_TRUE='#'
-  HAVE_LQT_FALSE=
-fi
-
-
-
-
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEXIF" >&5
-$as_echo_n "checking for LIBEXIF... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBEXIF_CFLAGS"; then
-        pkg_cv_LIBEXIF_CFLAGS="$LIBEXIF_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libexif") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBEXIF_LIBS"; then
-        pkg_cv_LIBEXIF_LIBS="$LIBEXIF_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libexif") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif"`
-        else
-	        LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBEXIF_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_libexif=false
-elif test $pkg_failed = untried; then
-	have_libexif=false
-else
-	LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
-	LIBEXIF_LIBS=$pkg_cv_LIBEXIF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_libexif=true
-fi
-
-if test x$have_libexif = "xtrue"; then
-$as_echo "#define HAVE_LIBEXIF 1" >>confdefs.h
-
-fi
-
- if test x$have_libexif = xtrue; then
-  HAVE_LIBEXIF_TRUE=
-  HAVE_LIBEXIF_FALSE='#'
-else
-  HAVE_LIBEXIF_TRUE='#'
-  HAVE_LIBEXIF_FALSE=
-fi
-
-
-
-
-
-
-V4LCONVERT_REQUIRED="0.5.7"
-have_v4lconvert=false
-
-# Check whether --enable-lqt was given.
-if test "${enable_lqt+set}" = set; then :
-  enableval=$enable_lqt; case "${enableval}" in
-                 yes) test_v4lconvert=true ;;
-                 no) test_v4lconvert=false ;;
-               esac
-else
-  test_v4lconvert=true
-fi
-
-
-if test x$test_v4lconvert = "xtrue"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for V4LCONVERT" >&5
-$as_echo_n "checking for V4LCONVERT... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$V4LCONVERT_CFLAGS"; then
-        pkg_cv_V4LCONVERT_CFLAGS="$V4LCONVERT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4lconvert >= \$V4LCONVERT_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libv4lconvert >= $V4LCONVERT_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_V4LCONVERT_CFLAGS=`$PKG_CONFIG --cflags "libv4lconvert >= $V4LCONVERT_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$V4LCONVERT_LIBS"; then
-        pkg_cv_V4LCONVERT_LIBS="$V4LCONVERT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4lconvert >= \$V4LCONVERT_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libv4lconvert >= $V4LCONVERT_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_V4LCONVERT_LIBS=`$PKG_CONFIG --libs "libv4lconvert >= $V4LCONVERT_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        V4LCONVERT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libv4lconvert >= $V4LCONVERT_REQUIRED"`
-        else
-	        V4LCONVERT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4lconvert >= $V4LCONVERT_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$V4LCONVERT_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_v4lconvert=false
-elif test $pkg_failed = untried; then
-	have_v4lconvert=false
-else
-	V4LCONVERT_CFLAGS=$pkg_cv_V4LCONVERT_CFLAGS
-	V4LCONVERT_LIBS=$pkg_cv_V4LCONVERT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_v4lconvert=true
-fi
-fi
-
- if test x$have_v4lconvert = xtrue; then
-  HAVE_V4LVCONVERT_TRUE=
-  HAVE_V4LVCONVERT_FALSE='#'
-else
-  HAVE_V4LVCONVERT_TRUE='#'
-  HAVE_V4LVCONVERT_FALSE=
-fi
-
-
-
-if test x$have_v4lconvert = xtrue; then
-$as_echo "#define HAVE_V4LCONVERT 1" >>confdefs.h
-
-fi
-
-
-
-
-
-LV_REQUIRED="0.4.0"
-have_LV=false
-# Check whether --enable-libvisual was given.
-if test "${enable_libvisual+set}" = set; then :
-  enableval=$enable_libvisual; case "${enableval}" in
-                 yes) test_lv=true ;;
-                 no) test_lv=false ;;
-               esac
-else
-  test_lv=true
-fi
-
-
-if test x$test_lv = "xtrue"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LV" >&5
-$as_echo_n "checking for LV... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LV_CFLAGS"; then
-        pkg_cv_LV_CFLAGS="$LV_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvisual-0.4 >= \$LV_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libvisual-0.4 >= $LV_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LV_CFLAGS=`$PKG_CONFIG --cflags "libvisual-0.4 >= $LV_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LV_LIBS"; then
-        pkg_cv_LV_LIBS="$LV_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvisual-0.4 >= \$LV_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libvisual-0.4 >= $LV_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LV_LIBS=`$PKG_CONFIG --libs "libvisual-0.4 >= $LV_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvisual-0.4 >= $LV_REQUIRED"`
-        else
-	        LV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvisual-0.4 >= $LV_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LV_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_lv=false
-elif test $pkg_failed = untried; then
-	have_lv=false
-else
-	LV_CFLAGS=$pkg_cv_LV_CFLAGS
-	LV_LIBS=$pkg_cv_LV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_lv=true
-fi
-fi
-
-if test x$have_lv = "xtrue"; then
-$as_echo "#define HAVE_LV 1" >>confdefs.h
-
-
-lv_plugin_dir=`pkg-config --variable=pluginsbasedir libvisual-0.4`
-lv_plugin_dir="$lv_plugin_dir/actor"
-
-
-cat >>confdefs.h <<_ACEOF
-#define LV_PLUGIN_DIR "$lv_plugin_dir"
-_ACEOF
-
-fi
-
-
- if test x$have_lv = xtrue; then
-  HAVE_LV_TRUE=
-  HAVE_LV_FALSE='#'
-else
-  HAVE_LV_TRUE='#'
-  HAVE_LV_FALSE=
-fi
-
-
-
-
-have_cdio="false"
-
-CDIO_REQUIRED="0.76"
-
-# Check whether --enable-libcdio was given.
-if test "${enable_libcdio+set}" = set; then :
-  enableval=$enable_libcdio; case "${enableval}" in
-   yes) test_cdio=true ;;
-   no)  test_cdio=false ;;
-esac
-else
-  test_cdio=true
-fi
-
-
-if test x$test_cdio = xtrue; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO" >&5
-$as_echo_n "checking for CDIO... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDIO_CFLAGS"; then
-        pkg_cv_CDIO_CFLAGS="$CDIO_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= \$CDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio >= $CDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= $CDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDIO_LIBS"; then
-        pkg_cv_CDIO_LIBS="$CDIO_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= \$CDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio >= $CDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= $CDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcdio >= $CDIO_REQUIRED"`
-        else
-	        CDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcdio >= $CDIO_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDIO_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_cdio="false"
-elif test $pkg_failed = untried; then
-	have_cdio="false"
-else
-	CDIO_CFLAGS=$pkg_cv_CDIO_CFLAGS
-	CDIO_LIBS=$pkg_cv_CDIO_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_cdio="true"
-fi
-
-if test x$have_cdio = xtrue; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO_CDDA" >&5
-$as_echo_n "checking for CDIO_CDDA... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDIO_CDDA_CFLAGS"; then
-        pkg_cv_CDIO_CDDA_CFLAGS="$CDIO_CDDA_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_cdda >= \$CDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio_cdda >= $CDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDIO_CDDA_CFLAGS=`$PKG_CONFIG --cflags "libcdio_cdda >= $CDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDIO_CDDA_LIBS"; then
-        pkg_cv_CDIO_CDDA_LIBS="$CDIO_CDDA_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_cdda >= \$CDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio_cdda >= $CDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDIO_CDDA_LIBS=`$PKG_CONFIG --libs "libcdio_cdda >= $CDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        CDIO_CDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcdio_cdda >= $CDIO_REQUIRED"`
-        else
-	        CDIO_CDDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcdio_cdda >= $CDIO_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDIO_CDDA_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_cdio="false"
-elif test $pkg_failed = untried; then
-	have_cdio="false"
-else
-	CDIO_CDDA_CFLAGS=$pkg_cv_CDIO_CDDA_CFLAGS
-	CDIO_CDDA_LIBS=$pkg_cv_CDIO_CDDA_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_cdio="true"
-fi
-fi
-
-if test x$have_cdio = xtrue; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO_PARANOIA" >&5
-$as_echo_n "checking for CDIO_PARANOIA... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDIO_PARANOIA_CFLAGS"; then
-        pkg_cv_CDIO_PARANOIA_CFLAGS="$CDIO_PARANOIA_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_paranoia >= \$CDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio_paranoia >= $CDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDIO_PARANOIA_CFLAGS=`$PKG_CONFIG --cflags "libcdio_paranoia >= $CDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDIO_PARANOIA_LIBS"; then
-        pkg_cv_CDIO_PARANOIA_LIBS="$CDIO_PARANOIA_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_paranoia >= \$CDIO_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcdio_paranoia >= $CDIO_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDIO_PARANOIA_LIBS=`$PKG_CONFIG --libs "libcdio_paranoia >= $CDIO_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        CDIO_PARANOIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcdio_paranoia >= $CDIO_REQUIRED"`
-        else
-	        CDIO_PARANOIA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcdio_paranoia >= $CDIO_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDIO_PARANOIA_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_cdio="false"
-elif test $pkg_failed = untried; then
-	have_cdio="false"
-else
-	CDIO_PARANOIA_CFLAGS=$pkg_cv_CDIO_PARANOIA_CFLAGS
-	CDIO_PARANOIA_LIBS=$pkg_cv_CDIO_PARANOIA_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_cdio="true"
-fi
-fi
-
-fi
-
- if test x$have_cdio = xtrue; then
-  HAVE_CDIO_TRUE=
-  HAVE_CDIO_FALSE='#'
-else
-  HAVE_CDIO_TRUE='#'
-  HAVE_CDIO_FALSE=
-fi
-
-
-
-
-
-
-MUSICBRAINZ_REQUIRED="2.0.2"
-have_musicbrainz=false
-# Check whether --enable-musicbrainz was given.
-if test "${enable_musicbrainz+set}" = set; then :
-  enableval=$enable_musicbrainz; case "${enableval}" in
-                 yes) test_musicbrainz=true ;;
-                 no) test_musicbrainz=false ;;
-               esac
-else
-  test_musicbrainz=true
-fi
-
-
-if test x$have_cdio = "xfalse"; then
-test_musicbrainz=false
-fi
-
-if test x$test_musicbrainz = "xtrue"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUSICBRAINZ" >&5
-$as_echo_n "checking for MUSICBRAINZ... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$MUSICBRAINZ_CFLAGS"; then
-        pkg_cv_MUSICBRAINZ_CFLAGS="$MUSICBRAINZ_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz >= $MUSICBRAINZ_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$MUSICBRAINZ_LIBS"; then
-        pkg_cv_MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz >= $MUSICBRAINZ_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQUIRED"`
-        else
-	        MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MUSICBRAINZ_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_musicbrainz=false
-elif test $pkg_failed = untried; then
-	have_musicbrainz=false
-else
-	MUSICBRAINZ_CFLAGS=$pkg_cv_MUSICBRAINZ_CFLAGS
-	MUSICBRAINZ_LIBS=$pkg_cv_MUSICBRAINZ_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_musicbrainz=true
-fi
-fi
-
-if test x$have_musicbrainz = "xtrue"; then
-$as_echo "#define HAVE_MUSICBRAINZ 1" >>confdefs.h
-
-fi
-
- if test x$have_musicbrainz = xtrue; then
-  HAVE_MUSICBRAINZ_TRUE=
-  HAVE_MUSICBRAINZ_FALSE='#'
-else
-  HAVE_MUSICBRAINZ_TRUE='#'
-  HAVE_MUSICBRAINZ_FALSE=
-fi
-
-
-
-
-
-
-LIBCDDB_REQUIRED="1.0.2"
-have_cddb=false
-# Check whether --enable-cddb was given.
-if test "${enable_cddb+set}" = set; then :
-  enableval=$enable_cddb; case "${enableval}" in
-                 yes) test_cddb=true ;;
-                 no) test_cddb=false ;;
-               esac
-else
-  test_cddb=true
-fi
-
-
-if test x$have_cdio = "xfalse"; then
-test_cddb=false
-fi
-
-if test x$test_cddb = "xtrue"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDDB" >&5
-$as_echo_n "checking for CDDB... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDDB_CFLAGS"; then
-        pkg_cv_CDDB_CFLAGS="$CDDB_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= \$LIBCDDB_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcddb >= $LIBCDDB_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDDB_CFLAGS=`$PKG_CONFIG --cflags "libcddb >= $LIBCDDB_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CDDB_LIBS"; then
-        pkg_cv_CDDB_LIBS="$CDDB_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= \$LIBCDDB_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcddb >= $LIBCDDB_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CDDB_LIBS=`$PKG_CONFIG --libs "libcddb >= $LIBCDDB_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        CDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcddb >= $LIBCDDB_REQUIRED"`
-        else
-	        CDDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcddb >= $LIBCDDB_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDDB_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_cddb=false
-elif test $pkg_failed = untried; then
-	have_cddb=false
-else
-	CDDB_CFLAGS=$pkg_cv_CDDB_CFLAGS
-	CDDB_LIBS=$pkg_cv_CDDB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_cddb=true
-fi
-fi
-
-if test x$have_cddb = "xtrue"; then
-$as_echo "#define HAVE_LIBCDDB 1" >>confdefs.h
-
-fi
-
- if test x$have_cddb = xtrue; then
-  HAVE_LIBCDDB_TRUE=
-  HAVE_LIBCDDB_FALSE='#'
-else
-  HAVE_LIBCDDB_TRUE='#'
-  HAVE_LIBCDDB_FALSE=
-fi
-
-
-
-
-
-ESD_REQUIRED="0.2.19"
-have_esd=false
-# Check whether --enable-esd was given.
-if test "${enable_esd+set}" = set; then :
-  enableval=$enable_esd; case "${enableval}" in
-                 yes) test_esd=true ;;
-                 no) test_esd=false ;;
-               esac
-else
-  test_esd=true
-fi
-
-
-if test x$test_esd = xtrue; then
-
-# Check whether --with-esd-prefix was given.
-if test "${with_esd_prefix+set}" = set; then :
-  withval=$with_esd_prefix; esd_prefix="$withval"
-else
-  esd_prefix=""
-fi
-
-
-# Check whether --with-esd-exec-prefix was given.
-if test "${with_esd_exec_prefix+set}" = set; then :
-  withval=$with_esd_exec_prefix; esd_exec_prefix="$withval"
-else
-  esd_exec_prefix=""
-fi
-
-# Check whether --enable-esdtest was given.
-if test "${enable_esdtest+set}" = set; then :
-  enableval=$enable_esdtest;
-else
-  enable_esdtest=yes
-fi
-
-
-  if test x$esd_exec_prefix != x ; then
-     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-     fi
-  fi
-  if test x$esd_prefix != x ; then
-     esd_args="$esd_args --prefix=$esd_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_prefix/bin/esd-config
-     fi
-  fi
-
-  # Extract the first word of "esd-config", so it can be a program name with args.
-set dummy esd-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ESD_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ESD_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ESD_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
-  ;;
-esac
-fi
-ESD_CONFIG=$ac_cv_path_ESD_CONFIG
-if test -n "$ESD_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ESD_CONFIG" >&5
-$as_echo "$ESD_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  min_esd_version=$ESD_REQUIRED
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ESD - version >= $min_esd_version" >&5
-$as_echo_n "checking for ESD - version >= $min_esd_version... " >&6; }
-  no_esd=""
-  if test "$ESD_CONFIG" = "no" ; then
-    no_esd=yes
-  else
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
-    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`
-    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'`
-    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'`
-    if test "x$enable_esdtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $ESD_CFLAGS"
-      LIBS="$LIBS $ESD_LIBS"
-      rm -f conf.esdtest
-      if test "$cross_compiling" = yes; then :
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.esdtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_esd_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_esd_version");
-     exit(1);
-   }
-
-   if (($esd_major_version > major) ||
-      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  no_esd=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-       ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     fi
-  fi
-  if test "x$no_esd" = x ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-     have_esd=true
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     if test "$ESD_CONFIG" = "no" ; then
-       echo "*** The esd-config script installed by ESD could not be found"
-       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-       echo "*** full path to esd-config."
-     else
-       if test -f conf.esdtest ; then
-        :
-       else
-          echo "*** Could not run ESD test program, checking why..."
-          CFLAGS="$CFLAGS $ESD_CFLAGS"
-          LIBS="$LIBS $ESD_LIBS"
-
-          ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <esd.h>
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
-   echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-          ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-       fi
-     fi
-     ESD_CFLAGS=""
-     ESD_LIBS=""
-     have_esd=false
-  fi
-
-
-  rm -f conf.esdtest
-
-fi
-
- if test x$have_esd = xtrue; then
-  HAVE_ESD_TRUE=
-  HAVE_ESD_FALSE='#'
-else
-  HAVE_ESD_TRUE='#'
-  HAVE_ESD_FALSE=
-fi
-
-
-
-
-ALSA_REQUIRED="1.0.0"
-have_alsa="false"
-
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-
-# Check whether --enable-alsa was given.
-if test "${enable_alsa+set}" = set; then :
-  enableval=$enable_alsa; case "${enableval}" in
-                 yes) test_alsa=true ;;
-                 no) test_alsa=false ;;
-               esac
-else
-  test_alsa=true
-fi
-
-
-if test x$test_alsa = xtrue; then
-  alsa_save_CFLAGS="$CFLAGS"
-alsa_save_LDFLAGS="$LDFLAGS"
-alsa_save_LIBS="$LIBS"
-alsa_found=yes
-
-
-# Check whether --with-alsa-prefix was given.
-if test "${with_alsa_prefix+set}" = set; then :
-  withval=$with_alsa_prefix; alsa_prefix="$withval"
-else
-  alsa_prefix=""
-fi
-
-
-
-# Check whether --with-alsa-inc-prefix was given.
-if test "${with_alsa_inc_prefix+set}" = set; then :
-  withval=$with_alsa_inc_prefix; alsa_inc_prefix="$withval"
-else
-  alsa_inc_prefix=""
-fi
-
-
-# Check whether --enable-alsatest was given.
-if test "${enable_alsatest+set}" = set; then :
-  enableval=$enable_alsatest; enable_alsatest="$enableval"
-else
-  enable_alsatest=yes
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA CFLAGS" >&5
-$as_echo_n "checking for ALSA CFLAGS... " >&6; }
-if test "$alsa_inc_prefix" != "" ; then
-	ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
-	CFLAGS="$CFLAGS -I$alsa_inc_prefix"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5
-$as_echo "$ALSA_CFLAGS" >&6; }
-CFLAGS="$alsa_save_CFLAGS"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA LDFLAGS" >&5
-$as_echo_n "checking for ALSA LDFLAGS... " >&6; }
-if test "$alsa_prefix" != "" ; then
-	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
-	LDFLAGS="$LDFLAGS $ALSA_LIBS"
-fi
-
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
-LIBS="$ALSA_LIBS $LIBS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
-$as_echo "$ALSA_LIBS" >&6; }
-
-min_alsa_version=1.0.0
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libasound headers version >= $min_alsa_version" >&5
-$as_echo_n "checking for libasound headers version >= $min_alsa_version... " >&6; }
-no_alsa=""
-    alsa_min_major_version=`echo $min_alsa_version | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`
-    alsa_min_minor_version=`echo $min_alsa_version | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'`
-    alsa_min_micro_version=`echo $min_alsa_version | \
-           sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'`
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <alsa/asoundlib.h>
-
-int
-main ()
-{
-
-/* ensure backward compatibility */
-#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
-#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
-#endif
-#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
-#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
-#endif
-#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
-#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
-#endif
-
-#  if(SND_LIB_MAJOR > $alsa_min_major_version)
-  exit(0);
-#  else
-#    if(SND_LIB_MAJOR < $alsa_min_major_version)
-#       error not present
-#    endif
-
-#   if(SND_LIB_MINOR > $alsa_min_minor_version)
-  exit(0);
-#   else
-#     if(SND_LIB_MINOR < $alsa_min_minor_version)
-#          error not present
-#      endif
-
-#      if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
-#        error not present
-#      endif
-#    endif
-#  endif
-exit(0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5
-$as_echo "found." >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present." >&5
-$as_echo "not present." >&6; }
-
-   alsa_found=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-if test "x$enable_alsatest" = "xyes"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_ctl_open in -lasound" >&5
-$as_echo_n "checking for snd_ctl_open in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lasound  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char snd_ctl_open ();
-int
-main ()
-{
-return snd_ctl_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_asound_snd_ctl_open=yes
-else
-  ac_cv_lib_asound_snd_ctl_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_ctl_open" >&5
-$as_echo "$ac_cv_lib_asound_snd_ctl_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_ctl_open" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBASOUND 1
-_ACEOF
-
-  LIBS="-lasound $LIBS"
-
-else
-
-	 alsa_found=no
-
-fi
-
-fi
-
-LDFLAGS="$alsa_save_LDFLAGS"
-LIBS="$alsa_save_LIBS"
-
-if test "x$alsa_found" = "xyes" ; then
-   have_alsa="true"
-else
-   ALSA_CFLAGS=""
-   ALSA_LIBS=""
-   have_alsa="false"
-fi
-
-
-
-
-fi
-
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
-
-
- if test x$have_alsa = xtrue; then
-  HAVE_ALSA_TRUE=
-  HAVE_ALSA_FALSE='#'
-else
-  HAVE_ALSA_TRUE='#'
-  HAVE_ALSA_FALSE=
-fi
-
-
-
-
-have_jack="false"
-
-# Check whether --enable-jack was given.
-if test "${enable_jack+set}" = set; then :
-  enableval=$enable_jack; case "${enableval}" in
-                 yes) test_jack=true ;;
-                 no) test_jack=false ;;
-               esac
-else
-  test_jack=true
-fi
-
-
-JACK_REQUIRED="0.109.2"
-
-if test x$test_jack = xtrue; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$JACK_CFLAGS"; then
-        pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= \$JACK_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jack >= $JACK_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= $JACK_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$JACK_LIBS"; then
-        pkg_cv_JACK_LIBS="$JACK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= \$JACK_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jack >= $JACK_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= $JACK_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack >= $JACK_REQUIRED"`
-        else
-	        JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack >= $JACK_REQUIRED"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JACK_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_jack="false"
-elif test $pkg_failed = untried; then
-	have_jack="false"
-else
-	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
-	JACK_LIBS=$pkg_cv_JACK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_jack="true"
-fi
-fi
-
-
-
- if test x$have_jack = xtrue; then
-  HAVE_JACK_TRUE=
-  HAVE_JACK_FALSE='#'
-else
-  HAVE_JACK_TRUE='#'
-  HAVE_JACK_FALSE=
-fi
-
-
-
-have_oss=false
-# Check whether --enable-oss was given.
-if test "${enable_oss+set}" = set; then :
-  enableval=$enable_oss; case "${enableval}" in
-                 yes) test_oss=true ;;
-                 no) test_oss=false ;;
-               esac
-else
-  test_oss=true
-fi
-
-
-if test x$test_oss = xtrue; then
-for ac_header in sys/soundcard.h soundcard.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- have_oss=true
-fi
-
-done
-
-fi
- if test x$have_oss = xtrue; then
-  HAVE_OSS_TRUE=
-  HAVE_OSS_FALSE='#'
-else
-  HAVE_OSS_TRUE='#'
-  HAVE_OSS_FALSE=
-fi
-
-
-
-
-
-have_v4l=false
-# Check whether --enable-v4l was given.
-if test "${enable_v4l+set}" = set; then :
-  enableval=$enable_v4l; case "${enableval}" in
-                 yes) test_v4l=true ;;
-                 no) test_v4l=false ;;
-               esac
-else
-  test_v4l=true
-fi
-
-
-if test x$test_v4l = xtrue; then
-for ac_header in linux/videodev.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_videodev_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_VIDEODEV_H 1
-_ACEOF
- have_v4l=true
-fi
-
-done
-
-fi
-
-if test x$have_v4l = xtrue; then
-$as_echo "#define HAVE_V4L 1" >>confdefs.h
-
-fi
-
- if test x$have_v4l = xtrue; then
-  HAVE_V4L_TRUE=
-  HAVE_V4L_FALSE='#'
-else
-  HAVE_V4L_TRUE='#'
-  HAVE_V4L_FALSE=
-fi
-
-
-
-have_v4l2=false
-# Check whether --enable-v4l2 was given.
-if test "${enable_v4l2+set}" = set; then :
-  enableval=$enable_v4l2; case "${enableval}" in
-                 yes) test_v4l2=true ;;
-                 no) test_v4l2=false ;;
-               esac
-else
-  test_v4l2=true
-fi
-
-
-if test x$test_v4l2 = xtrue; then
-for ac_header in linux/videodev2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_videodev2_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_VIDEODEV2_H 1
-_ACEOF
- have_v4l2=true
-fi
-
-done
-
-fi
-
- if test x$have_v4l2 = xtrue; then
-  HAVE_V4L2_TRUE=
-  HAVE_V4L2_FALSE='#'
-else
-  HAVE_V4L2_TRUE='#'
-  HAVE_V4L2_FALSE=
-fi
-
-
-
-
-
-
-
-have_libjpeg=false
-JPEG_REQUIRED="6b"
-
-# Check whether --enable-libjpeg was given.
-if test "${enable_libjpeg+set}" = set; then :
-  enableval=$enable_libjpeg; case "${enableval}" in
-   yes) test_libjpeg=true ;;
-   no)  test_libjpeg=false ;;
-esac
-else
-  test_libjpeg=true
-fi
-
-
-if test x$test_libjpeg = xtrue; then
-
-OLD_LIBS=$LIBS
-LIBS="$LIBS -ljpeg"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-$as_echo_n "checking for libjpeg... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-             #include <jpeglib.h>
-int
-main ()
-{
-struct jpeg_decompress_struct cinfo;
-             jpeg_create_decompress(&cinfo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_libjpeg=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-case $have_libjpeg in
-  true) $as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        JPEG_LIBS=$LIBS;;
-  false) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; JPEG_LIBS=""; JPEG_CFLAGS="";;
-  * ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"Somethings wrong: $have_libjpeg\"" >&5
-$as_echo "\"Somethings wrong: $have_libjpeg\"" >&6; } ;;
-esac
-
-LIBS=$OLD_LIBS
-
-fi
-
-
-
-
- if test x$have_libjpeg = xtrue; then
-  HAVE_LIBJPEG_TRUE=
-  HAVE_LIBJPEG_FALSE='#'
-else
-  HAVE_LIBJPEG_TRUE='#'
-  HAVE_LIBJPEG_FALSE=
-fi
-
-
-
-
-
-
-
-
-
-have_libpng=false
-PNG_REQUIRED="1.2.2"
-
-# Check whether --enable-libpng was given.
-if test "${enable_libpng+set}" = set; then :
-  enableval=$enable_libpng; case "${enableval}" in
-   yes) test_libpng=true ;;
-   no)  test_libpng=false ;;
-esac
-else
-  test_libpng=true
-fi
-
-
-if test x$test_libpng = xtrue; then
-
-OLD_LIBS=$LIBS
-
-LIBS="$LIBS -lpng -lm -lz"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-$as_echo_n "checking for libpng... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <png.h>
-int
-main ()
-{
-png_structp png_ptr;
-             png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
-                                               (png_voidp)0,
-                                                NULL, NULL);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_libpng=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-case $have_libpng in
-  true) $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        PNG_LIBS=$LIBS;;
-  false) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; PNG_LIBS=""; PNG_CFLAGS="";;
-esac
-LIBS=$OLD_LIBS
-
-fi
-
-
-
-
-
- if test x$have_libpng = xtrue; then
-  HAVE_LIBPNG_TRUE=
-  HAVE_LIBPNG_FALSE='#'
-else
-  HAVE_LIBPNG_TRUE='#'
-  HAVE_LIBPNG_FALSE=
-fi
-
-
-if test x$have_libpng = xtrue; then
-$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-fi
-
-
-
-
-
-
-
-
-have_libtiff=false
-TIFF_REQUIRED="3.5.0"
-
-# Check whether --enable-libtiff was given.
-if test "${enable_libtiff+set}" = set; then :
-  enableval=$enable_libtiff; case "${enableval}" in
-   yes) test_libtiff=true ;;
-   no)  test_libtiff=false ;;
-esac
-else
-  test_libtiff=true
-fi
-
-
-if test x$test_libtiff = xtrue; then
-
-OLD_LIBS=$LIBS
-
-LIBS="$LIBS -ltiff"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtiff" >&5
-$as_echo_n "checking for libtiff... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <tiffio.h>
-int
-main ()
-{
-TIFF * tiff = (TIFF*)0;
-	     int i = 0;
-	     /* We ensure the function is here but never call it */
-             if(i)
-	       TIFFReadRGBAImage(tiff, 0, 0, (uint32*)0, 0);
-	     return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_libtiff=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-case $have_libtiff in
-  true) $as_echo "#define HAVE_LIBTIFF 1" >>confdefs.h
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        TIFF_LIBS=$LIBS;;
-  false) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; TIFF_LIBS=""; TIFF_CFLAGS="";;
-esac
-LIBS=$OLD_LIBS
-
-fi
-
-
-
-
-
- if test x$have_libtiff = xtrue; then
-  HAVE_LIBTIFF_TRUE=
-  HAVE_LIBTIFF_FALSE='#'
-else
-  HAVE_LIBTIFF_TRUE='#'
-  HAVE_LIBTIFF_FALSE=
-fi
-
-
-if test x$have_libtiff = xtrue; then
-$as_echo "#define HAVE_LIBTIFF 1" >>confdefs.h
-
-fi
-
-
-
-
-
-have_inotify="false"
-
-ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
-if test "x$ac_cv_func_inotify_init" = x""yes; then :
-  have_inotify="true";$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
-
-fi
-
-
-
-
-
-
-
-# Check whether --enable-plugincfg was given.
-if test "${enable_plugincfg+set}" = set; then :
-  enableval=$enable_plugincfg; case "${enableval}" in
-                 yes) have_plugincfg=true ;;
-                 no) have_plugincfg=false ;;
-               esac
-else
-  have_plugincfg=true
-fi
-
-
-if test "x$have_gtk" != "xtrue"; then
-have_plugincfg=false
-fi
-
- if test x$have_plugincfg = xtrue; then
-  HAVE_PLUGINCFG_TRUE=
-  HAVE_PLUGINCFG_FALSE='#'
-else
-  HAVE_PLUGINCFG_TRUE='#'
-  HAVE_PLUGINCFG_FALSE=
-fi
-
-
-
-# Check whether --enable-alsamixer was given.
-if test "${enable_alsamixer+set}" = set; then :
-  enableval=$enable_alsamixer; case "${enableval}" in
-                 yes) have_alsamixer=true ;;
-                 no) have_alsamixer=false ;;
-               esac
-else
-  have_alsamixer=true
-fi
-
-
-if test "x$have_gtk" != "xtrue" -o "x$have_alsa" = "xfalse"; then
-have_alsamixer=false
-fi
-
- if test x$have_alsamixer = xtrue; then
-  HAVE_ALSAMIXER_TRUE=
-  HAVE_ALSAMIXER_FALSE='#'
-else
-  HAVE_ALSAMIXER_TRUE='#'
-  HAVE_ALSAMIXER_FALSE=
-fi
-
-
-
-# Check whether --enable-player was given.
-if test "${enable_player+set}" = set; then :
-  enableval=$enable_player; case "${enableval}" in
-                 yes) have_player=true ;;
-                 no) have_player=false ;;
-               esac
-else
-  have_player=true
-fi
-
-
-if test "x$have_gtk" != "xtrue"; then
-have_player=false
-fi
-
- if test x$have_player = xtrue; then
-  HAVE_PLAYER_TRUE=
-  HAVE_PLAYER_FALSE='#'
-else
-  HAVE_PLAYER_TRUE='#'
-  HAVE_PLAYER_FALSE=
-fi
-
-
-
-# Check whether --enable-kbd was given.
-if test "${enable_kbd+set}" = set; then :
-  enableval=$enable_kbd; case "${enableval}" in
-                 yes) have_kbd=true ;;
-                 no) have_kbd=false ;;
-               esac
-else
-  have_kbd=true
-fi
-
-
-if test "x$have_gtk" != "xtrue"; then
-have_kbd=false
-fi
-
-if test "x$have_x" != "xtrue"; then
-have_kbd=false
-fi
-
-
- if test x$have_kbd = xtrue; then
-  HAVE_KBD_TRUE=
-  HAVE_KBD_FALSE='#'
-else
-  HAVE_KBD_TRUE='#'
-  HAVE_KBD_FALSE=
-fi
-
-
-
-
-
-# Check whether --enable-transcoder was given.
-if test "${enable_transcoder+set}" = set; then :
-  enableval=$enable_transcoder; case "${enableval}" in
-                 yes) have_transcoder=true ;;
-                 no) have_transcoder=false ;;
-               esac
-else
-  have_transcoder=true
-fi
-
-
-if test "x$have_gtk" = "xfalse"; then
-have_transcoder=false
-fi
-
- if test x$have_transcoder = xtrue; then
-  HAVE_TRANSCODER_TRUE=
-  HAVE_TRANSCODER_FALSE='#'
-else
-  HAVE_TRANSCODER_TRUE='#'
-  HAVE_TRANSCODER_FALSE=
-fi
-
-
-
-# Check whether --enable-recorder was given.
-if test "${enable_recorder+set}" = set; then :
-  enableval=$enable_recorder; case "${enableval}" in
-                 yes) have_recorder=true ;;
-                 no) have_recorder=false ;;
-               esac
-else
-  have_recorder=true
-fi
-
-
-if test "x$have_gtk" = "xfalse"; then
-have_recorder=false
-fi
-
- if test x$have_recorder = xtrue; then
-  HAVE_RECORDER_TRUE=
-  HAVE_RECORDER_FALSE='#'
-else
-  HAVE_RECORDER_TRUE='#'
-  HAVE_RECORDER_FALSE=
-fi
-
-
-
-
-# Check whether --enable-visualizer was given.
-if test "${enable_visualizer+set}" = set; then :
-  enableval=$enable_visualizer; case "${enableval}" in
-                 yes) have_visualizer=true ;;
-                 no) have_visualizer=false ;;
-               esac
-else
-  have_visualizer=true
-fi
-
-
-if test "x$have_gtk" = "xfalse"; then
-have_visualizer=false
-fi
-
- if test x$have_visualizer = xtrue; then
-  HAVE_VISUALIZER_TRUE=
-  HAVE_VISUALIZER_FALSE='#'
-else
-  HAVE_VISUALIZER_TRUE='#'
-  HAVE_VISUALIZER_FALSE=
-fi
-
-
-
-# Check whether --enable-thumbnailer was given.
-if test "${enable_thumbnailer+set}" = set; then :
-  enableval=$enable_thumbnailer; case "${enableval}" in
-                 yes) have_thumbnailer=true ;;
-                 no) have_thumbnailer=false ;;
-               esac
-else
-  have_thumbnailer=true
-fi
-
-
- if test x$have_thumbnailer = xtrue; then
-  HAVE_THUMBNAILER_TRUE=
-  HAVE_THUMBNAILER_FALSE='#'
-else
-  HAVE_THUMBNAILER_TRUE='#'
-  HAVE_THUMBNAILER_FALSE=
-fi
-
-
-
-# Check whether --enable-nmjedit was given.
-if test "${enable_nmjedit+set}" = set; then :
-  enableval=$enable_nmjedit; case "${enableval}" in
-                 yes) have_nmjedit=true ;;
-                 no) have_nmjedit=false ;;
-               esac
-else
-  have_nmjedit=false
-fi
-
-
-if test "x$have_sqlite3" = "xfalse"; then
-have_nmjedit="false"
-fi
-
- if test "x$have_nmjedit" = "xtrue"; then
-  HAVE_NMJEDIT_TRUE=
-  HAVE_NMJEDIT_FALSE='#'
-else
-  HAVE_NMJEDIT_TRUE='#'
-  HAVE_NMJEDIT_FALSE=
-fi
-
-
-
-
-
-
-
-LQT_DEBUG=false
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; case "${enableval}" in
-   yes) LQT_DEBUG=true ;;
-   no)  LQT_DEBUG=false ;;
-esac
-else
-  LQT_DEBUG=false
-fi
-
-
-
-
-
-# Check whether --with-cpuflags was given.
-if test "${with_cpuflags+set}" = set; then :
-  withval=$with_cpuflags; lqt_cpuflags="$withval"
-else
-  lqt_cpuflags="auto"
-fi
-
-
-if test x$lqt_cpuflags = xnone; then
-lqt_cpuflags=""
-fi
-
-
-if test x$lqt_cpuflags = xauto; then
-
-lqt_cpu_family=""
-case $host_cpu in
-  i[3-7]86)
-    lqt_cpu_family=x86;;
-  x86_64*)
-    lqt_cpu_family=x86;;
-  powerpc | powerpc64)
-    lqt_cpu_family=ppc;;
-  *)
-    lqt_cpu_family="";;
-esac
-
-if test x$lqt_cpu_family = x; then
-  lqt_cpuflags=""
-else
-  lqt_cpuflags=`$srcdir/cpuinfo.sh $lqt_cpu_family`
-fi
-
-fi
-
-
-lqt_additional_opt_flags="-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math"
-
-lqt_test_flags=$lqt_cpuflags
-
-if test x$LQT_DEBUG = xtrue; then
-  lqt_test_cflags="$lqt_test_flags -g -DDEBUG"
-else
-  lqt_test_cflags="$lqt_test_flags $lqt_additional_opt_flags"
-fi
-
-OPT_CFLAGS=""
-for i in $lqt_test_cflags; do
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $i flags" >&5
-$as_echo_n "checking if $CC supports $i flags... " >&6; }
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$i"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  lqt_try_cflags_ok=yes
-else
-  lqt_try_cflags_ok=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS="$SAVE_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lqt_try_cflags_ok" >&5
-$as_echo "$lqt_try_cflags_ok" >&6; }
-    if test x"$lqt_try_cflags_ok" = x"yes"; then
-        OPT_CFLAGS="$OPT_CFLAGS $i"
-    else
-        :
-    fi ;
-done
-
-
-
-CFLAGS="$CFLAGS -D_REENTRANT -D_FILE_OFFSET_BITS=64 $GAVL_CFLAGS $OPT_CFLAGS"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall flags" >&5
-$as_echo_n "checking if $CC supports -Wall flags... " >&6; }
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="-Wall"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  lqt_try_cflags_ok=yes
-else
-  lqt_try_cflags_ok=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS="$SAVE_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lqt_try_cflags_ok" >&5
-$as_echo "$lqt_try_cflags_ok" >&6; }
-    if test x"$lqt_try_cflags_ok" = x"yes"; then
-        CFLAGS="$CFLAGS -Wall"
-    else
-        :
-    fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations flags" >&5
-$as_echo_n "checking if $CC supports -Wmissing-declarations flags... " >&6; }
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="-Wmissing-declarations"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  lqt_try_cflags_ok=yes
-else
-  lqt_try_cflags_ok=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS="$SAVE_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lqt_try_cflags_ok" >&5
-$as_echo "$lqt_try_cflags_ok" >&6; }
-    if test x"$lqt_try_cflags_ok" = x"yes"; then
-        CFLAGS="$CFLAGS -Wmissing-declarations"
-    else
-        :
-    fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement flags" >&5
-$as_echo_n "checking if $CC supports -Wdeclaration-after-statement flags... " >&6; }
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="-Wdeclaration-after-statement"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  lqt_try_cflags_ok=yes
-else
-  lqt_try_cflags_ok=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS="$SAVE_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lqt_try_cflags_ok" >&5
-$as_echo "$lqt_try_cflags_ok" >&6; }
-    if test x"$lqt_try_cflags_ok" = x"yes"; then
-        CFLAGS="$CFLAGS -Wdeclaration-after-statement"
-    else
-        :
-    fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Architecture" >&5
-$as_echo_n "checking Architecture... " >&6; }
-case $host_cpu in
-  i[3-7]86)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: IA32" >&5
-$as_echo "IA32" >&6; }
-    ARCH_X86=true
-    ;;
-  x86_64*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: x86_64" >&5
-$as_echo "x86_64" >&6; }
-    ARCH_X86=true
-    ARCH_X86_64=true
-    ;;
-  powerpc | powerpc64)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PowerPC" >&5
-$as_echo "PowerPC" >&6; }
-    ARCH_PPC=true
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
-    ;;
-esac
-
-OLD_CFLAGS=$CFLAGS
-CFLAGS="$OPT_CFLAGS"
-
-if test x$ARCH_X86 = xtrue; then
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts MMX assembly" >&5
-$as_echo_n "checking if C compiler accepts MMX assembly... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- __asm__ __volatile__ ("movq" " %" "mm0" ", %" "mm1");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  HAVE_MMX=true
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $HAVE_MMX = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts 3Dnow assembly" >&5
-$as_echo_n "checking if C compiler accepts 3Dnow assembly... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- __asm__ __volatile__ ("pmulhrw" " %" "mm0" ", %" "mm1");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  HAVE_3DNOW=true
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test "$HAVE_3DNOW" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts 3Dnowext assembly" >&5
-$as_echo_n "checking if C compiler accepts 3Dnowext assembly... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- __asm__ __volatile__ ("pswapd" " %" "mm0" ", %" "mm0");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  HAVE_3DNOWEXT=true
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test "$HAVE_3DNOWEXT" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts SSE assembly" >&5
-$as_echo_n "checking if C compiler accepts SSE assembly... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- __asm__ __volatile__ ("movaps" " %" "xmm0" ", %" "xmm1");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  HAVE_SSE=true
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $HAVE_SSE = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts SSE2 assembly" >&5
-$as_echo_n "checking if C compiler accepts SSE2 assembly... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- __asm__ __volatile__ ("movdqa" " %" "xmm0" ", %" "xmm1");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  HAVE_SSE2=true
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $HAVE_SSE2 = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts MMX intrinsics" >&5
-$as_echo_n "checking if C compiler accepts MMX intrinsics... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mmintrin.h>
-int
-main ()
-{
-__m64 m1, m2; _m_paddb(m1, m2)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_MMX_INT=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-  if test "$HAVE_MMX_INT" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts 3Dnow intrinsics" >&5
-$as_echo_n "checking if C compiler accepts 3Dnow intrinsics... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mm3dnow.h>
-int
-main ()
-{
-_m_femms();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_3DNOW_INT=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-  if test "$HAVE_3DNOW_INT" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts 3Dnowext intrinsics" >&5
-$as_echo_n "checking if C compiler accepts 3Dnowext intrinsics... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mm3dnow.h>
-int
-main ()
-{
-__m64 b1;b1 = _m_pswapd(b1);_m_femms();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_3DNOWEXT_INT=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-  if test "$HAVE_3DNOWEXT_INT" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts SSE intrinsics" >&5
-$as_echo_n "checking if C compiler accepts SSE intrinsics... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <xmmintrin.h>
-int
-main ()
-{
-__m128 m1, m2; _mm_add_ss(m1, m2)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_SSE_INT=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-  if test "$HAVE_SSE_INT" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler accepts SSE2 intrinsics" >&5
-$as_echo_n "checking if C compiler accepts SSE2 intrinsics... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <emmintrin.h>
-int
-main ()
-{
-__m128d m1; m1 = _mm_set1_pd(1.0)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_SSE2_INT=true
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test "$HAVE_SSE2_INT" = true; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  fi
-
-
-
-
-fi
-
-CFLAGS=$OLD_CFLAGS
-
-
-
-if test x"$HAVE_MMX" = "xtrue"; then
-$as_echo "#define HAVE_MMX 1" >>confdefs.h
-
-fi
- if test "x$HAVE_MMX" = "xtrue"; then
-  HAVE_MMX_TRUE=
-  HAVE_MMX_FALSE='#'
-else
-  HAVE_MMX_TRUE='#'
-  HAVE_MMX_FALSE=
-fi
-
-
-if test x"$HAVE_3DNOW" = "xtrue"; then
-$as_echo "#define HAVE_3DNOW 1" >>confdefs.h
-
-fi
- if test "x$HAVE_3DNOW" = "xtrue"; then
-  HAVE_3DNOW_TRUE=
-  HAVE_3DNOW_FALSE='#'
-else
-  HAVE_3DNOW_TRUE='#'
-  HAVE_3DNOW_FALSE=
-fi
-
-
-if test x"$HAVE_SSE" = "xtrue"; then
-$as_echo "#define HAVE_SSE 1" >>confdefs.h
-
-fi
- if test "x$HAVE_SSE" = "xtrue"; then
-  HAVE_SSE_TRUE=
-  HAVE_SSE_FALSE='#'
-else
-  HAVE_SSE_TRUE='#'
-  HAVE_SSE_FALSE=
-fi
-
-
-if test x"$HAVE_SSE2" = "xtrue"; then
-$as_echo "#define HAVE_SSE2 1" >>confdefs.h
-
-fi
- if test "x$HAVE_SSE2" = "xtrue"; then
-  HAVE_SSE2_TRUE=
-  HAVE_SSE2_FALSE='#'
-else
-  HAVE_SSE2_TRUE='#'
-  HAVE_SSE2_FALSE=
-fi
-
-
-if test x"$ARCH_X86" = "xtrue"; then
-$as_echo "#define ARCH_X86 1" >>confdefs.h
-
-fi
-
-if test x"$ARCH_X86_64" = "xtrue"; then
-$as_echo "#define ARCH_X86_64 1" >>confdefs.h
-
-fi
-
-if test x"$ARCH_PPC" = "xtrue"; then
-$as_echo "#define ARCH_PPC 1" >>confdefs.h
-
-fi
-
-
-
-
-
-CFLAGS="$CFLAGS $XML2_CFLAGS"
-
-LIBS="$GAVL_LIBS"
-
-
-if test "x$prefix" = xNONE; then
-   prefix="${ac_default_prefix}"
-fi
-if test "x$exec_prefix" = xNONE; then
-   exec_prefix="${prefix}"
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define PREFIX "$prefix"
-_ACEOF
-
-
-INCLUDES='-I$(top_builddir)/include'
-
-
-MODULE_LIBADD='$(top_builddir)/lib/libgmerlin.la'
-
-
-
-TOP_SRCDIR=`cd ${srcdir} && pwd`
-
-
-GMERLIN_PLUGIN_LDFLAGS='-export-symbols $(top_srcdir)/plugin.sym'
-
-
-
-ac_config_files="$ac_config_files Makefile po/Makefile.in gmerlin.spec gmerlin.pc gmerlin-gtk.pc apps/Makefile apps/plugincfg/Makefile apps/player/Makefile apps/alsamixer/Makefile apps/cmdlineplayer/Makefile apps/cmdlinerecorder/Makefile apps/recorder/Makefile apps/transcoder/Makefile apps/visualizer/Makefile apps/kbd/Makefile apps/thumbnailer/Makefile apps/nmjedit/Makefile doc/Makefile doc/Doxyfile icons/Makefile m4/Makefile utils/Makefile tests/Makefile include/Makefile include/gmerlin/Makefile include/gmerlin/bg_version.h include/gui_gtk/Makefile include/x11/Makefile lib/Makefile lib/gtk/Makefile lib/x11/Makefile osd/Makefile plugins/Makefile plugins/alsa/Makefile plugins/audiofilters/Makefile plugins/x11/Makefile plugins/cdaudio/Makefile plugins/edl/Makefile plugins/esd/Makefile plugins/gavl/Makefile plugins/jack/Makefile plugins/lqt/Makefile plugins/oss/Makefile plugins/jpeg/Makefile plugins/mikmod/Makefile plugins/png/Makefile plugins/postprocessors/Makefile plugins/pulseaudio/Makefile plugins/subwriters/Makefile plugins/image/Makefile plugins/tiff/Makefile plugins/v4l/Makefile plugins/v4l2/Makefile plugins/videofilters/Makefile plugins/visualization/Makefile plugins/wavwrite/Makefile skins/Makefile skins/Default/Makefile"
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
-     t end
-     s/^$[^=]*$=$.*$$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-if test -z "${HAVE_POSIX_SEMAPHORES_TRUE}" && test -z "${HAVE_POSIX_SEMAPHORES_FALSE}"; then
-  as_fn_error "conditional \"HAVE_POSIX_SEMAPHORES\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
-  as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
-  as_fn_error "conditional \"HAVE_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_X11_TRUE}" && test -z "${HAVE_X11_FALSE}"; then
-  as_fn_error "conditional \"HAVE_X11\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GL_TRUE}" && test -z "${HAVE_GL_FALSE}"; then
-  as_fn_error "conditional \"HAVE_GL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GLX_TRUE}" && test -z "${HAVE_GLX_FALSE}"; then
-  as_fn_error "conditional \"HAVE_GLX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PULSEAUDIO_TRUE}" && test -z "${HAVE_PULSEAUDIO_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PULSEAUDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_XTEST_TRUE}" && test -z "${HAVE_XTEST_FALSE}"; then
-  as_fn_error "conditional \"HAVE_XTEST\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_XV_TRUE}" && test -z "${HAVE_XV_FALSE}"; then
-  as_fn_error "conditional \"HAVE_XV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LQT_TRUE}" && test -z "${HAVE_LQT_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LQT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBEXIF_TRUE}" && test -z "${HAVE_LIBEXIF_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBEXIF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_V4LVCONVERT_TRUE}" && test -z "${HAVE_V4LVCONVERT_FALSE}"; then
-  as_fn_error "conditional \"HAVE_V4LVCONVERT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LV_TRUE}" && test -z "${HAVE_LV_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_CDIO_TRUE}" && test -z "${HAVE_CDIO_FALSE}"; then
-  as_fn_error "conditional \"HAVE_CDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_MUSICBRAINZ_TRUE}" && test -z "${HAVE_MUSICBRAINZ_FALSE}"; then
-  as_fn_error "conditional \"HAVE_MUSICBRAINZ\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBCDDB_TRUE}" && test -z "${HAVE_LIBCDDB_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBCDDB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_ESD_TRUE}" && test -z "${HAVE_ESD_FALSE}"; then
-  as_fn_error "conditional \"HAVE_ESD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
-  as_fn_error "conditional \"HAVE_ALSA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_JACK_TRUE}" && test -z "${HAVE_JACK_FALSE}"; then
-  as_fn_error "conditional \"HAVE_JACK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then
-  as_fn_error "conditional \"HAVE_OSS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_V4L_TRUE}" && test -z "${HAVE_V4L_FALSE}"; then
-  as_fn_error "conditional \"HAVE_V4L\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_V4L2_TRUE}" && test -z "${HAVE_V4L2_FALSE}"; then
-  as_fn_error "conditional \"HAVE_V4L2\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBJPEG_TRUE}" && test -z "${HAVE_LIBJPEG_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBJPEG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBPNG_TRUE}" && test -z "${HAVE_LIBPNG_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBPNG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBTIFF_TRUE}" && test -z "${HAVE_LIBTIFF_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBTIFF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PLUGINCFG_TRUE}" && test -z "${HAVE_PLUGINCFG_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PLUGINCFG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_ALSAMIXER_TRUE}" && test -z "${HAVE_ALSAMIXER_FALSE}"; then
-  as_fn_error "conditional \"HAVE_ALSAMIXER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PLAYER_TRUE}" && test -z "${HAVE_PLAYER_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PLAYER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_KBD_TRUE}" && test -z "${HAVE_KBD_FALSE}"; then
-  as_fn_error "conditional \"HAVE_KBD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_TRANSCODER_TRUE}" && test -z "${HAVE_TRANSCODER_FALSE}"; then
-  as_fn_error "conditional \"HAVE_TRANSCODER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_RECORDER_TRUE}" && test -z "${HAVE_RECORDER_FALSE}"; then
-  as_fn_error "conditional \"HAVE_RECORDER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_VISUALIZER_TRUE}" && test -z "${HAVE_VISUALIZER_FALSE}"; then
-  as_fn_error "conditional \"HAVE_VISUALIZER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_THUMBNAILER_TRUE}" && test -z "${HAVE_THUMBNAILER_FALSE}"; then
-  as_fn_error "conditional \"HAVE_THUMBNAILER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_NMJEDIT_TRUE}" && test -z "${HAVE_NMJEDIT_FALSE}"; then
-  as_fn_error "conditional \"HAVE_NMJEDIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_MMX_TRUE}" && test -z "${HAVE_MMX_FALSE}"; then
-  as_fn_error "conditional \"HAVE_MMX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_3DNOW_TRUE}" && test -z "${HAVE_3DNOW_FALSE}"; then
-  as_fn_error "conditional \"HAVE_3DNOW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SSE_TRUE}" && test -z "${HAVE_SSE_FALSE}"; then
-  as_fn_error "conditional \"HAVE_SSE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SSE2_TRUE}" && test -z "${HAVE_SSE2_FALSE}"; then
-  as_fn_error "conditional \"HAVE_SSE2\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$[^/][^/]*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.65,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X$[^=]*$='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "gmerlin.spec") CONFIG_FILES="$CONFIG_FILES gmerlin.spec" ;;
-    "gmerlin.pc") CONFIG_FILES="$CONFIG_FILES gmerlin.pc" ;;
-    "gmerlin-gtk.pc") CONFIG_FILES="$CONFIG_FILES gmerlin-gtk.pc" ;;
-    "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-    "apps/plugincfg/Makefile") CONFIG_FILES="$CONFIG_FILES apps/plugincfg/Makefile" ;;
-    "apps/player/Makefile") CONFIG_FILES="$CONFIG_FILES apps/player/Makefile" ;;
-    "apps/alsamixer/Makefile") CONFIG_FILES="$CONFIG_FILES apps/alsamixer/Makefile" ;;
-    "apps/cmdlineplayer/Makefile") CONFIG_FILES="$CONFIG_FILES apps/cmdlineplayer/Makefile" ;;
-    "apps/cmdlinerecorder/Makefile") CONFIG_FILES="$CONFIG_FILES apps/cmdlinerecorder/Makefile" ;;
-    "apps/recorder/Makefile") CONFIG_FILES="$CONFIG_FILES apps/recorder/Makefile" ;;
-    "apps/transcoder/Makefile") CONFIG_FILES="$CONFIG_FILES apps/transcoder/Makefile" ;;
-    "apps/visualizer/Makefile") CONFIG_FILES="$CONFIG_FILES apps/visualizer/Makefile" ;;
-    "apps/kbd/Makefile") CONFIG_FILES="$CONFIG_FILES apps/kbd/Makefile" ;;
-    "apps/thumbnailer/Makefile") CONFIG_FILES="$CONFIG_FILES apps/thumbnailer/Makefile" ;;
-    "apps/nmjedit/Makefile") CONFIG_FILES="$CONFIG_FILES apps/nmjedit/Makefile" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
-    "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
-    "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
-    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
-    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "include/gmerlin/Makefile") CONFIG_FILES="$CONFIG_FILES include/gmerlin/Makefile" ;;
-    "include/gmerlin/bg_version.h") CONFIG_FILES="$CONFIG_FILES include/gmerlin/bg_version.h" ;;
-    "include/gui_gtk/Makefile") CONFIG_FILES="$CONFIG_FILES include/gui_gtk/Makefile" ;;
-    "include/x11/Makefile") CONFIG_FILES="$CONFIG_FILES include/x11/Makefile" ;;
-    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-    "lib/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gtk/Makefile" ;;
-    "lib/x11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/x11/Makefile" ;;
-    "osd/Makefile") CONFIG_FILES="$CONFIG_FILES osd/Makefile" ;;
-    "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
-    "plugins/alsa/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/alsa/Makefile" ;;
-    "plugins/audiofilters/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/audiofilters/Makefile" ;;
-    "plugins/x11/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/x11/Makefile" ;;
-    "plugins/cdaudio/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/cdaudio/Makefile" ;;
-    "plugins/edl/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/edl/Makefile" ;;
-    "plugins/esd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/esd/Makefile" ;;
-    "plugins/gavl/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/gavl/Makefile" ;;
-    "plugins/jack/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/jack/Makefile" ;;
-    "plugins/lqt/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/lqt/Makefile" ;;
-    "plugins/oss/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/oss/Makefile" ;;
-    "plugins/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/jpeg/Makefile" ;;
-    "plugins/mikmod/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mikmod/Makefile" ;;
-    "plugins/png/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/png/Makefile" ;;
-    "plugins/postprocessors/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/postprocessors/Makefile" ;;
-    "plugins/pulseaudio/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/pulseaudio/Makefile" ;;
-    "plugins/subwriters/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/subwriters/Makefile" ;;
-    "plugins/image/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/image/Makefile" ;;
-    "plugins/tiff/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/tiff/Makefile" ;;
-    "plugins/v4l/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/v4l/Makefile" ;;
-    "plugins/v4l2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/v4l2/Makefile" ;;
-    "plugins/videofilters/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videofilters/Makefile" ;;
-    "plugins/visualization/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/visualization/Makefile" ;;
-    "plugins/wavwrite/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/wavwrite/Makefile" ;;
-    "skins/Makefile") CONFIG_FILES="$CONFIG_FILES skins/Makefile" ;;
-    "skins/Default/Makefile") CONFIG_FILES="$CONFIG_FILES skins/Default/Makefile" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/$.\{148\}$..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/$.\{148\}$..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = "&#x7;"
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^$[^=]*=[	 ]*$:*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = "&#x7;"
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X$//$[^/]' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X$//$[^/]' \| \
-	 X"$_am_arg" : 'X$//$$' \| \
-	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X$//$[^/]' \| \
-	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X$//$[^/]' \| \
-	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^$-[^=]*$=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
-
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-    "po-directories":C)
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-echo "=== Libraries: ===================================="
-
-echo -n "Gtk-2.0:             "
-if test "x$have_gtk" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing (GUI applications won't be compiled! Go to http://www.gtk.org/)"
-fi
-
-echo
-echo "=== Plugins: ======================================"
-
-echo -n "EsounD:              "
-if test "x$have_esd" = "xtrue"; then
-echo "Yes (CFLAGS=$ESD_CFLAGS LIBS=$ESD_LIBS)"
-else
-if test "x$test_esd" = "xtrue"; then
-echo "Missing (Go to http://www.tux.org/~ricdude/EsounD.html)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Alsa:                "
-if test "x$have_alsa" = "xtrue"; then
-echo "Yes (CFLAGS=$ALSA_CFLAGS LIBS=$ALSA_LIBS)"
-else
-if test "x$test_alsa" = "xtrue"; then
-echo "Missing (Go to http://www.alsa-project.org/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Jack:                "
-if test "x$have_jack" = "xtrue"; then
-echo "Yes (CFLAGS=$JACK_CFLAGS LIBS=$JACK_LIBS)"
-else
-if test "x$test_jack" = "xtrue"; then
-echo "Missing (Go to http://jackit.sourceforge.net/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Libquicktime:        "
-if test "x$have_lqt" = "xtrue"; then
-echo "Yes (CFLAGS=$LQT_CFLAGS LIBS=$LQT_LIBS)"
-else
-if test "x$test_lqt" = "xtrue"; then
-echo "Missing (Go to http://libquicktime.sourceforge.net/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Libvisual:           "
-if test "x$have_lv" = "xtrue"; then
-echo "Yes (CFLAGS=$LV_CFLAGS LIBS=$LV_LIBS)"
-else
-if test "x$test_lv" = "xtrue"; then
-echo "Missing (Go to http://libvisual.sourceforge.net/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Libjpeg:             "
-if test "x$have_libjpeg" = "xtrue"; then
-echo "Yes (CFLAGS=$JPEG_CFLAGS LIBS=$JPEG_LIBS)"
-else
-if test "x$test_libjpeg" = "xtrue"; then
-echo "Missing (Go to http://www.ijg.org/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Libpng:              "
-if test "x$have_libpng" = "xtrue"; then
-echo "Yes (CFLAGS=$PNG_CFLAGS LIBS=$PNG_LIBS)"
-else
-if test "x$test_libpng" = "xtrue"; then
-echo "Missing (Go to http://www.libpng.org/pub/png/libpng.html)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Libtiff:             "
-if test "x$have_libtiff" = "xtrue"; then
-echo "Yes (CFLAGS=$TIFF_CFLAGS LIBS=$TIFF_LIBS)"
-else
-if test "x$test_libtiff" = "xtrue"; then
-echo "Missing (Go to http://www.remotesensing.org/libtiff/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "pulseaudio:          "
-if test "x$have_pulseaudio" = "xtrue"; then
-echo "Yes (CFLAGS=$PULSEAUDIO_CFLAGS LIBS=$PULSEAUDIO_LIBS)"
-else
-if test "x$test_pulseaudio" = "xtrue"; then
-echo "Missing (Go to http://www.pulseaudio.org)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "OSS:                 "
-if test "x$have_oss" = "xtrue"; then
-echo "Yes"
-else
-if test "x$test_oss" = "xtrue"; then
-echo "Missing (Probably unsupported architecture)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Video4Linux:         "
-if test "x$have_v4l" = "xtrue"; then
-echo "Yes"
-else
-if test "x$test_v4l" = "xtrue"; then
-echo "Missing (Probably unsupported architecture)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Video4Linux2:        "
-if test "x$have_v4l2" = "xtrue"; then
-echo "Yes"
-else
-if test "x$test_v4l2" = "xtrue"; then
-echo "Missing (Probably unsupported architecture)"
-else
-echo "Disabled"
-fi
-fi
-
-
-echo -n "X11:                 "
-if test "x$have_x" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing"
-fi
-
-echo -n "OpenGL:              "
-if test "x$have_GL" = "xtrue"; then
-echo "Yes (CFLAGS=$GL_CFLAGS, LIBS=$GL_LIBS)"
-else
-echo "Missing"
-fi
-
-echo -n "GLX:                 "
-if test "x$have_GLX" = "xtrue"; then
-echo "Yes (CFLAGS=$GLX_CFLAGS, LIBS=$GLX_LIBS)"
-else
-echo "Missing"
-fi
-
-echo -n "Xinerama:            "
-if test "x$have_xinerama" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing"
-fi
-
-echo -n "Xtest:               "
-if test "x$have_xtest" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing"
-fi
-
-
-echo -n "Xvideo extension:    "
-if test "x$have_xv" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing"
-fi
-
-echo -n "X11 dpms extension:  "
-if test "x$have_xdpms" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing"
-fi
-
-echo -n "XFixes extension:    "
-if test "x$have_xfixes" = "xtrue"; then
-echo "Yes"
-else
-echo "Missing"
-fi
-
-
-echo -n "libcdio:             "
-if test "x$have_cdio" = "xtrue"; then
-echo "Yes (CFLAGS=$CDIO_CFLAGS $CDIO_CDDA_CFLAGS $CDIO_PARANOIA_CFLAGS LIBS=$CDIO_LIBS $CDIO_CDDA_LIBS $CDIO_PARANOIA_LIBS)"
-else
-if test "x$test_cdio" = "xtrue"; then
-echo "Missing (Go to http://www.gnu.org/software/libcdio/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "Musicbrainz:         "
-if test "x$have_musicbrainz" = "xtrue"; then
-echo "Yes (CFLAGS=$MUSICBRAINZ_CFLAGS LIBS=$MUSICBRAINZ_LIBS)"
-else
-if test "x$test_musicbrainz" = "xtrue"; then
-echo "Missing (Go to http://musicbrainz.org/products/client/index.html)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "libcddb:             "
-if test "x$have_cddb" = "xtrue"; then
-echo "Yes (CFLAGS=$CDDB_CFLAGS LIBS=$CDDB_LIBS)"
-else
-if test "x$test_cddb" = "xtrue"; then
-echo "Missing (Go to http://libcddb.sourceforge.net)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "libv4lconvert:       "
-if test "x$have_v4lconvert" = "xtrue"; then
-echo "Yes (CFLAGS=$V4LCONVERT_CFLAGS LIBS=$V4LCONVERT_LIBS)"
-else
-if test "x$test_v4lconvert" = "xtrue"; then
-echo "Missing (Go to http://people.atrpms.net/~hdegoede/)"
-else
-echo "Disabled"
-fi
-fi
-
-echo -n "libexif:             "
-if test "x$have_libexif" = "xtrue"; then
-echo "Yes (CFLAGS=$LIBEXIF_CFLAGS LIBS=$LIBEXIF_LIBS)"
-else
-echo "Missing (Go to http://libexif.sourceforge.net/)"
-fi
-
-
-echo
-echo "=== Applications: ================================="
-
-echo -n "Plugin Configurator: "
-if test "x$have_plugincfg" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Alsamixer:           "
-if test "x$have_alsamixer" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Player:              "
-if test "x$have_player" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Transcoder:          "
-if test "x$have_transcoder" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Recorder:            "
-if test "x$have_recorder" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Visualizer:          "
-if test "x$have_visualizer" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Keyboard daemon:     "
-if test "x$have_kbd" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "Thumbnailer:         "
-if test "x$have_thumbnailer" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo -n "nmjedit:             "
-if test "x$have_nmjedit" = "xtrue"; then
-echo "Enabled"
-else
-echo "Disabled"
-fi
-
-echo
-echo "If you installed a library but it was not detected, check the file INSTALL"
-echo "for troubleshooting tips. Also note that if the configure script reaches"
-echo "this point, all missing packages are optional so compilation should succeed"
-echo "anyway."

gmerlin-1.2.0.tar.gz/cpuinfo.sh Deleted

@@ -1,338 +0,0 @@
-#!/bin/sh
-
-if test x"$CC" = x; then
-   CC=gcc
-fi
-
-if test $# -ne 1; then
-   echo "Please give the arch (ppc or x86) as an argument!" 1>&2
-   exit 1
-fi
-
-if test `uname -s` = Darwin; then
-   IsDarwin=yes
-else
-   IsDarwin=no
-fi
-
-target=$1
-
-cc_version=`$CC -dumpversion`
-_cc_major=`echo $cc_version | cut -d'.' -f1`
-_cc_minor=`echo $cc_version | cut -d'.' -f2`
-
-if test $_cc_major -ge 4; then
-  _opt_mcpu="-mtune"
-elif test $_cc_major -ge 3 -a $_cc_minor -ge 4; then
-  _opt_mcpu="-mtune"
-else
-  _opt_mcpu="-mcpu"
-fi
-
-do_cc()
-{
-	$CC -o conftest conftest.c $@ >/dev/null 2>&1
-}
-
-extcheck()
-{
-cat > conftest.c <<EOF
-#include <signal.h>
-void catch() { exit(1); }
-int main(void){
-  signal(SIGILL, catch);
-  __asm__ __volatile__ ("$1":::"memory");
-  exit(0);
-}
-EOF
-
-do_cc
-if test -x ./conftest; then
-     ./conftest
-     if test $? -ne 0; then
-        return 1
-     fi
-     return 0
-else
-     return 1
-fi
-}
-
-do_x86()
-{
-
-CFLAGS=-O
-if test $IsDarwin = yes; then
-   CFLAGS="$CFLAGS -fno-pic -Wl,-read_only_relocs -Wl,suppress"
-fi
-
-if test -r /proc/cpuinfo; then
-	_cpuinfo="cat /proc/cpuinfo"
-else
-	$CC $CFLAGS -o cpuinfo utils/cpuinfo.c
-	_cpuinfo="./cpuinfo"
-fi
-
-# Cpu determination logic adapted from the MPlayer configure script.
-
-pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1`
-pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d':' -f2 | cut -d' ' -f2 | head -n 1`
-pfamily=`$_cpuinfo | grep 'cpu family' | cut -d':' -f2 | cut -d' ' -f2 | head -n 1`
-pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d':' -f2 | cut -d' ' -f2 | head -n 1`
-pstep=`$_cpuinfo | grep 'stepping' | cut -d':' -f2 | cut -d' ' -f2 | head -n 1`
-pparam=`$_cpuinfo | grep 'features' | cut -d':' -f2 | head -n 1`
-
-if test -z "$pparam" ; then
- pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n 1`
-fi
-
-_mmx=no
-_3dnow=no
-_3dnowex=no
-_mmx2=no
-_sse=no
-_sse2=no
-_mtrr=no
-
-for i in $pparam ; do
- case "$i" in
-  3dnow)        _3dnow=yes               ;;
-  3dnowext)     _3dnow=yes  _3dnowex=yes ;;
-  mmx)          _mmx=yes                 ;;
-  mmxext)       _mmx2=yes                ;;
-  mtrr|k6_mtrr|cyrix_arr)   _mtrr=yes    ;;
-  xmm|sse|kni)  _sse=yes    _mmx2=yes    ;;
-  sse2)         _sse2=yes                ;;
- esac
-done
-
-case "$pvendor" in
-	AuthenticAMD)
-		case "$pfamily" in
-			3)proc=i386
-			  ;;
-			4) proc=i486
-			  ;;
-			5) iproc=586
-			# models are: K5/SSA5 K5 K5 K5 ? ? K6 K6 K6-2 K6-3
-			# K6 model 13 are the K6-2+ and K6-III+
-			   if test "$pmodel" -eq 9 -o "$pmodel" -eq 13; then
-				proc=k6-3
-			   elif test "$pmodel" -ge 8; then
-				proc=k6-2
-			   elif test "$pmodel" -ge 6; then
-				proc=k6
-			   else
-				proc=i586
-			   fi
-			   ;;
-			6) iproc=686
-			   if test "$pmodel" -ge 7; then
-				proc=athlon-4
-			   elif test "$pmodel" -ge 6; then
-			       if test "$_sse" = yes && test "$pstep" -ge 2; then
-				   proc=athlon-xp
-			       else
-				   proc=athlon-4
-			       fi
-			   elif test "$pmodel" -ge 4; then
-				proc=athlon-tbird
-			   else
-				proc=athlon
-			   fi
-			   ;;
-			15) 
-			    # Despite what the gcc into says 'athlon64' is not accepted as 
-			    # synonym for 'k8'
-			   proc=k8
-			   ;;
-			*) proc=athlon-xp
-			   ;;
-		esac
-		;;
-	GenuineIntel)
-		case "$pfamily" in
-			3) proc=i386
-			   ;;
-			4) proc=i486
-			   ;;
-			5) iproc=586
-			   if test "$pmodel" -eq 4 || test "$pmodel" -eq 8; then
-				proc=pentium-mmx # 4 is desktop, 8 is mobile
-			   else
-				proc=i586
-			   fi
-			   ;;
-			6) iproc=686
-                           if test "$pmodel" -ge 15; then
-                                proc=nocona
-                           elif test "$pmodel" -ge 13; then
-                                proc=pentium-m
-			   elif test "$pmodel" -ge 7; then
-				proc=pentium3
-			   elif test "$pmodel" -ge 3; then
-				proc=pentium2
-			   else
-				proc=i686
-			   fi
-                           ;;
-			15) proc=pentium4
-			   ;;
-			*) proc=pentium4
-			   ;;
-		esac
-		;;
-	unknown)
-		case "$pfamily" in
-			3) proc=i386
-			   ;;
-			4) proc=i486
-			   ;;
-			*) proc=i586
-			   ;;
-  		esac
-		;;
-	*)
-	   proc=i586
-	   ;;
-esac
-
-# check that gcc supports our CPU, if not, fall back to earlier ones
-
-cat > conftest.c << EOF
-int main(void) { return 0; }
-EOF
-if  test "$proc" = "athlon64" ; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=athlon-xp
-fi
-
-if test "$proc" = "athlon-xp" || test "$proc" = "athlon-4" || test "$proc" = "athlon-tbird"; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=athlon
-fi
-
-if test "$proc" = "k6-3" || test "$proc" = "k6-2"; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=k6
-fi
-
-if test "$proc" = "k6"; then
-    do_cc -march=$proc $_opt_mcpu=$proc
-    if test $? -ne 0; then
-        if do_cc -march=i586 $_opt_mcpu=i686; then
-          proc=i586-i686
-        else 
-          proc=i586
-	fi
-    fi
-fi
-
-if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon"; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=i686
-fi
-if test "$proc" = "i686" || test "$proc" = "pentium-mmx"; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=i586
-fi
-if test "$proc" = "i586" ; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=i486
-fi
-if test "$proc" = "i486" ; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=i386
-fi
-if test "$proc" = "i386" ; then
-	do_cc -march=$proc $_opt_mcpu=$proc || proc=error
-fi
-if test "$proc" = "error" ; then
-	echo "Your $_cc does not even support \"i386\" for '-march' and $_opt_mcpu."
-	_mcpu=""
-	_march=""
-elif test "$proc" = "i586-i686"; then
-	_march="-march=i586"
-	_mcpu="$_opt_mcpu=i686"
-else
-      _march="-march=$proc"
-      _mcpu="$_opt_mcpu=$proc"
-fi
-
-if test $_cc_major -ge 3; then
-   extcheck "xorps %%xmm0, %%xmm0" || _gcc3_ext="$_gcc3_ext -mno-sse"
-   extcheck "xorpd %%xmm0, %%xmm0" || _gcc3_ext="$_gcc3_ext -mno-sse2"
-
-   if test x"$_gcc3_ext" != "x"; then
-    # if we had to disable sse/sse2 because the active kernel does not
-    # support this instruction set extension, we also have to tell
-    # gcc3 to not generate sse/sse2 instructions for normal C code
-    cat > conftest.c << EOF
-int main(void) { return 0; }
-EOF
-    do_cc $_march $_gcc3_ext && _march="$_march $_gcc3_ext"
-   fi
-fi
-
-echo $_march $_mcpu
-rm -f conftest.c conftest cpuinfo
-return 0
-}
-
-do_ppc()
-{
-# Linux on a PPC has /proc/info
-# Darwin (OS/X) has the hostinfo command
-# If neither of those we have no idea what to do - so do nothing.
-if test -r /proc/cpuinfo; then
-	proc=`grep cpu /proc/cpuinfo | cut -d':' -f2 | cut -d',' -f1 | cut -b 2- | head -n 1`
-elif test $IsDarwin = yes; then
-	proc=`hostinfo | grep "Processor type" | cut -f3 -d' ' | sed 's/ppc//'`
-else
-	return 0
-fi
-
-case "$proc" in
-	601) _march="$_opt_mcpu=601" _mcpu='-mtune=601'
-	     ;;
-	603) _march="$_opt_mcpu=603" _mcpu='-mtune=603'
-	     ;;
-	603e|603ev) _march="$_opt_mcpu=603e" _mcpu='-mtune=603e'
-	     ;;
-	604|604e|604r|604ev) _march="$_opt_mcpu=604" _mcpu='-mtune=604'
-	     ;;
-	740|740/750|745/755) _march="$_opt_mcpu=740" _mcpu='-mtune=740'
-	     ;;
-	750|750CX) _march="$_opt_mcpu=750" _mcpu='-mtune=750'
-	     ;;
-	*) ;;
-esac
-
-# gcc 3.1(.1) and up supports 7400 and 7450
-if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "1" || test "$_cc_major" -ge "4"; then
-	case "$proc" in
-		7400*|7410*) _march="$_opt_mcpu=7400" _mcpu='-mtune=7400' ;;
-		7450*|7455*) _march="$_opt_mcpu=7450" _mcpu='-mtune=7450' ;;
-		*) ;;
-	esac
-fi
-
-# gcc 3.2 and up supports 970
-if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then
-	case "$proc" in
-	     970*) if test $IsDarwin = yes; then
-		      _march="$_opt_mcpu=G5 -mpowerpc64 -mpowerpc-gpopt -falign-loops=16" _mcpu='-mtune=G5'
-		   else
-		      _march="$_opt_mcpu=970" _mcpu='-mtune=970'
-		   fi
-		   ;;
-		*) ;;
-	esac
-fi
-
-echo $_march $_mcpu
-return 0
-}
-
-#
-# The script that runs the various functions above
-#
-
-if test $target = x86; then
-	do_x86
-elif test $target = ppc; then
-        do_ppc
-fi

gmerlin-1.2.0.tar.gz/depcomp Deleted

@@ -1,630 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

gmerlin-1.2.0.tar.gz/doc/Makefile.in Deleted

@@ -1,805 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc
-DIST_COMMON = $(gmerlin_TEXINFOS) $(srcdir)/Doxyfile.in \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/stamp-vti $(srcdir)/version.texi mdate-sh \
-	texinfo.tex
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES = Doxyfile
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-INFO_DEPS = $(srcdir)/gmerlin.info
-am__TEXINFO_TEX_DIR = $(srcdir)
-DVIS = gmerlin.dvi
-PDFS = gmerlin.pdf
-PSS = gmerlin.ps
-HTMLS = gmerlin.html
-TEXINFOS = gmerlin.texi
-TEXI2DVI = texi2dvi
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-MAKEINFOHTML = $(MAKEINFO) --html
-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-DVIPS = dvips
-am__installdirs = "$(DESTDIR)$(infodir)"
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = Doxyfile.in \
-mainpage.incl \
-img \
-gmerlin_remote.texi \
-gmerlin_transcoder.texi \
-gmerlin_transcoder_remote.texi \
-gmerlin_play.texi \
-gmerlin_player.texi \
-gmerlin_record.texi \
-plugins.texi \
-gavl.tags
-
-@HAVE_DOXYGEN_FALSE@doxygen_output = 
-@HAVE_DOXYGEN_TRUE@doxygen_output = apiref
-info_TEXINFOS = gmerlin.texi
-texinfo_output = userguide
-gmerlin_TEXINFOS = $(info_TEXINFOS) version.texi
-CLEANFILES = gmerlin.tags
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .dvi .html .info .pdf .ps .texi
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-.texi.info:
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
-	rm -rf $$backupdir && mkdir $$backupdir && \
-	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-	  done; \
-	else :; fi && \
-	cd "$$am__cwd"; \
-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $@ $<; \
-	then \
-	  rc=0; \
-	  $(am__cd) $(srcdir); \
-	else \
-	  rc=$$?; \
-	  $(am__cd) $(srcdir) && \
-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-	fi; \
-	rm -rf $$backupdir; exit $$rc
-
-.texi.dvi:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $<
-
-.texi.pdf:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $<
-
-.texi.html:
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $(@:.html=.htp) $<; \
-	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
-	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
-	fi
-$(srcdir)/gmerlin.info: gmerlin.texi $(srcdir)/version.texi $(gmerlin_TEXINFOS)
-gmerlin.dvi: gmerlin.texi $(srcdir)/version.texi $(gmerlin_TEXINFOS)
-gmerlin.pdf: gmerlin.texi $(srcdir)/version.texi $(gmerlin_TEXINFOS)
-gmerlin.html: gmerlin.texi $(srcdir)/version.texi $(gmerlin_TEXINFOS)
-$(srcdir)/version.texi:  $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: gmerlin.texi $(top_srcdir)/configure
-	@(dir=.; test -f ./gmerlin.texi || dir=$(srcdir); \
-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/gmerlin.texi`; \
-	echo "@set UPDATED $$1 $$2 $$3"; \
-	echo "@set UPDATED-MONTH $$2 $$3"; \
-	echo "@set EDITION $(VERSION)"; \
-	echo "@set VERSION $(VERSION)") > vti.tmp
-	@cmp -s vti.tmp $(srcdir)/version.texi \
-	  || (echo "Updating $(srcdir)/version.texi"; \
-	      cp vti.tmp $(srcdir)/version.texi)
-	-@rm -f vti.tmp
-	@cp $(srcdir)/version.texi $@
-
-mostlyclean-vti:
-	-rm -f vti.tmp
-
-maintainer-clean-vti:
-	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
-.dvi.ps:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) -o $@ $<
-
-uninstall-dvi-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
-	done
-
-uninstall-html-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
-	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
-	done
-
-uninstall-info-am:
-	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && \
-	    (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
-	    then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
-	  done; \
-	else :; fi
-	@$(NORMAL_UNINSTALL)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
-	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
-	   else :; fi); \
-	done
-
-uninstall-pdf-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
-	done
-
-uninstall-ps-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
-	done
-
-dist-info: $(INFO_DEPS)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; \
-	for base in $$list; do \
-	  case $$base in \
-	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-	    if test -f $$file; then \
-	      relfile=`expr "$$file" : "$$d/$.*$"`; \
-	      test -f "$(distdir)/$$relfile" || \
-		cp -p $$file "$(distdir)/$$relfile"; \
-	    else :; fi; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -rf gmerlin.aux gmerlin.cp gmerlin.cps gmerlin.fn gmerlin.fns \
-	  gmerlin.ky gmerlin.kys gmerlin.log gmerlin.pg gmerlin.tmp \
-	  gmerlin.toc gmerlin.tp gmerlin.tps gmerlin.vr gmerlin.vrs
-
-clean-aminfo:
-	-test -z "gmerlin.dvi gmerlin.pdf gmerlin.ps gmerlin.html" \
-	|| rm -rf gmerlin.dvi gmerlin.pdf gmerlin.ps gmerlin.html
-
-maintainer-clean-aminfo:
-	@list='$(INFO_DEPS)'; for i in $$list; do \
-	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-info
-check-am: all-am
-check: check-am
-all-am: Makefile $(INFO_DEPS)
-installdirs:
-	for dir in "$(DESTDIR)$(infodir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-aminfo clean-generic clean-libtool clean-local \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am: $(DVIS)
-
-html-am: $(HTMLS)
-
-info: info-am
-
-info-am: $(INFO_DEPS)
-
-install-data-am: install-data-local install-info-am
-
-install-dvi: install-dvi-am
-
-install-dvi-am: $(DVIS)
-	@$(NORMAL_INSTALL)
-	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
-	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
-	done
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am: $(HTMLS)
-	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
-	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__strip_dir) \
-	  if test -d "$$d$$p"; then \
-	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-	  else \
-	    list2="$$list2 $$d$$p"; \
-	  fi; \
-	done; \
-	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
-	done; }
-install-info: install-info-am
-
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-	               $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
-	    if test -f $$ifile; then \
-	      echo "$$ifile"; \
-	    else : ; fi; \
-	  done; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
-	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-	  done; \
-	else : ; fi
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am: $(PDFS)
-	@$(NORMAL_INSTALL)
-	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
-install-ps: install-ps-am
-
-install-ps-am: $(PSS)
-	@$(NORMAL_INSTALL)
-	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-vti
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-vti
-
-pdf: pdf-am
-
-pdf-am: $(PDFS)
-
-ps: ps-am
-
-ps-am: $(PSS)
-
-uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
-	uninstall-local uninstall-pdf-am uninstall-ps-am
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
-	clean-libtool clean-local dist-info distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic \
-	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-vti pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-dvi-am \
-	uninstall-html-am uninstall-info-am uninstall-local \
-	uninstall-pdf-am uninstall-ps-am
-
-
-userguide: $(gmerlin_TEXINFOS)
-	ln -sf `pwd`"/$(top_srcdir)/doc/img" $(top_builddir)/img
-	$(MAKEINFO) -I $(top_srcdir)/doc $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-                --html -o userguide $(top_srcdir)/doc/gmerlin.texi
-	rm -f $(top_builddir)/img
-
-apiref:
-	doxygen Doxyfile
-
-all: html
-
-html: $(doxygen_output) $(texinfo_output)
-
-install-data-local:
-	if test "x$(doxygen_output)" != "x"; then \
-          test -z "$(DESTDIR)$(docdir)/userguide" || $(mkdir_p) "$(DESTDIR)$(docdir)/userguide" ; \
-          $(INSTALL_DATA) userguide/* $(DESTDIR)$(docdir)/userguide ; \
-        fi
-	if test "x$(texinfo_output)" != "x"; then \
-          test -z "$(DESTDIR)$(docdir)/apiref" || $(mkdir_p) "$(DESTDIR)$(docdir)/apiref" ; \
-          $(INSTALL_DATA) apiref/* $(DESTDIR)$(docdir)/apiref ; \
-          test -z "$(DESTDIR)$(docdir)/img" || $(mkdir_p) "$(DESTDIR)$(docdir)/img" ; \
-          $(INSTALL_DATA) $(top_srcdir)/doc/img/*.png $(DESTDIR)$(docdir)/img ; \
-        fi
-
-clean-local:
-	-rm -rf apiref
-	-rm -rf userguide
-
-uninstall-local:
-	-rm -rf "$(DESTDIR)$(docdir)/apiref"
-	-rm -rf "$(DESTDIR)$(docdir)/userguide"
-	-rm -rf "$(DESTDIR)$(docdir)/img"
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/doc/gmerlin.info Deleted

@@ -1,108 +0,0 @@
-This is gmerlin.info, produced by makeinfo version 4.13 from
-gmerlin.texi.
-
-INFO-DIR-SECTION Gmerlin
-START-INFO-DIR-ENTRY
-* Gmerlin: (gmerlin).           Gmerlin multimedia applications
-END-INFO-DIR-ENTRY
-
-   This manual is for Gmerlin (version 1.2.0, 8 June 2012).
-
-   Copyright (C) 2001-2008 Members of the Gmerlin project.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.1 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with the Front-Cover Texts
-     being "A GNU Manual," and with the Back-Cover Texts as in (a)
-     below.  A copy of the license is included in the section entitled
-     "GNU Free Documentation License."
-
-     (a) The FSF's Back-Cover Text is: "You have freedom to copy and
-     modify this GNU Manual, like GNU software.  Copies published by
-     the Free Software Foundation raise funds for GNU development."
-
-&#x1f;
-Indirect:
-gmerlin.info-1: 988
-gmerlin.info-2: 80538
-gmerlin.info-3: 491595
-&#x1f;
-Tag Table:
-(Indirect)
-Node: Top&#x7f;988
-Node: Basics&#x7f;2025
-Node: Installation&#x7f;2410
-Node: Requirements&#x7f;2621
-Node: Compilation and installation&#x7f;8165
-Node: Binary codecs&#x7f;9499
-Node: General usage information&#x7f;9950
-Node: Configuration data&#x7f;10219
-Node: GUI&#x7f;10859
-Node: gui_intro&#x7f;11173
-Node: gui_statdyn&#x7f;11554
-Node: gui_i&#x7f;12668
-Node: gui_f&#x7f;14376
-Node: gui_log&#x7f;15495
-Node: gui_tips&#x7f;16059
-Node: gml&#x7f;16380
-Node: Setting parameters from the commandline&#x7f;17327
-Node: Applications&#x7f;19226
-Node: GUI Player&#x7f;19557
-Node: gmerlin_player_usage&#x7f;19998
-Node: Main window&#x7f;21058
-Node: player_mainmenu&#x7f;21329
-Node: player_display&#x7f;23324
-Node: Media tree&#x7f;24339
-Node: player_treewidget&#x7f;25044
-Node: player_albumwidget&#x7f;27167
-Node: Video window&#x7f;29287
-Node: gmerlin_player_trackinfo&#x7f;29935
-Node: gmerlin_player_avconfig&#x7f;30329
-Node: gmerlin_player_shortcuts&#x7f;31119
-Node: Player remote control&#x7f;34389
-Node: gmerlin_remote&#x7f;35050
-Node: gmerlin_remote_examples&#x7f;37127
-Node: GUI Transcoder&#x7f;38166
-Node: gmerlin_transcoder&#x7f;38581
-Node: gmerlin_transcoder_intro&#x7f;39369
-Node: gmerlin_transcoder_window&#x7f;41767
-Node: transcoder_menubar&#x7f;42139
-Node: transcoder_display&#x7f;46612
-Node: transcoder_progressbar&#x7f;46972
-Node: transcoder_tasklist&#x7f;47201
-Node: gmerlin_transcoder_enc&#x7f;47973
-Node: gmerlin_transcoder_tracks&#x7f;49534
-Node: Transcoder remote control&#x7f;51715
-Node: gmerlin_transcoder_remote&#x7f;51976
-Node: Commandline player&#x7f;53064
-Node: gmerlin_play&#x7f;53291
-Node: Commandline recorder&#x7f;80319
-Node: gmerlin-record&#x7f;80538
-Node: Alsamixer&#x7f;491595
-Node: Visualizer&#x7f;492449
-Node: Keyboard daemon&#x7f;493815
-Node: Plugins&#x7f;494874
-Node: plugin_i&#x7f;495506
-Node: plugin_oa&#x7f;497813
-Node: plugin_ov&#x7f;498480
-Node: plugin_ra&#x7f;498808
-Node: plugin_rv&#x7f;499674
-Node: plugin_ea&#x7f;500236
-Node: plugin_ev&#x7f;502404
-Node: plugin_est&#x7f;503440
-Node: plugin_eso&#x7f;503808
-Node: plugin_e&#x7f;504200
-Node: plugin_epp&#x7f;505741
-Node: plugin_ir&#x7f;506533
-Node: plugin_iw&#x7f;507587
-Node: plugin_fa&#x7f;508632
-Node: plugin_fv&#x7f;509132
-Node: plugin_vis&#x7f;525358
-Node: FAQ&#x7f;525843
-Node: General questions&#x7f;526016
-Node: Installation questions&#x7f;526150
-Node: Usage questions&#x7f;527755
-Node: Get involved&#x7f;530001
-&#x1f;
-End Tag Table

gmerlin-1.2.0.tar.gz/doc/gmerlin.info-1 Deleted

@@ -1,2237 +0,0 @@
-This is gmerlin.info, produced by makeinfo version 4.13 from
-gmerlin.texi.
-
-INFO-DIR-SECTION Gmerlin
-START-INFO-DIR-ENTRY
-* Gmerlin: (gmerlin).           Gmerlin multimedia applications
-END-INFO-DIR-ENTRY
-
-   This manual is for Gmerlin (version 1.2.0, 8 June 2012).
-
-   Copyright (C) 2001-2008 Members of the Gmerlin project.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.1 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with the Front-Cover Texts
-     being "A GNU Manual," and with the Back-Cover Texts as in (a)
-     below.  A copy of the license is included in the section entitled
-     "GNU Free Documentation License."
-
-     (a) The FSF's Back-Cover Text is: "You have freedom to copy and
-     modify this GNU Manual, like GNU software.  Copies published by
-     the Free Software Foundation raise funds for GNU development."
-
-&#x1f;
-File: gmerlin.info,  Node: Top,  Next: Basics,  Prev: (dir),  Up: (dir)
-
-Gmerlin userguide
-*****************
-
-Gmerlin user guide.
-
-   This manual is for Gmerlin (version 1.2.0, 8 June 2012).
-
-   Copyright (C) 2001-2008 Members of the Gmerlin project.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.1 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with the Front-Cover Texts
-     being "A GNU Manual," and with the Back-Cover Texts as in (a)
-     below.  A copy of the license is included in the section entitled
-     "GNU Free Documentation License."
-
-     (a) The FSF's Back-Cover Text is: "You have freedom to copy and
-     modify this GNU Manual, like GNU software.  Copies published by
-     the Free Software Foundation raise funds for GNU development."
-
-* Menu:
-
-* Basics::
-* Installation::
-* General usage information::
-* Applications::
-* Plugins::
-* FAQ::
-* Get involved::
-
-&#x1f;
-File: gmerlin.info,  Node: Basics,  Next: Installation,  Prev: Top,  Up: Top
-
-1 Basics
-********
-
-This manual should help you to get familiar with gmerlin software. The
-gmerlin software is quite modular, because it consists of multiple
-packages, most of which can be used independently. In this document, it
-is assumed, that you have all packages installed (See Installation
-below).
-
-&#x1f;
-File: gmerlin.info,  Node: Installation,  Next: General usage information,  Prev: Basics,  Up: Top
-
-2 Installation
-**************
-
-* Menu:
-
-* Requirements::
-* Compilation and installation::
-* Binary codecs::
-
-&#x1f;
-File: gmerlin.info,  Node: Requirements,  Next: Compilation and installation,  Up: Installation
-
-2.1 Requirements
-================
-
-For compiling x264, you need nasm (http://nasm.sourceforge.net/) (yasm
-(http://www.tortall.net/projects/yasm/) on x86_64).  They are included
-in most distributions. Required libraries can be installed from source
-or from binary packages. In the latter case, you must install the
-development packages (e.g. libfoo-devel-1.2.3-4.i386.rpm) also. This is
-what you need:
-
-_Alsa (http://www.alsa-project.org/)_
-     It's the recommended audio architecture
-
-_esound (http://www.tux.org/~ricdude/EsounD.html)_
-     Only needed if neither Alsa nor OSS work for you.
-
-_flac (http://flac.sourceforge.net/)_
-     For en-/decoding flac files (optional).
-
-_gtk-2.4.x (http://www.gtk.org/)_
-     This is needed for compiling the GUI applications. Without it
-     you'll get just the core library, which won't be of much use.
-
-_libjpeg (http://www.ijg.org/)_
-     For reading and writing single JPEG images (strongly recommended)
-
-_libpng (http://www.libpng.org/pub/png/libpng.html)_
-     For reading and writing single PNG images (strongly recommended).
-     Also for decoding png encoded Quicktime and AVI files
-
-_libtiff (http://www.remotesensing.org/libtiff/)_
-     For reading and writing single TIFF images (Optional)
-
-_libxml (http://www.xmlsoft.org/)_
-     Required. All kinds of configuration files as well as the media
-     tree are xml based.
-
-_vorbis (http://www.vorbis.com/)_
-     Needed for en-/decoding Vorbis files. Also required for the theora
-     encoding.
-
-_libmusicbrainz (http://musicbrainz.org/products/client/index.html)_
-     Needed for getting Audio CD metadata using musicbrainz
-     (http://musicbrainz.org/)
-
-_libcddb (http://libcddb.sourceforge.net/)_
-     Needed for getting Audio CD metadata from CDDB servers
-
-_Headers for libXv and libXinerama_
-     These are usually shipped with X11 but some distributions pack the
-     header files separately (e.g. libxv-dev, libxinerama-dev). libXv
-     is needed for hardware accelerated video playback, libXinerama
-     adds support for multi-screen configurations.
-
-_libsmbclient (http://www.samba.org/)_
-     For loading smb:// URLs (optional).
-
-_libvisual (http://sourceforge.net/projects/libvisual)_
-     For using libvisual plugins (optional).
-
-_Ladspa plugins (http://www.ladspa.org)_
-     Optional for audio filters/effects. Good experiences were made with
-     the plugin packages cmt (http://www.ladspa.org/cmt/), swh-plugins
-     (http://plugin.org.uk) and tap-plugins
-     (http://tap-plugins.sourceforge.net). Gmerlin looks for them at
-     runtime, so you can install them at any time.
-
-
-   From now on, there are 2 ways to proceed:
-   * You can download the gmerlin-dependencies
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151779)
-     package, unpack it and install it using the instructions in the
-     README file.  A full dependencies install will provide you with
-     the complete codec support, but some packages you already have
-     might be installed a second time.  Everything, however, gets into
-     /opt/gmerlin, so there will be no conflicts.
-
-   * To have more control over the process, download and install the
-     libraries listed below manually.
-
-_libcdio (http://www.gnu.org/software/libcdio/)_
-     Neccessary for the VCD, Audio CD and DVD plugins.
-
-_faad2 (http://www.audiocoding.com/)_
-     Needed for MPEG-4 audio support (mp4, aac files).
-
-_faac (http://www.audiocoding.com/)_
-     Needed for MPEG-4 audio encoding (.aac files) and for AAC encoding
-     via libquicktime.
-
-_FFmpeg (http://www.ffmpeg.org/)_
-     Many codecs, strongly recommended. You should get a sufficiently
-     new version from ffmpeg SVN
-     (http://ffmpeg.mplayerhq.hu/download.html) and use -enable-shared
-     when calling configure. Another option is the version in the
-     gmerlin-dependencies
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151779)
-     package.
-
-_lame (http://www.mp3dev.org/)_
-     For encoding mp3 files and AVIs with mp3 audio streams with
-     libquicktime.
-
-_mad (http://mad.sourceforge.net/)_
-     For playing MPEG-1/2 audio (e.g. mp3)
-
-_libdvdread (http://freshmeat.net/redir/libdvdread/17926/url_homepage/downloads.shtml)_
-     For playing DVDs. Gmerlins method of accessing DVD drives doesn't
-     differ much from others. Thus, DVD playback howtos found in the web
-     apply for gmerlin as well.
-
-_x264 (http://developers.videolan.org/x264.html)_
-     For H.264 encoding with libquicktime.
-
-_libdca (http://www.videolan.org/developers/libdca.html)_
-     For decoding DTS streams.
-
-_libmpeg2 (http://libmpeg2.sourceforge.net/)_
-     For decoding MPEG-1/2 Video (like .mpg files and DVD video)
-
-_liba52 (http://liba52.sourceforge.net/)_
-     For playing AC3 (aka DVD audio) streams.
-
-_libmpcdec (http://www.musepack.net/)_
-     For playing musepack files (optional).
-
-_theora (http://www.theora.org/)_
-     For en-/decoding theora video (optional).
-
-_speex (http://www.speex.org/)_
-     For en-/decoding Speex streams (optional).
-
-_libquicktime (http://libquicktime.sourceforge.net/)_
-     Optional, for the libquicktime based encoding and decoding plugins.
-     Mostly necessary if you want to encode video. For decoding
-     Quicktime, gmerlin_avdecoder is a lot better.
-
-_mjpegtools (http://mjpeg.sourceforge.net/)_
-     Optional for en-/decoding yuv4mpeg streams and for encoding high
-     quality MPEG video using mpeg2enc and friends.
-
-
-&#x1f;
-File: gmerlin.info,  Node: Compilation and installation,  Next: Binary codecs,  Prev: Requirements,  Up: Installation
-
-2.2 Compilation and installation
-================================
-
-If you downloaded a release, make sure, that you have the latest
-version of all packages. Alternatively, you can download the latest
-gmerlin-all-in-one
-(http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151778)
-package. It contains all source packages together with optional scripts
-to build and install them. Check the included README file.
-
-   We always try to be compatible ther GNU build system. This means,
-that all gmerlin packages are compiled using the usual `./configure;
-make; su; make install' prodecure. Type `./configure --help' to see the
-supported options.
-
-   The order is the following:
-
-   * gavl
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=50349)
-
-   * gmerlin
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=14511)
-
-   * gmerlin_avdecoder
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124659)
-
-   * gmerlin-encoders
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=152799)
-
-   * gmerlin-visualizer
-     (http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124661)
-
-&#x1f;
-File: gmerlin.info,  Node: Binary codecs,  Prev: Compilation and installation,  Up: Installation
-
-2.3 Binary codecs
-=================
-
-These must be downloaded from the MPlayer codec page
-(http://www1.mplayerhq.hu/MPlayer/releases/codecs/). Download the file
-essential-YYYYMMDD.tar.bz2, where YYYYMMDD is some date. Unpack the
-.tar.bz2 and move the included files to /usr/lib/codecs. At this
-location, the DLLs will also be found by other players.
-
-&#x1f;
-File: gmerlin.info,  Node: General usage information,  Next: Applications,  Prev: Installation,  Up: Top
-
-3 General usage information
-***************************
-
-* Menu:
-
-* Configuration data::
-* GUI::
-* GML Syntax: gml.
-* Setting parameters from the commandline::
-
-&#x1f;
-File: gmerlin.info,  Node: Configuration data,  Next: GUI,  Up: General usage information
-
-3.1 Configuration data
-======================
-
-They are saved in the directory `~/.gmerlin', which has subdirectories
-for all applications. The directory "generic" stores common
-configuration data for applications, which have no config dialog.
-Plugins used by these programs can be configured with the
-gmerlin_plugincfg application. If a program misbehaves, especially
-after a version upgrade, delete the file
-`~/.gmerlin/application_dir/config.xml', where `application_dir'
-corresponds to the application. Normally, this shouldn't be necessary.
-
-&#x1f;
-File: gmerlin.info,  Node: GUI,  Next: gml,  Prev: Configuration data,  Up: General usage information
-
-3.2 GUI
-=======
-
-* Menu:
-
-* Introduction: gui_intro.
-* Static and dynamic parameters: gui_statdyn.
-* Configuring input plugins: gui_i.
-* Configuring filters: gui_f.
-* Log messages: gui_log.
-* Tips: gui_tips.
-
-&#x1f;
-File: gmerlin.info,  Node: gui_intro,  Next: gui_statdyn,  Up: GUI
-
-3.2.1 Introduction
-------------------
-
-We try to make this as consistent as possible across the applications.
-In many windows, you'll see context sensitive menus when you right
-click somewhere. Furthermore, tooltips are enabled in all programs by
-default. You can, however, switch them off if they bother you.
-
-&#x1f;
-File: gmerlin.info,  Node: gui_statdyn,  Next: gui_i,  Prev: gui_intro,  Up: GUI
-
-3.2.2 Static and dynamic parameters
------------------------------------
-
-All GUI applications have their own configuration data.  This means,
-that plugin configurations are not shared between these applications.
-
-   There is a strict separation between static and plugin dependent
-configurations.
-
-   Most applications have one or more config dialogs which let you
-change settings either for several subsystems of the application or for
-plugins, depending on the context.  To change the plugins themselves,
-there are separate plugin dialogs which let you select and configure
-plugins.
-
-   It might be a bit tricky to find out if a special option can be set
-via the the plugin dialog or via the global config dialog. The general
-rule is: All features, which are supported by the core architecture,
-are configured in some global dialog. You can expect them to be present
-on every gmerlin installation of the same version. The plugin options
-vary depending on what plugins are installed (that's the reason, why
-they are separated).
-
-&#x1f;
-File: gmerlin.info,  Node: gui_i,  Next: gui_f,  Prev: gui_statdyn,  Up: GUI
-
-3.2.3 Configuring input plugins
--------------------------------
-
-This dialog lets you control, how input plugins (or image reader
-plugins) are loaded. The widgets on the right are valid for the plugin,
-which is selected on the left. You have the following options:
-
-Parameters
-     Lets you set parameters of the plugin. These will be valid when an
-     instance of the plugin is opened the next time. If you configure
-     hardware plugins in the player, you must close and reopen all
-     device albums for the changes to become effective.  For plugins,
-     which have no options, this button is disabled.
-
-Info
-     Pops up a window showing much of the information, which is known
-     to the plugin registry.
-
-Priority
-     This lets you change the priority of the plugin, if multiple
-     plugins are available for a gml. The value can be between 1 and
-     10. Usually, the default priorities are ok. But for image files,
-     the priorities of the "Image stills input plugin" and the "Image
-     video input plugin" decide, whether images are displayed as a
-     slideshow or a video.
-
-Protocols
-     Lets you configure the supported network protocols. The protocols
-     should rarely be changed and changes are overwritten by a new
-     install of the plugin. For plugins, which don't support network
-     streams, the protocols cannot be changed.
-
-Extensions
-     Lets you configure the file extensions, which are associated with
-     the plugin.  If you change the extensions, they are overwritten by
-     a new install of the plugin.  That's a good reason to report
-     missing file extensions to the developers.
-
-&#x1f;
-File: gmerlin.info,  Node: gui_f,  Next: gui_log,  Prev: gui_i,  Up: GUI
-
-3.2.4 Configuring filters
--------------------------
-
-This dialog lets you build a filter chain to apply additional changes
-to the A/V data. The GUI player will apply most changes during playback
-(reinitializing the playback pipelines if necessary), the transcoder
-can change filter chains only per track. The filters are processed in
-top-to-bottom order.
-
-   You have the following buttons:
-
-Add filter
-     Pops up a dialog, which will let you add new filters to the chain.
-     Filter are always added to the end of the chain.
-
-Remove filter
-     Deletes the currently selected filter
-
-Configure filter
-     Set parameters of the currently selected filter
-
-Move to top
-     Move filter to the top (= the beginning) of the chain
-
-Move up
-     Move filter up by one
-
-Move down
-     Move filter down by one
-
-Move to top
-     Move filter to the bottom (= the end) of the chain
-
-   Note for the player
-
-   Even though filter parameters are changed on the fly, pressing
-"cancel", without pressing "apply" before will revert all changes you
-made.
-
-&#x1f;
-File: gmerlin.info,  Node: gui_log,  Next: gui_tips,  Prev: gui_f,  Up: GUI
-
-3.2.5 Log messages
-------------------
-
-Messages from pretty much everywhere in the applications are sent
-through the logging mechanism, and finally show up in the log window.
-It's the first place to look, if something does not work as expected
-(e.g. an URL does not load).  There are 4 different types of messages,
-error, warning, info and debug. In the configuration for the log
-window, you can select, which message you want to see, the colors of
-the messages and the history size.
-
-&#x1f;
-File: gmerlin.info,  Node: gui_tips,  Prev: gui_log,  Up: GUI
-
-3.2.6 Tips
-----------
-
-   * Many buttons, which are associated with a list, are disabled
-     unless you select an item in the list
-
-   * Doubleclicking onto the background of a slider (*not* the slider
-     itself) resets it to the       factory default
-
-&#x1f;
-File: gmerlin.info,  Node: gml,  Next: Setting parameters from the commandline,  Prev: GUI,  Up: General usage information
-
-3.3 GML Syntax
-==============
-
-GMLs (Gmerlin media locations) are pretty much similar to URLs or MRLs
-with the difference, that device plugins support passing the device.
-This makes it possible to use gmls with hardware setups, which have
-multiple devices for each plugin.
-
-   A gml can be:
-
-*A regular filename
-     Optionally preceeded with "file://". This means, that
-     /files/music.mp3 is the same as file:///files/music.mp3.
-
-*A dash "-" or the string "stdin://" for reading from stdin
-
-*Any valid network URL
-     Examples: http://webstream.example.com:8080,
-     ftp://user:pass@ftp.example.com/music.mp3
-
-*A "hardare protocol" followed by the device like cda:///dev/hdc.
-     Known hardware protocols are cda (Audio CD), vcd, dvd and dvb. The
-     supported protocols may vary according to your installation.
-
-&#x1f;
-File: gmerlin.info,  Node: Setting parameters from the commandline,  Prev: gml,  Up: General usage information
-
-3.4 Setting parameters from the commandline
-===========================================
-
-Gmerlin configuration handling provides the same features for both GUI
-applications and commandline programs. The natural result is, that the
-commandline syntax is a bit more complicated, since parameters can be
-nested.
-
-   In General options have the form
-
-   `'parameter1=value1:parameter2=value2...''
-
-   The quotes are necessary, if the string contains characters, which
-have a special meaning for the shell.
-
-   The syntax of values depends on the type:
-*Boolean*
-     Value can be either 0 or 1.
-
-*Integer values*
-     An integer number.
-
-*Float values*
-     A floating point (i.e. fractional) number.
-
-*Strings*
-     A string. Colons ':' should be escaped with '\'.
-
-*Time*
-     Time is in the format `{[[HH:]MM:]SS}' while the seconds can be
-     fractional. Hours and Minutes are optional, thus any format of
-     `{5.5}', `{0:05.5}' or `{0:00:05.5'} is valid for a time of 5.5
-     seconds. Writing `0' instead of `00' is also ok.
-
-*Enumeration with suboptions*
-     Value is in the form
-     `string[{subparameter1=subvalue1:subparameter2=subvalue2...}]'.
-     The subparameters are optional. E.g. if the option is for
-     selecting a plugin, setting string to `foo' will select the plugin
-     `foo' and pass the subparameters (if avaliable) to the `foo'
-     plugin.
-
-*List or chain with suboptions*
-     This is like enumeration with suboptions with the difference, that
-     you can concatenate multiple options together with colons (:) and
-     must enclose everything with braces. For example:
-
-     `{opt1{param1=value1}:opt2{param2=value2}}'
-
-     If you use `-help', you'll also see supported ranges for numeric
-     types, or supported options for strings (if available).
-
-
-&#x1f;
-File: gmerlin.info,  Node: Applications,  Next: Plugins,  Prev: General usage information,  Up: Top
-
-4 Applications
-**************
-
-* Menu:
-
-* GUI Player::
-* Player remote control::
-* GUI Transcoder::
-* Transcoder remote control::
-* Commandline player::
-* Commandline recorder::
-* Alsamixer::
-* Visualizer::
-* Keyboard daemon::
-
-&#x1f;
-File: gmerlin.info,  Node: GUI Player,  Next: Player remote control,  Up: Applications
-
-4.1 GUI Player
-==============
-
-Type `gmerlin' with optionally any number of files or URLs to start
-this.
-
-* Menu:
-
-* Invoking gmerlin: gmerlin_player_usage.
-* Main window::
-* Media tree::
-* Video window::
-* Track information: gmerlin_player_trackinfo.
-* Configuring playback pipelines: gmerlin_player_avconfig.
-* Shortcuts: gmerlin_player_shortcuts.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_player_usage,  Next: Main window,  Up: GUI Player
-
-4.1.1 Invoking gmerlin
-----------------------
-
-Synopsis
-     gmerlin [options] [gmls ...]
-Description
-     Gmerlin GUI Player
-Generic options
-     The following generic options are available for all gmerlin
-     applications
-    -help
-          Print this help message and exit
-    -help-man
-          Print this help message as a manual page and exit
-    -help-texi
-          Print this help message in texinfo format and exit
-    -version
-          Print version info and exit
-
-Environment variables
-
-    `GMERLIN_PLAYER_REMOTE_PORT'
-          Default port for the remote control
-
-Files
-
-    `~/.gmerlin/plugins.xml'
-          Cache of the plugin registry (shared by all applicatons)
-    `~/.gmerlin/player/config.xml'
-          Used for configuration data. Delete this file if you think
-          you goofed something up.
-    `~/.gmerlin/player/tree/tree.xml'
-          Media tree is saved here. The albums are saved as separate
-          files in the same directory.
-
-&#x1f;
-File: gmerlin.info,  Node: Main window,  Next: Media tree,  Prev: gmerlin_player_usage,  Up: GUI Player
-
-4.1.2 Main window
------------------
-
-It's a usual player window, with self explanatory buttons.
-
-* Menu:
-
-* Main menu: player_mainmenu.
-* Display: player_display.
-
-&#x1f;
-File: gmerlin.info,  Node: player_mainmenu,  Next: player_display,  Up: Main window
-
-4.1.2.1 Main menu
-.................
-
-The menu button will show the main menu of the player. Here, you can
-control practically the whole application:
-
-Audio, video and subtitles
-     See *note Configuring playback pipelines: gmerlin_player_avconfig.
-
-Chapters
-     Chapters in gmerlin are just seekpoints with optional labels.  If
-     an input plugin supports chapters (e.g. of DVDs), gmerlin will
-     make them available through the chapter menu.
-
-Visualizations
-     If the upper menu item is enabled and the video window isn't used
-     otherwise, Visualizations will be turned on.  The audio stream of
-     an Audio/video track can be visualized by disabling the video
-     stream of that file (See *note Configuring playback pipelines:
-     gmerlin_player_avconfig.).
-
-     Then you can set some plugin-independent options and finally the
-     plugin itself . The menu for visualization plugin works exactly
-     the same as for output plugins (See *note Configuring playback
-     pipelines: gmerlin_player_avconfig.).
-
-Windows
-     Here, you can show or hide the *note Log window: gui_log, the
-     *note Track info window: gmerlin_player_trackinfo. and the *note
-     Media tree::.
-
-Options
-     Here, you can set Preferences , configure *note Input plugins:
-     gui_i.  , select skins or configure the *note Keyboard daemon::.
-
-Commands
-     Here you have some commonly used commands. The good news about the
-     shortcuts is, that they work in the media tree and in the video
-     window as well.
-
-     Only exception are the shortcuts, which map to ASCII-characters
-     (Pause and Seek to start), they don't work in the media tree and
-     in albums.
-
-     Use this menu as a quick-help for all global shortcuts.
-
-Accessories
-     Here, you can conventiently fire up some other gmerlin applications
-     like the *note GUI Transcoder::, the *note Visualizer:: and the
-     *note Alsamixer::.
-
-
-&#x1f;
-File: gmerlin.info,  Node: player_display,  Prev: player_mainmenu,  Up: Main window
-
-4.1.2.2 Display
-...............
-
-The display is divided into several areas. Left of the time display,
-gmerlin shows an icon denoting the current operation mode (playing,
-paused etc.). Right of the time display, you have 2 fields. By
-left-clicking into the upper field, you can change the displayed time
-value. Options are
-Default
-     Time is counted since track start
-
-ALL
-     Time is counted since album start
-
-REM
-     Remaining time until track end
-
-ALL REM
-     Remaining time until album end
-
-   In the lower field, you can left-click to change the repeat mode.
-Options are no repeat, repeat current track and repeat current album.
-
-   At the bottom, there is the scrolltext. It displayes the name of the
-currently played track (which can change e.g. for live radio stations),
-or a brief error messages if something goes wrong. Note, that in the
-latter case, you get more information from the *note Log Window:
-gui_log.
-
-&#x1f;
-File: gmerlin.info,  Node: Media tree,  Next: Video window,  Prev: Main window,  Up: GUI Player
-
-4.1.3 Media tree
-----------------
-
-The media tree can be used to store and organize your media collection.
-It consists of virtual folders called _albums_. You can create albums,
-subalbums and move stuff between them like you want. The media files
-always stay at the same place in the filesystem. The albums can be
-either in own windows (Windowed mode) or as tabs in the tree window
-(tabbed mode). You cah switch this with the right-click menu of the
-tree widget.  The tree- and album windows remember their screen
-positions.
-
-* Menu:
-
-* Tree widget: player_treewidget.
-* Album widget: player_albumwidget.
-
-&#x1f;
-File: gmerlin.info,  Node: player_treewidget,  Next: player_albumwidget,  Up: Media tree
-
-4.1.3.1 Tree widget
-...................
-
-Doubleclicking an album opens it if it was closed or vice versa.
-
-   Creating albums is done by right selecting the parent album in the
-tree and click the "New album" button or "Album->New" in the
-right-click menu. In the new empty album, you can then load files or
-URLs. Another option to import whole directory trees, is to click
-"Album->New from directory". It will pop up a directory selection
-dialog.  The directory can optionally be scanned recursively. The
-tracks are either in one (flat) album, or in subalbums according to the
-directory structure.  Note that importing large directories takes some
-time.
-
-   Deleting albums is done by selecting them in the tree and clicking
-the "remove" button (or by choosing Album->Remove in the right click
-menu. Please note the following:
-
-   * Removing albums is done without confirmation
-
-   * All subalbums are removed as well
-
-   * This (as well as removing tracks) cannot be undone
-
-   * Good news: gmerlin never removes media files from disk
-
-   Moving albums is done with Drag & Drop
-
-   Loading files or URLs into an open or closed album can be done by
-dragging it from a filemanager or webbrowser into the target album in
-the tree widget.
-
-   Some special albums are automatically created in addition to the
-regular albums (which are created by you):
-
-   * _Incoming:_
-
-     It's the destination for tracks, which come from the comandline or
-     from the remote.
-
-   * _Favourites:_
-
-     Each regular album has a Favourites button , which lets you copy
-     the selected tracks to the favourites. It's useful for quickly
-     making a selection of tracks from multiple different albums.
-
-   * _Plugin and device albums:_
-
-     Each plugin, which handles devices like removable disc drives or
-     tuners will create a plugin album. The available devices are then
-     autoscanned and added as subalbums. Device albums are a bit
-     limited: You can delete or reorder tracks, but you cannot move
-     tracks from/to other albums.
-
-
-&#x1f;
-File: gmerlin.info,  Node: player_albumwidget,  Prev: player_treewidget,  Up: Media tree
-
-4.1.3.2 Album widget
-....................
-
-The album widget can either be in an own window (when the tree is in
-tabbed mode) or in a notebook right of the tree widget. It lists all
-tracks of that album.  At the bottom there is a toolbar and a display
-of the total playback time of the album.
-
-   A track in gmerlin is a piece of media, which can have an arbitrary
-number of audio-, video- and subtitle streams. A track can be divided
-into chapters (which are just seekpoints). Some files (like ALBW
-wrapped mp3s or concatenated Ogg streams), will show up as multiple
-tracks. You can move them around in the whole tree as if they were
-separate files.
-
-   Doubleclicking an album opens it if it was closed or vice versa.
-
-   The right click menu offers lots of options and shortcuts, not all
-of them are documented here.
-
-   Adding tracks can happen in multiple ways:
-
-   * Drag Files or URLs from filenanagers or webbrowsers into an album
-
-   * Use the buttons in the album toolbar, or the right click menu
-
-   Drag and Drop is supported:
-   * From most webbrowsers and filenmanagers into the album (see above)
-
-   * From one regular album to another. By default, tracks are moved.
-     Press the <CTRL>-key before dragging, and the tracks will be
-     copied.
-
-   * Inside all albums to sort the tracks
-
-   * From an album window into the tree window to transfer tracks to
-     another album
-
-   * From the album to text editors or graphics programs, which support
-     dropping text. You'll get a string representation of the tracks,
-     which will make designing disk covers easier.
-
-   Error tracks are tracks, which failed to load last time you tried.
-They are marked red but remain in the album. If they are on removable
-disks or in the network, you might retry playing them when they become
-available. To delete all error tracks, go to "Select error tracks" in
-the right click menu to select them. Then, press `<CTRL>+DELETE' to get
-rid of them.
-
-   For keyboard commands, see *note Shortcuts: gmerlin_player_shortcuts.
-
-&#x1f;
-File: gmerlin.info,  Node: Video window,  Next: gmerlin_player_trackinfo,  Prev: Media tree,  Up: GUI Player
-
-4.1.4 Video window
-------------------
-
-This comes only when gmerlin has to show some video or still images. It
-is created and owned by the video output plugin (i.e. it has nothing to
-do with the core GUI). Currently, only an X11 plugin is available. It
-has some special features: You can zoom or squeeze the image to make
-your favourite tradeoff between aspect ratio distortion, black borders
-or cropped images. All global gmerlin *note Shortcuts:
-gmerlin_player_shortcuts. work also in the video window, as well as
-some special ones.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_player_trackinfo,  Next: gmerlin_player_avconfig,  Prev: Video window,  Up: GUI Player
-
-4.1.5 Track information
------------------------
-
-Here, you see detailed information of the currently (or last) played
-track in a tree structure. The right-click menu lets you copy either
-the whole contents or the currently selected row to the clipboard as
-plain text.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_player_avconfig,  Next: gmerlin_player_shortcuts,  Prev: gmerlin_player_trackinfo,  Up: GUI Player
-
-4.1.6 Configuring playback pipelines
-------------------------------------
-
-The configuration for audio, video and subtitle handling is almost the
-same.
-
-   Stream menu
-
-   For each category, you have a stream menu.
-
-   In the upper part, you can select the available streams.  You can
-also switch the stream off.
-
-   In the lower part, you can set global (= plugin independent) options
-, Filters  (See *note Configuring filters: gui_f.)  and the output
-plugin .
-
-   Output plugin menu
-
-   In the upper part, you can change the output plugin (even during
-playback).  In the lower part, you can configure the plugin or show
-information about the plugin.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_player_shortcuts,  Prev: gmerlin_player_avconfig,  Up: GUI Player
-
-4.1.7 Shortcuts
----------------
-
-The following global shortcuts are available in the main window, the
-media tree including albums and the video window:
-
-`<CTRL>+G'
-     Pop up current album and goto current track
-
-`<CTRL>+O'
-     Pop up preferences dialog
-
-`<CTRL>+P'
-     Pop up input plugin dialog
-
-`<CTRL>+Q'
-     Quit program
-
-`<CTRL>+PAGEDOWN'
-     Goto next track
-
-`<CTRL>+PAGEUP'
-     Goto previous track
-
-`<CTRL>+<SHIFT>+PAGEDOWN'
-     Goto next chapter
-
-`<CTRL>+<SHIFT>+PAGEUP'
-     Goto previous chapter
-
-`<CTRL>+RIGHT'
-     Seek forward
-
-`<CTRL>+LEFT'
-     Seek backward
-
-`<SHIFT>+RIGHT'
-     Decrease volume
-
-`<SHIFT>+LEFT'
-     Increase volume
-
-`<CTRL>+M'
-     Toggle mute
-
-`0'
-     (Zero) Seek to start. This is not available in the media tree and
-     the albums.
-
-`Space'
-     Toggle pause. This is not available in the media tree and the
-     albums.
-
-`<CTRL>+G'
-     Goto current track. This raises the current album and moves to the
-     current track within that album.
-
-`F9'
-     Copy current track to favourites
-
-`<CTRL>+Q'
-     Quit gmerlin
-
-   The following additional chortcuts are available in the *note Video
-window:::
-
-`CTRL+PLUS/MINUS'
-     Increase/decrease aspect ratio (squeeze). Zoom and squeeze are a
-     simple way to choose your personal tradeoff between aspect ratio
-     distortion, missing image parts and black borders.
-
-`CTRL+MOUSEWHEEL'
-     Increase/decrease aspect ratio (squeeze).
-
-`ALT+PLUS/MINUS'
-     Increase/decrease zoom factor
-
-`ALT+MOUSEWHEEL'
-     Increase/decrease zoom factor
-
-`<CTRL>+HOME'
-     Reset zoom and squeeze
-
-`HOME'
-     Resize the window to the size of the video. If the video has
-     nonsquare pixels, the window width is adjustetd accordingly.
-
-`<SHIFT>+HOME'
-     Shrink the window such that no black borders are visible abound
-     the video
-
-`B/b'
-     Increase/decrease brightness.
-
-`S/s'
-     Increase/decrease saturation.
-
-`C/c'
-     Increase/decrease contrast.
-
-     Brightness, saturation and contrast work only, if the hardware and
-     the currently used display driver support this.
-
-`TAB'
-     Toggle fullscreen/windowed mode
-
-`f'
-     Toggle fullscreen/windowed mode
-
-`Esc'
-     Exit fullscreen mode
-
-   The following additional shortcuts are available inside *note
-albums: player_albumwidget.:
-
-`UP/DOWN'
-     Move the cursor one track up/down
-
-`PAGEUP/PAGEDOWN'
-     Move the cursor one page up/down
-
-`Mousewheel'
-     Scroll
-
-`SHIFT+UP/DOWN'
-     Move the cursor one track up/down and select track
-
-`SHIFT+PAGEUP/PAGEDOWN'
-     Move the cursor one page up/down and select tracks
-
-`<CTRL>+UP/DOWN'
-     Move the cursor one track up/down and unselect track
-
-`ALT+HOME'
-     Move selected tracks to the top
-
-`ALT+END'
-     Move selected tracks to the bottom
-
-`ALT+MOUSEWHEEL'
-     Increase/decrease zoom factor
-
-`<CTRL>+C'
-     Copy selected tracks to clipboard
-
-`<CTRL>+X'
-     Cut selected tracks to clipboard
-
-`<CTRL>+V'
-     Paste tracks from clipboard at the current cursor position
-
-`<CTRL>+DELETE'
-     Delete selected tracks
-
-`<CTRL>+F'
-     Search for tracks
-
-`<CTRL>+I'
-     Display info about the currently selected track
-
-`F10'
-     Copy selected tracks to favourites
-
-&#x1f;
-File: gmerlin.info,  Node: Player remote control,  Next: GUI Transcoder,  Prev: GUI Player,  Up: Applications
-
-4.2 Player remote control
-=========================
-
-`gmerlin_remote' is the command for remotely controlling the GUI
-player. It can be used as a helper application if webbrowsers or
-filenmanagers or for all kinds of remote control methods (including
-keyboard- or infrared-daemons), which can execute arbitrary shell
-commands. One example for a generic keyboard daemon, which can call
-`gmerlin_remote' is the *note Gmerlin Keyboard daemon: Keyboard daemon.
-
-* Menu:
-
-* Invoking gmerlin_remote: gmerlin_remote.
-* Examples: gmerlin_remote_examples.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_remote,  Next: gmerlin_remote_examples,  Up: Player remote control
-
-4.2.1 Invoking gmerlin_remote
------------------------------
-
-Synopsis
-     gmerlin_remote [options] command
-Description
-     Remote control command for the Gmerlin GUI Player
-Global options
-
-    -host <hostname>
-          Host to connect to, default is localhost
-    -port <port>
-          Port to connect to
-    -launch
-          Launch new player if necessary
-
-Commands
-
-    -play
-          Play current track
-    -next
-          Switch to next track
-    -prev
-          Switch to previous track
-    -stop
-          Stop playback
-    -pause
-          Pause playback
-    -mute
-          Toggle mute
-    -add <gml>
-          Add <gml> to the incoming album
-    -addplay <gml>
-          Add <gml> to the incoming album and play it
-    -open <device>
-          Open album for <device>. Device must be a GML (e.g.
-          dvd:///dev/hdd).
-    -openplay <device>
-          Open album for <device> and play first track. Device must be
-          a GML (e.g. dvd:///dev/hdd).
-    -volume <volume>
-          Set player volume. <volume> is in dB, 0.0 is max
-    -volume-rel <diff>
-          In- or decrease player volume. <diff> is in dB
-    -seek-rel <diff>
-          Seek relative. <diff> is in seconds.
-    -chapter [num|+|-]
-          Go to the specified chapter. Use '+' and '-' to go to the
-          next or previous chapter respectively
-    -get-name
-          Print name of the current track
-    -get-metadata
-          Print metadata of the current track
-    -get-time
-          Print time of the current track
-
-Generic options
-     The following generic options are available for all gmerlin
-     applications
-    -help
-          Print this help message and exit
-    -help-man
-          Print this help message as a manual page and exit
-    -help-texi
-          Print this help message in texinfo format and exit
-    -version
-          Print version info and exit
-
-Environment variables
-
-    `GMERLIN_PLAYER_REMOTE_PORT'
-          Default port for the remote control
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_remote_examples,  Prev: gmerlin_remote,  Up: Player remote control
-
-4.2.2 Examples
---------------
-
-`gmerlin_remote -play'
-     Play the current track (same as pressing the "play" button)
-
-`gmerlin_remote -host remote.example.com -play'
-     Connect to `remote.example.com' and play the current track there
-
-`gmerlin_remote -seek-rel -10.0'
-     Seek 10 seconds backwards
-
-`gmerlin_remote -next'
-     Go to next track
-
-`gmerlin_remote -chapter +'
-     Go to next chapter
-
-`gmerlin_remote -openplay cda:///dev/scd0'
-     Open and play an audio CD in the first SCSI drive and start
-     playing.  Use commands like this in your desktop configuration for
-     handling removable media.
-
-`gmerlin_remote -launch -addplay http://webradio.example.com/stream.ogg'
-     Add the given gml to the Incoming album (launching a new player if
-     necessary) and play it. Use commands like this as MIME-Handler in
-     webbrowsers and filemanagers. A shortcut for this command is the
-     script `gmerlin_launcher'.
-
-&#x1f;
-File: gmerlin.info,  Node: GUI Transcoder,  Next: Transcoder remote control,  Prev: Player remote control,  Up: Applications
-
-4.3 GUI Transcoder
-==================
-
-* Menu:
-
-* Invoking gmerlin_transcoder: gmerlin_transcoder.
-* Quick intro: gmerlin_transcoder_intro.
-* Main window: gmerlin_transcoder_window.
-* Configuring encoder plugins: gmerlin_transcoder_enc.
-* Configuring tracks: gmerlin_transcoder_tracks.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_transcoder,  Next: gmerlin_transcoder_intro,  Up: GUI Transcoder
-
-4.3.1 Invoking gmerlin_transcoder
----------------------------------
-
-Synopsis
-     gmerlin_transcoder [options]
-Description
-     GTK multimedia transcoder
-Options
-
-    -p <file>
-          Load a profile from the given file
-
-Generic options
-     The following generic options are available for all gmerlin
-     applications
-    -help
-          Print this help message and exit
-    -help-man
-          Print this help message as a manual page and exit
-    -help-texi
-          Print this help message in texinfo format and exit
-    -version
-          Print version info and exit
-
-Environment variables
-
-    `GMERLIN_TRANSCODER_REMOTE_PORT'
-          Default port for the remote control
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_transcoder_intro,  Next: gmerlin_transcoder_window,  Prev: gmerlin_transcoder,  Up: GUI Transcoder
-
-4.3.2 Quick intro
------------------
-
-Gmerlin transoder can transcode every supported input file to any of
-the supported output files. It has some unique features, which seperate
-it from other transcoding applications. Most notably:
-
-Per stream settings
-     All settings are configured for each stream separately. This means,
-     different streams can have different formats, different filters and
-     even different codecs (of course only if the container supports it)
-
-Subtitle support
-     There are plugins for exporting subitles to separate files or to
-     the same file, where the A/V data gets written. Alternatively, you
-     can blend subtitles onto the video frames (for containers, which
-     don't support subtitles).
-
-Profile support
-     Finding out the right encoder parameters can be a time-consuming
-     task.  `gmerlin_transcoder' allows you to save all settings and
-     load them later.  Once you have found out your favourite encoder
-     settings for a specific task, transcoding is a matter of
-        * Loading the profile
-
-        * Adding tracks to the tasklist
-
-        * Clicking the transcode button
-
-Postprocessing support
-     There are postprocessors, which take the encoded files and make
-     e.g. Audio CDs (with cdtext) from it. It also contains a frontend
-     for cdrdao, so you can burn them as well.
-
-Chapter support
-     `gmerlin_transcoder' imports all chapter seekpoints from the
-     source, and writes them  into the file (currently only supported
-     for Quicktime and mp4).  You can also edit chapter lists or create
-     new ones
-
-Language codes
-     `gmerlin_transcoder' lets you import, edit and export language
-     codes for the Audio- and subtitle streams
-
-2 Pass encoding
-     For plugins, which support it, we can do 2-transcoding. There is
-     also a generic volume normalizer built in.
-
-   There is a *note tasklist: transcoder_tasklist, in which the tracks
-are queued. All newly loaded tracks get the globally configured
-settings (plugins, formats, filters). You can then fine-tune the tracks
-by configuring them individually. Changing track parameters for
-multiple tracks at once isn't possible. Instead, make the settings,
-save them to a profile and load the profile before loading the tracks.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_transcoder_window,  Next: gmerlin_transcoder_enc,  Prev: gmerlin_transcoder_intro,  Up: GUI Transcoder
-
-4.3.3 Main window
------------------
-
-The window contains of the following elements:
-
-* Menu:
-
-* Menu bar: transcoder_menubar.
-* Display: transcoder_display.
-* Progress bar: transcoder_progressbar.
-* Tasklist: transcoder_tasklist.
-
-&#x1f;
-File: gmerlin.info,  Node: transcoder_menubar,  Next: transcoder_display,  Up: gmerlin_transcoder_window
-
-4.3.3.1 Menu bar
-................
-
-Here you have all global commands and settings.  The item Tasklist has
-per track commands and settings.
-
-   File menu
-
-Load tasklist...
-     Pops up a file selection dialog and loads the chosen tasklist.
-     The tracks are appended to already existing tracks in the list.
-     Has a shortcut in the upper toolbar.
-
-Save tasklist...
-     Pops up a file selection dialog for saving the current tasklist.
-     Has a shortcut in the upper toolbar.
-
-Quit
-     Stop the current transcoding action (if any) and quit Has a
-     shortcut in the upper toolbar.
-
-   Options menu
-Preferences
-     Here, you configure the GUI and the default settings for newly
-     added tracks.  The preferences are saved in the profile.
-
-Configure plugins
-     Here, you set the default plugins for newly added tracks. You can
-     configure input plugins (See *note Configuring input plugins:
-     gui_i.)  and encoders (See *note Configuring encoders:
-     gmerlin_transcoder_enc.).  The plugin settings are saved in the
-     profile.
-
-Load profile...
-     Pops up a file selection dialog and loads the chosen profile.  All
-     configuration and plugin settings for new tracks will be changed
-     immediately.
-
-Save profile...
-     Pops up a file selection dialog for saving the current
-     configuration to a profile.
-
-
-   Actions
-
-Start transcoding
-     This will start transcoding of the tracks in the trasklist in
-     top-to-bottom order. While transcoding you can still
-     add/delete/edit tracks in the list.  Has a shortcut in the upper
-     toolbar.
-
-Stop transcoding
-     Stops transcoding. If the currently transcoded track is not a live
-     stream, the produced files are deleted from disk (unless you
-     disable this in the preferences). The currently decoded track is
-     moved back to the top of the tasklist.  Has a shortcut in the
-     upper toolbar.
-
-   Tasklist
-
-   This menu acts on the tasklist as a whole or the selected track(s).
-
-Add... -> Files...
-     Pops up a file selection dialog, which lets you add files
-     (optionally with a specific input plugin) to the end of the
-     tasklist.  Has a shortcut in the lower toolbar.
-
-Add... -> URLs...
-     Pops up a window, which lets you enter an URL (optionally with a
-     specific input plugin) to the end of the tasklist.  Has a shortcut
-     in the lower toolbar.
-
-Add... -> Drives...
-     Pops up a window, which lets open a removeable disk (e.g.  and
-     Audio CD) and append it's tracks to the end of the tasklist. You
-     must specify the device and the plugin.  Has a shortcut in the
-     lower toolbar.
-
-Selected... -> Move up...
-     Move the selected tracks to the top of the list, so they will be
-     transcoded first.
-
-Selected... -> Move down...
-     Move the selected tracks to the bottom of the list, so they will be
-     transcoded last
-
-Selected... -> Remove...
-     Remove the selected tracks (without confirmation or undo).  Has a
-     shortcut in the lower toolbar.
-
-Selected... -> Configure...
-     Configure the selected track.  Has a shortcut in the lower toolbar.
-
-Selected... -> Edit chapters...
-     Pop up the chapter editor. If the source has chapters, you'll find
-     them here. You can also add/delete/move chapters. Chapters can
-     also have names (currently only supported by the libquicktime
-     encoder).  Has a shortcut in the lower toolbar.
-
-Selected... -> Change encoders...
-     Here, you set the encoding plugins of the selected tracks.  (See
-     *note Configuring encoders: gmerlin_transcoder_enc.).  Has a
-     shortcut in the lower toolbar.
-
-Edit... -> Cut
-     Cut selected tracks to the clipboard.  Has a shortcut in the lower
-     toolbar.
-
-Edit... -> Copy
-     Copy selected tracks to the clipboard.  Has a shortcut in the
-     lower toolbar.
-
-Edit... -> Paste
-     Paste tracks or album entries from the *note GUI Player:: from the
-     clipboard. Has a shortcut in the lower toolbar.
-
-Postprocess...
-     Pops up a dialog to configure postprocessing.  Postprocessing
-     plugins are invoked whenever the tasklist gets empty. It adds all
-     tracks, which have been encoded since batch transcoding was
-     started.  Postprocessors make some sanity checks of the files they
-     get, and won't try to burn e.g. audio CDs with MPEG data.
-
-   Windows
-
-   Here, you can show and hide the *note log window: gui_log.
-
-&#x1f;
-File: gmerlin.info,  Node: transcoder_display,  Next: transcoder_progressbar,  Prev: transcoder_menubar,  Up: gmerlin_transcoder_window
-
-4.3.3.2 Display
-...............
-
-Displays the currently performed action and the estimated remaining
-time for the current action. The time display in the lower right corner
-shows the total playback time of the tasklist.
-
-&#x1f;
-File: gmerlin.info,  Node: transcoder_progressbar,  Next: transcoder_tasklist,  Prev: transcoder_display,  Up: gmerlin_transcoder_window
-
-4.3.3.3 Progress bar
-....................
-
-Displays the progress of the current action.
-
-&#x1f;
-File: gmerlin.info,  Node: transcoder_tasklist,  Prev: transcoder_progressbar,  Up: gmerlin_transcoder_window
-
-4.3.3.4 Tasklist
-................
-
-A queue for tracks to be transcoded. Right clicking into the list pops
-up a menu, which is the same as in the menubar.
-
-   New tracks can be added in various ways:
-
-   * By dragging files or URLs from filenanagers or webbrowsers into
-     the tasklist
-
-   * By using the buttons in lower toolbar or the right click menu
-
-   * From the *note GUI Player:: by right clicking into an album end
-     select Selected->Transcode. If multiple transcoders are open, the
-     instance, which listens on the remote port (can be only one at a
-     time), gets the track.
-
-   * By dragging tracks from a gmerlin album into the tasklist
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_transcoder_enc,  Next: gmerlin_transcoder_tracks,  Prev: gmerlin_transcoder_window,  Up: GUI Transcoder
-
-4.3.4 Configuring encoders
---------------------------
-
-This dialog exists in the global settings as well as in the per track
-settings. It describes a complete encoder setup.
-
-   There are 2 different modes for encoding: Either all A/V streams go
-into one file, or into separate files (i.e. it's not possible to group
-some A/V streams and write others separately). You control this by
-clicking "Encode audio into video file" checkbox. Subtitles can be
-written into the video file, or into a separate file. You can select
-this independently for text- and overlay subtitles with the
-corresponding checkbuttons.
-
-   Note, that some streams are always written to a separate file
-(regardless of the check-box settings) if the video encoder plugin
-doesn't support streams of that type.
-
-   Then, you can set encoder plugins for each stream type. The menu
-selects the plugin. Right of the menu, there are buttons for displaying
-plugin info and setting global options (like ID3 generation or
-fileformat flavours). These settings can be changed on a per track
-basis in the *note track configuration dialog:
-gmerlin_transcoder_tracks.
-
-   Finally, there are the default audio- and video settings. Here, you
-mostly configure codec parameters like bitrates, etc.  To further tweak
-these settings of a per stream base, you'll find the same options for
-each stream in the *note track configuration dialog:
-gmerlin_transcoder_tracks.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_transcoder_tracks,  Prev: gmerlin_transcoder_enc,  Up: GUI Transcoder
-
-4.3.5 Configuring tracks
-------------------------
-
-It's a standard gmerlin configuration dialog, which is built dynamically
-depending on the stream layout of the source and the encoder setup. On
-the left you see a tree structure of all settings:
-General
-     Sets global settings like basename of the file and an optional
-     subdirectory of the encoding directory, where the file(s) will be
-     written. Note, that the toplevel destination directory is
-     configured globally, not per track.
-
-     If you select "postprocess only", the input file will be sent
-     directly to the postprocessing plugin. Enable this for files,
-     which already have a format supported by the postprocessor.
-
-     Finally you can choose to transcode only a certain selection given
-     by the start- and/or end time.
-
-Metadata
-     Here, any available metadata are imported from the input, and you
-     can edit them. Note that not all medatada fields are supported by
-     all output formats. Some formats don't support metadata at all.
-
-Global encoder options
-     For each enabled encoding plugin, you can configure global
-     settings here.
-
-Stream options
-     For each stream, you have Generic options. Here you can en- or
-     disable the stream, set the language and the format. In addition
-     for subtitles, you can choose whether to convert text- to overlay
-     subtitles, blend subtitles onto video frames or encode them
-     separately.
-
-     For Audio and video streams, you can also set up *note filters:
-     gui_f.
-
-     For text subtitles, the render options let you configure the font
-     and colors of the subtitles, if they are converted to overlay
-     subtitles.
-
-     The default format of subtitles is for the rare case, that you want
-     to convert subtitles to a video stream. It's only used if you
-     encode subtitles but no corresponding video stream.
-
-     The last tree- node for each stream has always the codec option of
-     the output plugin for the respective streams. Here, you can change
-     encoder settings for each stream separately.
-
-&#x1f;
-File: gmerlin.info,  Node: Transcoder remote control,  Next: Commandline player,  Prev: GUI Transcoder,  Up: Applications
-
-4.4 Transcoder remote control
-=============================
-
-* Menu:
-
-* Invoking gmerlin_transcoder_remote: gmerlin_transcoder_remote.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_transcoder_remote,  Up: Transcoder remote control
-
-4.4.1 Invoking gmerlin_transcoder_remote
-----------------------------------------
-
-Synopsis
-     gmerlin_transcoder_remote [options] command
-Description
-     Remote control command for the Gmerlin GUI transcoder
-Global options
-
-    -host <hostname>
-          Host to connect to, default is localhost
-    -port <port>
-          Port to connect to
-    -launch
-          Launch new transcoder if necessary
-
-Commands
-
-    -addalbum <album_file>
-          Add album to track list
-    -add <location>
-          Add <location> to the track list
-
-Generic options
-     The following generic options are available for all gmerlin
-     applications
-    -help
-          Print this help message and exit
-    -help-man
-          Print this help message as a manual page and exit
-    -help-texi
-          Print this help message in texinfo format and exit
-    -version
-          Print version info and exit
-
-Environment variables
-
-    `GMERLIN_TRANSCODER_REMOTE_PORT'
-          Default port for the remote control
-
-&#x1f;
-File: gmerlin.info,  Node: Commandline player,  Next: Commandline recorder,  Prev: Transcoder remote control,  Up: Applications
-
-4.5 Commandline player
-======================
-
-* Menu:
-
-* Invoking gmerlin_play: gmerlin_play.
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin_play,  Up: Commandline player
-
-4.5.1 Invoking gmerlin_play
----------------------------
-
-Synopsis
-     gmerlin_player [options] gml...
-Description
-     Commandline Multimedia player
-Options
-
-    -oa <audio_output_options>
-          Set audio output options
-         p=option[{suboptions}]
-               Supported options: oa_alsa oa_pulse oa_oss oa_esd
-               Default: oa_alsa
-               Audio output plugin
-               Suboptions for p=oa_alsa
-              card=<string>
-                    Supported strings: default hw:0,0 hw:0,1
-                    Default: default
-                    Card
-              surround40=[1|0] (default: 1)
-                    Enable 4.0 Surround
-                    Use the surround 4.0 (aka quadrophonic) device
-              surround41=[1|0] (default: 1)
-                    Enable 4.1 Surround
-                    Use the surround 4.1 device
-              surround50=[1|0] (default: 1)
-                    Enable 5.0 Surround
-                    Use the surround 5.0 device
-              surround51=[1|0] (default: 1)
-                    Enable 5.1 Surround
-                    Use the surround 5.1 device
-              user_device=<string>
-                    User device
-                    Enter a custom device to use for playback. Leave
-                    empty to use the settings above
-              buffer_time=<number> (10..10000, default: 1000)
-                    Buffer time
-                    Set the buffer time (in milliseconds). Larger
-                    values improve playback performance on slow systems
-                    under load. Smaller values decrease the latency of
-                    the volume control.
-               Suboptions for p=oa_oss
-              multichannel_mode=<string>
-                    Supported strings: none multidev creative
-                    Default: none
-                    Multichannel Mode
-              device=<string> (Default: /dev/dsp)
-                    Device
-              use_rear_device=[1|0] (default: 0)
-                    Use Rear Device
-              rear_device=<string> (Default: /dev/dsp1)
-                    Rear Device
-              use_center_lfe_device=[1|0] (default: 0)
-                    Use Center/LFE Device
-              center_lfe_device=<string> (Default: /dev/dsp2)
-                    Center/LFE Device
-               Suboptions for p=oa_esd
-              esd_host=<string>
-                    Host (empty: local)
-
-    -ov <video_output_options>
-          Set video output options
-         p=option[{suboptions}]
-               Supported options: ov_x11
-               Default: ov_x11
-               Video output plugin
-               Suboptions for p=ov_x11
-              auto_resize=[1|0] (default: 1)
-                    Auto resize window
-              disable_xscreensaver_normal=[1|0] (default: 0)
-                    Disable Screensaver for normal playback
-              disable_xscreensaver_fullscreen=[1|0] (default: 1)
-                    Disable Screensaver for fullscreen playback
-              force_hw_scale=[1|0] (default: 1)
-                    Force hardware scaling
-                    Use hardware scaling even if it involves more CPU
-                    intensive pixelformat conversions
-              background_color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0
-                    Background color
-                    Specify the background color for videos with alpha
-                    channel. This is only used by the OpenGL driver.
-              scale_mode=<string>
-                    Supported strings: auto nearest bilinear quadratic
-                    cubic_bspline cubic_mitchell cubic_catmull
-                    sinc_lanczos
-                    Default: auto
-                    Scale mode
-                    Choose scaling method. Auto means to choose based
-                    on the conversion quality. Nearest is fastest, Sinc
-                    with Lanczos window is slowest.
-              scale_order=<number> (4..1000, default: 4)
-                    Scale order
-                    Order for sinc scaling
-              scale_quality=<number> (1..5, default: 2)
-                    Scale quality
-                    Scale quality
-
-         w=<string>
-               Window ID
-
-    -i <input_plugin>
-          Set and configure input plugin
-         p=option[{suboptions}]
-               Supported options: i_avdec i_cdaudio i_dvd i_vcd
-               i_singlepic_stills i_lqt i_edl i_singlepic i_mikmod
-               Default: i_avdec
-               input plugin
-               Suboptions for p=i_avdec
-              audio_dynrange=[1|0] (default: 1)
-                    Dynamic range control
-                    Enable dynamic range control for codecs, which
-                    support this (currently only A52 and DTS).
-              pp=<number> (0.00..1.00, default: 0.20)
-                    Postprocessing level
-                    Set postprocessing (to remove compression
-                    artifacts). 0 means no postprocessing, 1 means
-                    maximum postprocessing.
-              shrink=<number> (0..3, default: 0)
-                    Shrink factor
-                    This enables downscaling of images while decoding.
-                    Currently only supported for JPEG-2000.
-              vdpau=[1|0] (default: 1)
-                    Use vdpau
-                    Use VDPAU
-              connect_timeout=<number> (0..2000000, default: 5000)
-                    Connect timeout (milliseconds)
-              read_timeout=<number> (0..2000000, default: 5000)
-                    Read timeout (milliseconds)
-              network_buffer_size=<number> (1..1000, default: 32)
-                    Network buffer size (kB)
-              network_bandwidth=<string>
-                    Supported strings: 14400 19200 28800 33600 34400
-                    57600 115200 262200 393200 524300 1500000 10500000
-                    Default: 524300
-                    Bandwidth
-              http_shoutcast_metadata=[1|0] (default: 1)
-                    Enable shoutcast title streaming
-              http_use_proxy=[1|0] (default: 0)
-                    Use proxy
-              http_proxy_host=<string>
-                    Proxy host
-              http_proxy_port=<number> (1..65535, default: 80)
-                    Proxy port
-              http_proxy_auth=[1|0] (default: 0)
-                    Proxy needs authentication
-              http_proxy_user=<string>
-                    Proxy username
-              http_proxy_pass=<string>
-                    Proxy password
-              rtp_try_tcp=[1|0] (default: 0)
-                    Try RTP over TCP
-                    Use this if your filewall blocks all UDP traffic.
-                    Not all servers support TCP
-              rtp_port_base=<number> (0..65530, default: 0)
-                    Port base for RTP
-                    Port base for RTP over UDP. Values of 1024 or
-                    smaller enable random ports (recommended for RTSP
-                    aware firewalls). Values larger than 1024 define
-                    the base port. 2 consecutive ports are used for
-                    each A/V stream, these must be accessable through
-                    the firewall. Odd values are rounded to the next
-                    even value.
-              ftp_anonymous=[1|0] (default: 1)
-                    Login as anonymous
-              ftp_anonymous_password=<string> (Default: gates@nanosoft.com)
-                    Anonymous ftp password
-              seek_subtitles=<string>
-                    Supported strings: never video always
-                    Default: never
-                    Seek external subtitles
-                    If the input is a regular file, gmerlin_avdecoder
-                    can scan the directory for matching subtitle files.
-                    For a file movie.mpg, possible subtitle files are
-                    e.g. movie_english.srt, movie_german.srt. The rule
-                    is, that the first part of the filename of the
-                    subtitle file must be equal to the movie filename
-                    up to the extension. Furthermore, the subtitle
-                    filename must have an extension supported by any of
-                    the subtitle readers.  Subtitle seeking can be
-                    disabled, enabled for video files or enabled for
-                    all files.
-              default_subtitle_encoding=<string> (Default: LATIN1)
-                    Default subtitle encoding
-                    This sets the default encoding for text
-                    subtitles,when the original encoding is unknown. It
-                    must be a character set namerecognized by iconv.
-                    Type 'iconv -l' at the commandline for a list of
-                    supported encodings.
-              sample_accuracy=<string>
-                    Supported strings: never always when_necessary
-                    Default: never
-                    Sample accurate
-                    Try sample accurate seeking. For most formats, this
-                    is not necessary, since normal seeking works fine.
-                    Some formats are only seekable in sample accurate
-                    mode. Choose "When necessary" to enable seeking for
-                    most formats with the smallest overhead.
-              cache_time=<number> (default: 500)
-                    Cache time (milliseconds)
-                    If building an index takes longer than the
-                    specified time, it will be cached.
-              cache_size=<number> (default: 20)
-                    Cache size (Megabytes)
-                    Set the maximum total size of the cache directory.
-              dv_datetime=[1|0] (default: 0)
-                    Export date and time as timecodes for DV
-               Suboptions for p=i_cdaudio
-              trackname_template=<string> (Default: %p - %t)
-                    Trackname template
-                    Template for track name generation from metadata
-                    %p:    Artist
-                    %a:    Album
-                    %g:    Genre
-                    %t:    Track name
-                    %<d>n: Track number (d = number of digits, 1-9)
-                    %y:    Year
-                    %c:    Comment
-              use_cdtext=[1|0] (default: 1)
-                    Use CD-Text
-                    Try to get CD metadata from CD-Text
-              use_local=[1|0] (default: 1)
-                    Use locally saved metadata
-                    Whenever we obtain CD metadata from the internet,
-                    we save them into $HOME/.gmerlin/cdaudio_metadata.
-                    If you got wrong metadata for a CD, disabling this
-                    option will retrieve the metadata again and
-                    overwrite the saved data.
-              use_musicbrainz=[1|0] (default: 1)
-                    Use Musicbrainz
-              musicbrainz_host=<string> (Default: mm.musicbrainz.org)
-                    Server
-              musicbrainz_port=<number> (1..65535, default: 80)
-                    Port
-              musicbrainz_proxy_host=<string>
-                    Proxy
-                    Proxy server (leave empty for direct connection)
-              musicbrainz_proxy_port=<number> (1..65535, default: 80)
-                    Proxy port
-                    Proxy port
-              use_cddb=[1|0] (default: 1)
-                    Use Cddb
-              cddb_host=<string> (Default: freedb.org)
-                    Server
-              cddb_port=<number> (1..65535, default: 80)
-                    Port
-              cddb_path=<string> (Default: /~cddb/cddb.cgi)
-                    Path
-              cddb_proxy_host=<string>
-                    Proxy
-                    Proxy server (leave empty for direct connection)
-              cddb_proxy_port=<number> (1..65535, default: 80)
-                    Proxy port
-                    Proxy port
-              cddb_proxy_user=<string>
-                    Proxy username
-                    User name for proxy (leave empty for poxies, which
-                    don't require authentication)
-              cddb_proxy_pass=<string>
-                    Proxy password
-                    Password for proxy
-              cddb_timeout=<number> (0..1000, default: 10)
-                    Timeout
-                    Timeout (in seconds) for connections to the CDDB
-                    server
-              cdparanoia_speed=<string>
-                    Supported strings: Auto 4 8 16 32
-                    Default: Auto
-                    Speed
-              cdparanoia_max_retries=<number> (0..200, default: 20)
-                    Maximum retries
-                    Maximum number of retries, 0 = infinite
-              cdparanoia_disable_paranoia=[1|0] (default: 0)
-                    Disable paranoia
-                    Disable all data verification and correction
-                    features.
-              cdparanoia_disable_extra_paranoia=[1|0] (default: 0)
-                    Disable extra paranoia
-                    Disables intra-read data verification; only overlap
-                    checking atread boundaries is performed. It can
-                    wedge if errors  occur  in the attempted overlap
-                    area. Not recommended.
-               Suboptions for p=i_dvd
-              audio_dynrange=[1|0] (default: 1)
-                    Dynamic range control
-                    Enable dynamic range control for codecs, which
-                    support this (currently only A52 and DTS).
-               Suboptions for p=i_singlepic_stills
-              display_time={[[HH:]MM:]SS} (default: 0:00)
-                    Seconds can be fractional (i.e. with decimal point)
-                    Display time
-                    Time to pass until the next track will be selected.
-                    0 means infinite.
-               Suboptions for p=i_lqt
-              ac={option[{suboptions}][:option[{suboptions}]...]}
-                    Supported options: ima4 rawaudio twos ulaw sowt
-                    alaw in24 in32 fl32 fl64 lpcm faad2 ffmpeg_mp3
-                    ffmpeg_mp2 ffmpeg_ac3 ffmpeg_qdm2 ffmpeg_alac
-                    ffmpeg_adpcm_ms ffmpeg_ima_adpcm_wav vorbis
-                    vorbis_qt
-
-                    Audio Codecs
-                    Sort and configure audio codecs
-              vc={option[{suboptions}][:option[{suboptions}]...]}
-                    Supported options: jpeg rtjpeg raw v308 v408 v410
-                    yuv2 yuv4 yv12 2vuy v210 schroedinger png
-                    ffmpeg_mpg1 ffmpeg_mpg4 ffmpeg_msmpeg4v1
-                    ffmpeg_msmpeg4v2 ffmpeg_msmpeg4v3
-                    ffmpeg_msmpeg4v3_wmp ffmpeg_h263_dec ffmpeg_h263
-                    ffmpeg_h264 ffmpeg_i263 ffmpeg_svq1 ffmpeg_svq3
-                    ffmpeg_mjpg ffmpeg_mjpegb ffmpeg_TGA ffmpeg_TIFF
-                    ffmpeg_8BPS ffmpeg_indeo ffmpeg_rpza ffmpeg_smc
-                    ffmpeg_cinepak ffmpeg_cyuv ffmpeg_rle ffmpeg_wrle
-                    ffmpeg_dvcprohd ffmpeg_ffvhuff ffmpeg_ffv1
-                    ffmpeg_dnxhd mjpa ffmpeg_imx ffmpeg_dv
-                    ffmpeg_dvcpro ffmpeg_dv50 yuvs
-
-                    Video Codecs
-                    Sort and configure video codecs
-                    Suboptions for ffmpeg_mpg1
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_mpg4
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_msmpeg4v1
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_msmpeg4v2
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_msmpeg4v3
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_msmpeg4v3_wmp
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_h263_dec
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_h263
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_h264
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_i263
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_svq1
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_svq3
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_mjpg
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_indeo
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_cinepak
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_cyuv
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_dvcprohd
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_ffvhuff
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_ffv1
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_dnxhd
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_imx
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_dv
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_dvcpro
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                    Suboptions for ffmpeg_dv50
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-               Suboptions for p=i_singlepic
-              timescale=<number> (1..100000, default: 25)
-                    Timescale
-              frame_duration=<number> (1..100000, default: 1)
-                    Frame duration
-               Suboptions for p=i_mikmod
-              output=<string>
-                    Supported strings: mono8 stereo8 mono16 stereo16
-                    Default: stereo16
-                    Output format
-              mixing_frequency=<number> (4000..60000, default: 44100)
-                    Samplerate
-              hidden=[1|0] (default: 0)
-                    Look for hidden patterns in module
-              sur=[1|0] (default: 0)
-                    Use surround mixing
-              fade=[1|0] (default: 0)
-                    Force volume fade at the end of module
-              interpol=[1|0] (default: 0)
-                    Use interpolate mixing
-
-    -aud <audio_options>
-          Set audio processing options
-         sampleformat=<string>
-               Supported strings: none 8 16 32 f d
-               Default: none
-               Force sampleformat
-               Force a sampleformat to be used for processing. None
-               means to take the input format.
-         q=<number> (1..5, default: 2)
-               Conversion Quality
-               Set the conversion quality for format conversions. Lower
-               quality means more speed. Values above 3 enable slow
-               high quality calculations.
-         dither_mode=<string>
-               Supported strings: auto none rect tri shaped
-               Default: auto
-               Dither mode
-               Dither mode. Auto means to use the quality level.
-               Subsequent options are ordered by increasing quality
-               (i.e. decreasing speed).
-         fixed_samplerate=[1|0] (default: 0)
-               Fixed samplerate
-               If disabled, the output samplerate is taken from the
-               source. If enabled, the samplerate you specify below us
-               used.
-         samplerate=<number> (8000..192000, default: 44100)
-               Samplerate
-               Samplerate
-         resample_mode=<string>
-               Supported strings: auto zoh linear sinc_fast sinc_medium
-               sinc_best
-               Default: auto
-               Resample mode
-               Resample mode. Auto means to use the quality level.
-               Subsequent options are ordered by increasing quality
-               (i.e. decreasing speed).
-         fixed_channel_setup=[1|0] (default: 0)
-               Fixed channel setup
-               If disabled, the output channel configuration is taken
-               from the source. If enabled, the setup you specify below
-               us used.
-         num_front_channels=<number> (1..5, default: 2)
-               Front channels
-         num_rear_channels=<number> (0..3, default: 0)
-               Rear channels
-         num_lfe_channels=[1|0] (default: 0)
-               LFE
-         front_to_rear=<string>
-               Supported strings: mute copy diff
-               Default: copy
-               Front to rear mode
-               Mix mode when the output format has rear channels, but
-               the source doesn't.
-         stereo_to_mono=<string>
-               Supported strings: left right mix
-               Default: mix
-               Stereo to mono mode
-               Mix mode when downmixing Stereo to Mono.
-
-    -vid <video_options>
-          Set video processing options
-         q=<number> (1..5, default: 2)
-               Conversion Quality
-               Set the conversion quality for format conversions. Lower
-               quality means more speed. Values above 3 enable slow
-               high quality calculations.
-         alpha_mode=<string>
-               Supported strings: ignore blend_color
-               Default: ignore
-               Alpha mode
-               This option is used if the source has an alpha
-               (=transparency) channel, but the output supports no
-               transparency. Either, the transparency is ignored, or
-               the background color you specify below is blended in.
-         background_color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-               <r>, <g> and <b> are in the range 0.0..1.0 Background
-               color
-               Background color to use, when alpha mode above is "Blend
-               background color".
-         sm=[1|0] (default: 0)
-               Resample chroma
-               Always perform chroma resampling if chroma subsampling
-               factors or chroma placements are different. Usually,
-               this is only done for qualities above 3.
-         still_framerate=<number> (1.00..100.00, default: 10.00)
-               Still image framerate
-               Set framerate with which still images will be
-               redisplayed periodically
-         threads=<number> (1..1024, default: 1)
-               Number of threads
-               Threads to launch for processing operations. Changing
-               this requires program restart
-
-    -inopt <input_options>
-          Set generic input options
-         still_framerate=<number> (0..100, default: 10)
-               Still image repitition rate
-               When showing still images, gmerlin repeats them
-               periodically to make realtime filter tweaking work.
-         sync_offset=<number> (-1000..1000, default: 0)
-               Sync offset [ms]
-               Use this for playing buggy files, which have a constant
-               offset between audio and video. Use positive values if
-               the video is ahead of audio
-
-    -osd <osd_options>
-          Set OSD options
-         enable_osd=[1|0] (default: 1)
-               Enable OSD
-         font_size=<number> (12.00..100.00, default: 30.00)
-               Size
-               Specify fontsize for OSD. The value you enter, is for an
-               image width of 640.  For other widths, the value will be
-               scaled
-         color=<r>,<g>,<b>,<a> (default: 1.000,1.000,1.000,1.000)
-               <r>, <g>, <b> and <a> are in the range 0.0..1.0
-               Foreground color
-         border_color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-               <r>, <g> and <b> are in the range 0.0..1.0 Border color
-         border_width=<number> (0.00..10.00, default: 2.00)
-               Border width
-         justify_h=<string>
-               Supported strings: center left right
-               Default: center
-               Horizontal justify
-         justify_v=<string>
-               Supported strings: center top bottom
-               Default: center
-               Vertical justify
-         border_left=<number> (0..65535, default: 10)
-               Left border
-               Distance from the left text border to the image border
-         border_right=<number> (0..65535, default: 10)
-               Right border
-               Distance from the right text border to the image border
-         border_top=<number> (0..65535, default: 10)
-               Top border
-               Distance from the top text border to the image border
-         border_bottom=<number> (0..65535, default: 10)
-               Bottom border
-               Distance from the bottom text border to the image border
-         duration=<number> (0..10000, default: 2000)
-               Duration (milliseconds)
-
-    -nt
-          Disable time display
-    -vol <volume>
-          Set volume in dB (max: 0.0)
-    -v level
-          Set verbosity level (0..4)
-    -tracks <track_spec>
-          <track_spec> can be a ranges mixed with comma separated tracks
-
-Generic options
-     The following generic options are available for all gmerlin
-     applications
-    -help
-          Print this help message and exit
-    -help-man
-          Print this help message as a manual page and exit
-    -help-texi
-          Print this help message in texinfo format and exit
-    -version
-          Print version info and exit
-
-Files
-
-    `~/.gmerlin/plugins.xml'
-          Cache of the plugin registry (shared by all applicatons)
-    `~/.gmerlin/generic/config.xml'
-          Default plugin parameters are read from there. Use
-          gmerlin_plugincfg to change them.
-
-&#x1f;
-File: gmerlin.info,  Node: Commandline recorder,  Next: Alsamixer,  Prev: Commandline player,  Up: Applications
-
-4.6 Commandline recorder
-========================
-
-* Menu:
-
-* Invoking gmerlin-record: gmerlin-record.
-

gmerlin-1.2.0.tar.gz/doc/gmerlin.info-2 Deleted

@@ -1,7762 +0,0 @@
-This is gmerlin.info, produced by makeinfo version 4.13 from
-gmerlin.texi.
-
-INFO-DIR-SECTION Gmerlin
-START-INFO-DIR-ENTRY
-* Gmerlin: (gmerlin).           Gmerlin multimedia applications
-END-INFO-DIR-ENTRY
-
-   This manual is for Gmerlin (version 1.2.0, 8 June 2012).
-
-   Copyright (C) 2001-2008 Members of the Gmerlin project.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.1 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with the Front-Cover Texts
-     being "A GNU Manual," and with the Back-Cover Texts as in (a)
-     below.  A copy of the license is included in the section entitled
-     "GNU Free Documentation License."
-
-     (a) The FSF's Back-Cover Text is: "You have freedom to copy and
-     modify this GNU Manual, like GNU software.  Copies published by
-     the Free Software Foundation raise funds for GNU development."
-
-&#x1f;
-File: gmerlin.info,  Node: gmerlin-record,  Up: Commandline recorder
-
-4.6.1 Invoking gmerlin-record
------------------------------
-
-Synopsis
-     gmerlin-record [options]
-Description
-     Commandline recorder
-Options
-
-    -aud <audio_options>
-          Set audio recording options
-         do_audio=[1|0] (default: 1)
-               Record audio
-         plugin=option[{suboptions}]
-               Supported options: i_alsa i_oss i_esd i_pulse i_audiofile
-               Default: i_alsa
-               Plugin
-               Suboptions for plugin=i_alsa
-              card=<string>
-                    Supported strings: default hw:0,0 hw:0,2
-                    Default: default
-                    Card
-              channel_mode=<string>
-                    Supported strings: mono stereo
-                    Default: stereo
-                    Channel Mode
-              bits=<string>
-                    Supported strings: 8 16
-                    Default: 16
-                    Bits
-              samplerate=<number> (8000..96000, default: 44100)
-                    Samplerate [Hz]
-              buffer_time=<number> (10..10000, default: 1000)
-                    Buffer time
-                    Set the buffer time (in milliseconds). Larger
-                    values improve recording performance on slow
-                    systems under load.
-              user_device=<string>
-                    User device
-                    Enter a custom device to use for recording. Leave
-                    empty to use the settings above
-               Suboptions for plugin=i_oss
-              device=<string> (Default: /dev/dsp)
-                    Device
-              channel_mode=<string>
-                    Supported strings: Mono Stereo
-                    Default: Stereo
-                    Channel Mode
-              bits=<string>
-                    Supported strings: 8 16
-                    Default: 16
-                    Bits
-              samplerate=<number> (8000..96000, default: 44100)
-                    Samplerate [Hz]
-               Suboptions for plugin=i_esd
-              esd_host=<string>
-                    Host (empty: local)
-              input_mode=<string>
-                    Supported strings: record monitor
-                    Default: record
-                    Input Mode
-               Suboptions for plugin=i_pulse
-              channel_mode=<string>
-                    Supported strings: mono stereo
-                    Default: stereo
-                    Channel Mode
-              bits=<string>
-                    Supported strings: 8 16
-                    Default: 16
-                    Bits
-              samplerate=<number> (8000..96000, default: 44100)
-                    Samplerate [Hz]
-              server=<string>
-                    Server
-                    Server to connect to. Leave empty for default.
-              dev=<string>
-                    Source
-                    Source to open. Use the PulseAudio manager for
-                    available Sources.
-               Suboptions for plugin=i_audiofile
-              channel_mode=<string>
-                    Supported strings: mono stereo
-                    Default: stereo
-                    Channel Mode
-              samplerate=<number> (8000..96000, default: 44100)
-                    Samplerate [Hz]
-              album=<string>
-                    Album
-              shuffle=[1|0] (default: 0)
-                    Shuffle
-
-         language=<string>
-               Supported strings: aar abk ace ach ada afa afh afr aka
-               akk ale alg amh ang apa ara arc arn arp art arw asm ath
-               aus ava ave awa aym aze bad bai bak bal bam ban bas bat
-               bej bel bem ben ber bho bih bik bin bis bla bnt tib bos
-               bra bre btk bua bug bul cad cai car cat cau ceb cel cze
-               cha chb che chg chk chm chn cho chp chr chu chv chy cmc
-               cop cor cos cpe cpf cpp cre crp cus wel dak dan day del
-               den ger dgr din div doi dra dua dum dyu dzo efi egy eka
-               gre elx eng enm epo est baq ewe ewo fan fao per fat fij
-               fin fiu fon fre frm fro fry ful fur gaa gay gba gem gez
-               gil gla gle glg glv gmh goh gon gor got grb grc grn guj
-               gwi hai hau haw heb her hil him hin hit hmn hmo scr hun
-               hup arm iba ibo ijo iku ile ilo ina inc ind ine ipk ira
-               iro ice ita jav jpn jpr kaa kab kac kal kam kan kar kas
-               geo kau kaw kaz kha khi khm kho kik kin kir kmb kok kom
-               kon kor kos kpe kro kru kum kur kut lad lah lam lao lat
-               lav lez lin lit lol loz ltz lua lub lug lui lun luo lus
-               mad mag mah mai mak mal man map mar mas mdr men mga mic
-               min mis mac mkh mlg mlt mnc mni mno moh mol mon mos mao
-               may mul mun mus mwr bur myn nah nai nau nav nbl nde ndo
-               nds nep new nia nic niu dut nno nob non nor nso nub nya
-               nym nyn nyo nzi oci oji ori orm osa oss ota oto paa pag
-               pal pam pan pap pau peo phi pli pol pon por pra pro pus
-               que raj rap rar roa rom rum run rus sad sag sah sai sal
-               sam san sas sat sco sel sem sga sgn shn sid sin sio sit
-               sla slo slv sme smi smo sna snd snk sog som son sot spa
-               alb srd scc srr ssa ssw suk sun sus sux swa swe syr tah
-               tai tam tat tel tem ter tet tgk tgl tha tig tir tiv tkl
-               tli tmh tog ton tpi tsi tsn tso tuk tum tur tut tvl twi
-               tyv uga uig ukr umb und urd uzb vai ven vie vol vot wak
-               wal war was wen wol xho yao yap yid yor ypk zap zen zha
-               chi znd zul zun
-               Default: eng
-               Language
-
-    -vid <video_options>
-          Set video recording options
-         do_video=[1|0] (default: 1)
-               Record video
-         plugin=option[{suboptions}]
-               Supported options: i_v4l2 i_v4l i_x11
-               Default: i_v4l2
-               Plugin
-               Suboptions for plugin=i_v4l2
-              device=option[{suboptions}]
-                    Supported options: <None>
-                    Default: /dev/video0
-                    V4L2 Device
-              resolution=<string>
-                    Supported strings: QSIF (160x112) QCIF (176x144)
-                    QVGA (320x240) SIF(352x240) CIF (352x288) VGA
-                    (640x480) User defined
-                    Default: QVGA (320x240)
-                    Resolution
-              user_width=<number> (160..1024, default: 720)
-                    User defined width
-              user_height=<number> (112..768, default: 576)
-                    User defined height
-               Suboptions for plugin=i_v4l
-              device=<string> (Default: /dev/video0)
-                    V4L Device
-              resolution=<string>
-                    Supported strings: QSIF (160x112) QCIF (176x144)
-                    QVGA (320x240) SIF(352x240) CIF (352x288) VGA
-                    (640x480) User defined
-                    Default: QVGA (320x240)
-                    Resolution
-              user_width=<number> (160..1024, default: 720)
-                    User defined width
-              user_height=<number> (112..768, default: 576)
-                    User defined height
-              brightness=<number> (0..65535, default: 40000)
-                    Brightness
-              hue=<number> (0..65535, default: 65535)
-                    Hue
-              colour=<number> (0..65535, default: 30000)
-                    Colour
-              contrast=<number> (0..65535, default: 30000)
-                    Contrast
-              whiteness=<number> (0..65535, default: 30000)
-                    Whiteness
-               Suboptions for plugin=i_x11
-              root=[1|0] (default: 0)
-                    Grab from root window
-              draw_cursor=[1|0] (default: 1)
-                    Draw cursor
-              win_ontop=[1|0] (default: 1)
-                    Keep grab window on top
-              win_sticky=[1|0] (default: 1)
-                    Make grab window sticky
-              disable_screensaver=[1|0] (default: 1)
-                    Disable screensaver
-                    Disable screensaver and energy saving mode
-
-         limit_fps=<number> (1.00..100.00, default: 25.00)
-               fps limit
-               Specify the maximum framerate for input plugins, which
-               can capture images really fast
-
-    -af <audio filter options>
-          Set audio filter options
-         audio_filters={option[{suboptions}][:option[{suboptions}]...]}
-               Supported options: fa_ladspa_fourByFourPole
-               fa_ladspa_amPitchshift fa_ladspa_alias
-               fa_ladspa_allpass_c fa_ladspa_allpass_l
-               fa_ladspa_allpass_n fa_ladspa_amp_mono
-               fa_ladspa_amp_stereo fa_ladspa_artificialLatency
-               fa_ladspa_divider fa_ladspa_autoPhaser
-               fa_ladspa_satanMaximiser fa_ladspa_canyon_delay
-               fa_ladspa_chebstortion fa_ladspa_comb fa_ladspa_comb_c
-               fa_ladspa_comb_l fa_ladspa_comb_n fa_ladspa_const
-               fa_ladspa_crossoverDist fa_ladspa_dcRemove
-               fa_ladspa_dj_eq fa_ladspa_dj_eq_mono fa_ladspa_djFlanger
-               fa_ladspa_decimator fa_ladspa_declip
-               fa_ladspa_delayorama fa_ladspa_diode
-               fa_ladspa_disintegrator fa_ladspa_dysonCompress
-               fa_ladspa_delay_0,01s fa_ladspa_delay_0,1s
-               fa_ladspa_delay_1s fa_ladspa_delay_5s
-               fa_ladspa_delay_60s fa_ladspa_decay fa_ladspa_fmOsc
-               fa_ladspa_fastLookaheadLimiter fa_ladspa_foverdrive
-               fa_ladspa_fbdelay_0,01s fa_ladspa_fbdelay_0,1s
-               fa_ladspa_fbdelay_1s fa_ladspa_fbdelay_5s
-               fa_ladspa_fbdelay_60s fa_ladspa_flanger
-               fa_ladspa_foldover fa_sampleformat fa_ladspa_fadDelay
-               fa_ladspa_freeverb3 fa_ladspa_freqTracker
-               fa_ladspa_butthigh_iir fa_ladspa_buttlow_iir
-               fa_ladspa_gsm fa_ladspa_gate fa_ladspa_giantFlange
-               fa_ladspa_bandpass_a_iir fa_ladspa_bandpass_iir
-               fa_ladspa_highpass_iir fa_ladspa_lowpass_iir
-               fa_ladspa_gongBeater fa_ladspa_gong
-               fa_ladspa_grain_scatter fa_ladspa_hard_gate
-               fa_ladspa_hardLimiter fa_ladspa_harmonicGen
-               fa_ladspa_hermesFilter fa_ladspa_hpf
-               fa_ladspa_pitchScaleHQ fa_ladspa_identity_audio
-               fa_ladspa_imp fa_ladspa_inv fa_ladspa_karaoke
-               fa_ladspa_lcrDelay fa_ladspa_lfoPhaser
-               fa_ladspa_lsFilter fa_ladspa_lofi fa_ladspa_lpf
-               fa_ladspa_notch_iir fa_ladspa_matrixSpatialiser
-               fa_ladspa_matrixMSSt fa_ladspa_matrixStMS fa_ladspa_mbeq
-               fa_ladspa_multivoiceChorus fa_ladspa_pitchScale
-               fa_ladspa_pointerCastDistortion fa_ladspa_rateShifter
-               fa_ladspa_retroFlange fa_ladspa_revdelay
-               fa_ladspa_ringmod_1i1o1l fa_ladspa_sc1 fa_ladspa_sc4
-               fa_ladspa_sc4m fa_ladspa_se4 fa_ladspa_sifter
-               fa_ladspa_compress_peak fa_ladspa_compress_rms
-               fa_ladspa_expand_peak fa_ladspa_expand_rms
-               fa_ladspa_limit_peak fa_ladspa_limit_rms fa_ladspa_amp
-               fa_ladspa_delay_c fa_ladspa_delay_l fa_ladspa_delay_n
-               fa_ladspa_sine_faac fa_ladspa_sine_fcaa
-               fa_ladspa_singlePara fa_ladspa_sinusWavewrapper
-               fa_ladspa_smoothDecimate fa_ladspa_svf
-               fa_ladspa_tap_autopan fa_ladspa_tap_chorusflanger
-               fa_ladspa_tap_deesser fa_ladspa_tap_dynamics_m
-               fa_ladspa_tap_dynamics_st fa_ladspa_tap_equalizer
-               fa_ladspa_tap_equalizer_bw fa_ladspa_tap_doubler
-               fa_ladspa_tap_pinknoise fa_ladspa_tap_pitch
-               fa_ladspa_tap_reflector fa_ladspa_tap_reverb
-               fa_ladspa_tap_rotspeak fa_ladspa_tap_limiter
-               fa_ladspa_tap_sigmoid fa_ladspa_tap_stereo_echo
-               fa_ladspa_tap_tremolo fa_ladspa_tap_tubewarmth
-               fa_ladspa_tap_vibrato fa_ladspa_tapeDelay
-               fa_ladspa_transient fa_ladspa_triplePara
-               fa_ladspa_vcf303 fa_ladspa_valveRect fa_ladspa_valve
-               fa_volume fa_ladspa_vynil fa_ladspa_wshape_sine
-               fa_ladspa_shaper fa_ladspa_zm1
-
-               Audio Filters
-               Suboptions for fa_ladspa_fourByFourPole
-              Frequency 1=<number> (1.000..20000.000, default: 5000.750)
-                    Frequency 1
-              Feedback 1=<number> (-1.000..1.000, default: 5000.750)
-                    Feedback 1
-              Frequency 2=<number> (1.000..20000.000, default: 10000.500)
-                    Frequency 2
-              Feedback 2=<number> (-1.000..1.000, default: 10000.500)
-                    Feedback 2
-              Frequency 3=<number> (1.000..20000.000, default: 15000.250)
-                    Frequency 3
-              Feedback 3=<number> (-1.000..1.000, default: 15000.250)
-                    Feedback 3
-              Frequency 4=<number> (1.000..20000.000, default: 20000.000)
-                    Frequency 4
-              Feedback 4=<number> (-1.000..1.000, default: 20000.000)
-                    Feedback 4
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_amPitchshift
-              Pitch shift=<number> (0.250..4.000, default: 0.000)
-                    Pitch shift
-              Buffer size=<number> (1..7, default: 4)
-                    Buffer size
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_alias
-              Aliasing level=<number> (0.000..1.000, default: 0.000)
-                    Aliasing level
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_allpass_c
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_allpass_l
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_allpass_n
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_amp_mono
-              Gain=<number> (default: 0.000)
-                    Gain
-               Suboptions for fa_ladspa_amp_stereo
-              Gain=<number> (default: 0.000)
-                    Gain
-               Suboptions for fa_ladspa_artificialLatency
-              Delay (ms)=<number> (0.000..10000.000, default: 2500.000)
-                    Delay (ms)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_divider
-              Denominator=<number> (1..8, default: 0)
-                    Denominator
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_autoPhaser
-              Attack time (s)=<number> (0.000..1.000, default: 0.250)
-                    Attack time (s)
-              Decay time (s)=<number> (0.000..1.000, default: 0.250)
-                    Decay time (s)
-              Modulation depth=<number> (0.000..1.000, default: 0.250)
-                    Modulation depth
-              Feedback=<number> (-1.000..1.000, default: 0.250)
-                    Feedback
-              Spread (octaves)=<number> (0.000..2.000, default: 0.250)
-                    Spread (octaves)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_satanMaximiser
-              Decay time (samples)=<number> (2.000..30.000, default: 30.000)
-                    Decay time (samples)
-              Knee point (dB)=<number> (-90.000..0.000, default: 30.000)
-                    Knee point (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_canyon_delay
-              Left to Right Time (Seconds)=<number> (0.010..0.990, default: 0.000)
-                    Left to Right Time (Seconds)
-              Left to Right Feedback (Percent)=<number> (-1.000..1.000, default: 0.000)
-                    Left to Right Feedback (Percent)
-              Right to Left Time (Seconds)=<number> (0.010..0.990, default: 0.000)
-                    Right to Left Time (Seconds)
-              Right to Left Feedback (Percent)=<number> (-1.000..1.000, default: 0.000)
-                    Right to Left Feedback (Percent)
-              Low-Pass Cutoff (Hz)=<number> (1.000..5000.000, default: 0.000)
-                    Low-Pass Cutoff (Hz)
-               Suboptions for fa_ladspa_chebstortion
-              Distortion=<number> (0.000..3.000, default: 0.000)
-                    Distortion
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_comb
-              Band separation (Hz)=<number> (16.000..640.000, default: 172.000)
-                    Band separation (Hz)
-              Feedback=<number> (-0.990..0.990, default: 172.000)
-                    Feedback
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_comb_c
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_comb_l
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_comb_n
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_const
-              Signal amplitude=<number> (-1.000..1.100, default: 0.000)
-                    Signal amplitude
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_crossoverDist
-              Crossover amplitude=<number> (0.000..0.100, default: 0.000)
-                    Crossover amplitude
-              Smoothing=<number> (0.000..1.000, default: 1.000)
-                    Smoothing
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_dcRemove
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_dj_eq
-              Lo gain (dB)=<number> (-70.000..6.000, default: 0.000)
-                    Lo gain (dB)
-              Mid gain (dB)=<number> (-70.000..6.000, default: 0.000)
-                    Mid gain (dB)
-              Hi gain (dB)=<number> (-70.000..6.000, default: 0.000)
-                    Hi gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_dj_eq_mono
-              Lo gain (dB)=<number> (-70.000..6.000, default: 0.000)
-                    Lo gain (dB)
-              Mid gain (dB)=<number> (-70.000..6.000, default: 0.000)
-                    Mid gain (dB)
-              Hi gain (dB)=<number> (-70.000..6.000, default: 0.000)
-                    Hi gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_djFlanger
-              LFO sync=<number> (default: 0.000)
-                    LFO sync
-              LFO period (s)=<number> (0.100..32.000, default: 0.000)
-                    LFO period (s)
-              LFO depth (ms)=<number> (1.000..5.000, default: 4.000)
-                    LFO depth (ms)
-              Feedback (%)=<number> (-100.000..100.000, default: 4.000)
-                    Feedback (%)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_decimator
-              Bit depth=<number> (1.000..24.000, default: 24.000)
-                    Bit depth
-              Sample rate (Hz)=<number> (0.001..1.000, default: 1.000)
-                    Sample rate (Hz)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_declip
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_delayorama
-              Random seed=<number> (0..1000, default: 0)
-                    Random seed
-              Input gain (dB)=<number> (-96.000..24.000, default: 0.000)
-                    Input gain (dB)
-              Feedback (%)=<number> (0.000..100.000, default: 0.000)
-                    Feedback (%)
-              Number of taps=<number> (2..128, default: 2)
-                    Number of taps
-              First delay (s)=<number> (0.000..5.000, default: 2.000)
-                    First delay (s)
-              Delay range (s)=<number> (0.000..6.000, default: 6.000)
-                    Delay range (s)
-              Delay change=<number> (0.200..5.000, default: 6.000)
-                    Delay change
-              Delay random (%)=<number> (0.000..100.000, default: 6.000)
-                    Delay random (%)
-              Amplitude change=<number> (0.200..5.000, default: 6.000)
-                    Amplitude change
-              Amplitude random (%)=<number> (0.000..100.000, default: 6.000)
-                    Amplitude random (%)
-              Dry/wet mix=<number> (0.000..1.000, default: 6.000)
-                    Dry/wet mix
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_diode
-              Mode (0 for none, 1 for half wave, 2 for full wave)=<number> (0.000..3.000, default: 0.000)
-                    Mode (0 for none, 1 for half wave, 2 for full wave)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_disintegrator
-              Probability=<number> (0.000..1.000, default: 0.000)
-                    Probability
-              Multiplier=<number> (-1.000..1.000, default: 0.000)
-                    Multiplier
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_dysonCompress
-              Peak limit (dB)=<number> (-30.000..0.000, default: 0.000)
-                    Peak limit (dB)
-              Release time (s)=<number> (0.000..1.000, default: 0.250)
-                    Release time (s)
-              Fast compression ratio=<number> (0.000..1.000, default: 0.500)
-                    Fast compression ratio
-              Compression ratio=<number> (0.000..1.000, default: 0.500)
-                    Compression ratio
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_delay_0,01s
-              Delay (Seconds)=<number> (0.000..0.010, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-               Suboptions for fa_ladspa_delay_0,1s
-              Delay (Seconds)=<number> (0.000..0.100, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-               Suboptions for fa_ladspa_delay_1s
-              Delay (Seconds)=<number> (0.000..1.000, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-               Suboptions for fa_ladspa_delay_5s
-              Delay (Seconds)=<number> (0.000..5.000, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-               Suboptions for fa_ladspa_delay_60s
-              Delay (Seconds)=<number> (0.000..60.000, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-               Suboptions for fa_ladspa_decay
-              Decay Time (s)=<number> (default: 0.000)
-                    Decay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_fmOsc
-              Waveform (1=sin, 2=tri, 3=squ, 4=saw)=<number> (1..4, default: 0)
-                    Waveform (1=sin, 2=tri, 3=squ, 4=saw)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_fastLookaheadLimiter
-              Input gain (dB)=<number> (-20.000..20.000, default: 0.000)
-                    Input gain (dB)
-              Limit (dB)=<number> (-20.000..0.000, default: 0.000)
-                    Limit (dB)
-              Release time (s)=<number> (0.010..2.000, default: 0.507)
-                    Release time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_foverdrive
-              Drive level=<number> (1.000..3.000, default: 1.000)
-                    Drive level
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_fbdelay_0,01s
-              Delay (Seconds)=<number> (0.000..0.010, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-              Feedback=<number> (-1.000..1.000, default: 0.500)
-                    Feedback
-               Suboptions for fa_ladspa_fbdelay_0,1s
-              Delay (Seconds)=<number> (0.000..0.100, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-              Feedback=<number> (-1.000..1.000, default: 0.500)
-                    Feedback
-               Suboptions for fa_ladspa_fbdelay_1s
-              Delay (Seconds)=<number> (0.000..1.000, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-              Feedback=<number> (-1.000..1.000, default: 0.500)
-                    Feedback
-               Suboptions for fa_ladspa_fbdelay_5s
-              Delay (Seconds)=<number> (0.000..5.000, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-              Feedback=<number> (-1.000..1.000, default: 0.500)
-                    Feedback
-               Suboptions for fa_ladspa_fbdelay_60s
-              Delay (Seconds)=<number> (0.000..60.000, default: 0.000)
-                    Delay (Seconds)
-              Dry/Wet Balance=<number> (0.000..1.000, default: 0.500)
-                    Dry/Wet Balance
-              Feedback=<number> (-1.000..1.000, default: 0.500)
-                    Feedback
-               Suboptions for fa_ladspa_flanger
-              Delay base (ms)=<number> (0.100..25.000, default: 6.325)
-                    Delay base (ms)
-              Max slowdown (ms)=<number> (0.000..10.000, default: 2.500)
-                    Max slowdown (ms)
-              LFO frequency (Hz)=<number> (0.050..100.000, default: 0.334)
-                    LFO frequency (Hz)
-              Feedback=<number> (-1.000..1.000, default: 0.334)
-                    Feedback
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_foldover
-              Drive=<number> (0.000..1.000, default: 0.000)
-                    Drive
-              Skew=<number> (0.000..1.000, default: 0.000)
-                    Skew
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_sampleformat
-              sampleformat=<string>
-                    Supported strings: Unsigned 8 bit Signed 8 bit
-                    Unsigned 16 bit Signed 16 bit Signed 32 bit
-                    Floating point Double precision
-                    Default: YUV 420 Planar
-                    Sampleformat
-               Suboptions for fa_ladspa_fadDelay
-              Delay (seconds)=<number> (0.100..10.000, default: 0.000)
-                    Delay (seconds)
-              Feedback (dB)=<number> (-70.000..0.000, default: 0.000)
-                    Feedback (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_freeverb3
-              Freeze Mode=[1|0] (default: 0)
-                    Freeze Mode
-              Room Size=<number> (0.000..1.000, default: 0.500)
-                    Room Size
-              Damping=<number> (0.000..1.000, default: 0.000)
-                    Damping
-              Wet Level=<number> (0.000..1.000, default: 0.000)
-                    Wet Level
-              Dry Level=<number> (0.000..1.000, default: 1.000)
-                    Dry Level
-              Width=<number> (0.000..1.000, default: 0.500)
-                    Width
-               Suboptions for fa_ladspa_freqTracker
-              Tracking speed=<number> (0.000..1.000, default: 0.500)
-                    Tracking speed
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_butthigh_iir
-              Cutoff Frequency (Hz)=<number> (0.000..0.450, default: 0.001)
-                    Cutoff Frequency (Hz)
-              Resonance=<number> (0.100..1.410, default: 0.755)
-                    Resonance
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_buttlow_iir
-              Cutoff Frequency (Hz)=<number> (0.000..0.450, default: 0.001)
-                    Cutoff Frequency (Hz)
-              Resonance=<number> (0.100..1.410, default: 0.755)
-                    Resonance
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_gsm
-              Dry/wet mix=<number> (0.000..1.000, default: 0.000)
-                    Dry/wet mix
-              Number of passes=<number> (0..10, default: 0)
-                    Number of passes
-              Error rate (bits/block)=<number> (0.000..30.000, default: 0.000)
-                    Error rate (bits/block)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_gate
-              LF key filter (Hz)=<number> (0.001..0.100, default: 0.001)
-                    LF key filter (Hz)
-              HF key filter (Hz)=<number> (0.005..0.490, default: 0.490)
-                    HF key filter (Hz)
-              Threshold (dB)=<number> (-70.000..20.000, default: -70.000)
-                    Threshold (dB)
-              Attack (ms)=<number> (0.010..1000.000, default: 250.008)
-                    Attack (ms)
-              Hold (ms)=<number> (2.000..2000.000, default: 1500.500)
-                    Hold (ms)
-              Decay (ms)=<number> (2.000..4000.000, default: 2001.000)
-                    Decay (ms)
-              Range (dB)=<number> (-90.000..0.000, default: -90.000)
-                    Range (dB)
-              Output select (-1 = key listen, 0 = gate, 1 = bypass)=<number> (-1..1, default: -90)
-                    Output select (-1 = key listen, 0 = gate, 1 =
-                    bypass)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_giantFlange
-              Double delay=<number> (default: 0.000)
-                    Double delay
-              LFO frequency 1 (Hz)=<number> (0.000..30.000, default: 0.000)
-                    LFO frequency 1 (Hz)
-              Delay 1 range (s)=<number> (0.000..10.500, default: 2.625)
-                    Delay 1 range (s)
-              LFO frequency 2 (Hz)=<number> (0.000..30.000, default: 2.625)
-                    LFO frequency 2 (Hz)
-              Delay 2 range (s)=<number> (0.000..10.500, default: 2.625)
-                    Delay 2 range (s)
-              Feedback=<number> (-100.000..100.000, default: 2.625)
-                    Feedback
-              Dry/Wet level=<number> (0.000..1.000, default: 2.625)
-                    Dry/Wet level
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_bandpass_a_iir
-              Center Frequency (Hz)=<number> (0.000..0.450, default: 0.001)
-                    Center Frequency (Hz)
-              Bandwidth (Hz)=<number> (0.000..0.450, default: 0.007)
-                    Bandwidth (Hz)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_bandpass_iir
-              Center Frequency (Hz)=<number> (0.000..0.450, default: 0.007)
-                    Center Frequency (Hz)
-              Bandwidth (Hz)=<number> (0.000..0.450, default: 0.007)
-                    Bandwidth (Hz)
-              Stages(2 poles per stage)=<number> (1..10, default: 0)
-                    Stages(2 poles per stage)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_highpass_iir
-              Cutoff Frequency=<number> (0.000..0.450, default: 0.001)
-                    Cutoff Frequency
-              Stages(2 poles per stage)=<number> (1..10, default: 0)
-                    Stages(2 poles per stage)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_lowpass_iir
-              Cutoff Frequency=<number> (0.000..0.450, default: 0.055)
-                    Cutoff Frequency
-              Stages(2 poles per stage)=<number> (1..10, default: 0)
-                    Stages(2 poles per stage)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_gongBeater
-              Impulse gain (dB)=<number> (-70.000..0.000, default: -70.000)
-                    Impulse gain (dB)
-              Strike gain (dB)=<number> (-70.000..0.000, default: 0.000)
-                    Strike gain (dB)
-              Strike duration (s)=<number> (0.001..0.200, default: 0.101)
-                    Strike duration (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_gong
-              Inner damping=<number> (0.000..1.000, default: 0.500)
-                    Inner damping
-              Outer damping=<number> (0.000..1.000, default: 0.500)
-                    Outer damping
-              Mic position=<number> (0.000..1.000, default: 0.250)
-                    Mic position
-              Inner size 1=<number> (0.000..1.000, default: 0.500)
-                    Inner size 1
-              Inner stiffness 1 +=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 1 +
-              Inner stiffness 1 -=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 1 -
-              Inner size 2=<number> (0.000..1.000, default: 0.500)
-                    Inner size 2
-              Inner stiffness 2 +=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 2 +
-              Inner stiffness 2 -=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 2 -
-              Inner size 3=<number> (0.000..1.000, default: 0.500)
-                    Inner size 3
-              Inner stiffness 3 +=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 3 +
-              Inner stiffness 3 -=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 3 -
-              Inner size 4=<number> (0.000..1.000, default: 0.500)
-                    Inner size 4
-              Inner stiffness 4 +=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 4 +
-              Inner stiffness 4 -=<number> (0.000..1.000, default: 0.500)
-                    Inner stiffness 4 -
-              Outer size 1=<number> (0.000..1.000, default: 0.500)
-                    Outer size 1
-              Outer stiffness 1 +=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 1 +
-              Outer stiffness 1 -=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 1 -
-              Outer size 2=<number> (0.000..1.000, default: 0.500)
-                    Outer size 2
-              Outer stiffness 2 +=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 2 +
-              Outer stiffness 2 -=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 2 -
-              Outer size 3=<number> (0.000..1.000, default: 0.500)
-                    Outer size 3
-              Outer stiffness 3 +=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 3 +
-              Outer stiffness 3 -=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 3 -
-              Outer size 4=<number> (0.000..1.000, default: 0.500)
-                    Outer size 4
-              Outer stiffness 4 +=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 4 +
-              Outer stiffness 4 -=<number> (0.000..1.000, default: 0.500)
-                    Outer stiffness 4 -
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_grain_scatter
-              Density (Grains/s)=<number> (default: 10.000)
-                    Density (Grains/s)
-              Scatter (s)=<number> (0.000..5.000, default: 2.500)
-                    Scatter (s)
-              Grain Length (s)=<number> (default: 0.200)
-                    Grain Length (s)
-              Grain Attack (s)=<number> (default: 0.050)
-                    Grain Attack (s)
-               Suboptions for fa_ladspa_hard_gate
-              Threshold=<number> (0.000..1.000, default: 0.000)
-                    Threshold
-               Suboptions for fa_ladspa_hardLimiter
-              dB limit=<number> (-50.000..0.000, default: 0.000)
-                    dB limit
-              Wet level=<number> (0.000..1.000, default: 0.000)
-                    Wet level
-              Residue level=<number> (0.000..1.000, default: 0.000)
-                    Residue level
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_harmonicGen
-              Fundamental magnitude=<number> (-1.000..1.000, default: 0.000)
-                    Fundamental magnitude
-              2nd harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    2nd harmonic magnitude
-              3rd harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    3rd harmonic magnitude
-              4th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    4th harmonic magnitude
-              5th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    5th harmonic magnitude
-              6th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    6th harmonic magnitude
-              7th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    7th harmonic magnitude
-              8th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    8th harmonic magnitude
-              9th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    9th harmonic magnitude
-              10th harmonic magnitude=<number> (-1.000..1.000, default: 0.000)
-                    10th harmonic magnitude
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_hermesFilter
-              LFO1 freq (Hz)=<number> (0.000..1000.000, default: 250.000)
-                    LFO1 freq (Hz)
-              LFO1 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 = s&h)=<number> (0..4, default: 250)
-                    LFO1 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 =
-                    s&h)
-              LFO2 freq (Hz)=<number> (0.000..1000.000, default: 250.000)
-                    LFO2 freq (Hz)
-              LFO2 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 = s&h)=<number> (0..4, default: 250)
-                    LFO2 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 =
-                    s&h)
-              Osc1 freq (Hz)=<number> (0.000..4000.000, default: 440.000)
-                    Osc1 freq (Hz)
-              Osc1 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 = noise)=<number> (0..4, default: 440)
-                    Osc1 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 =
-                    noise)
-              Osc2 freq (Hz)=<number> (0.000..4000.000, default: 440.000)
-                    Osc2 freq (Hz)
-              Osc2 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 = noise)=<number> (0..4, default: 440)
-                    Osc2 wave (0 = sin, 1 = tri, 2 = saw, 3 = squ, 4 =
-                    noise)
-              Ringmod 1 depth (0=none, 1=AM, 2=RM)=<number> (0.000..2.000, default: 440.000)
-                    Ringmod 1 depth (0=none, 1=AM, 2=RM)
-              Ringmod 2 depth (0=none, 1=AM, 2=RM)=<number> (0.000..2.000, default: 440.000)
-                    Ringmod 2 depth (0=none, 1=AM, 2=RM)
-              Ringmod 3 depth (0=none, 1=AM, 2=RM)=<number> (0.000..2.000, default: 440.000)
-                    Ringmod 3 depth (0=none, 1=AM, 2=RM)
-              Osc1 gain (dB)=<number> (-70.000..20.000, default: -70.000)
-                    Osc1 gain (dB)
-              RM1 gain (dB)=<number> (-70.000..20.000, default: -70.000)
-                    RM1 gain (dB)
-              Osc2 gain (dB)=<number> (-70.000..20.000, default: -70.000)
-                    Osc2 gain (dB)
-              RM2 gain (dB)=<number> (-70.000..20.000, default: -70.000)
-                    RM2 gain (dB)
-              Input gain (dB)=<number> (-70.000..20.000, default: -70.000)
-                    Input gain (dB)
-              RM3 gain (dB)=<number> (-70.000..20.000, default: -70.000)
-                    RM3 gain (dB)
-              Xover lower freq=<number> (50.000..6000.000, default: 1537.500)
-                    Xover lower freq
-              Xover upper freq=<number> (1000.000..10000.000, default: 7750.000)
-                    Xover upper freq
-              Dist1 drive=<number> (0.000..3.000, default: 7750.000)
-                    Dist1 drive
-              Dist2 drive=<number> (0.000..3.000, default: 7750.000)
-                    Dist2 drive
-              Dist3 drive=<number> (0.000..3.000, default: 7750.000)
-                    Dist3 drive
-              Filt1 type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)=<number> (0..5, default: 7750)
-                    Filt1 type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)
-              Filt1 freq=<number> (0.000..8000.000, default: 440.000)
-                    Filt1 freq
-              Filt1 q=<number> (0.000..1.000, default: 440.000)
-                    Filt1 q
-              Filt1 resonance=<number> (0.000..1.000, default: 440.000)
-                    Filt1 resonance
-              Filt1 LFO1 level=<number> (-500.000..500.000, default: 440.000)
-                    Filt1 LFO1 level
-              Filt1 LFO2 level=<number> (-500.000..500.000, default: 440.000)
-                    Filt1 LFO2 level
-              Filt2 type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)=<number> (0..5, default: 440)
-                    Filt2 type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)
-              Filt2 freq=<number> (0.000..8000.000, default: 440.000)
-                    Filt2 freq
-              Filt2 q=<number> (0.000..1.000, default: 440.000)
-                    Filt2 q
-              Filt2 resonance=<number> (0.000..1.000, default: 440.000)
-                    Filt2 resonance
-              Filt2 LFO1 level=<number> (-500.000..500.000, default: 440.000)
-                    Filt2 LFO1 level
-              Filt2 LFO2 level=<number> (-500.000..500.000, default: 440.000)
-                    Filt2 LFO2 level
-              Filt3 type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)=<number> (0..5, default: 440)
-                    Filt3 type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)
-              Filt3 freq=<number> (0.000..8000.000, default: 440.000)
-                    Filt3 freq
-              Filt3 q=<number> (0.000..1.000, default: 440.000)
-                    Filt3 q
-              Filt3 resonance=<number> (0.000..1.000, default: 440.000)
-                    Filt3 resonance
-              Filt3 LFO1 level=<number> (-500.000..500.000, default: 440.000)
-                    Filt3 LFO1 level
-              Filt3 LFO2 level=<number> (-500.000..500.000, default: 440.000)
-                    Filt3 LFO2 level
-              Delay1 length (s)=<number> (0.000..2.000, default: 440.000)
-                    Delay1 length (s)
-              Delay1 feedback=<number> (0.000..1.000, default: 440.000)
-                    Delay1 feedback
-              Delay1 wetness=<number> (0.000..1.000, default: 440.000)
-                    Delay1 wetness
-              Delay2 length (s)=<number> (0.000..2.000, default: 440.000)
-                    Delay2 length (s)
-              Delay2 feedback=<number> (0.000..1.000, default: 440.000)
-                    Delay2 feedback
-              Delay2 wetness=<number> (0.000..1.000, default: 440.000)
-                    Delay2 wetness
-              Delay3 length (s)=<number> (0.000..2.000, default: 440.000)
-                    Delay3 length (s)
-              Delay3 feedback=<number> (0.000..1.000, default: 440.000)
-                    Delay3 feedback
-              Delay3 wetness=<number> (0.000..1.000, default: 440.000)
-                    Delay3 wetness
-              Band 1 gain (dB)=<number> (-70.000..20.000, default: 440.000)
-                    Band 1 gain (dB)
-              Band 2 gain (dB)=<number> (-70.000..20.000, default: 440.000)
-                    Band 2 gain (dB)
-              Band 3 gain (dB)=<number> (-70.000..20.000, default: 440.000)
-                    Band 3 gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_hpf
-              Cutoff Frequency (Hz)=<number> (0.000..0.500, default: 440.000)
-                    Cutoff Frequency (Hz)
-               Suboptions for fa_ladspa_pitchScaleHQ
-              Pitch co-efficient=<number> (0.500..2.000, default: 0.000)
-                    Pitch co-efficient
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_imp
-              Impulse ID=<number> (1..21, default: 0)
-                    Impulse ID
-              High latency mode=<number> (0..1, default: 0)
-                    High latency mode
-              Gain (dB)=<number> (-90.000..24.000, default: 0.000)
-                    Gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_inv
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_karaoke
-              Vocal volume (dB)=<number> (-70.000..0.000, default: 0.000)
-                    Vocal volume (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_lcrDelay
-              L delay (ms)=<number> (0.000..2700.000, default: 675.000)
-                    L delay (ms)
-              L level=<number> (0.000..50.000, default: 25.000)
-                    L level
-              C delay (ms)=<number> (0.000..2700.000, default: 675.000)
-                    C delay (ms)
-              C level=<number> (0.000..50.000, default: 25.000)
-                    C level
-              R delay (ms)=<number> (0.000..2700.000, default: 675.000)
-                    R delay (ms)
-              R level=<number> (0.000..50.000, default: 25.000)
-                    R level
-              Feedback=<number> (-100.000..100.000, default: 25.000)
-                    Feedback
-              High damp (%)=<number> (0.000..100.000, default: 50.000)
-                    High damp (%)
-              Low damp (%)=<number> (0.000..100.000, default: 50.000)
-                    Low damp (%)
-              Spread=<number> (0.000..50.000, default: 25.000)
-                    Spread
-              Dry/Wet level=<number> (0.000..1.000, default: 25.000)
-                    Dry/Wet level
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_lfoPhaser
-              LFO rate (Hz)=<number> (0.000..100.000, default: 25.000)
-                    LFO rate (Hz)
-              LFO depth=<number> (0.000..1.000, default: 0.250)
-                    LFO depth
-              Feedback=<number> (-1.000..1.000, default: 0.250)
-                    Feedback
-              Spread (octaves)=<number> (0.000..2.000, default: 1.000)
-                    Spread (octaves)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_lsFilter
-              Filter type (0=LP, 1=BP, 2=HP)=<number> (0..2, default: 0)
-                    Filter type (0=LP, 1=BP, 2=HP)
-              Cutoff frequency (Hz)=<number> (0.002..0.500, default: 0.032)
-                    Cutoff frequency (Hz)
-              Resonance=<number> (0.000..1.000, default: 0.032)
-                    Resonance
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_lofi
-              Crackling (%)=<number> (0..100, default: 0)
-                    Crackling (%)
-              Powersupply Overloading (%)=<number> (0.000..100.000, default: 0.000)
-                    Powersupply Overloading (%)
-              Opamp Bandwidth Limiting (Hz)=<number> (1.000..10000.000, default: 0.000)
-                    Opamp Bandwidth Limiting (Hz)
-               Suboptions for fa_ladspa_lpf
-              Cutoff Frequency (Hz)=<number> (0.000..0.500, default: 440.000)
-                    Cutoff Frequency (Hz)
-               Suboptions for fa_ladspa_notch_iir
-              Center Frequency (Hz)=<number> (0.000..0.450, default: 0.007)
-                    Center Frequency (Hz)
-              Bandwidth (Hz)=<number> (0.000..0.450, default: 0.007)
-                    Bandwidth (Hz)
-              Stages(2 poles per stage)=<number> (1..10, default: 0)
-                    Stages(2 poles per stage)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_matrixSpatialiser
-              Width=<number> (-512..512, default: 0)
-                    Width
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_matrixMSSt
-              Width=<number> (0.000..2.000, default: 0.000)
-                    Width
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_matrixStMS
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_mbeq
-              50Hz gain (low shelving)=<number> (-70.000..30.000, default: 0.000)
-                    50Hz gain (low shelving)
-              100Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    100Hz gain
-              156Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    156Hz gain
-              220Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    220Hz gain
-              311Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    311Hz gain
-              440Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    440Hz gain
-              622Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    622Hz gain
-              880Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    880Hz gain
-              1250Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    1250Hz gain
-              1750Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    1750Hz gain
-              2500Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    2500Hz gain
-              3500Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    3500Hz gain
-              5000Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    5000Hz gain
-              10000Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    10000Hz gain
-              20000Hz gain=<number> (-70.000..30.000, default: 0.000)
-                    20000Hz gain
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_multivoiceChorus
-              Number of voices=<number> (1..8, default: 0)
-                    Number of voices
-              Delay base (ms)=<number> (10.000..40.000, default: 10.000)
-                    Delay base (ms)
-              Voice separation (ms)=<number> (0.000..2.000, default: 0.500)
-                    Voice separation (ms)
-              Detune (%)=<number> (0.000..5.000, default: 0.500)
-                    Detune (%)
-              LFO frequency (Hz)=<number> (2.000..30.000, default: 9.000)
-                    LFO frequency (Hz)
-              Output attenuation (dB)=<number> (-20.000..0.000, default: 9.000)
-                    Output attenuation (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_pitchScale
-              Pitch co-efficient=<number> (0.500..2.000, default: 0.000)
-                    Pitch co-efficient
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_pointerCastDistortion
-              Effect cutoff freq (Hz)=<number> (0.000..0.300, default: 0.001)
-                    Effect cutoff freq (Hz)
-              Dry/wet mix=<number> (0.000..1.000, default: 0.001)
-                    Dry/wet mix
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_rateShifter
-              Rate=<number> (-4.000..4.000, default: 0.000)
-                    Rate
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_retroFlange
-              Average stall (ms)=<number> (0.000..10.000, default: 2.500)
-                    Average stall (ms)
-              Flange frequency (Hz)=<number> (0.500..8.000, default: 2.500)
-                    Flange frequency (Hz)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_revdelay
-              Delay Time (s)=<number> (0.000..5.000, default: 0.000)
-                    Delay Time (s)
-              Dry Level (dB)=<number> (-70.000..0.000, default: 0.000)
-                    Dry Level (dB)
-              Wet Level (dB)=<number> (-70.000..0.000, default: 0.000)
-                    Wet Level (dB)
-              Feedback=<number> (0.000..1.000, default: 0.000)
-                    Feedback
-              Crossfade samples=<number> (0..5000, default: 1250)
-                    Crossfade samples
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_ringmod_1i1o1l
-              Modulation depth (0=none, 1=AM, 2=RM)=<number> (0.000..2.000, default: 0.000)
-                    Modulation depth (0=none, 1=AM, 2=RM)
-              Frequency (Hz)=<number> (1.000..1000.000, default: 440.000)
-                    Frequency (Hz)
-              Sine level=<number> (-1.000..1.000, default: 440.000)
-                    Sine level
-              Triangle level=<number> (-1.000..1.000, default: 440.000)
-                    Triangle level
-              Sawtooth level=<number> (-1.000..1.000, default: 440.000)
-                    Sawtooth level
-              Square level=<number> (-1.000..1.000, default: 440.000)
-                    Square level
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_sc1
-              Attack time (ms)=<number> (2.000..400.000, default: 101.500)
-                    Attack time (ms)
-              Release time (ms)=<number> (2.000..800.000, default: 401.000)
-                    Release time (ms)
-              Threshold level (dB)=<number> (-30.000..0.000, default: 0.000)
-                    Threshold level (dB)
-              Ratio (1:n)=<number> (1.000..10.000, default: 0.000)
-                    Ratio (1:n)
-              Knee radius (dB)=<number> (1.000..10.000, default: 3.250)
-                    Knee radius (dB)
-              Makeup gain (dB)=<number> (0.000..24.000, default: 3.250)
-                    Makeup gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_sc4
-              RMS/peak=<number> (0.000..1.000, default: 0.000)
-                    RMS/peak
-              Attack time (ms)=<number> (1.500..400.000, default: 101.125)
-                    Attack time (ms)
-              Release time (ms)=<number> (2.000..800.000, default: 401.000)
-                    Release time (ms)
-              Threshold level (dB)=<number> (-30.000..0.000, default: 0.000)
-                    Threshold level (dB)
-              Ratio (1:n)=<number> (1.000..20.000, default: 0.000)
-                    Ratio (1:n)
-              Knee radius (dB)=<number> (1.000..10.000, default: 3.250)
-                    Knee radius (dB)
-              Makeup gain (dB)=<number> (0.000..24.000, default: 3.250)
-                    Makeup gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_sc4m
-              RMS/peak=<number> (0.000..1.000, default: 0.000)
-                    RMS/peak
-              Attack time (ms)=<number> (1.500..400.000, default: 101.125)
-                    Attack time (ms)
-              Release time (ms)=<number> (2.000..800.000, default: 401.000)
-                    Release time (ms)
-              Threshold level (dB)=<number> (-30.000..0.000, default: 0.000)
-                    Threshold level (dB)
-              Ratio (1:n)=<number> (1.000..20.000, default: 0.000)
-                    Ratio (1:n)
-              Knee radius (dB)=<number> (1.000..10.000, default: 3.250)
-                    Knee radius (dB)
-              Makeup gain (dB)=<number> (0.000..24.000, default: 3.250)
-                    Makeup gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_se4
-              RMS/peak=<number> (0.000..1.000, default: 0.000)
-                    RMS/peak
-              Attack time (ms)=<number> (1.500..400.000, default: 101.125)
-                    Attack time (ms)
-              Release time (ms)=<number> (2.000..800.000, default: 401.000)
-                    Release time (ms)
-              Threshold level (dB)=<number> (-30.000..0.000, default: 0.000)
-                    Threshold level (dB)
-              Ratio (1:n)=<number> (1.000..20.000, default: 0.000)
-                    Ratio (1:n)
-              Knee radius (dB)=<number> (1.000..10.000, default: 3.250)
-                    Knee radius (dB)
-              Attenuation (dB)=<number> (-24.000..0.000, default: 3.250)
-                    Attenuation (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_sifter
-              Sift size=<number> (1.000..1000.000, default: 0.000)
-                    Sift size
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_compress_peak
-              Threshold=<number> (default: 0.000)
-                    Threshold
-              Compression Ratio=<number> (default: 0.500)
-                    Compression Ratio
-              Output Envelope Attack (s)=<number> (default: 0.100)
-                    Output Envelope Attack (s)
-              Output Envelope Decay (s)=<number> (default: 0.100)
-                    Output Envelope Decay (s)
-               Suboptions for fa_ladspa_compress_rms
-              Threshold=<number> (default: 0.000)
-                    Threshold
-              Compression Ratio=<number> (default: 0.500)
-                    Compression Ratio
-              Output Envelope Attack (s)=<number> (default: 0.100)
-                    Output Envelope Attack (s)
-              Output Envelope Decay (s)=<number> (default: 0.100)
-                    Output Envelope Decay (s)
-               Suboptions for fa_ladspa_expand_peak
-              Threshold=<number> (default: 0.000)
-                    Threshold
-              Expansion Ratio=<number> (default: 0.500)
-                    Expansion Ratio
-              Output Envelope Attack (s)=<number> (default: 0.100)
-                    Output Envelope Attack (s)
-              Output Envelope Decay (s)=<number> (default: 0.100)
-                    Output Envelope Decay (s)
-               Suboptions for fa_ladspa_expand_rms
-              Threshold=<number> (default: 0.000)
-                    Threshold
-              Expansion Ratio=<number> (default: 0.500)
-                    Expansion Ratio
-              Output Envelope Attack (s)=<number> (default: 0.100)
-                    Output Envelope Attack (s)
-              Output Envelope Decay (s)=<number> (default: 0.100)
-                    Output Envelope Decay (s)
-               Suboptions for fa_ladspa_limit_peak
-              Threshold=<number> (default: 0.000)
-                    Threshold
-              Output Envelope Attack (s)=<number> (default: 0.100)
-                    Output Envelope Attack (s)
-              Output Envelope Decay (s)=<number> (default: 0.100)
-                    Output Envelope Decay (s)
-               Suboptions for fa_ladspa_limit_rms
-              Threshold=<number> (default: 0.000)
-                    Threshold
-              Output Envelope Attack (s)=<number> (default: 0.100)
-                    Output Envelope Attack (s)
-              Output Envelope Decay (s)=<number> (default: 0.100)
-                    Output Envelope Decay (s)
-               Suboptions for fa_ladspa_amp
-              Amps gain (dB)=<number> (-70.000..70.000, default: 0.000)
-                    Amps gain (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_delay_c
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_delay_l
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_delay_n
-              Max Delay (s)=<number> (default: 0.000)
-                    Max Delay (s)
-              Delay Time (s)=<number> (default: 0.000)
-                    Delay Time (s)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_sine_faac
-              Amplitude=<number> (default: 0.000)
-                    Amplitude
-               Suboptions for fa_ladspa_sine_fcaa
-              Frequency=<number> (0.000..0.500, default: 440.000)
-                    Frequency
-               Suboptions for fa_ladspa_singlePara
-              Gain (dB)=<number> (-70.000..30.000, default: 0.000)
-                    Gain (dB)
-              Frequency (Hz)=<number> (0.000..0.400, default: 440.000)
-                    Frequency (Hz)
-              Bandwidth (octaves)=<number> (0.000..4.000, default: 440.000)
-                    Bandwidth (octaves)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_sinusWavewrapper
-              Wrap degree=<number> (0.000..10.000, default: 0.000)
-                    Wrap degree
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_smoothDecimate
-              Resample rate=<number> (0.000..1.000, default: 1.000)
-                    Resample rate
-              Smoothing=<number> (0.000..1.000, default: 1.000)
-                    Smoothing
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_svf
-              Filter type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)=<number> (0..5, default: 0)
-                    Filter type (0=none, 1=LP, 2=HP, 3=BP, 4=BR, 5=AP)
-              Filter freq=<number> (0.000..6000.000, default: 440.000)
-                    Filter freq
-              Filter Q=<number> (0.000..1.000, default: 0.250)
-                    Filter Q
-              Filter resonance=<number> (0.000..1.000, default: 0.250)
-                    Filter resonance
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_autopan
-              Frequency [Hz]=<number> (0.000..20.000, default: 0.000)
-                    Frequency [Hz]
-              Depth [%]=<number> (0.000..100.000, default: 0.000)
-                    Depth [%]
-              Gain [dB]=<number> (-70.000..20.000, default: 0.000)
-                    Gain [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_chorusflanger
-              Frequency [Hz]=<number> (0.000..5.000, default: 1.250)
-                    Frequency [Hz]
-              L/R Phase Shift [deg]=<number> (0.000..180.000, default: 90.000)
-                    L/R Phase Shift [deg]
-              Depth [%]=<number> (0.000..100.000, default: 75.000)
-                    Depth [%]
-              Delay [ms]=<number> (0.000..100.000, default: 25.000)
-                    Delay [ms]
-              Contour [Hz]=<number> (20.000..20000.000, default: 100.000)
-                    Contour [Hz]
-              Dry Level [dB]=<number> (-90.000..20.000, default: 100.000)
-                    Dry Level [dB]
-              Wet Level [dB]=<number> (-90.000..20.000, default: 100.000)
-                    Wet Level [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_deesser
-              Threshold Level [dB]=<number> (-50.000..10.000, default: 0.000)
-                    Threshold Level [dB]
-              Frequency [Hz]=<number> (2000.000..16000.000, default: 5500.000)
-                    Frequency [Hz]
-              Sidechain Filter=<number> (0..1, default: 5500)
-                    Sidechain Filter
-              Monitor=<number> (0..1, default: 5500)
-                    Monitor
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_dynamics_m
-              Attack [ms]=<number> (4.000..500.000, default: 128.000)
-                    Attack [ms]
-              Release [ms]=<number> (4.000..1000.000, default: 502.000)
-                    Release [ms]
-              Offset Gain [dB]=<number> (-20.000..20.000, default: 502.000)
-                    Offset Gain [dB]
-              Makeup Gain [dB]=<number> (-20.000..20.000, default: 502.000)
-                    Makeup Gain [dB]
-              Function=<number> (0..14, default: 502)
-                    Function
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_dynamics_st
-              Attack [ms]=<number> (4.000..500.000, default: 128.000)
-                    Attack [ms]
-              Release [ms]=<number> (4.000..1000.000, default: 502.000)
-                    Release [ms]
-              Offset Gain [dB]=<number> (-20.000..20.000, default: 502.000)
-                    Offset Gain [dB]
-              Makeup Gain [dB]=<number> (-20.000..20.000, default: 502.000)
-                    Makeup Gain [dB]
-              Stereo Mode=<number> (0..2, default: 502)
-                    Stereo Mode
-              Function=<number> (0..14, default: 502)
-                    Function
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_equalizer
-              Band 1 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 1 Gain [dB]
-              Band 2 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 2 Gain [dB]
-              Band 3 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 3 Gain [dB]
-              Band 4 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 4 Gain [dB]
-              Band 5 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 5 Gain [dB]
-              Band 6 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 6 Gain [dB]
-              Band 7 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 7 Gain [dB]
-              Band 8 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 8 Gain [dB]
-              Band 1 Freq [Hz]=<number> (40.000..280.000, default: 100.000)
-                    Band 1 Freq [Hz]
-              Band 2 Freq [Hz]=<number> (100.000..500.000, default: 200.000)
-                    Band 2 Freq [Hz]
-              Band 3 Freq [Hz]=<number> (200.000..1000.000, default: 400.000)
-                    Band 3 Freq [Hz]
-              Band 4 Freq [Hz]=<number> (400.000..2800.000, default: 1000.000)
-                    Band 4 Freq [Hz]
-              Band 5 Freq [Hz]=<number> (1000.000..5000.000, default: 3000.000)
-                    Band 5 Freq [Hz]
-              Band 6 Freq [Hz]=<number> (3000.000..9000.000, default: 6000.000)
-                    Band 6 Freq [Hz]
-              Band 7 Freq [Hz]=<number> (6000.000..18000.000, default: 12000.000)
-                    Band 7 Freq [Hz]
-              Band 8 Freq [Hz]=<number> (10000.000..20000.000, default: 15000.000)
-                    Band 8 Freq [Hz]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_equalizer_bw
-              Band 1 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 1 Gain [dB]
-              Band 2 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 2 Gain [dB]
-              Band 3 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 3 Gain [dB]
-              Band 4 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 4 Gain [dB]
-              Band 5 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 5 Gain [dB]
-              Band 6 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 6 Gain [dB]
-              Band 7 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 7 Gain [dB]
-              Band 8 Gain [dB]=<number> (-50.000..20.000, default: 0.000)
-                    Band 8 Gain [dB]
-              Band 1 Freq [Hz]=<number> (40.000..280.000, default: 100.000)
-                    Band 1 Freq [Hz]
-              Band 2 Freq [Hz]=<number> (100.000..500.000, default: 200.000)
-                    Band 2 Freq [Hz]
-              Band 3 Freq [Hz]=<number> (200.000..1000.000, default: 400.000)
-                    Band 3 Freq [Hz]
-              Band 4 Freq [Hz]=<number> (400.000..2800.000, default: 1000.000)
-                    Band 4 Freq [Hz]
-              Band 5 Freq [Hz]=<number> (1000.000..5000.000, default: 3000.000)
-                    Band 5 Freq [Hz]
-              Band 6 Freq [Hz]=<number> (3000.000..9000.000, default: 6000.000)
-                    Band 6 Freq [Hz]
-              Band 7 Freq [Hz]=<number> (6000.000..18000.000, default: 12000.000)
-                    Band 7 Freq [Hz]
-              Band 8 Freq [Hz]=<number> (10000.000..20000.000, default: 15000.000)
-                    Band 8 Freq [Hz]
-              Band 1 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 1 Bandwidth [octaves]
-              Band 2 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 2 Bandwidth [octaves]
-              Band 3 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 3 Bandwidth [octaves]
-              Band 4 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 4 Bandwidth [octaves]
-              Band 5 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 5 Bandwidth [octaves]
-              Band 6 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 6 Bandwidth [octaves]
-              Band 7 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 7 Bandwidth [octaves]
-              Band 8 Bandwidth [octaves]=<number> (0.100..5.000, default: 15000.000)
-                    Band 8 Bandwidth [octaves]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_doubler
-              Time Tracking=<number> (0.000..1.000, default: 0.500)
-                    Time Tracking
-              Pitch Tracking=<number> (0.000..1.000, default: 0.500)
-                    Pitch Tracking
-              Dry Level [dB]=<number> (-90.000..20.000, default: 0.500)
-                    Dry Level [dB]
-              Dry Left Position=<number> (0.000..1.000, default: 0.000)
-                    Dry Left Position
-              Dry Right Position=<number> (0.000..1.000, default: 1.000)
-                    Dry Right Position
-              Wet Level [dB]=<number> (-90.000..20.000, default: 1.000)
-                    Wet Level [dB]
-              Wet Left Position=<number> (0.000..1.000, default: 0.000)
-                    Wet Left Position
-              Wet Right Position=<number> (0.000..1.000, default: 1.000)
-                    Wet Right Position
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_pinknoise
-              Fractal Dimension=<number> (0.000..1.000, default: 0.500)
-                    Fractal Dimension
-              Signal Level [dB]=<number> (-90.000..20.000, default: 0.500)
-                    Signal Level [dB]
-              Noise Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Noise Level [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_pitch
-              Semitone Shift=<number> (-12.000..12.000, default: 0.000)
-                    Semitone Shift
-              Rate Shift [%]=<number> (-50.000..100.000, default: 0.000)
-                    Rate Shift [%]
-              Dry Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Dry Level [dB]
-              Wet Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Wet Level [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_reflector
-              Fragment Length [ms]=<number> (20.000..1600.000, default: 415.000)
-                    Fragment Length [ms]
-              Dry Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Dry Level [dB]
-              Wet Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Wet Level [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_reverb
-              Decay [ms]=<number> (0.000..10000.000, default: 2500.000)
-                    Decay [ms]
-              Dry Level [dB]=<number> (-70.000..10.000, default: 2500.000)
-                    Dry Level [dB]
-              Wet Level [dB]=<number> (-70.000..10.000, default: 2500.000)
-                    Wet Level [dB]
-              Comb Filters=[1|0] (default: 1)
-                    Comb Filters
-              Allpass Filters=[1|0] (default: 1)
-                    Allpass Filters
-              Bandpass Filter=[1|0] (default: 1)
-                    Bandpass Filter
-              Enhanced Stereo=[1|0] (default: 1)
-                    Enhanced Stereo
-              Reverb Type=<number> (0..42, default: 2500)
-                    Reverb Type
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_rotspeak
-              Rotor Frequency [Hz]=<number> (0.000..30.000, default: 0.000)
-                    Rotor Frequency [Hz]
-              Horn Frequency [Hz]=<number> (0.000..30.000, default: 0.000)
-                    Horn Frequency [Hz]
-              Mic Distance [%]=<number> (0.000..100.000, default: 25.000)
-                    Mic Distance [%]
-              Rotor/Horn Mix=<number> (0.000..1.000, default: 0.500)
-                    Rotor/Horn Mix
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_limiter
-              Limit Level [dB]=<number> (-30.000..20.000, default: 0.000)
-                    Limit Level [dB]
-              Output Volume [dB]=<number> (-30.000..20.000, default: 0.000)
-                    Output Volume [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_sigmoid
-              Pre Gain [dB]=<number> (-90.000..20.000, default: 0.000)
-                    Pre Gain [dB]
-              Post Gain [dB]=<number> (-90.000..20.000, default: 0.000)
-                    Post Gain [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_stereo_echo
-              L Delay [ms]=<number> (0.000..2000.000, default: 100.000)
-                    L Delay [ms]
-              L Feedback [%]=<number> (0.000..100.000, default: 100.000)
-                    L Feedback [%]
-              R/Haas Delay [ms]=<number> (0.000..2000.000, default: 100.000)
-                    R/Haas Delay [ms]
-              R/Haas Feedback [%]=<number> (0.000..100.000, default: 100.000)
-                    R/Haas Feedback [%]
-              L Echo Level [dB]=<number> (-70.000..10.000, default: 100.000)
-                    L Echo Level [dB]
-              R Echo Level [dB]=<number> (-70.000..10.000, default: 100.000)
-                    R Echo Level [dB]
-              Dry Level [dB]=<number> (-70.000..10.000, default: 100.000)
-                    Dry Level [dB]
-              Cross Mode=[1|0] (default: 1)
-                    Cross Mode
-              Haas Effect=[1|0] (default: 1)
-                    Haas Effect
-              Swap Outputs=[1|0] (default: 1)
-                    Swap Outputs
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_tremolo
-              Frequency [Hz]=<number> (0.000..20.000, default: 0.000)
-                    Frequency [Hz]
-              Depth [%]=<number> (0.000..100.000, default: 0.000)
-                    Depth [%]
-              Gain [dB]=<number> (-70.000..20.000, default: 0.000)
-                    Gain [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_tubewarmth
-              Drive=<number> (0.100..10.000, default: 2.575)
-                    Drive
-              Tape-Tube Blend=<number> (-10.000..10.000, default: 10.000)
-                    Tape-Tube Blend
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tap_vibrato
-              Frequency [Hz]=<number> (0.000..30.000, default: 0.000)
-                    Frequency [Hz]
-              Depth [%]=<number> (0.000..20.000, default: 0.000)
-                    Depth [%]
-              Dry Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Dry Level [dB]
-              Wet Level [dB]=<number> (-90.000..20.000, default: -90.000)
-                    Wet Level [dB]
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_tapeDelay
-              Tape speed (inches/sec, 1=normal)=<number> (0.000..10.000, default: 0.000)
-                    Tape speed (inches/sec, 1=normal)
-              Dry level (dB)=<number> (-90.000..0.000, default: -90.000)
-                    Dry level (dB)
-              Tap 1 distance (inches)=<number> (0.000..4.000, default: -90.000)
-                    Tap 1 distance (inches)
-              Tap 1 level (dB)=<number> (-90.000..0.000, default: -90.000)
-                    Tap 1 level (dB)
-              Tap 2 distance (inches)=<number> (0.000..4.000, default: 1.000)
-                    Tap 2 distance (inches)
-              Tap 2 level (dB)=<number> (-90.000..0.000, default: -90.000)
-                    Tap 2 level (dB)
-              Tap 3 distance (inches)=<number> (0.000..4.000, default: 2.000)
-                    Tap 3 distance (inches)
-              Tap 3 level (dB)=<number> (-90.000..0.000, default: -90.000)
-                    Tap 3 level (dB)
-              Tap 4 distance (inches)=<number> (0.000..4.000, default: 3.000)
-                    Tap 4 distance (inches)
-              Tap 4 level (dB)=<number> (-90.000..0.000, default: -90.000)
-                    Tap 4 level (dB)
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_transient
-              Attack speed=<number> (-1.000..1.000, default: 0.000)
-                    Attack speed
-              Sustain time=<number> (-1.000..1.000, default: 0.000)
-                    Sustain time
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_triplePara
-              Low-shelving gain (dB)=<number> (-70.000..30.000, default: 0.000)
-                    Low-shelving gain (dB)
-              Low-shelving frequency (Hz)=<number> (0.000..0.490, default: 0.000)
-                    Low-shelving frequency (Hz)
-              Low-shelving slope=<number> (0.000..1.000, default: 0.500)
-                    Low-shelving slope
-              Band 1 gain (dB)=<number> (-70.000..30.000, default: 0.500)
-                    Band 1 gain (dB)
-              Band 1 frequency (Hz)=<number> (0.000..0.490, default: 0.001)
-                    Band 1 frequency (Hz)
-              Band 1 bandwidth (octaves)=<number> (0.000..4.000, default: 0.001)
-                    Band 1 bandwidth (octaves)
-              Band 2 gain (dB)=<number> (-70.000..30.000, default: 0.001)
-                    Band 2 gain (dB)
-              Band 2 frequency (Hz)=<number> (0.000..0.490, default: 0.007)
-                    Band 2 frequency (Hz)
-              Band 2 bandwidth (octaves)=<number> (0.000..4.000, default: 0.007)
-                    Band 2 bandwidth (octaves)
-              Band 3 gain (dB)=<number> (-70.000..30.000, default: 0.007)
-                    Band 3 gain (dB)
-              Band 3 frequency (Hz)=<number> (0.000..0.490, default: 0.059)
-                    Band 3 frequency (Hz)
-              Band 3 bandwidth (octaves)=<number> (0.000..4.000, default: 0.059)
-                    Band 3 bandwidth (octaves)
-              High-shelving gain (dB)=<number> (-70.000..30.000, default: 0.059)
-                    High-shelving gain (dB)
-              High-shelving frequency (Hz)=<number> (0.000..0.490, default: 0.490)
-                    High-shelving frequency (Hz)
-              High-shelving slope=<number> (0.000..1.000, default: 0.500)
-                    High-shelving slope
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_vcf303
-              Trigger=[1|0] (default: 0)
-                    Trigger
-              Cutoff=<number> (0.000..1.000, default: 0.000)
-                    Cutoff
-              Resonance=<number> (0.000..1.000, default: 0.000)
-                    Resonance
-              Envelope Modulation=<number> (0.000..1.000, default: 0.000)
-                    Envelope Modulation
-              Decay=<number> (0.000..1.000, default: 0.000)
-                    Decay
-               Suboptions for fa_ladspa_valveRect
-              Sag level=<number> (0.000..1.000, default: 0.000)
-                    Sag level
-              Distortion=<number> (0.000..1.000, default: 0.000)
-                    Distortion
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_valve
-              Distortion level=<number> (0.000..1.000, default: 0.000)
-                    Distortion level
-              Distortion character=<number> (0.000..1.000, default: 0.000)
-                    Distortion character
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_volume
-              volume=<number> (-90.00..20.00, default: 0.00)
-                    Volume
-               Suboptions for fa_ladspa_vynil
-              Year=<number> (1900.000..1990.000, default: 1990.000)
-                    Year
-              RPM=<number> (33.000..78.000, default: 33.000)
-                    RPM
-              Surface warping=<number> (0.000..1.000, default: 33.000)
-                    Surface warping
-              Crackle=<number> (0.000..1.000, default: 33.000)
-                    Crackle
-              Wear=<number> (0.000..1.000, default: 33.000)
-                    Wear
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_wshape_sine
-              Limiting Amplitude=<number> (default: 0.000)
-                    Limiting Amplitude
-               Suboptions for fa_ladspa_shaper
-              Waveshape=<number> (-10.000..10.000, default: 0.000)
-                    Waveshape
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-               Suboptions for fa_ladspa_zm1
-              $run_adding=[1|0] (default: 0)
-                    Add effect to input data
-              $run_adding_gain=<number> (-70.00..0.00, default: 0.00)
-                    Add gain (dB)
-                    Overall gain for this filter. This is only valid if
-                    you add the effect to the input data
-
-    -vf <video filter options>
-          Set video filter options
-         video_filters={option[{suboptions}][:option[{suboptions}]...]}
-               Supported options: fv_onedtv fv_agingtv fv_baltantv
-               fv_blur fv_brokentv fv_burningtv fv_chameleontv
-               fv_colorbalance fv_colstreaktv fv_cropscale fv_cycletv
-               fv_decimate fv_deinterlace fv_dicetv fv_difftv
-               fv_tcdisplay fv_displaywalltv fv_dottv fv_edgetv
-               fv_edgeblurtv fv_equalizer fv_firetv fv_flip
-               fv_framerate fv_pixelformat fv_interlace fv_invert
-               fv_lenstv fv_lifetv fv_matrixtv fv_mosaictv fv_halftv
-               fv_nervoustv fv_noisetv fv_oldcolor fv_optv fv_puptv
-               fv_quarktv fv_colormatrix_rgb fv_rdstv fv_revtv
-               fv_rippletv fv_rndmtv fv_shagadelictv fv_shift
-               fv_simuratv fv_slofasttv fv_sparktv fv_spiraltv
-               fv_streaktv fv_tlp fv_timedisttv fv_transform
-               fv_transformtv fv_tctweak fv_vertigotv fv_warholtv
-               fv_warptv fv_colormatrix_yuv fv_zoom bg_f0r_3 point
-               color balance bg_f0r_3dflippo bg_f0r_B bg_f0r_Baltan
-               bg_f0r_Brightness bg_f0r_Cartoon bg_f0r_Color Distance
-               bg_f0r_Contrast0r bg_f0r_Curves bg_f0r_Dealygrab
-               bg_f0r_Distort0r bg_f0r_Edgeglow bg_f0r_Equaliz0r
-               bg_f0r_Flippo bg_f0r_G bg_f0r_Gamma bg_f0r_Glow
-               bg_f0r_Hueshift0r bg_f0r_Invert0r bg_f0r_K-Means
-               Clustering bg_f0r_Lens Correction bg_f0r_LetterB0xed
-               bg_f0r_Levels bg_f0r_Luminance bg_f0r_Mask0Mate
-               bg_f0r_Nervous bg_f0r_Perspective bg_f0r_R
-               bg_f0r_RGB-Parade bg_f0r_Saturat0r bg_f0r_Scale0Tilt
-               bg_f0r_Sobel bg_f0r_Squareblur bg_f0r_TehRoxx0r
-               bg_f0r_Threshold0r bg_f0r_Tint0r bg_f0r_Transparency
-               bg_f0r_Twolay0r bg_f0r_Vectorscope bg_f0r_Vertigo
-               bg_f0r_Water bg_f0r_White Balance bg_f0r_bluescreen0r
-               bg_f0r_bw0r bg_f0r_delay0r bg_f0r_nosync0r
-               bg_f0r_pixeliz0r bg_f0r_primaries bg_f0r_scanline0r
-               bg_f0r_threelay0r
-
-               Video Filters
-               Suboptions for fv_blur
-              mode=<string>
-                    Supported strings: gauss triangular box
-                    Default: gauss
-                    Mode
-              radius_h=<number> (0.5..50.0, default: 0.5)
-                    Horizontal radius
-              radius_v=<number> (0.5..50.0, default: 0.5)
-                    Vertical radius
-              blur_chroma=[1|0] (default: 0)
-                    Blur chroma planes
-              correct_nonsquare=[1|0] (default: 0)
-                    Correct radii for nonsquare pixels
-               Suboptions for fv_burningtv
-              mode=<string>
-                    Supported strings: fg all
-                    Default: all
-                    Mode
-               Suboptions for fv_chameleontv
-              mode=<string>
-                    Supported strings: app disapp
-                    Default: disapp
-                    Mode
-               Suboptions for fv_colorbalance
-              r=<number> (0.00..2.00, default: 1.00)
-                    Red gain
-              g=<number> (0.00..2.00, default: 1.00)
-                    Green gain
-              b=<number> (0.00..2.00, default: 1.00)
-                    Blue gain
-              n=[1|0] (default: 0)
-                    Normalize
-                    Normalize for constant luminance.
-               Suboptions for fv_colstreaktv
-              blendnum=<number> (1..10, default: 4)
-                    Blend num
-               Suboptions for fv_cropscale
-              crl=<number> (0.000..100000.000, default: 0.000)
-                    Crop left
-                    Cut this many pixels from the left border of the
-                    source images.
-              crr=<number> (0.000..100000.000, default: 0.000)
-                    Crop right
-                    Cut this many pixels from the right border of the
-                    source images.
-              crt=<number> (0.000..100000.000, default: 0.000)
-                    Crop top
-                    Cut this many pixels from the top border of the
-                    source images.
-              crb=<number> (0.000..100000.000, default: 0.000)
-                    Crop bottom
-                    Cut this many pixels from the bottom border of the
-                    source images.
-              s=<string>
-                    Supported strings: from_input user_defined pal_d1
-                    pal_d1_wide pal_dv pal_dv_wide pal_cvd pal_vcd
-                    pal_svcd pal_svcd_wide ntsc_d1 ntsc_d1_wide ntsc_dv
-                    ntsc_dv_wide ntsc_cvd ntsc_vcd ntsc_svcd
-                    ntsc_svcd_wide 720 1080 vga qvga sqcif qcif cif
-                    4cif 16cif
-                    Default: from_input
-                    Image size
-                    Set the output image size. For a user defined size,
-                    you must specify the width and height as well as
-                    the pixel width and pixel height.
-              w=<number> (1..100000, default: 640)
-                    User defined width
-                    User defined width in pixels. Only meaningful if
-                    you selected "User defined" for the image size.
-              h=<number> (1..100000, default: 480)
-                    User defined height
-                    User defined height in pixels. Only meaningful if
-                    you selected "User defined" for the image size.
-              sw=<number> (1..100000, default: 1)
-                    User defined pixel width
-                    User defined pixel width. Only meaningful if you
-                    selected "User defined" for the image size.
-              sh=<number> (1..100000, default: 1)
-                    User defined pixel height
-                    User defined pixel height. Only meaningful if you
-                    selected "User defined" for the image size.
-              ka=[1|0] (default: 1)
-                    Maintain aspect ratio
-                    Let the aspect ratio appear the same as in the
-                    source, probably resulting in additional borders.
-              bc=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Border
-                    color
-                    Color of the image borders.
-              squeeze=<number> (-1.000..1.000, default: 0.000)
-                    Squeeze
-              zoom=<number> (20..180, default: 100)
-                    Zoom
-              sm=<string>
-                    Supported strings: auto nearest bilinear quadratic
-                    cubic_bspline cubic_mitchell cubic_catmull
-                    sinc_lanczos
-                    Default: auto
-                    Scale mode
-                    Choose scaling method. Auto means to choose based
-                    on the conversion quality. Nearest is fastest, Sinc
-                    with Lanczos window is slowest.
-              so=<number> (4..1000, default: 4)
-                    Scale order
-                    Order for sinc scaling
-              downscale_filter=<string>
-                    Supported strings: auto none wide gauss
-                    Default: auto
-                    Antialiasing for downscaling
-                    Specifies the antialiasing filter to be used when
-                    downscaling images.
-              downscale_blur=<number> (0.00..2.00, default: 1.00)
-                    Blur factor for downscaling
-                    Specifies how much blurring should be applied when
-                    downscaling. Smaller values can speed up scaling,
-                    but might result in strong aliasing.
-              chroma_output=<string>
-                    Supported strings: from_input 444 422 420mpeg1
-                    420mpeg2 420paldv 411
-                    Default: from_input
-                    Chroma output
-                    Set the output chroma format to that of the
-                    destination. This can save one chroma scaling
-                    operation at a later stage. It only works if the
-                    input pixelformat is otherwise compatible to the
-                    output.
-              deinterlace=<string>
-                    Supported strings: never auto always
-                    Default: never
-                    Deinterlace
-              ddm=<string>
-                    Supported strings: top bottom
-                    Default: top
-                    Drop mode
-                    Specifies which field the deinterlacer should drop.
-               Suboptions for fv_decimate
-              threshold_block=<number> (0.00..1.00, default: 0.00)
-                    Block threshold
-                    Specifies how much a block may differ from the last
-                    non-skipped block. 0 means identical blocks, 1
-                    means completely different blocks. Note that the
-                    meaning of "completely different" depends on the
-                    colorspace.
-              threshold_total=<number> (0.00..1.00, default: 0.00)
-                    Total threshold
-                    Specifies how much a frame may differ from the last
-                    non-skipped frame. 0 means identical frames,  1
-                    means completely different frames. Note that the
-                    meaning of "completely different" depends on the
-                    colorspace.
-              skip_max=<number> (1..500, default: 10)
-                    Maximum skipped frames
-                    Maximum number of consecutive skipped frames
-              do_log=[1|0] (default: 0)
-                    Report results
-                    Log reports about skipped frames
-               Suboptions for fv_deinterlace
-              method=<string>
-                    Supported strings: none copy scale_hw scale_sw
-                    blend yadif yadif_fast
-                    Default: none
-                    Method
-              force=[1|0] (default: 0)
-                    Force deinterlacing
-                    Always perform deinterlacing even if the source
-                    format pretends to be progressive
-              output_mode=<string>
-                    Supported strings: top bottom first second both
-                    Default: top
-                    Output mode
-                    Specify which field to output. Outputting both
-                    fields is not always supported.
-              sm=<string>
-                    Supported strings: auto nearest bilinear quadratic
-                    cubic_bspline cubic_mitchell cubic_catmull
-                    sinc_lanczos
-                    Default: auto
-                    Scale mode
-                    Choose scaling method. Auto means to choose based
-                    on the conversion quality. Nearest is fastest, Sinc
-                    with Lanczos window is slowest.
-              so=<number> (4..1000, default: 4)
-                    Scale order
-                    Order for sinc scaling
-               Suboptions for fv_dicetv
-              g_cube_bits=<number> (0..5, default: 4)
-                    Square Size
-               Suboptions for fv_difftv
-              tolerance=<number> (0..255, default: 10)
-                    Tolerance
-               Suboptions for fv_tcdisplay
-              interpolate=[1|0] (default: 1)
-                    Interpolate missing
-                    Interpolate missing timecodes
-              color=<r>,<g>,<b>,<a> (default: 1.000,1.000,1.000,1.000)
-                    <r>, <g>, <b> and <a> are in the range 0.0..1.0
-                    Text color
-              border_color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Border
-                    color
-              border_width=<number> (0.00..10.00, default: 2.00)
-                    Border width
-              font=<string> (Default: Courier-20)
-                    Font
-              justify_h=<string>
-                    Supported strings: center left right
-                    Default: right
-                    Horizontal justify
-              justify_v=<string>
-                    Supported strings: center top bottom
-                    Default: top
-                    Vertical justify
-              border_left=<number> (0..65535, default: 10)
-                    Left border
-                    Distance from the left text border to the image
-                    border
-              border_right=<number> (0..65535, default: 10)
-                    Right border
-                    Distance from the right text border to the image
-                    border
-              border_top=<number> (0..65535, default: 10)
-                    Top border
-                    Distance from the top text border to the image
-                    border
-              border_bottom=<number> (0..65535, default: 10)
-                    Bottom border
-                    Distance from the bottom text border to the image
-                    border
-               Suboptions for fv_displaywalltv
-              scale=<number> (1..9, default: 3)
-                    Scale
-              speedx=<number> (-100..100, default: 10)
-                    Horizontal scroll speed
-              speedy=<number> (-100..100, default: 10)
-                    Vertical scroll speed
-               Suboptions for fv_dottv
-              mode=<string>
-                    Supported strings: dots hearts
-                    Default: dots
-                    Mode
-               Suboptions for fv_edgeblurtv
-              color=<r>,<g>,<b> (default: 1.000,1.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Color
-               Suboptions for fv_equalizer
-              brightness=<number> (-10.0..10.0, default: 0.0)
-                    Brightness
-              contrast=<number> (-10.0..10.0, default: 0.0)
-                    Contrast
-              saturation=<number> (-10.0..10.0, default: 0.0)
-                    Saturation
-              hue=<number> (-180.0..180.0, default: 0.0)
-                    Hue
-               Suboptions for fv_firetv
-              mode=<string>
-                    Supported strings: fg light dark
-                    Default: all
-                    Mode
-               Suboptions for fv_flip
-              flip_h=[1|0] (default: 0)
-                    Flip horizontally
-              flip_v=[1|0] (default: 0)
-                    Flip vertically
-               Suboptions for fv_framerate
-              framerate=<string>
-                    Supported strings: from_source user_defined 23_976
-                    24 25 29_970 30 50 59_940 60
-                    Default: from_source
-                    Framerate
-                    Output framerate. For user defined framerate, enter
-                    the timescale and frame duration below (framerate =
-                    timescale / frame duration).
-              timescale=<number> (1..100000, default: 25)
-                    Timescale
-                    Timescale for user defined output framerate
-                    (Framerate = timescale / frame duration).
-              frame_duration=<number> (1..100000, default: 1)
-                    Frame duration
-                    Frame duration for user defined output framerate
-                    (Framerate = timescale / frame duration).
-               Suboptions for fv_pixelformat
-              pixelformat=<string>
-                    Supported strings: 8 bpp gray 16 bpp gray Float
-                    gray 16 bpp gray + alpha 32 bpp gray + alpha Float
-                    gray + alpha 15 bpp RGB 15 bpp BGR 16 bpp RGB 16
-                    bpp BGR 24 bpp RGB 24 bpp BGR 32 bpp RGB 32 bpp BGR
-                    32 bpp RGBA 48 bpp RGB 64 bpp RGBA Float RGB Float
-                    RGBA YUV 422 (YUY2) YUV 422 (UYVY) YUVA 4444 (8
-                    bit) YUVA 4444 (16 bit) YUVA 4444 (float) YUV 444
-                    (float) YUV 420 Planar YUV 410 Planar YUV 411
-                    Planar YUV 422 Planar YUV 422 Planar (16 bit) YUV
-                    444 Planar YUV 444 Planar (16 bit) YUVJ 420 Planar
-                    YUVJ 422 Planar YUVJ 444 Planar
-                    Default: YUV 420 Planar
-                    Pixelformat
-               Suboptions for fv_interlace
-              field_order=<string>
-                    Supported strings: top bottom
-                    Default: top
-                    Output field order
-               Suboptions for fv_invert
-              r=[1|0] (default: 1)
-                    Invert red
-              g=[1|0] (default: 1)
-                    Invert green
-              b=[1|0] (default: 1)
-                    Invert blue
-              a=[1|0] (default: 1)
-                    Invert alpha
-               Suboptions for fv_lenstv
-              x=<number> (0.00..1.00, default: 0.25)
-                    X
-              y=<number> (0.00..1.00, default: 0.25)
-                    Y
-              lens_width=<number> (0.00..1.00, default: 0.25)
-                    Diameter
-              lens_zoom=<number> (5..200, default: 30)
-                    Zoom
-               Suboptions for fv_matrixtv
-              mode=[1|0] (default: 0)
-                    Blend
-               Suboptions for fv_halftv
-              mode=<string>
-                    Supported strings: delay scratch nervous
-                    Default: delay
-                    Mode
-              direction=<string>
-                    Supported strings: left right top bottom
-                    Default: right
-                    Direction
-              mirror=<string>
-                    Supported strings: normal mirror copy
-                    Default: mirror
-                    Mirror
-              delay=<number> (0..31, default: 10)
-                    Delay
-               Suboptions for fv_nervoustv
-              mode=<string>
-                    Supported strings: random scratch
-                    Default: random
-                    Mode
-               Suboptions for fv_oldcolor
-              style=<string>
-                    Supported strings: bw tech1 tech2
-                    Default: tech1
-                    Style
-              strength=<number> (0.000..1.000, default: 1.000)
-                    Strength
-              r_gain=<number> (0.000..2.000, default: 1.000)
-                    Red gain
-              g_gain=<number> (0.000..2.000, default: 1.000)
-                    Green gain
-              b_gain=<number> (0.000..2.000, default: 1.000)
-                    Blue gain
-               Suboptions for fv_optv
-              mode=<string>
-                    Supported strings: maelstrom radiation perspective
-                    vertical
-                    Default: maelstrom
-                    Mode
-              speed=<number> (-64..64, default: 16)
-                    Speed
-               Suboptions for fv_puptv
-              mode=<string>
-                    Supported strings: horizontal vertical diagonal
-                    dissolution random raster
-                    Default: horizontal
-                    Mode
-              strength=<number> (0.00..1.00, default: 0.20)
-                    Strength
-               Suboptions for fv_colormatrix_rgb
-              r_to_r=<number> (-2.000..2.000, default: 1.000)
-                    Red -> Red
-              g_to_r=<number> (-2.000..2.000, default: 0.000)
-                    Green -> Red
-              b_to_r=<number> (-2.000..2.000, default: 0.000)
-                    Blue -> Red
-              a_to_r=<number> (-2.000..2.000, default: 0.000)
-                    Alpha -> Red
-              off_r=<number> (-2.000..2.000, default: 0.000)
-                    Red offset
-              r_to_g=<number> (-2.000..2.000, default: 0.000)
-                    Red -> Green
-              g_to_g=<number> (-2.000..2.000, default: 1.000)
-                    Green -> Green
-              b_to_g=<number> (-2.000..2.000, default: 0.000)
-                    Blue -> Green
-              a_to_g=<number> (-2.000..2.000, default: 0.000)
-                    Alpha -> Green
-              off_g=<number> (-2.000..2.000, default: 0.000)
-                    Green offset
-              r_to_b=<number> (-2.000..2.000, default: 0.000)
-                    Red -> Blue
-              g_to_b=<number> (-2.000..2.000, default: 0.000)
-                    Green -> Blue
-              b_to_b=<number> (-2.000..2.000, default: 1.000)
-                    Blue -> Blue
-              a_to_b=<number> (-2.000..2.000, default: 0.000)
-                    Alpha -> Blue
-              off_b=<number> (-2.000..2.000, default: 0.000)
-                    Blue offset
-              r_to_a=<number> (-2.000..2.000, default: 0.000)
-                    Red -> Alpha
-              g_to_a=<number> (-2.000..2.000, default: 0.000)
-                    Green -> Alpha
-              b_to_a=<number> (-2.000..2.000, default: 0.000)
-                    Blue -> Alpha
-              a_to_a=<number> (-2.000..2.000, default: 1.000)
-                    Alpha -> Alpha
-              off_a=<number> (-2.000..2.000, default: 0.000)
-                    Alpha offset
-              force_alpha=[1|0] (default: 0)
-                    Force alpha
-                    Create video with alpha channel even if the input
-                    format has no alpha channel. Use this to generate
-                    the alpha channel from other channels using the
-                    colormatrix.
-               Suboptions for fv_rdstv
-              method=<string>
-                    Supported strings: wall cross
-                    Default: wall
-                    Method
-               Suboptions for fv_revtv
-              fg_color=<r>,<g>,<b> (default: 1.000,1.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Line
-                    color
-              bg_color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0
-                    Background
-              spacing=<number> (0.000..1.000, default: 0.100)
-                    Spacing
-              amplitude=<number> (0.00..1.00, default: 0.10)
-                    Amplitude
-              vgrabtime=<number> (1..10, default: 1)
-                    Grab interval
-               Suboptions for fv_rippletv
-              mode=<string>
-                    Supported strings: motion rain
-                    Default: motion
-                    Mode
-              loopnum=<number> (1..5, default: 2)
-                    Speed
-              strength=<number> (1..10, default: 8)
-                    Strength
-              decay_cfg=<number> (1..15, default: 8)
-                    Decay
-               Suboptions for fv_rndmtv
-              rmode=[1|0] (default: 1)
-                    Color
-               Suboptions for fv_shagadelictv
-              mask_r=[1|0] (default: 1)
-                    Red mask
-              mask_g=[1|0] (default: 1)
-                    Green mask
-              mask_b=[1|0] (default: 1)
-                    Blue mask
-               Suboptions for fv_shift
-              shift=<number> (0..8, default: 0)
-                    Bits to shift
-               Suboptions for fv_simuratv
-              color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Color
-              mirror_mode=<string>
-                    Supported strings: no l r d dl dr u ul ur
-                    Default: no
-                    Mirror mode
-               Suboptions for fv_sparktv
-              mode=<string>
-                    Supported strings: fg light dark
-                    Default: all
-                    Mode
-               Suboptions for fv_spiraltv
-              mode=<string>
-                    Supported strings: Concentric A Sawtooth Up
-                    Sawtooth Down Triangle Sinusoidal Concentric B Lens
-                    Flat
-                    Default: Concentric A
-                    Mode
-              g_focus_interval=<number> (0..60, default: 6)
-                    Focus interval
-              center_x=<number> (0.000..1.000, default: 0.500)
-                    Center x
-              center_y=<number> (0.000..1.000, default: 0.500)
-                    Center y
-              g_depth_shift=<number> (0..5, default: 0)
-                    Depth shift
-               Suboptions for fv_tlp
-              factor=<number> (0.00..1.00, default: 0.50)
-                    Strength
-                    0 means no effect, 1 means maximum (= still image)
-              quality=<number> (1..5, default: 2)
-                    Quality
-               Suboptions for fv_transform
-              tm=<string>
-                    Supported strings: rotate affine perspective
-                    lens_effect whirl
-                    Default: rotate
-                    Transformation mode
-                    Choose Transformation method. Each method can be
-                    configured in it's section.
-              im=<string>
-                    Supported strings: auto nearest bilinear quadratic
-                    cubic_bspline
-                    Default: auto
-                    Interpolation mode
-                    Choose interpolation method. Auto means to choose
-                    based on the conversion quality. Nearest is
-                    fastest, Bicubic is slowest.
-              bg_color=<r>,<g>,<b>,<a> (default: 0.000,0.000,0.000,1.000)
-                    <r>, <g>, <b> and <a> are in the range 0.0..1.0
-                    Background color
-              rotate_angle=<number> (-360.00..360.00, default: 0.00)
-                    Angle
-              affine_xx=<number> (-2.000..2.000, default: 1.000)
-                    X -> X
-              affine_xy=<number> (-2.000..2.000, default: 0.000)
-                    X -> Y
-              affine_yx=<number> (-2.000..2.000, default: 0.000)
-                    Y -> X
-              affine_yy=<number> (-2.000..2.000, default: 1.000)
-                    Y -> Y
-              affine_ox=<number> (-1.000..1.000, default: 0.000)
-                    X Offset
-                    Normalized X offset. 1 corresponds to image with.
-              affine_oy=<number> (-1.000..1.000, default: 0.000)
-                    Y Offset
-                    Normalized Y offset. 1 corresponds to image height.
-              perspective_tl=<x>,<y> (default: 0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Top left
-                    Top left corner in normalized image coordinates
-              perspective_tr=<x>,<y> (default: 1.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Top right
-                    Top right corner in normalized image coordinates
-              perspective_bl=<x>,<y> (default: 0.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Bottom
-                    left
-                    Bottom left corner in normalized image coordinates
-              perspective_br=<x>,<y> (default: 1.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Bottom
-                    right
-                    Bottom right corner in normalized image coordinates
-              lens_effect_pos=<x>,<y> (default: 0.500,0.500)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Position
-                    Center of the lens
-              lens_effect_diameter=<number> (0.00..1.00, default: 0.25)
-                    Diameter
-                    Diamater of the lens (1 is image size)
-              lens_effect_zoom=<number> (5.00..200.00, default: 20.00)
-                    Zoom
-                    Zoom factor
-              whirl_center=<x>,<y> (default: 0.500,0.500)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Center
-              whirl_radius=<number> (0.00..1.00, default: 0.50)
-                    Radius
-              whirl_pinch=<number> (0.00..1.00, default: 0.50)
-                    Pinch
-              whirl_angle=<number> (0.00..360.00, default: 30.00)
-                    Angle
-               Suboptions for fv_transformtv
-              transform=<number> (0..5, default: 0)
-                    Transformation
-               Suboptions for fv_tctweak
-              mode=<string>
-                    Supported strings: off interpolate remove_redundant
-                    remove_all add add_first
-                    Default: off
-                    Mode
-              int_framerate=<number> (1..999, default: 25)
-                    Integer framerate
-                    Set the integer framerate used when adding new
-                    timecodes
-              drop=[1|0] (default: 0)
-                    Drop frame
-                    Set the if drop frame is used when adding new
-                    timecodes
-              hours=<number> (0..23, default: 0)
-                    Start hour
-                    Set the start hours used when adding new timecodes
-              minutes=<number> (0..59, default: 0)
-                    Start minute
-                    Set the start minutes used when adding new timecodes
-              seconds=<number> (0..59, default: 0)
-                    Start second
-                    Set the start seconds used when adding new timecodes
-              frames=<number> (0..999, default: 0)
-                    Start frames
-                    Set the start frames used when adding new timecodes
-               Suboptions for fv_vertigotv
-              phase_increment=<number> (0.01..1.00, default: 0.02)
-                    Phase increment
-              zoomrate=<number> (1.01..1.10, default: 1.01)
-                    Zoom rate
-               Suboptions for fv_colormatrix_yuv
-              y_to_y=<number> (-2.000..2.000, default: 1.000)
-                    Luminance -> Luminance
-              u_to_y=<number> (-2.000..2.000, default: 0.000)
-                    Cb -> Luminance
-              v_to_y=<number> (-2.000..2.000, default: 0.000)
-                    Cr -> Luminance
-              a_to_y=<number> (-2.000..2.000, default: 0.000)
-                    Alpha -> Luminance
-              off_y=<number> (-2.000..2.000, default: 0.000)
-                    Luminance offset
-              r_to_u=<number> (-2.000..2.000, default: 0.000)
-                    Luminance -> Cb
-              u_to_u=<number> (-2.000..2.000, default: 1.000)
-                    Cb -> Cb
-              b_to_u=<number> (-2.000..2.000, default: 0.000)
-                    Cr -> Cb
-              a_to_u=<number> (-2.000..2.000, default: 0.000)
-                    Alpha -> Cb
-              off_u=<number> (-2.000..2.000, default: 0.000)
-                    Cb offset
-              y_to_v=<number> (-2.000..2.000, default: 0.000)
-                    Luminance -> Cr
-              u_to_v=<number> (-2.000..2.000, default: 0.000)
-                    Cb -> Cr
-              v_to_v=<number> (-2.000..2.000, default: 1.000)
-                    Cr -> Cr
-              a_to_v=<number> (-2.000..2.000, default: 0.000)
-                    Alpha -> Cr
-              off_v=<number> (-2.000..2.000, default: 0.000)
-                    Cr offset
-              y_to_a=<number> (-2.000..2.000, default: 0.000)
-                    Luminance -> Alpha
-              u_to_a=<number> (-2.000..2.000, default: 0.000)
-                    Cb -> Alpha
-              v_to_a=<number> (-2.000..2.000, default: 0.000)
-                    Cr -> Alpha
-              a_to_a=<number> (-2.000..2.000, default: 1.000)
-                    Alpha -> Alpha
-              off_a=<number> (-2.000..2.000, default: 0.000)
-                    Alpha offset
-              force_alpha=[1|0] (default: 0)
-                    Force alpha
-                    Create video with alpha channel even if the input
-                    format has no alpha channel. Use this to generate
-                    the alpha channel from other channels using the
-                    colormatrix.
-               Suboptions for fv_zoom
-              zoom_h=<number> (0.50..2.00, default: 1.00)
-                    Zoom horizontally
-              zoom_v=<number> (0.50..2.00, default: 1.00)
-                    Zoom vertically
-              sm=<string>
-                    Supported strings: auto nearest bilinear quadratic
-                    cubic_bspline cubic_mitchell cubic_catmull
-                    sinc_lanczos
-                    Default: auto
-                    Scale mode
-                    Choose scaling method. Auto means to choose based
-                    on the conversion quality. Nearest is fastest, Sinc
-                    with Lanczos window is slowest.
-              so=<number> (4..1000, default: 4)
-                    Scale order
-                    Order for sinc scaling
-              downscale_filter=<string>
-                    Supported strings: auto none wide gauss
-                    Default: auto
-                    Antialiasing for downscaling
-                    Specifies the antialiasing filter to be used when
-                    downscaling images.
-              downscale_blur=<number> (0.00..2.00, default: 1.00)
-                    Blur factor for downscaling
-                    Specifies how much blurring should be applied when
-                    downscaling. Smaller values can speed up scaling,
-                    but might result in strong aliasing.
-              quality=<number> (1..5, default: 2)
-                    Quality
-              bg_color=<r>,<g>,<b>,<a> (default: 0.000,0.000,0.000,1.000)
-                    <r>, <g>, <b> and <a> are in the range 0.0..1.0
-                    Background color
-               Suboptions for bg_f0r_3 point color balance
-              Black color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Black
-                    color
-                    Black color
-              Gray color=<r>,<g>,<b> (default: 0.500,0.500,0.500)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Gray
-                    color
-                    Gray color
-              White color=<r>,<g>,<b> (default: 1.000,1.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 White
-                    color
-                    White color
-              Split preview=[1|0] (default: 1)
-                    Split preview
-                    Split privew
-              Source image on left side=[1|0] (default: 1)
-                    Source image on left side
-                    Source image on left side
-               Suboptions for bg_f0r_3dflippo
-              X axis rotation=<number> (0.0000..1.0000, default: 0.5000)
-                    X axis rotation
-                    Rotation on the X axis
-              Y axis rotation=<number> (0.0000..1.0000, default: 0.5000)
-                    Y axis rotation
-                    Rotation on the Y axis
-              Z axis rotation=<number> (0.0000..1.0000, default: 0.5000)
-                    Z axis rotation
-                    Rotation on the Z axis
-              X axis rotation rate=<number> (0.0000..1.0000, default: 0.5000)
-                    X axis rotation rate
-                    Rotation rate on the X axis
-              Y axis rotation rate=<number> (0.0000..1.0000, default: 0.5000)
-                    Y axis rotation rate
-                    Rotation rate on the Y axis
-              Z axis rotation rate=<number> (0.0000..1.0000, default: 0.5000)
-                    Z axis rotation rate
-                    Rotation rate on the Z axis
-              Center position (X)=<number> (0.0000..1.0000, default: 0.0000)
-                    Center position (X)
-                    Position of the center of rotation on the X axis
-              Center position (Y)=<number> (0.0000..1.0000, default: 0.0000)
-                    Center position (Y)
-                    Position of the center of rotation on the Y axis
-              Invert rotation assignment=[1|0] (default: 0)
-                    Invert rotation assignment
-                    If true, when mapping rotation, make inverted
-                    (wrong) assignment
-              Don't blank mask=[1|0] (default: 0)
-                    Don't blank mask
-                    Mask for frame transposition is not blanked, so a
-                    trace of old transpositions is maintained
-              Fill with image or black=[1|0] (default: 0)
-                    Fill with image or black
-                    If true, pixels that are not transposed are black,
-                    otherwise, they are copied with the original
-               Suboptions for bg_f0r_Brightness
-              Brightness=<number> (0.0000..1.0000, default: 0.5000)
-                    Brightness
-                    The brightness value
-               Suboptions for bg_f0r_Cartoon
-              triplevel=<number> (0.0000..1.0000, default: 1000.0000)
-                    triplevel
-                    level of trip: use high numbers, incremented by 100
-              diffspace=<number> (0.0000..1.0000, default: 1.0000)
-                    diffspace
-                    difference space: a value from 0 to 256
-               Suboptions for bg_f0r_Color Distance
-              Color=<r>,<g>,<b> (default: 0.500,0.500,0.500)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Color
-                    The Source Color
-               Suboptions for bg_f0r_Contrast0r
-              Contrast=<number> (0.0000..1.0000, default: 0.5000)
-                    Contrast
-                    The contrast value
-               Suboptions for bg_f0r_Curves
-              Channel=<number> (0.0000..1.0000, default: 0.0000)
-                    Channel
-                    Channel to adjust levels (1 = RED; 2 = GREEN; 3 =
-                    BLUE; 4 = LUMA)
-              Show curves=[1|0] (default: 1)
-                    Show curves
-                    Draw curve graph on output image
-              Graph position=<number> (0.0000..1.0000, default: 3.0000)
-                    Graph position
-                    Output image corner where curve graph will be drawn
-                    (1 = TOP,LEFT; 2 = TOP,RIGHT; 3 = BOTTOM,LEFT; 4 =
-                    BOTTOM, RIGHT)
-              Curve point number=<number> (0.0000..1.0000, default: 2.0000)
-                    Curve point number
-                    Number of point to use to build curve
-              Point 1 input value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 1 input value
-                    Point 1 input value
-              Point 1 output value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 1 output value
-                    Point 1 output value
-              Point 2 input value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 2 input value
-                    Point 2 input value
-              Point 2 output value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 2 output value
-                    Point 2 output value
-              Point 3 input value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 3 input value
-                    Point 3 input value
-              Point 3 output value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 3 output value
-                    Point 3 output value
-              Point 4 input value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 4 input value
-                    Point 4 input value
-              Point 4 output value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 4 output value
-                    Point 4 output value
-              Point 5 input value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 5 input value
-                    Point 5 input value
-              Point 5 output value=<number> (0.0000..1.0000, default: 1.0000)
-                    Point 5 output value
-                    Point 5 output value
-               Suboptions for bg_f0r_Distort0r
-              Amplitude=<number> (0.0000..1.0000, default: 1.0000)
-                    Amplitude
-                    The amplitude of the plasma signal
-              Frequency=<number> (0.0000..1.0000, default: 0.0050)
-                    Frequency
-                    The frequency of the plasma signal
-               Suboptions for bg_f0r_Edgeglow
-              lthresh=<number> (0.0000..1.0000, default: 0.0000)
-                    lthresh
-                    threshold for edge lightening
-              lupscale=<number> (0.0000..1.0000, default: 0.0000)
-                    lupscale
-                    multiplier for upscaling edge brightness
-              lredscale=<number> (0.0000..1.0000, default: 0.0000)
-                    lredscale
-                    multiplier for downscaling non-edge brightness
-               Suboptions for bg_f0r_Flippo
-              X axis=[1|0] (default: 0)
-                    X axis
-                    Flipping on the horizontal axis
-              Y axis=[1|0] (default: 0)
-                    Y axis
-                    Flipping on the vertical axis
-               Suboptions for bg_f0r_Gamma
-              Gamma=<number> (0.0000..1.0000, default: 1.0000)
-                    Gamma
-                    The gamma value
-               Suboptions for bg_f0r_Glow
-              Blur=<number> (0.0000..1.0000, default: 0.0000)
-                    Blur
-                    Blur of the glow
-               Suboptions for bg_f0r_Hueshift0r
-              Hue=<number> (0.0000..1.0000, default: 0.0000)
-                    Hue
-                    The shift value
-               Suboptions for bg_f0r_K-Means Clustering
-              Num=<number> (0.0000..1.0000, default: 0.5000)
-                    Num
-                    The number of clusters
-              Dist weight=<number> (0.0000..1.0000, default: 0.5000)
-                    Dist weight
-                    The weight on distance
-               Suboptions for bg_f0r_Lens Correction
-              xcenter=<number> (0.0000..1.0000, default: 0.5000)
-                    xcenter
-              ycenter=<number> (0.0000..1.0000, default: 0.5000)
-                    ycenter
-              correctionnearcenter=<number> (0.0000..1.0000, default: 0.5000)
-                    correctionnearcenter
-              correctionnearedges=<number> (0.0000..1.0000, default: 0.5000)
-                    correctionnearedges
-              brightness=<number> (0.0000..1.0000, default: 0.5000)
-                    brightness
-               Suboptions for bg_f0r_LetterB0xed
-              Border Width=<number> (0.0000..1.0000, default: 0.4000)
-                    Border Width
-              Transparency=[1|0] (default: 0)
-                    Transparency
-               Suboptions for bg_f0r_Levels
-              Channel=<number> (0.0000..1.0000, default: 0.0000)
-                    Channel
-                    Channel to adjust levels
-              Input black level=<number> (0.0000..1.0000, default: 0.0000)
-                    Input black level
-                    Input black level
-              Input white level=<number> (0.0000..1.0000, default: 1.0000)
-                    Input white level
-                    Input white level
-              Gamma=<number> (0.0000..1.0000, default: 0.2500)
-                    Gamma
-                    Gamma
-              Black output=<number> (0.0000..1.0000, default: 0.0000)
-                    Black output
-                    Black output
-              White output=<number> (0.0000..1.0000, default: 1.0000)
-                    White output
-                    White output
-              Show histogram=[1|0] (default: 1)
-                    Show histogram
-                    Show histogram
-              Histogram position=<number> (0.0000..1.0000, default: 3.0000)
-                    Histogram position
-                    Histogram position
-               Suboptions for bg_f0r_Mask0Mate
-              Left=<number> (0.0000..1.0000, default: 0.2000)
-                    Left
-              Right=<number> (0.0000..1.0000, default: 0.2000)
-                    Right
-              Top=<number> (0.0000..1.0000, default: 0.2000)
-                    Top
-              Bottom=<number> (0.0000..1.0000, default: 0.2000)
-                    Bottom
-              Invert=[1|0] (default: 0)
-                    Invert
-                    Invert the mask, creates a hole in the frame.
-              Blur=<number> (0.0000..1.0000, default: 0.0000)
-                    Blur
-                    Blur the outline of the mask
-               Suboptions for bg_f0r_Perspective
-              Top Left=<x>,<y> (default: 0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Top Left
-              Top Right=<x>,<y> (default: 1.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Top Right
-              Bottom Left=<x>,<y> (default: 0.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Bottom
-                    Left
-              Bottom Right=<x>,<y> (default: 1.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Bottom
-                    Right
-               Suboptions for bg_f0r_Saturat0r
-              Saturation=<number> (0.0000..1.0000, default: 0.0000)
-                    Saturation
-                    The saturation value
-               Suboptions for bg_f0r_Scale0Tilt
-              Clip left=<number> (0.0000..1.0000, default: 0.0000)
-                    Clip left
-              Clip right=<number> (0.0000..1.0000, default: 0.0000)
-                    Clip right
-              Clip top=<number> (0.0000..1.0000, default: 0.0000)
-                    Clip top
-              Clip bottom=<number> (0.0000..1.0000, default: 0.0000)
-                    Clip bottom
-              Scale X=<number> (0.0000..1.0000, default: 0.5000)
-                    Scale X
-              Scale Y=<number> (0.0000..1.0000, default: 0.5000)
-                    Scale Y
-              Tilt X=<number> (0.0000..1.0000, default: 0.5000)
-                    Tilt X
-              Tilt Y=<number> (0.0000..1.0000, default: 0.5000)
-                    Tilt Y
-               Suboptions for bg_f0r_Squareblur
-              Kernel size=<number> (0.0000..1.0000, default: 0.0000)
-                    Kernel size
-                    The size of the kernel, as a proportion to its
-                    coverage of the image
-               Suboptions for bg_f0r_TehRoxx0r
-              Interval=<number> (0.0000..1.0000, default: 0.0100)
-                    Interval
-                    Changing speed of small blocks
-               Suboptions for bg_f0r_Threshold0r
-              Threshold=<number> (0.0000..1.0000, default: 0.0000)
-                    Threshold
-                    The threshold
-               Suboptions for bg_f0r_Tint0r
-              Map black to=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Map
-                    black to
-                    The color to map source color with null luminance
-              Map white to=<r>,<g>,<b> (default: 0.500,1.000,0.500)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Map
-                    white to
-                    The color to map source color with full luminance
-              Tint amount=<number> (0.0000..1.0000, default: 0.2500)
-                    Tint amount
-                    Amount of color
-               Suboptions for bg_f0r_Transparency
-              Transparency=<number> (0.0000..1.0000, default: 0.0000)
-                    Transparency
-                    The transparency value
-               Suboptions for bg_f0r_Vertigo
-              Mode=<number> (0.0000..1.0000, default: 3.0000)
-                    Mode
-                    The effect mode
-              PhaseIncrement=<number> (0.0000..1.0000, default: 0.0200)
-                    PhaseIncrement
-                    Phase increment
-              Zoomrate=<number> (0.0000..1.0000, default: 1.0100)
-                    Zoomrate
-                    Zoomrate
-               Suboptions for bg_f0r_Water
-              physics=<number> (0.0000..1.0000, default: 0.0000)
-                    physics
-                    water density: from 1 to 4
-              rain=[1|0] (default: 0)
-                    rain
-                    rain drops all over
-              distort=[1|0] (default: 0)
-                    distort
-                    distort all surface like dropping a bucket to the
-                    floor
-              smooth=[1|0] (default: 0)
-                    smooth
-                    smooth up all perturbations on the surface
-              surfer=[1|0] (default: 0)
-                    surfer
-                    surf the surface with a wandering finger
-              swirl=[1|0] (default: 0)
-                    swirl
-                    swirling whirpool in the center
-              randomize_swirl=[1|0] (default: 0)
-                    randomize_swirl
-                    randomize the swirling angle
-               Suboptions for bg_f0r_White Balance
-              Neutral Color=<r>,<g>,<b> (default: 1.000,1.000,1.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Neutral
-                    Color
-                    Choose a color from the source image that should be
-                    white.
-              Green Tint=<number> (0.0000..1.0000, default: 1.2000)
-                    Green Tint
-                    Adjust the level of green.
-               Suboptions for bg_f0r_bluescreen0r
-              Color=<r>,<g>,<b> (default: 0.000,240.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0 Color
-                    The color to make transparent (B G R)
-              Distance=<number> (0.0000..1.0000, default: 127.0000)
-                    Distance
-                    Distance to Color (127 is good)
-               Suboptions for bg_f0r_delay0r
-              DelayTime=<number> (0.0000..1.0000, default: 0.0000)
-                    DelayTime
-                    the delay time
-               Suboptions for bg_f0r_nosync0r
-              HSync=<number> (0.0000..1.0000, default: 0.0000)
-                    HSync
-                    the hsync offset
-               Suboptions for bg_f0r_pixeliz0r
-              BlockSizeX=<number> (0.0000..1.0000, default: 0.4375)
-                    BlockSizeX
-                    Horizontal size of one "pixel"
-              BlockSizeY=<number> (0.0000..1.0000, default: 0.4375)
-                    BlockSizeY
-                    Vertical size of one "pixel"
-               Suboptions for bg_f0r_primaries
-              Factor=<number> (0.0000..1.0000, default: 1.0000)
-                    Factor
-                    influence of mean px value. > 32 = 0
-
-    -vm <video monitor options>
-          Set video monitor options
-         do_monitor=[1|0] (default: 1)
-               Enable monitor
-         plugin=option[{suboptions}]
-               Supported options: ov_x11
-               Default: ov_x11
-               Plugin
-               Suboptions for plugin=ov_x11
-              auto_resize=[1|0] (default: 1)
-                    Auto resize window
-              disable_xscreensaver_normal=[1|0] (default: 0)
-                    Disable Screensaver for normal playback
-              disable_xscreensaver_fullscreen=[1|0] (default: 1)
-                    Disable Screensaver for fullscreen playback
-              force_hw_scale=[1|0] (default: 1)
-                    Force hardware scaling
-                    Use hardware scaling even if it involves more CPU
-                    intensive pixelformat conversions
-              background_color=<r>,<g>,<b> (default: 0.000,0.000,0.000)
-                    <r>, <g> and <b> are in the range 0.0..1.0
-                    Background color
-                    Specify the background color for videos with alpha
-                    channel. This is only used by the OpenGL driver.
-              scale_mode=<string>
-                    Supported strings: auto nearest bilinear quadratic
-                    cubic_bspline cubic_mitchell cubic_catmull
-                    sinc_lanczos
-                    Default: auto
-                    Scale mode
-                    Choose scaling method. Auto means to choose based
-                    on the conversion quality. Nearest is fastest, Sinc
-                    with Lanczos window is slowest.
-              scale_order=<number> (4..1000, default: 4)
-                    Scale order
-                    Order for sinc scaling
-              scale_quality=<number> (1..5, default: 2)
-                    Scale quality
-                    Scale quality
-
-    -m <metadata_options>
-          Set metadata options
-         metadata_mode=<string>
-               Supported strings: static input player
-               Default: static
-               Metadata mode
-         artist=<string>
-               Artist
-         title=<string>
-               Title
-         album=<string>
-               Album
-         track=<number> (default: 0)
-               Track
-         genre=<string>
-               Genre
-         author=<string>
-               Author
-         copyright=<string>
-               Copyright
-         date=<string>
-               Date
-               Complete date or year only
-         comment=<string>
-               Comment
-
-    -enc <encoding_options>
-          Set encoding options
-         encode_audio_to_video=[1|0] (default: 0)
-               Write audio stream to video file if possible
-         audio_encoder=option[{suboptions}]
-               Supported options: e_wav e_speex e_flacogg e_flac e_lame
-               e_mpegaudio b_lame e_faac e_ffmpeg_audio e_vorbis
-               Default: e_wav
-               Audio
-               Suboptions for audio_encoder=e_wav
-              write_info_chunk=[1|0] (default: 1)
-                    Write info chunk
-              bits=<string>
-                    Supported strings: 8 16 24 32
-                    Default: 16
-                    Bits per sample
-               Suboptions for audio_encoder=e_speex
-              mode=<string>
-                    Supported strings: auto nb wb uwb
-                    Default: auto
-                    Speex mode
-                    Encoding mode. If you select Auto, the mode will be
-                    taken from the samplerate.
-              quality=<number> (0..10, default: 3)
-                    Quality (10: best)
-              complexity=<number> (0..10, default: 3)
-                    Encoding complexity
-              nframes=<number> (1..10, default: 1)
-                    Frames per Ogg packet
-              bitrate=<number> (0..128, default: 8)
-                    Bitrate (kbps)
-                    Bitrate (in kbps). Set to 0 for seleting the
-                    standard bitrates for the encoding mode.
-              vbr=[1|0] (default: 0)
-                    Variable bitrate
-              abr_bitrate=<number> (0..128, default: 0)
-                    Average bitrate (kbps)
-                    Average bitrate (in kbps). Set to 0 for disabling
-                    ABR.
-              vad=[1|0] (default: 0)
-                    Use voice activity detection
-              dtx=[1|0] (default: 0)
-                    Enable file-based discontinuous transmission
-               Suboptions for audio_encoder=e_flacogg
-              bits=<string>
-                    Supported strings: 8 12 16 20 24
-                    Default: 16
-                    Bits
-              compression_level=<number> (0..8, default: 5)
-                    Compression Level
-                    0: Fastest encoding, biggest files
-                    8: Slowest encoding, smallest files
-               Suboptions for audio_encoder=e_flac
-              use_vorbis_comment=[1|0] (default: 1)
-                    Write vorbis comment
-                    Write Vorbis comment containing metadata to the file
-              use_seektable=[1|0] (default: 1)
-                    Write seek table
-                    Write seektable (strongly recommended)
-              num_seektable_entries=<number> (1..1000000, default: 100)
-                    Entries in the seektable
-                    Maximum number of entries in the seek table.
-                    Default is 100, larger numbers result in shorter
-                    seeking times but also in larger files.
-              bits=<string>
-                    Supported strings: 8 12 16 20 24
-                    Default: 16
-                    Bits
-              compression_level=<number> (0..8, default: 5)
-                    Compression Level
-                    0: Fastest encoding, biggest files
-                    8: Slowest encoding, smallest files
-               Suboptions for audio_encoder=e_lame
-              do_id3v1=[1|0] (default: 1)
-                    Write ID3V1.1 tag
-              do_id3v2=[1|0] (default: 1)
-                    Write ID3V2 tag
-              id3v2_charset=<string>
-                    Supported strings: 0 1 2 3
-                    Default: 3
-                    ID3V2 Encoding
-              bitrate_mode=<string>
-                    Supported strings: CBR ABR VBR
-                    Default: CBR
-                    Bitrate mode
-              stereo_mode=<string>
-                    Supported strings: Stereo Joint stereo Auto
-                    Default: Auto
-                    Stereo mode
-                    Stereo: Completely independent channels
-                    Joint stereo: Improve quality (save bits) by using
-                    similarities of the channels
-                    Auto (recommended): Select one of the above
-                    depending on quality or bitrate setting
-              quality=<number> (0..9, default: 2)
-                    Encoding speed
-                    0: Slowest encoding, best quality
-                    9: Fastest encoding, worst quality
-              cbr_bitrate=<number> (8..320, default: 128)
-                    Bitrate (kbps)
-                    Bitrate in kbps. If your selection is no valid mp3
-                    bitrate, we'll choose the closest value.
-              vbr_quality=<number> (0..9, default: 4)
-                    VBR Quality
-                    VBR Quality level. 0: best, 9: worst
-              abr_bitrate=<number> (8..320, default: 128)
-                    ABR overall bitrate (kbps)
-                    Average bitrate for ABR mode
-              abr_min_bitrate=<number> (0..320, default: 0)
-                    ABR min bitrate (kbps)
-                    Minimum bitrate for ABR mode. 0 means let lame
-                    decide. If your selection is no valid mp3 bitrate,
-                    we'll choose the closest value.
-              abr_max_bitrate=<number> (0..320, default: 0)
-                    ABR max bitrate (kbps)
-                    Maximum bitrate for ABR mode. 0 means let lame
-                    decide. If your selection is no valid mp3 bitrate,
-                    we'll choose the closest value.
-               Suboptions for audio_encoder=e_mpegaudio
-              bitrate=<number> (32..448, default: 224)
-                    Bitrate (kbps)
-              layer=<number> (1..2, default: 2)
-                    Layer (1 or 2)
-                    Audio layer
-              vcd=[1|0] (default: 1)
-                    VCD Compatible
-                    Make VCD compliant output. This forces layer II,
-                    224 kbps and 44.1 KHz stereo
-               Suboptions for audio_encoder=b_lame
-              server=<string> (Default: localhost)
-                    Server
-              port=<number> (1..65535, default: 8000)
-                    Port
-              mount=<string> (Default: /stream.ogg)
-                    Mount
-              user=<string> (Default: source)
-                    User
-              password=<string>
-                    Password
-              name=<string> (Default: Test stream)
-                    Name
-              description=<string> (Default: Brought to you by gmerlin)
-                    Description
-              stereo_mode=<string>
-                    Supported strings: Stereo Joint stereo Auto
-                    Default: Auto
-                    Stereo mode
-                    Stereo: Completely independent channels
-                    Joint stereo: Improve quality (save bits) by using
-                    similarities of the channels
-                    Auto (recommended): Select one of the above
-                    depending on quality or bitrate setting
-              quality=<number> (0..9, default: 2)
-                    Encoding speed
-                    0: Slowest encoding, best quality
-                    9: Fastest encoding, worst quality
-              cbr_bitrate=<number> (8..320, default: 128)
-                    Bitrate (kbps)
-                    Bitrate in kbps. If your selection is no valid mp3
-                    bitrate, we'll choose the closest value.
-               Suboptions for audio_encoder=e_faac
-              do_id3v1=[1|0] (default: 1)
-                    Write ID3V1.1 tag
-              do_id3v2=[1|0] (default: 1)
-                    Write ID3V2 tag
-              id3v2_charset=<string>
-                    Supported strings: 0 1 2 3
-                    Default: 3
-                    ID3V2 Encoding
-              object_type=<string>
-                    Supported strings: mpeg2_main mpeg2_lc mpeg4_main
-                    mpeg4_lc mpeg4_ltp
-                    Default: mpeg4_main
-                    Object type
-              bitrate=<number> (0..1000, default: 0)
-                    Bitrate (kbps)
-                    Average bitrate (0: VBR based on quality)
-              quality=<number> (10..500, default: 100)
-                    Quality
-                    Quantizer quality
-              block_types=<string>
-                    Supported strings: Both No short No long
-                    Default: Both
-                    Block types
-              tns=[1|0] (default: 0)
-                    Use temporal noise shaping
-              no_midside=[1|0] (default: 0)
-                    Don't use mid/side coding
-               Suboptions for audio_encoder=e_ffmpeg_audio
-              format=<string>
-                    Supported strings: au ac3 aiff mp2 asf
-                    Default: au
-                    Format
-              codec=option[{suboptions}]
-                    Supported options: pcm_mulaw pcm_s16be pcm_alaw ac3
-                    pcm_s8 mp2 wma2 wma1
-                    Default: pcm_mulaw
-                    Codec
-                    Suboptions for codec=ac3
-                   ff_bit_rate_str=<string>
-                         Supported strings: 32 40 48 56 64 80 96 112
-                         128 160 192 224 256 320 384 448 512 576 640
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=mp2
-                   ff_bit_rate_str=<string>
-                         Supported strings: 32 48 56 64 80 96 112 128
-                         160 192 224 256 320 384
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=wma2
-                   ff_bit_rate_str=<string>
-                         Supported strings: 24 48 64 96 128
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=wma1
-                   ff_bit_rate_str=<string>
-                         Supported strings: 24 48 64 96 128
-                         Default: 128
-                         Bit rate (kbps)
-               Suboptions for audio_encoder=e_vorbis
-              bitrate_mode=<string>
-                    Supported strings: vbr vbr_bitrate managed
-                    Default: VBR
-                    Bitrate mode
-                    Bitrate mode:
-                    VBR: You specify a quality and (optionally) a
-                    minimum and maximum bitrate
-                    VBR (bitrate): The specified nominal bitrate will
-                    be used for selecting the encoder mode.
-                    Managed: You specify a nominal bitrate and
-                    (optionally) a minimum and maximum bitrate
-                    VBR is recommended, managed bitrate might result in
-                    a worse quality
-              nominal_bitrate=<number> (0..1000, default: 128)
-                    Nominal bitrate (kbps)
-                    Nominal bitrate (in kbps) for managed mode
-              quality=<number> (0.0..10.0, default: 3.0)
-                    VBR Quality (10: best)
-                    Quality for VBR mode
-                    10: best (largest output file)
-                    0:  worst (smallest output file)
-              min_bitrate=<number> (0..1000, default: 0)
-                    Minimum bitrate (kbps)
-                    Optional minimum bitrate (in kbps)
-                    0 = unspecified
-              max_bitrate=<number> (0..1000, default: 0)
-                    Maximum bitrate (kbps)
-                    Optional maximum bitrate (in kbps)
-                    0 = unspecified
-
-         video_encoder=option[{suboptions}]
-               Supported options: e_lqt e_y4m e_mpegvideo e_singlepic
-               e_theora b_ogg e_ffmpeg e_ffmpeg_video e_mpeg
-               Default: e_lqt
-               Video
-               Suboptions for video_encoder=e_lqt
-              format=<string>
-                    Supported strings: quicktime avi avi_opendml mp4
-                    m4a 3gp
-                    Default: quicktime
-                    Format
-              make_streamable=[1|0] (default: 0)
-                    Make streamable
-                    Make the file streamable afterwards (uses twice the
-                    diskspace)
-              max_riff_size=<number> (1..1024, default: 1024)
-                    Maximum RIFF size
-                    Maximum RIFF size (in MB) for OpenDML AVIs. The
-                    default (1GB) is reasonable and should only be
-                    changed by people who know what they do.
-              codec=option[{suboptions}]
-                    Supported options: ima4 rawaudio twos ulaw sowt
-                    alaw in24 in32 fl32 fl64 lpcm faac lame ffmpeg_mp2
-                    ffmpeg_ac3 vorbis vorbis_qt
-                    Default: ima4
-                    Codec
-                    Suboptions for codec=in24
-                   pcm_little_endian=[1|0] (default: 0)
-                         Little endian
-                    Suboptions for codec=in32
-                   pcm_little_endian=[1|0] (default: 0)
-                         Little endian
-                    Suboptions for codec=fl32
-                   pcm_little_endian=[1|0] (default: 0)
-                         Little endian
-                    Suboptions for codec=fl64
-                   pcm_little_endian=[1|0] (default: 0)
-                         Little endian
-                    Suboptions for codec=lpcm
-                   pcm_format=<string>
-                         Supported strings: Integer (16 bit) Integer
-                         (24 bit) Integer (32 bit) Float (32 bit) Float
-                         (64 bit)
-                         Default: Integer (16 bit)
-                         Format
-                   pcm_little_endian=[1|0] (default: 0)
-                         Little endian
-                    Suboptions for codec=faac
-                   faac_bitrate=<number> (default: 0)
-                         Bitrate (kbps, 0 = VBR)
-                   quality=<number> (10..500, default: 100)
-                         VBR Quality
-                   object_type=<string>
-                         Supported strings: Low Main SSR LTP
-                         Default: Low
-                         Object type
-                    Suboptions for codec=lame
-                   mp3_bitrate_mode=<string>
-                         Supported strings: CBR ABR VBR
-                         Default: CBR
-                         Bitrate mode
-                         CBR: Constant bitrate
-                         VBR: Variable bitrate
-                         ABR: Average bitrate
-                   mp3_bitrate=<number> (default: 256000)
-                         Nominal Bitrate (ABR/CBR)
-                         Bitrate in bits per second. For CBR, this must
-                         be a valid MP3 bitrate
-                   mp3_bitrate_min=<number> (default: 64000)
-                         Minimum Bitrate (ABR)
-                         Minimum ABR bitrate in bits per second. This
-                         must be a valid MP3 bitrate
-                   mp3_bitrate_max=<number> (default: 320000)
-                         Maximum Bitrate (ABR)
-                         Maximum ABR bitrate in bits per second. This
-                         must be a valid MP3 bitrate
-                   mp3_quality=<number> (0..9, default: 0)
-                         Quality (0 = best)
-                         0: Slowest encoding, best quality
-                         9: Fastest encoding, worst quality
-                   mp3_quality_vbr=<number> (0..9, default: 0)
-                         VBR Quality (0 = best)
-                         VBR Quality level. 0: best, 9: worst
-                    Suboptions for codec=ffmpeg_mp2
-                   bit_rate_audio=<number> (default: 128)
-                         Bit rate (kbps)
-                    Suboptions for codec=ffmpeg_ac3
-                   bit_rate_audio=<number> (default: 128)
-                         Bit rate (kbps)
-                    Suboptions for codec=vorbis
-                   vorbis_bitrate=<number> (default: 128000)
-                         Nominal Bitrate
-                   vorbis_vbr=[1|0] (default: 1)
-                         Use variable bitrate
-                   vorbis_max_bitrate=<number> (default: -1)
-                         Maximum Bitrate (-1 = no limit)
-                   vorbis_min_bitrate=<number> (default: -1)
-                         Minimum Bitrate (-1 = no limit)
-                    Suboptions for codec=vorbis_qt
-                   vorbis_bitrate=<number> (default: 128000)
-                         Nominal Bitrate
-                   vorbis_vbr=[1|0] (default: 1)
-                         Use variable bitrate
-                   vorbis_max_bitrate=<number> (default: -1)
-                         Maximum Bitrate (-1 = no limit)
-                   vorbis_min_bitrate=<number> (default: -1)
-                         Minimum Bitrate (-1 = no limit)
-
-              box_top=<number> (0..65535, default: 0)
-                    Text box (top)
-              box_left=<number> (0..65535, default: 0)
-                    Text box (left)
-              box_bottom=<number> (0..65535, default: 0)
-                    Text box (bottom)
-              box_right=<number> (0..65535, default: 0)
-                    Text box (right)
-              fg_color=<r>,<g>,<b>,<a> (default: 1.000,1.000,1.000,1.000)
-                    <r>, <g>, <b> and <a> are in the range 0.0..1.0
-                    Text color
-              bg_color=<r>,<g>,<b>,<a> (default: 0.000,0.000,0.000,1.000)
-                    <r>, <g>, <b> and <a> are in the range 0.0..1.0
-                    Background color
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-              codec=option[{suboptions}]
-                    Supported options: jpeg rtjpeg raw v308 v408 v410
-                    yuv2 yuv4 yv12 2vuy v210 schroedinger png
-                    ffmpeg_mpg4 ffmpeg_msmpeg4v3 ffmpeg_msmpeg4v3_wmp
-                    ffmpeg_h263 ffmpeg_h263p ffmpeg_mjpg ffmpeg_rle
-                    ffmpeg_ffvhuff ffmpeg_ffv1 ffmpeg_dnxhd mjpa x264
-                    ffmpeg_imx ffmpeg_dv ffmpeg_dvcpro ffmpeg_dv50 yuvs
-                    Default: jpeg
-                    Codec
-                    Suboptions for codec=jpeg
-                   jpeg_quality=<number> (1..100, default: 95)
-                         Quality
-                   jpeg_usefloat=[1|0] (default: 0)
-                         Use float
-                    Suboptions for codec=rtjpeg
-                   rtjpeg_quality=<number> (0..100, default: 100)
-                         Quality setting
-                   rtjpeg_key_rate=<number> (default: 25)
-                         Key frame interval
-                   rtjpeg_luma_quant=<number> (default: 1)
-                         Luma quantiser
-                   rtjpeg_chroma_quant=<number> (default: 1)
-                         Chroma quantiser
-                    Suboptions for codec=schroedinger
-                   enc_rate_control=<string>
-                         Supported strings: Constant noise threshold
-                         Constant bitrate Low delay Lossless Constant
-                         lambda Constant error Constant quality
-                         Default: Constant quality
-                         Rate control
-                   enc_bitrate=<number> (default: 13824000)
-                         Bitrate
-                   enc_buffer_size=<number> (default: 0)
-                         Buffer size
-                   enc_buffer_level=<number> (default: 0)
-                         Buffer level
-                   enc_noise_threshold=<number> (0.00..100.00, default: 25.00)
-                         Noise Threshold
-                   enc_quality=<number> (0.00..10.00, default: 5.00)
-                         Quality
-                   enc_enable_rdo_cbr=[1|0] (default: 1)
-                         rdo cbr
-                   enc_gop_structure=<string>
-                         Supported strings: Adaptive Intra only Backref
-                         Chained backref Biref Chained biref
-                         Default: Adaptive
-                         GOP Stucture
-                   enc_au_distance=<number> (default: 30)
-                         GOP size
-                   enc_open_gop=[1|0] (default: 1)
-                         Open GOPs
-                         Choose whether GOPs should be open or closed.
-                         Closed GOPs improve seeking accuracy for buggy
-                         decoders, open GOPs have a slightly better
-                         compression
-                   enc_mv_precision=<number> (default: 0)
-                         MV Precision
-                   enc_motion_block_size=<string>
-                         Supported strings: Automatic Small Medium Large
-                         Default: Automatic
-                         Block size
-                   enc_motion_block_overlap=<string>
-                         Supported strings: Automatic None Partial Full
-                         Default: Automatic
-                         Block overlap
-                   enc_enable_chroma_me=[1|0] (default: 0)
-                         Enable chroma ME
-                   enc_enable_global_motion=[1|0] (default: 0)
-                         Enable GMC
-                         Enable global motion estimation
-                   enc_enable_phasecorr_estimation=[1|0] (default: 0)
-                         Enable phasecorrelation estimation
-                   enc_enable_hierarchical_estimation=[1|0] (default: 1)
-                         Hierarchical estimation
-                   enc_enable_phasecorr_estimation=[1|0] (default: 0)
-                         Phasecorr estimation
-                   enc_enable_bigblock_estimation=[1|0] (default: 1)
-                         Bigblock estimation
-                   enc_enable_global_motion=[1|0] (default: 0)
-                         Global motion estimation
-                   enc_enable_deep_estimation=[1|0] (default: 1)
-                         Deep estimation
-                   enc_enable_scene_change_detection=[1|0] (default: 1)
-                         Scene change detection
-                   enc_intra_wavelet=<string>
-                         Supported strings: Deslauriers-Debuc (9,3)
-                         LeGall (5,3) Deslauriers-Debuc (13,5) Haar (no
-                         shift) Haar (single shift) Fidelity Daubechies
-                         (9,7)
-                         Default: Deslauriers-Debuc (9,3)
-                         Intra wavelet
-                   enc_inter_wavelet=<string>
-                         Supported strings: Deslauriers-Debuc (9,3)
-                         LeGall (5,3) Deslauriers-Debuc (13,5) Haar (no
-                         shift) Haar (single shift) Fidelity Daubechies
-                         (9,7)
-                         Default: LeGall (5,3)
-                         Inter wavelet
-                   enc_filtering=<string>
-                         Supported strings: None Center weighted median
-                         Gaussian Add noise Adaptive Gaussian
-                         Default: None
-                         Filter
-                   enc_filter_value=<number> (0..100, default: 5)
-                         Filter value
-                   enc_force_profile=<string>
-                         Supported strings: Auto VC-2 low delay VC-2
-                         simple VC-2 main Main
-                         Default: Auto
-                         Force profile
-                   enc_codeblock_size=<string>
-                         Supported strings: Auto Small Medium Large Full
-                         Default: Auto
-                         Codeblock size
-                   enc_enable_multiquant=[1|0] (default: 1)
-                         Enable multiquant
-                   enc_enable_dc_multiquant=[1|0] (default: 0)
-                         Enable DC multiquant
-                   enc_enable_noarith=[1|0] (default: 0)
-                         Disable arithmetic coding
-                   enc_downsample_levels=<number> (2..8, default: 5)
-                         Downsample levels
-                   enc_transform_depth=<number> (0..6, default: 3)
-                         Transform depth
-                    Suboptions for codec=png
-                   png_compression_level=<number> (0..9, default: 9)
-                         Compression Level
-                    Suboptions for codec=ffmpeg_mpg4
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_max_b_frames=<number> (0..16, default: 0)
-                         Max B-Frames
-                         Maximum number of B-frames between non B-frames
-                   ff_b_frame_strategy=[1|0] (default: 0)
-                         Avoid B-frames in high motion scenes
-                   ff_flag_ac_pred=[1|0] (default: 0)
-                         MPEG-4 AC prediction
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_b_quant_factor=<number> (-31.00..31.00, default: 1.25)
-                         B quantizer factor
-                         Quantizer factor between B-frames and
-                         non-B-frames
-                   ff_b_quant_offset=<number> (0.00..31.00, default: 1.25)
-                         B quantizer offset
-                         Quantizer offset between B-frames and
-                         non-B-frames
-                         if > 0 then the last p frame quantizer will be
-                         used (q= lastp_q*factor+offset)
-                         if < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_flag_cbp_rd=[1|0] (default: 0)
-                         CBP RD
-                         Use rate distortion optimization for cbp. This
-                         can only be used together with trellis
-                         quantization.
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_flag_gmc=[1|0] (default: 0)
-                         Use global motion compensation
-                         Warning: GMC is not supported by all decoders
-                   ff_flag_4mv=[1|0] (default: 0)
-                         4 MV per MB allowed
-                         Allow 4 motion vectors per macroblock
-                         (slightly better quality).  Works better if MB
-                         decision mode is "Fewest bits" or "Rate
-                         distoration".
-                   ff_flag_mv0=[1|0] (default: 0)
-                         Always try a MB with MV=<0,0>
-                   ff_flag_qp_rd=[1|0] (default: 0)
-                         QP RD
-                         Use rate distortion optimization for qp
-                         selection. Can only be used if MB decision
-                         mode is "Rate distoration"
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_flag_qpel=[1|0] (default: 0)
-                         Use qpel MC
-                         Use 1/4 pixel motion compensation. Warning:
-                         QPEL is not supported by all decoders.
-                   ff_me_sub_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         Subpixel ME compare function
-                         Subpixel motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_sub_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma subpixel ME compare
-                   ff_me_subpel_quality=<number> (1..8, default: 8)
-                         Subpel ME quality
-                         Subpel motion estimation refinement quality
-                         (for qpel). Higher values mean higher quality
-                         but slower encoding.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality.0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks). 0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2 = Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no  matter what consequences
-                         0: Default
-                         -1: Allow unofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                   ff_thread_count=<number> (default: 1)
-                         Number of threads to launch
-                         Spcify how many threads to launch
-                    Suboptions for codec=ffmpeg_msmpeg4v3
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality.0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks). 0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2 = Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no  matter what consequences
-                         0: Default
-                         -1: Allow unofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                   ff_thread_count=<number> (default: 1)
-                         Number of threads to launch
-                         Spcify how many threads to launch
-                    Suboptions for codec=ffmpeg_msmpeg4v3_wmp
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality.0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks). 0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2 = Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no  matter what consequences
-                         0: Default
-                         -1: Allow unofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                   ff_thread_count=<number> (default: 1)
-                         Number of threads to launch
-                         Spcify how many threads to launch
-                    Suboptions for codec=ffmpeg_h263
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_flag_4mv=[1|0] (default: 0)
-                         4 MV per MB allowed
-                         Allow 4 motion vectors per macroblock
-                         (slightly better quality).  Works better if MB
-                         decision mode is "Fewest bits" or "Rate
-                         distoration".
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality.0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks). 0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2 = Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no  matter what consequences
-                         0: Default
-                         -1: Allow unofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                   ff_thread_count=<number> (default: 1)
-                         Number of threads to launch
-                         Spcify how many threads to launch
-                   ff_flag_obmc=[1|0] (default: 0)
-                         OBMC
-                         Overlapped block motion compensation (only
-                         supported with simple MB decision)
-                    Suboptions for codec=ffmpeg_h263p
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_flag_4mv=[1|0] (default: 0)
-                         4 MV per MB allowed
-                         Allow 4 motion vectors per macroblock
-                         (slightly better quality).  Works better if MB
-                         decision mode is "Fewest bits" or "Rate
-                         distoration".
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality.0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks). 0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2 = Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no  matter what consequences
-                         0: Default
-                         -1: Allow unofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                   ff_thread_count=<number> (default: 1)
-                         Number of threads to launch
-                         Spcify how many threads to launch
-                   ff_flag_h263p_aiv=[1|0] (default: 0)
-                         Alternative inter vlc
-                   ff_flag_obmc=[1|0] (default: 0)
-                         OBMC
-                         Overlapped block motion compensation (only
-                         supported with simple MB decision)
-                    Suboptions for codec=ffmpeg_mjpg
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality.0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks). 0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2 = Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no  matter what consequences
-                         0: Default
-                         -1: Allow unofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                   ff_thread_count=<number> (default: 1)
-                         Number of threads to launch
-                         Spcify how many threads to launch
-                    Suboptions for codec=ffmpeg_ffv1
-                   ff_coder_type=<string>
-                         Supported strings: VLC Arithmetic
-                         Default: VLC
-                         Coder type
-                    Suboptions for codec=mjpa
-                   jpeg_quality=<number> (1..100, default: 95)
-                         Quality
-                   jpeg_usefloat=[1|0] (default: 0)
-                         Use float
-                    Suboptions for codec=x264
-                   x264_i_keyint_max=<number> (default: 250)
-                         Maximum GOP size
-                   x264_i_keyint_min=<number> (default: 25)
-                         Minimum GOP size
-                   x264_i_scenecut_threshold=<number> (default: 40)
-                         Scenecut threshold
-                         How aggressively to insert extra I-frames
-                   x264_i_bframe=<number> (0..16, default: 0)
-                         B-Frames
-                         Number of B-frames between I and P
-                   x264_i_bframe_adaptive=<string>
-                         Supported strings: None Fast Trellis
-                         Default: Fast
-                         Adaptive B-frame decision
-                   x264_i_bframe_bias=<number> (-90..100, default: 0)
-                         B-frame bias
-                         Influences how often B-frames are used
-                   x264_i_bframe_pyramid=<string>
-                         Supported strings: None Strict Normal
-                         Default: Normal
-                         B-frame pyramid
-                         Keep some B-frames as references
-                   x264_i_rc_method=<string>
-                         Supported strings: Constant quality CRF based
-                         VBR Average bitrate
-                         Default: CRF based VBR
-                         Ratecontrol method
-                         Ratecontrol method:
-                         Constant quality: Specify a quantizer
-                         parameter below
-                         CRF based VBR: Specify a rate factor below
-                         Average bitrate: Specify a bitrate below
-                         Selecting 2-pass encoding will force Average
-                         bitrate.
-                   x264_i_bitrate=<number> (default: 0)
-                         Bitrate
-                         Bitrate in kbit/s. 0 means VBR (recommended)
-                   x264_f_rate_tolerance=<number> (0.0..100.0, default: 1.0)
-                         Bitrate tolerance
-                         Allowed variance of average bitrate
-                   x264_i_vbv_max_bitrate=<number> (default: 0)
-                         Maximum local bitrate
-                         Sets a maximum local bitrate in kbits/s.
-                   x264_i_vbv_buffer_size=<number> (default: 0)
-                         VBV Buffer size
-                         Averaging period for the maximum local
-                         bitrate. Measured in kbits.
-                   x264_f_vbv_buffer_init=<number> (0.00..1.00, default: 0.90)
-                         Initial VBV buffer occupancy
-                         Sets the initial VBV buffer occupancy as a
-                         fraction of the buffer size.
-                   x264_b_psy=[1|0] (default: 1)
-                         Psy optimizations
-                         Psychovisual optimization
-                   x264_f_psy_rd=<number> (0.00..10.00, default: 1.00)
-                         Psy RD strength
-                         Strength of psychovisual optimization: RD
-                         (requires Partition decision >= 6)
-                   x264_f_psy_trellis=<number> (0.00..10.00, default: 0.00)
-                         Psy trellis strength
-                         Strength of psychovisual optimization
-                         (requires trellis)
-                   x264_b_mb_tree=[1|0] (default: 1)
-                         Macroblock-tree ratecontrol
-                   x264_i_lookahead=<number> (0..250, default: 40)
-                         Lookahead
-                         Number of frames for frametype lookahead
-                   x264_f_rf_constant=<number> (0..51, default: 23)
-                         Nominal Quantizer parameter
-                         This selects the nominal quantizer to use (1
-                         to 51). Lower values result in better
-                         fidelity, but higher bitrates. 26 is a good
-                         default value. 0 means lossless.
-                   x264_i_qp_constant=<number> (0..51, default: 23)
-                         Quantizer parameter
-                         This selects the quantizer to use (1 to 51).
-                         Lower values result in better fidelity, but
-                         higher bitrates. 26 is a good default value. 0
-                         means lossless.
-                   x264_i_qp_min=<number> (0..51, default: 10)
-                         Minimum quantizer parameter
-                         Minimum quantizer parameter
-                   x264_i_qp_max=<number> (0..51, default: 51)
-                         Maximum quantizer parameter
-                         Maximum quantizer parameter
-                   x264_i_qp_step=<number> (1..50, default: 4)
-                         Maximum QP step
-                         Maximum quantizer step
-                   x264_f_ip_factor=<number> (default: 1.40)
-                         QP factor between I and P
-                   x264_f_pb_factor=<number> (default: 1.30)
-                         QP factor between P and B
-                   x264_i_aq_mode=<string>
-                         Supported strings: None Variance AQ
-                         (complexity mask) Autovariance AQ
-                         (experimental)
-                         Default: Variance AQ (complexity mask)
-                         Adaptive quantization
-                   x264_f_aq_strength=<number> (0.50..1.50, default: 1.00)
-                         AQ strength
-                         Adaptive quantization strength:
-                         Reduces blocking and blurring in flat and
-                         textured areas
-                   x264_f_qcompress=<number> (0.00..1.00, default: 0.60)
-                         QP curve compression
-                         Only for 2-pass encoding
-                   x264_f_qblur=<number> (default: 0.50)
-                         QP Reduce fluctuations in QP (after curve
-                         compression)
-                         Only for 2-pass encoding
-                   x264_f_complexity_blur=<number> (default: 20.00)
-                         Temporally blur complexity
-                         Only for 2-pass encoding
-                   x264_i_chroma_qp_offset=<number> (default: 0)
-                         QP difference between chroma and luma
-                   x264_i_luma_deadzone_0=<number> (default: 21)
-                         Inter luma quantization deadzone
-                   x264_i_luma_deadzone_1=<number> (default: 11)
-                         Intra luma quantization deadzone
-                   x264_analyse_8x8_transform=[1|0] (default: 0)
-                         8x8 transform
-                   x264_analyse_psub16x16=[1|0] (default: 1)
-                         8x16, 16x8 and 8x8 P-frame search
-                   x264_analyse_bsub16x16=[1|0] (default: 1)
-                         8x16, 16x8 and 8x8 B-frame search
-                   x264_analyse_psub8x8=[1|0] (default: 0)
-                         4x8, 8x4 and 4x4 P-frame search
-                   x264_analyse_i8x8=[1|0] (default: 1)
-                         8x8 Intra search
-                         8x8 Intra search requires 8x8 transform
-                   x264_analyse_i4x4=[1|0] (default: 1)
-                         4x4 Intra search
-                   x264_i_me_method=<string>
-                         Supported strings: Diamond search Hexagonal
-                         search Uneven Multi-Hexagon Exhaustive search
-                         Hadamard exhaustive search (slow)
-                         Default: Hexagonal search
-                         Method
-                         Motion estimation method
-                         Diamond search: fastest
-                         Hexagonal search: default setting
-                         Uneven Multi-Hexagon: better but slower
-                         Exhaustive search: extremely slow, primarily
-                         for testing
-                   x264_i_subpel_refine=<number> (1..9, default: 7)
-                         Partition decision
-                         Subpixel motion estimation and partition
-                         decision quality: 1=fast, 9=best.
-                   x264_i_me_range=<number> (default: 16)
-                         Search range
-                         Maximum distance to search for motion
-                         estimation, measured from predicted
-                         position(s). Default of 16 is good for most
-                         footage, high motion sequences may benefit
-                         from settings between 24-32.
-                   x264_i_frame_reference=<number> (1..16, default: 1)
-                         Max Ref. frames
-                         This is effective in Anime, but seems to make
-                         little difference in live-action source
-                         material. Some decoders are unable to deal with
-                         large frameref values.
-                   x264_b_chroma_me=[1|0] (default: 1)
-                         Chroma motion estimation
-                   x264_b_mixed_references=[1|0] (default: 1)
-                         Mixed references
-                         Allow each MB partition in P-frames to have
-                         it's own reference number
-                   x264_b_weighted_bipred=[1|0] (default: 0)
-                         Weighted biprediction
-                         Implicit weighting for B-frames
-                   x264_i_weighted_pred=<string>
-                         Supported strings: Disabled Blind offset Smart
-                         analysis
-                         Default: Smart analysis
-                         Weighted prediction for P-frames
-                   x264_i_direct_mv_pred=<string>
-                         Supported strings: None Spatial Temporal Auto
-                         Default: Spatial
-                         Direct MV prediction mode
-                   x264_b_deblocking_filter=[1|0] (default: 1)
-                         Deblocking filter
-                         Use deblocking loop filter (increases quality).
-                   x264_i_deblocking_filter_alphac0=<number> (-6..6, default: 0)
-                         Deblocking filter strength
-                         Loop filter AlphaC0 parameter
-                   x264_i_deblocking_filter_beta=<number> (-6..6, default: 0)
-                         Deblocking filter threshold
-                         Loop filter Beta parameter
-                   x264_b_cabac=[1|0] (default: 1)
-                         Enable CABAC
-                         Enable CABAC (Context-Adaptive Binary
-                         Arithmetic Coding). Slightly slows down
-                         encoding and decoding, but should save 10-15%
-                         bitrate.
-                   x264_i_trellis=<string>
-                         Supported strings: Disabled Enabled (final)
-                         Enabled (always)
-                         Default: Enabled (final)
-                         Trellis RD quantization
-                         Trellis RD quantization. Requires CABAC. Can
-                         be enabled either for the final encode of a MB
-                         or for all mode desisions
-                   x264_i_noise_reduction=<number> (0..65536, default: 0)
-                         Noise reduction
-                   x264_i_threads=<number> (default: 1)
-                         Threads
-                         Number of threads
-                   x264_b_fast_pskip=[1|0] (default: 1)
-                         early SKIP detection on P-frames
-                   x264_b_dct_decimate=[1|0] (default: 1)
-                         Transform coefficient thresholding on P-frames
-                    Suboptions for codec=ffmpeg_imx
-                   imx_bitrate=<string>
-                         Supported strings: 30 40 50
-                         Default: 50
-                         Bitrate (Mbps)
-                   imx_strip_vbi=<number> (default: 1)
-                         Strip VBI
-               Suboptions for video_encoder=e_y4m
-              chroma_mode=<string>
-                    Supported strings: auto 420jpeg 420mpeg2 420paldv
-                    444 422 411 mono yuva4444
-                    Default: auto
-                    Chroma mode
-                    Set the chroma mode of the output file. Auto means
-                    to take the format most similar to the source.
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-               Suboptions for video_encoder=e_mpegvideo
-              format=<string>
-                    Supported strings: mpeg1 mpeg2 vcd svcd dvd
-                    Default: mpeg1
-                    Format
-                    Sets the MPEG flavour. Note, that for VCD, SVCD and
-                    DVD, you MUST provide valid frame sizes
-              bitrate_mode=<string>
-                    Supported strings: auto vbr cbr
-                    Default: auto
-                    Bitrate Mode
-                    Specify constant or variable bitrate. For "Auto",
-                    constant bitrate will be used for MPEG-1, variable
-                    bitrate will be used for MPEG-2. For formats, which
-                    require CBR, this option is ignored
-              bitrate=<number> (200..99999, default: 1150)
-                    Bitrate (kbps)
-                    Video bitrate in kbps. For VBR, it's the maximum
-                    bitrate. If the format requires a fixed bitrate
-                    (e.g. VCD) this option is ignored
-              quantization=<number> (1..31, default: 8)
-                    Quantization
-                    Minimum quantization for VBR. Lower numbers mean
-                    higher quality. For CBR, this option is ignored.
-              quant_matrix=<string>
-                    Supported strings: default kvcd tmpgenc hi-res
-                    Default: default
-                    Quantization matrices
-              bframes=<number> (0..2, default: 0)
-                    Number of B-Frames
-                    Specify the number of B-frames between 2 P/I
-                    frames. More B-frames slow down encoding and
-                    increase memory usage, but might give better
-                    compression results. For VCD, this option is
-                    ignored, since the VCD standard requires 2
-                    B-frames, no matter if you like them or not.
-              user_options=<string>
-                    User options
-                    Enter further commandline options for mpeg2enc
-                    here. Check the mpeg2enc manual page for details
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-               Suboptions for video_encoder=e_singlepic
-              plugin=option[{suboptions}]
-                    Supported options: iw_pnm iw_bmp iw_png iw_jpeg
-                    iw_tga iw_tiff iw_gavl
-                    Default: iw_pnm
-                    Plugin
-                    Suboptions for plugin=iw_pnm
-                   format=<string>
-                         Supported strings: binary ascii
-                         Default: binary
-                         Format
-                   comment=<string> (Default: Created with gmerlin)
-                         Comment
-                         Comment which will be written in front of
-                         every file
-                    Suboptions for plugin=iw_png
-                   compression=<number> (0..9, default: 9)
-                         Compression level
-                   bit_mode=<string>
-                         Supported strings: Auto 8 16
-                         Default: 8
-                         Bits per channel
-                         If you select auto, the depth will be chosen
-                         according to the input format
-                    Suboptions for plugin=iw_jpeg
-                   quality=<number> (0..100, default: 95)
-                         Quality
-                   chroma_sampling=<string>
-                         Supported strings: 4:2:0 4:2:2 4:4:4
-                         Default: 4:2:0
-                         Chroma sampling
-                    Suboptions for plugin=iw_tga
-                   rle=[1|0] (default: 0)
-                         Do RLE compression
-                    Suboptions for plugin=iw_tiff
-                   compression=<string>
-                         Supported strings: none packbits deflate jpeg
-                         Default: none
-                         Compression
-                   jpeg_quality=<number> (0..100, default: 75)
-                         JPEG quality
-                   zip_quality=<number> (0..9, default: 6)
-                         Deflate compression level
-
-              frame_digits=<number> (1..9, default: 4)
-                    Framenumber digits
-              frame_offset=<number> (0..1000000, default: 0)
-                    Framenumber offset
-               Suboptions for video_encoder=e_theora
-              codec=option[{suboptions}]
-                    Supported options: vorbis speex flacogg
-                    Default: vorbis
-                    Codec
-                    Suboptions for codec=vorbis
-                   bitrate_mode=<string>
-                         Supported strings: vbr vbr_bitrate managed
-                         Default: VBR
-                         Bitrate mode
-                         Bitrate mode:
-                         VBR: You specify a quality and (optionally) a
-                         minimum and maximum bitrate
-                         VBR (bitrate): The specified nominal bitrate
-                         will be used for selecting the encoder mode.
-                         Managed: You specify a nominal bitrate and
-                         (optionally) a minimum and maximum bitrate
-                         VBR is recommended, managed bitrate might
-                         result in a worse quality
-                   nominal_bitrate=<number> (0..1000, default: 128)
-                         Nominal bitrate (kbps)
-                         Nominal bitrate (in kbps) for managed mode
-                   quality=<number> (0.0..10.0, default: 3.0)
-                         VBR Quality (10: best)
-                         Quality for VBR mode
-                         10: best (largest output file)
-                         0:  worst (smallest output file)
-                   min_bitrate=<number> (0..1000, default: 0)
-                         Minimum bitrate (kbps)
-                         Optional minimum bitrate (in kbps)
-                         0 = unspecified
-                   max_bitrate=<number> (0..1000, default: 0)
-                         Maximum bitrate (kbps)
-                         Optional maximum bitrate (in kbps)
-                         0 = unspecified
-                    Suboptions for codec=speex
-                   mode=<string>
-                         Supported strings: auto nb wb uwb
-                         Default: auto
-                         Speex mode
-                         Encoding mode. If you select Auto, the mode
-                         will be taken from the samplerate.
-                   quality=<number> (0..10, default: 3)
-                         Quality (10: best)
-                   complexity=<number> (0..10, default: 3)
-                         Encoding complexity
-                   nframes=<number> (1..10, default: 1)
-                         Frames per Ogg packet
-                   bitrate=<number> (0..128, default: 8)
-                         Bitrate (kbps)
-                         Bitrate (in kbps). Set to 0 for seleting the
-                         standard bitrates for the encoding mode.
-                   vbr=[1|0] (default: 0)
-                         Variable bitrate
-                   abr_bitrate=<number> (0..128, default: 0)
-                         Average bitrate (kbps)
-                         Average bitrate (in kbps). Set to 0 for
-                         disabling ABR.
-                   vad=[1|0] (default: 0)
-                         Use voice activity detection
-                   dtx=[1|0] (default: 0)
-                         Enable file-based discontinuous transmission
-                    Suboptions for codec=flacogg
-                   bits=<string>
-                         Supported strings: 8 12 16 20 24
-                         Default: 16
-                         Bits
-                   compression_level=<number> (0..8, default: 5)
-                         Compression Level
-                         0: Fastest encoding, biggest files
-                         8: Slowest encoding, smallest files
-
-              cbr=[1|0] (default: 0)
-                    Use constant bitrate
-                    For constant bitrate, choose a target bitrate. For
-                    variable bitrate, choose a nominal quality.
-              target_bitrate=<number> (45..2000, default: 250)
-                    Target bitrate (kbps)
-              quality=<number> (0..63, default: 10)
-                    Nominal quality
-                    Quality for VBR mode
-                    63: best (largest output file)
-                    0:  worst (smallest output file)
-              max_keyframe_interval=<number> (1..1000, default: 64)
-                    Maximum keyframe interval
-              drop_frames=[1|0] (default: 1)
-                    Enable frame dropping
-                    Drop frames to keep within bitrate buffer
-                    constraints. This can have a severe impact on
-                    quality, but is the only way to ensure that bitrate
-                    targets are met at low rates during sudden bursts
-                    of activity.
-              cap_overflow=[1|0] (default: 1)
-                    Don't bank excess bits for later use
-                    Ignore bitrate buffer overflows. If the encoder
-                    uses so few bits that the reservoir of available
-                    bits overflows, ignore the excess. The encoder will
-                    not try to use these extra bits in future frames.
-                    At high rates this may cause the result to be
-                    undersized, but allows a client to play the stream
-                    using a finite buffer; it should normally be
-                    enabled.
-              cap_underflow=[1|0] (default: 0)
-                    Don't try to make up shortfalls later
-                    Ignore bitrate buffer underflows. If the encoder
-                    uses so many bits that the reservoir of available
-                    bits underflows, ignore the deficit. The encoder
-                    will not try to make up these extra bits in future
-                    frames. At low rates this may cause the result to
-                    be oversized; it should normally be disabled.
-              speed=<number> (0.00..1.00, default: 0.00)
-                    Encoding speed
-                    Higher speed levels favor quicker encoding over
-                    better quality per bit.  Depending on the encoding
-                    mode, and the internal algorithms used, quality may
-                    actually improve, but in this case bitrate will
-                    also likely increase. In any case, overall
-                    rate/distortion performance will probably decrease.
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-               Suboptions for video_encoder=b_ogg
-              server=<string> (Default: localhost)
-                    Server
-              port=<number> (1..65535, default: 8000)
-                    Port
-              mount=<string> (Default: /stream.ogg)
-                    Mount
-              user=<string> (Default: source)
-                    User
-              password=<string>
-                    Password
-              name=<string> (Default: Test stream)
-                    Name
-              description=<string> (Default: Brought to you by gmerlin)
-                    Description
-              codec=option[{suboptions}]
-                    Supported options: vorbis speex
-                    Default: vorbis
-                    Codec
-                    Suboptions for codec=vorbis
-                   bitrate_mode=<string>
-                         Supported strings: vbr vbr_bitrate managed
-                         Default: VBR
-                         Bitrate mode
-                         Bitrate mode:
-                         VBR: You specify a quality and (optionally) a
-                         minimum and maximum bitrate
-                         VBR (bitrate): The specified nominal bitrate
-                         will be used for selecting the encoder mode.
-                         Managed: You specify a nominal bitrate and
-                         (optionally) a minimum and maximum bitrate
-                         VBR is recommended, managed bitrate might
-                         result in a worse quality
-                   nominal_bitrate=<number> (0..1000, default: 128)
-                         Nominal bitrate (kbps)
-                         Nominal bitrate (in kbps) for managed mode
-                   quality=<number> (0.0..10.0, default: 3.0)
-                         VBR Quality (10: best)
-                         Quality for VBR mode
-                         10: best (largest output file)
-                         0:  worst (smallest output file)
-                   min_bitrate=<number> (0..1000, default: 0)
-                         Minimum bitrate (kbps)
-                         Optional minimum bitrate (in kbps)
-                         0 = unspecified
-                   max_bitrate=<number> (0..1000, default: 0)
-                         Maximum bitrate (kbps)
-                         Optional maximum bitrate (in kbps)
-                         0 = unspecified
-                    Suboptions for codec=speex
-                   mode=<string>
-                         Supported strings: auto nb wb uwb
-                         Default: auto
-                         Speex mode
-                         Encoding mode. If you select Auto, the mode
-                         will be taken from the samplerate.
-                   quality=<number> (0..10, default: 3)
-                         Quality (10: best)
-                   complexity=<number> (0..10, default: 3)
-                         Encoding complexity
-                   nframes=<number> (1..10, default: 1)
-                         Frames per Ogg packet
-                   bitrate=<number> (0..128, default: 8)
-                         Bitrate (kbps)
-                         Bitrate (in kbps). Set to 0 for seleting the
-                         standard bitrates for the encoding mode.
-                   vbr=[1|0] (default: 0)
-                         Variable bitrate
-                   abr_bitrate=<number> (0..128, default: 0)
-                         Average bitrate (kbps)
-                         Average bitrate (in kbps). Set to 0 for
-                         disabling ABR.
-                   vad=[1|0] (default: 0)
-                         Use voice activity detection
-                   dtx=[1|0] (default: 0)
-                         Enable file-based discontinuous transmission
-
-              cbr=[1|0] (default: 0)
-                    Use constant bitrate
-                    For constant bitrate, choose a target bitrate. For
-                    variable bitrate, choose a nominal quality.
-              target_bitrate=<number> (45..2000, default: 250)
-                    Target bitrate (kbps)
-              quality=<number> (0..63, default: 10)
-                    Nominal quality
-                    Quality for VBR mode
-                    63: best (largest output file)
-                    0:  worst (smallest output file)
-              max_keyframe_interval=<number> (1..1000, default: 64)
-                    Maximum keyframe interval
-              drop_frames=[1|0] (default: 1)
-                    Enable frame dropping
-                    Drop frames to keep within bitrate buffer
-                    constraints. This can have a severe impact on
-                    quality, but is the only way to ensure that bitrate
-                    targets are met at low rates during sudden bursts
-                    of activity.
-              cap_overflow=[1|0] (default: 1)
-                    Don't bank excess bits for later use
-                    Ignore bitrate buffer overflows. If the encoder
-                    uses so few bits that the reservoir of available
-                    bits overflows, ignore the excess. The encoder will
-                    not try to use these extra bits in future frames.
-                    At high rates this may cause the result to be
-                    undersized, but allows a client to play the stream
-                    using a finite buffer; it should normally be
-                    enabled.
-              cap_underflow=[1|0] (default: 0)
-                    Don't try to make up shortfalls later
-                    Ignore bitrate buffer underflows. If the encoder
-                    uses so many bits that the reservoir of available
-                    bits underflows, ignore the deficit. The encoder
-                    will not try to make up these extra bits in future
-                    frames. At low rates this may cause the result to
-                    be oversized; it should normally be disabled.
-              speed=<number> (0.00..1.00, default: 0.00)
-                    Encoding speed
-                    Higher speed levels favor quicker encoding over
-                    better quality per bit.  Depending on the encoding
-                    mode, and the internal algorithms used, quality may
-                    actually improve, but in this case bitrate will
-                    also likely increase. In any case, overall
-                    rate/distortion performance will probably decrease.
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-               Suboptions for video_encoder=e_ffmpeg
-              format=<string>
-                    Supported strings: avi mpeg vob flv asf mpegts
-                    Default: avi
-                    Format
-              codec=option[{suboptions}]
-                    Supported options: pcm_s16le pcm_u8 pcm_alaw
-                    pcm_mulaw mp3 mp2 ac3 wma2 wma1
-                    Default: pcm_s16le
-                    Codec
-                    Suboptions for codec=mp3
-                   ff_bit_rate_str=<string>
-                         Supported strings: 32 40 48 56 64 80 96 112
-                         128 160 192 224 256 320
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=mp2
-                   ff_bit_rate_str=<string>
-                         Supported strings: 32 48 56 64 80 96 112 128
-                         160 192 224 256 320 384
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=ac3
-                   ff_bit_rate_str=<string>
-                         Supported strings: 32 40 48 56 64 80 96 112
-                         128 160 192 224 256 320 384 448 512 576 640
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=wma2
-                   ff_bit_rate_str=<string>
-                         Supported strings: 24 48 64 96 128
-                         Default: 128
-                         Bit rate (kbps)
-                    Suboptions for codec=wma1
-                   ff_bit_rate_str=<string>
-                         Supported strings: 24 48 64 96 128
-                         Default: 128
-                         Bit rate (kbps)
-
-              codec=option[{suboptions}]
-                    Supported options: mpeg4 msmpeg4v3 mjpeg mpeg1video
-                    mpeg2video flv1 wmv1
-                    Default: mpeg4
-                    Codec
-                    Suboptions for codec=mpeg4
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_max_b_frames=<number> (0..16, default: 0)
-                         Max B-Frames
-                         Maximum number of B-frames between non B-frames
-                   ff_b_frame_strategy=[1|0] (default: 0)
-                         Avoid B-frames in high motion scenes
-                   ff_flag_ac_pred=[1|0] (default: 0)
-                         MPEG-4 AC prediction
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_b_quant_factor=<number> (-31.00..31.00, default: 1.25)
-                         B quantizer factor
-                         Quantizer factor between B-frames and
-                         non-B-frames
-                   ff_b_quant_offset=<number> (0.00..31.00, default: 1.25)
-                         B quantizer offset
-                         Quantizer offset between B-frames and
-                         non-B-frames
-                         if > 0 then the last p frame quantizer will be
-                         used (q= lastp_q*factor+offset)
-                         if < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_flag_cbp_rd=[1|0] (default: 0)
-                         CBP RD
-                         Use rate distortion optimization for cbp
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_flag_gmc=[1|0] (default: 0)
-                         Use global motion compensation
-                         Warning: GMC is not supported by all decoders
-                   ff_flag_4mv=[1|0] (default: 0)
-                         4 MV per MB allowed
-                         Allow 4 motion vectors per macroblock
-                         (slightly better quality).  Works better if MB
-                         decision mode is "Fewest bits" or "Rate
-                         distoration".
-                   ff_flag_mv0=[1|0] (default: 0)
-                         Always try a MB with MV=<0,0>
-                   ff_flag_qp_rd=[1|0] (default: 0)
-                         QP RD
-                         Use rate distortion optimization for qp
-                         selection
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_flag_qpel=[1|0] (default: 0)
-                         Use qpel MC
-                         Use 1/4 pixel motion compensation.  Warning:
-                         QPEL is not supported by all decoders.
-                   ff_me_sub_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         Subpixel ME compare function
-                         Subpixel motion estimation compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_sub_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma subpixel ME compare
-                   ff_me_subpel_quality=<number> (1..8, default: 8)
-                         Subpel ME quality
-                         Subpel motion estimation refinement quality
-                         (for qpel). Higher values mean higher quality
-                         but slower encoding.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=msmpeg4v3
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=mjpeg
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=mpeg1video
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_max_b_frames=<number> (0..16, default: 0)
-                         Max B-Frames
-                         Maximum number of B-frames between non B-frames
-                   ff_b_frame_strategy=[1|0] (default: 0)
-                         Avoid B-frames in high motion scenes
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_b_quant_factor=<number> (-31.00..31.00, default: 1.25)
-                         B quantizer factor
-                         Quantizer factor between B-frames and
-                         non-B-frames
-                   ff_b_quant_offset=<number> (0.00..31.00, default: 1.25)
-                         B quantizer offset
-                         Quantizer offset between B-frames and
-                         non-B-frames
-                         if > 0 then the last p frame quantizer will be
-                         used (q= lastp_q*factor+offset)
-                         if < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=mpeg2video
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_max_b_frames=<number> (0..16, default: 0)
-                         Max B-Frames
-                         Maximum number of B-frames between non B-frames
-                   ff_b_frame_strategy=[1|0] (default: 0)
-                         Avoid B-frames in high motion scenes
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_b_quant_factor=<number> (-31.00..31.00, default: 1.25)
-                         B quantizer factor
-                         Quantizer factor between B-frames and
-                         non-B-frames
-                   ff_b_quant_offset=<number> (0.00..31.00, default: 1.25)
-                         B quantizer offset
-                         Quantizer offset between B-frames and
-                         non-B-frames
-                         if > 0 then the last p frame quantizer will be
-                         used (q= lastp_q*factor+offset)
-                         if < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=flv1
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=wmv1
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-               Suboptions for video_encoder=e_ffmpeg_video
-              format=<string>
-                    Supported strings: mpeg1video mpeg2video
-                    Default: mpeg1video
-                    Format
-              codec=option[{suboptions}]
-                    Supported options: mpeg1video mpeg2video
-                    Default: mpeg1video
-                    Codec
-                    Suboptions for codec=mpeg1video
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_max_b_frames=<number> (0..16, default: 0)
-                         Max B-Frames
-                         Maximum number of B-frames between non B-frames
-                   ff_b_frame_strategy=[1|0] (default: 0)
-                         Avoid B-frames in high motion scenes
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_b_quant_factor=<number> (-31.00..31.00, default: 1.25)
-                         B quantizer factor
-                         Quantizer factor between B-frames and
-                         non-B-frames
-                   ff_b_quant_offset=<number> (0.00..31.00, default: 1.25)
-                         B quantizer offset
-                         Quantizer offset between B-frames and
-                         non-B-frames
-                         if > 0 then the last p frame quantizer will be
-                         used (q= lastp_q*factor+offset)
-                         if < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-                    Suboptions for codec=mpeg2video
-                   gop_size=<number> (0..300, default: 250)
-                         GOP size (0 = intra only)
-                   ff_scenechange_threshold=<number> (-1000000000..1000000000, default: 0)
-                         Scenechange threshold
-                         Threshold for scene change detection.
-                         Negative values mean more sensitivity (more
-                         keyframes)
-                   ff_scenechange_factor=<number> (default: 0)
-                         Scenechange factor
-                         Multiplied by qscale for each frame and added
-                         to scene_change_score
-                   ff_flag_closed_gop=[1|0] (default: 0)
-                         Close all GOPs
-                   ff_flag2_strict_gop=[1|0] (default: 0)
-                         Strictly enforce GOP size
-                   ff_max_b_frames=<number> (0..16, default: 0)
-                         Max B-Frames
-                         Maximum number of B-frames between non B-frames
-                   ff_b_frame_strategy=[1|0] (default: 0)
-                         Avoid B-frames in high motion scenes
-                   ff_bit_rate_video=<number> (default: 800)
-                         Bit rate (kbps)
-                   ff_bit_rate_tolerance=<number> (default: 8000)
-                         Bitrate tolerance (kbps)
-                         Number of bits the bitstream is allowed to
-                         diverge from the reference. Unused for
-                         constant quantizer encoding
-                   ff_rc_min_rate=<number> (default: 0)
-                         Minimum bitrate (kbps)
-                         Minimum bitrate (0 means arbitrary)
-                   ff_rc_max_rate=<number> (default: 0)
-                         Maximum bitrate (kbps)
-                         Maximum bitrate (0 means arbitrary)
-                   ff_rc_buffer_size=<number> (default: 0)
-                         RC buffer size
-                         Decoder bitstream buffer size in kbits. When
-                         encoding with max and/or min bitrate, this
-                         must be specified.
-                   ff_rc_initial_cplx=<number> (0.0..99.0, default: 0.0)
-                         Initial RC complexity
-                   ff_rc_initial_buffer_occupancy=<number> (default: 0)
-                         Initial RC buffer occupancy
-                         Number of kilobits which should be loaded into
-                         the rc buffer before encoding starts. Must not
-                         be larger than RC buffer size
-                   ff_qmin=<number> (0..31, default: 2)
-                         Minimum quantizer scale
-                   ff_qmax=<number> (0..31, default: 31)
-                         Maximum quantizer scale
-                   ff_max_qdiff=<number> (0..31, default: 3)
-                         Maximum quantizer difference
-                         Maximum quantizer difference between frames
-                   ff_flag_qscale=[1|0] (default: 0)
-                         Use fixed quantizer
-                         Use fixed quality encoding
-                   ff_qscale=<number> (1..31, default: 10)
-                         Fixed quantizer
-                         Quantizer for fixed quality encoding. Lower
-                         means better, 1 is not recommended
-                   ff_qcompress=<number> (0.00..1.00, default: 0.50)
-                         Quantizer compression
-                         Amount of qscale change between easy & hard
-                         scenes
-                   ff_qblur=<number> (0.00..1.00, default: 0.00)
-                         Quantizer blur
-                         Amount of qscale smoothing over time
-                   ff_quantizer_noise_shaping=<number> (0..3, default: 0)
-                         Quantizer noise shaping
-                         Choose quantization such that noise will be
-                         masked by similar-frequency content in the
-                         image
-                   ff_trellis=[1|0] (default: 0)
-                         Use trellis quantization
-                         Use trellis quantization (improves quality)
-                   ff_i_quant_factor=<number> (-31.0..31.0, default: -0.8)
-                         I quantizer factor
-                         Quantizer factor between P-frames and I-frames.
-                         If > 0 then the last P frame quantizer will be
-                         used (q= lastp_q*factor+offset).
-                         If < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_i_quant_offset=<number> (0.0..31.0, default: 0.0)
-                         I quantizer offset
-                         Quantizer offset between P-frames and I-frames
-                   ff_b_quant_factor=<number> (-31.00..31.00, default: 1.25)
-                         B quantizer factor
-                         Quantizer factor between B-frames and
-                         non-B-frames
-                   ff_b_quant_offset=<number> (0.00..31.00, default: 1.25)
-                         B quantizer offset
-                         Quantizer offset between B-frames and
-                         non-B-frames
-                         if > 0 then the last p frame quantizer will be
-                         used (q= lastp_q*factor+offset)
-                         if < 0 then normal ratecontrol will be done (q=
-                         -normal_q*factor+offset)
-                   ff_me_method=<string>
-                         Supported strings: Zero Phods Log X1 Epzs Full
-                         Default: Zero
-                         Motion estimation method
-                   ff_me_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME compare function
-                         Motion estimation compare function.SAD: Sum of
-                         absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME compare
-                   ff_me_range=<number> (0..1000, default: 0)
-                         Motion estimation range
-                         Motion estimation search range (0 means
-                         unlimited)
-                   ff_me_threshold=<number> (0..4000000, default: 0)
-                         ME Theshold
-                         Motion estimation threshold. under which no
-                         motion estimation is performed, but instead
-                         the user specified motion vectors are used
-                   ff_mb_decision=<string>
-                         Supported strings: Use compare function Fewest
-                         bits Rate distoration
-                         Default: Use compare function
-                         MB decision mode
-                   ff_dia_size=<number> (-9..9, default: 0)
-                         ME diamond size & shape
-                         Motion estimation diamond size. Negative means
-                         shape adaptive.
-                   ff_pre_me=<number> (0..2, default: 0)
-                         ME pre-pass
-                         Motion estimation pre-pass
-                         0: disabled
-                         1: only after I-frames
-                         2: always
-                   ff_me_pre_cmp=<string>
-                         Supported strings: SAD SSE SATD DCT PSNR BIT
-                         RD ZERO VSAD VSSE NSSE
-                         Default: SAD
-                         ME pre-pass compare function
-                         Motion estimation pre-pass compare function.
-                         SAD: Sum of absolute differences
-                         SSE: Sum of squared errors
-                         SATD: Sum of absolute Hadamard transformed
-                         differences
-                         DCT: Sum of absolute DCT transformed
-                         differences
-                         PSNR: Sum of squared quantization errors (low
-                         quality)
-                         BIT: Number of bits needed for the block
-                         RD: Rate distortion optimal (slow)
-                         ZERO: 0
-                         VSAD: Sum of absolute vertical differences
-                         VSSE: Sum of squared vertical differences
-                         NSSE: Noise preserving sum of squared
-                         differences
-                   ff_me_pre_cmp_chroma=[1|0] (default: 0)
-                         Enable chroma ME pre-pass compare
-                   ff_pre_dia_size=<number> (-9..9, default: 0)
-                         ME pre-pass diamond size & shape
-                         Motion estimation pre-pass diamond size.
-                         Negative means shape adaptive.
-                   ff_lumi_masking=<number> (0.00..1.00, default: 0.00)
-                         Luminance masking
-                         Encode very bright image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_dark_masking=<number> (0.00..1.00, default: 0.00)
-                         Darkness masking
-                         Encode very dark image parts with reduced
-                         quality. 0 means disabled, 0-0.3 is a sane
-                         range.
-                   ff_temporal_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Temporary complexity masking
-                         Encode very fast moving image parts with
-                         reduced quality. 0 means disabled.
-                   ff_spatial_cplx_masking=<number> (0.00..1.00, default: 0.00)
-                         Spatial complexity masking
-                         Encode very complex image parts with reduced
-                         quality. 0 means disabled, 0-0.5 is a sane
-                         range.
-                   ff_border_masking=<number> (0.00..1.00, default: 0.00)
-                         Border masking
-                         Encode image parts near the border with
-                         reduced quality. 0 means disabled
-                   ff_p_masking=<number> (0.00..1.00, default: 0.00)
-                         Inter block masking
-                         Encode inter blocks with reduced quality
-                         (increases the quality of intra blocks).  0
-                         means disabled, 1 will double the bits
-                         allocated for intra blocks.
-                   ff_flag_normalize_aqp=[1|0] (default: 0)
-                         Normalize adaptive quantization
-                         When using masking, try to adjust the per
-                         macroblock quantizers to maintain the desired
-                         average
-                   ff_strict_std_compliance=<number> (-2..2, default: 0)
-                         Standards compliance
-                         2: Strictly conform to a older more strict
-                         version of the spec or reference software
-                         1: Strictly conform to all the things in the
-                         spec no matter what consequences
-                         0: Default
-                         -1: Allow inofficial extensions
-                         -2: Allow non standarized experimental things
-                   ff_noise_reduction=<number> (0..2000, default: 0)
-                         Noise reduction
-                   ff_flag_gray=[1|0] (default: 0)
-                         Grayscale mode
-                   ff_flag_bitexact=[1|0] (default: 0)
-                         Use only bitexact stuff
-                         Use only bitexact stuff (except (i)dct)
-
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-               Suboptions for video_encoder=e_mpeg
-              format=<string>
-                    Supported strings: mpeg1 vcd mpeg2 svcd dvd_nav dvd
-                    Default: mpeg1
-                    Format
-                    Output format. Note that for some output formats
-                    (e.g. VCD), you MUST use proper settings for the
-                    audio and video streams also, since this isn't done
-                    automatically
-              tmp_dir=<string>
-                    Directory for temporary files
-                    Leave empty to use the same directory as the final
-                    output file
-              aux_stream_1=<string>
-                    Additional stream 1
-                    Additional stream to multiplex into the final
-                    output file. Use this if you want e.g. create mp3
-                    or AC3 audio with some other encoder
-              aux_stream_2=<string>
-                    Additional stream 2
-                    Additional stream to multiplex into the final
-                    output file. Use this if you want e.g. create mp3
-                    or AC3 audio with some other encoder
-              aux_stream_3=<string>
-                    Additional stream 3
-                    Additional stream to multiplex into the final
-                    output file. Use this if you want e.g. create mp3
-                    or AC3 audio with some other encoder
-              bitrate=<number> (32..448, default: 224)
-                    Bitrate (kbps)
-              layer=<number> (1..2, default: 2)
-                    Layer (1 or 2)
-                    Audio layer
-              vcd=[1|0] (default: 1)
-                    VCD Compatible
-                    Make VCD compliant output. This forces layer II,
-                    224 kbps and 44.1 KHz stereo
-              format=<string>
-                    Supported strings: mpeg1 mpeg2 vcd svcd dvd
-                    Default: mpeg1
-                    Format
-                    Sets the MPEG flavour. Note, that for VCD, SVCD and
-                    DVD, you MUST provide valid frame sizes
-              bitrate_mode=<string>
-                    Supported strings: auto vbr cbr
-                    Default: auto
-                    Bitrate Mode
-                    Specify constant or variable bitrate. For "Auto",
-                    constant bitrate will be used for MPEG-1, variable
-                    bitrate will be used for MPEG-2. For formats, which
-                    require CBR, this option is ignored
-              bitrate=<number> (200..99999, default: 1150)
-                    Bitrate (kbps)
-                    Video bitrate in kbps. For VBR, it's the maximum
-                    bitrate. If the format requires a fixed bitrate
-                    (e.g. VCD) this option is ignored
-              quantization=<number> (1..31, default: 8)
-                    Quantization
-                    Minimum quantization for VBR. Lower numbers mean
-                    higher quality. For CBR, this option is ignored.
-              quant_matrix=<string>
-                    Supported strings: default kvcd tmpgenc hi-res
-                    Default: default
-                    Quantization matrices
-              bframes=<number> (0..2, default: 0)
-                    Number of B-Frames
-                    Specify the number of B-frames between 2 P/I
-                    frames. More B-frames slow down encoding and
-                    increase memory usage, but might give better
-                    compression results. For VCD, this option is
-                    ignored, since the VCD standard requires 2
-                    B-frames, no matter if you like them or not.
-              user_options=<string>
-                    User options
-                    Enter further commandline options for mpeg2enc
-                    here. Check the mpeg2enc manual page for details
-              default_timescale=<number> (default: 25)
-                    Default timescale
-                    For formats, which support only constant
-                    framerates, set the default timescale here
-              default_frame_duration=<number> (default: 1)
-                    Default frame duration
-                    For formats, which support only constant
-                    framerates, set the default frame duration here
-
-    -o <output_options>
-          Set output options
-         output_directory=<string> (Default: .)
-               Output directory
-         output_filename_mask=<string> (Default: %Y-%m-%d-%H-%M-%S)
-               Output filename mask
-               Extension is appended by the plugin
-               For the date and time formatting, consult the
-               documentation
-               of the strftime(3) function
-         snapshot_directory=<string> (Default: .)
-               Snapshot directory
-         snapshot_filename_mask=<string> (Default: shot_%5n)
-               Snapshot filename mask
-               Extension is appended by the plugin
-               %t    Inserts time
-               %d    Inserts date
-               %<i>n Inserts Frame number with <i> digits
-
-    -r
-          Record to file
-
-Generic options
-     The following generic options are available for all gmerlin
-     applications
-    -help
-          Print this help message and exit
-    -help-man
-          Print this help message as a manual page and exit
-    -help-texi
-          Print this help message in texinfo format and exit
-    -version
-          Print version info and exit
-
-Files
-
-    `~/.gmerlin/plugins.xml'
-          Cache of the plugin registry (shared by all applicatons)
-    `~/.gmerlin/generic/config.xml'
-          Default plugin parameters are read from there. Use
-          gmerlin_plugincfg to change them.
-

gmerlin-1.2.0.tar.gz/doc/gmerlin.info-3 Deleted

@@ -1,2019 +0,0 @@
-This is gmerlin.info, produced by makeinfo version 4.13 from
-gmerlin.texi.
-
-INFO-DIR-SECTION Gmerlin
-START-INFO-DIR-ENTRY
-* Gmerlin: (gmerlin).           Gmerlin multimedia applications
-END-INFO-DIR-ENTRY
-
-   This manual is for Gmerlin (version 1.2.0, 8 June 2012).
-
-   Copyright (C) 2001-2008 Members of the Gmerlin project.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.1 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with the Front-Cover Texts
-     being "A GNU Manual," and with the Back-Cover Texts as in (a)
-     below.  A copy of the license is included in the section entitled
-     "GNU Free Documentation License."
-
-     (a) The FSF's Back-Cover Text is: "You have freedom to copy and
-     modify this GNU Manual, like GNU software.  Copies published by
-     the Free Software Foundation raise funds for GNU development."
-
-&#x1f;
-File: gmerlin.info,  Node: Alsamixer,  Next: Visualizer,  Prev: Commandline recorder,  Up: Applications
-
-4.7 Alsamixer
-=============
-
-Type `gmerlin_alsamixer' to start this.  This is a mixer program, which
-is still convenient, if you have multiple soundcards with 100s of
-options each. It provides widgets for almost all soundcard parameters,
-which are supported by alsa.
-
-   By right clicking on a control, you get a menu where you can:
-
-   * Move controls inside the window
-
-   * Move controls to own windows . To move them back to main window,
-     simply close the control-windows.
-
-   * Pop up an options dialog , where you can select which controls
-     should be shown at all.
-
-   All window configurations and coordinates are remembered. The actual
-mixer settings are _not_ remembered, since this is done globally by the
-Alsa startup scripts.
-
-&#x1f;
-File: gmerlin.info,  Node: Visualizer,  Next: Keyboard daemon,  Prev: Alsamixer,  Up: Applications
-
-4.8 Visualizer
-==============
-
-Type `gmerlin_visualizer' to start this.  Gmerlin visualizer opens your
-soundard for recording and displays a visualization in a window. It
-supports fullscreen and mouse- and keyboard interaction with visuals
-for visualization plugins, which support this.  If you move the mouse
-or press the "Menu key", the toolbar will show up (either method can be
-disabled). It will be hidden again after the mouse is idle for some
-seconds.
-
-   In the upper left row, you can change the input plugin, show info
-about the plugin or configure the visualization .
-
-   In the lower left row, you can change the recording- and display
-plugins , set global (plugin independent) options , restart the
-visualization , switch to fullscreen or back . Moreover you can show or
-hide the *note Log window: gui_log.  or exit the application.
-
-   The VU-meter at the right displays the recording level as it comes
-from the device (i.e. before the visualizer gain is applied).
-
-   You have the following Shortcuts:
-
-`f'
-     Toggle fullscreen mode
-
-`Tab'
-     Toggle fullscreen mode
-
-`Escape'
-     Exit fullscreen mode
-
-`Menu'
-     Show toolbar
-
-   All other keyboard- and mouse events are propagated to the display
-plugin and then to the visualization plugin.
-
-&#x1f;
-File: gmerlin.info,  Node: Keyboard daemon,  Prev: Visualizer,  Up: Applications
-
-4.9 Keyboard daemon
-===================
-
-The gmerlin keyboard daemon is an X11 application, which grabs key
-combinations and executes commands. You will communicate mostly via the
-configuration utility `gmerlin_kbd_config'. It's independent of
-keyboard model definitions, because it allows to enter the keyboard
-combination in the config dialog directly. It's independent of gmerlin
-or any other multimedia architecture, since the actions can be
-arbitrary shell commands.
-
-   You can manually start and stop the keyboard daemon, add, edit and
-delete key combinations and tell the daemon to apply the changes.
-
-   To automatically start the keyboard daemon at each X11 start, find
-out where to enter start commands in your desktop configuration add the
-command `/usr/local/bin/gmerlin_kbd'. Change `/usr/local' to your
-install prefix if necessary.
-
-   Messages from the keyboard daemon show up in `/var/log/messages' or
-in another syslog file depending on your system setup.
-
-&#x1f;
-File: gmerlin.info,  Node: Plugins,  Next: FAQ,  Prev: Applications,  Up: Top
-
-5 Plugins
-*********
-
-* Menu:
-
-* Media input: plugin_i.
-* Audio output: plugin_oa.
-* Video output: plugin_ov.
-* Audio recorder: plugin_ra.
-* Video recorder: plugin_rv.
-* Encoders for audio: plugin_ea.
-* Encoders for video: plugin_ev.
-* Encoders for text subtitles: plugin_est.
-* Encoders for overlay subtitles: plugin_eso.
-* Encoders for multiple stream types: plugin_e.
-* Encoder postprocessors: plugin_epp.
-* Image readers: plugin_ir.
-* Image writers: plugin_iw.
-* Audio filters: plugin_fa.
-* Video filters: plugin_fv.
-* Visualizations: plugin_vis.
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_i,  Next: plugin_oa,  Up: Plugins
-
-5.1 Media input
-===============
-
-5.1.1 AVDecoder plugin
-----------------------
-
-Internal name
-     i_avdec
-
-Module
-     i_avdec.so
-
-Description
-     Plugin based on the Gmerlin avdecoder library. Supports most media
-     formats. Playback is supported from files, URLs (with various
-     protocols) and stdin.
-
-5.1.2 Audio CD player/ripper
-----------------------------
-
-Internal name
-     i_cdaudio
-
-Module
-     i_cdaudio.so
-
-Description
-     Plugin for audio CDs. Supports both playing with direct connection
-     from the CD-drive to the souncard and ripping with cdparanoia.
-     Metadata are obtained from Musicbrainz, freedb or CD-text.
-     Metadata are cached in $HOME/.gmerlin/cdaudio_metadata.
-
-5.1.3 DVD Player
-----------------
-
-Internal name
-     i_dvd
-
-Module
-     i_dvd.so
-
-Description
-     Plugin for playing DVDs. Based on Gmerlin avdecoder.
-
-5.1.4 VCD Player
-----------------
-
-Internal name
-     i_vcd
-
-Module
-     i_vcd.so
-
-Description
-     Plugin for playing VCDs. Based on Gmerlin avdecoder.
-
-5.1.5 DVB Player
-----------------
-
-Internal name
-     i_dvb
-
-Module
-     i_dvb.so
-
-Description
-     Plugin for playing DVB streams from a Linux-DVB compatible card.
-     Based on Gmerlin avdecoder.
-
-5.1.6 Still image input plugin
-------------------------------
-
-Internal name
-     i_singlepic_stills
-
-Module
-     Internal plugin
-
-Description
-     This plugin reads images as stills. It uses the installed image
-     readers.
-
-5.1.7 libquicktime input plugin
--------------------------------
-
-Internal name
-     i_lqt
-
-Module
-     i_lqt.so
-
-Description
-     Input plugin based on libquicktime
-
-5.1.8 Parser for gmerlin EDLs
------------------------------
-
-Internal name
-     i_edl
-
-Module
-     i_edl.so
-
-Description
-     This parses the XML file and exports an EDL, which can be played
-     with the builtin EDL decoder.
-
-5.1.9 Image video input plugin
-------------------------------
-
-Internal name
-     i_singlepic
-
-Module
-     Internal plugin
-
-Description
-     This plugin reads series of images as a video. It uses the
-     installed image readers.
-
-5.1.10 mikmod input plugin
---------------------------
-
-Internal name
-     i_mikmod
-
-Module
-     i_mikmod.so
-
-Description
-     Simple wrapper, which calls the mikmod program
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_oa,  Next: plugin_ov,  Prev: plugin_i,  Up: Plugins
-
-5.2 Audio output
-================
-
-5.2.1 Alsa
-----------
-
-Internal name
-     oa_alsa
-
-Module
-     oa_alsa.so
-
-Description
-     Alsa output plugin with support for channel configurations up to
-     5.1
-
-5.2.2 PulseAudio
-----------------
-
-Internal name
-     oa_pulse
-
-Module
-     oa_pulse.so
-
-Description
-     PulseAudio output
-
-5.2.3 OSS
----------
-
-Internal name
-     oa_oss
-
-Module
-     oa_oss.so
-
-Description
-     OSS output driver
-
-5.2.4 EsounD output driver
---------------------------
-
-Internal name
-     oa_esd
-
-Module
-     oa_esd.so
-
-Description
-     EsounD output driver
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_ov,  Next: plugin_ra,  Prev: plugin_oa,  Up: Plugins
-
-5.3 Video output
-================
-
-5.3.1 X11
----------
-
-Internal name
-     ov_x11
-
-Module
-     ov_x11.so
-
-Description
-     X11 display driver with support for XVideo, XImage and OpenGL.
-     Shared memory (XShm) is used where available.
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_ra,  Next: plugin_rv,  Prev: plugin_ov,  Up: Plugins
-
-5.4 Audio recorder
-==================
-
-5.4.1 Alsa
-----------
-
-Internal name
-     i_alsa
-
-Module
-     i_alsa.so
-
-Description
-     Alsa recorder
-
-5.4.2 OSS
----------
-
-Internal name
-     i_oss
-
-Module
-     i_oss.so
-
-Description
-     OSS Recorder
-
-5.4.3 EsounD input driver
--------------------------
-
-Internal name
-     i_esd
-
-Module
-     i_esd.so
-
-Description
-     EsounD input driver
-
-5.4.4 PulseAudio
-----------------
-
-Internal name
-     i_pulse
-
-Module
-     i_pulse.so
-
-Description
-     PulseAudio capture. You can specify the source, where we'll get
-     the audio.
-
-5.4.5 Audiofile recorder
-------------------------
-
-Internal name
-     i_audiofile
-
-Module
-     Internal plugin
-
-Description
-     Take a bunch of audio file and make them available as a recording
-     device
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_rv,  Next: plugin_ea,  Prev: plugin_ra,  Up: Plugins
-
-5.5 Video recorder
-==================
-
-5.5.1 V4L2
-----------
-
-Internal name
-     i_v4l2
-
-Module
-     i_v4l2.so
-
-Description
-     video4linux 2 recording plugin. Supports only video and no tuner
-     decives.
-
-5.5.2 V4L
----------
-
-Internal name
-     i_v4l
-
-Module
-     i_v4l.so
-
-Description
-     video4linux recording plugin. Supports only video and no tuner
-     decives.
-
-5.5.3 X11
----------
-
-Internal name
-     i_x11
-
-Module
-     i_x11.so
-
-Description
-     X11 grabber
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_ea,  Next: plugin_ev,  Prev: plugin_rv,  Up: Plugins
-
-5.6 Encoders for audio
-======================
-
-5.6.1 Wave writer
------------------
-
-Internal name
-     e_wav
-
-Module
-     e_wav.so
-
-Description
-     Simple writer for wave files, supports 8, 16, 24 and 32 bit PCM
-
-5.6.2 Speex encoder
--------------------
-
-Internal name
-     e_speex
-
-Module
-     e_speex.so
-
-Description
-     Encoder for Speex files
-
-5.6.3 Flac in Ogg encoder
--------------------------
-
-Internal name
-     e_flacogg
-
-Module
-     e_flacogg.so
-
-Description
-     Encoder for flac streams in Ogg containers. Based on libflac
-     (http://flac.sourceforge.net)
-
-5.6.4 Flac encoder
-------------------
-
-Internal name
-     e_flac
-
-Module
-     e_flac.so
-
-Description
-     Encoder for flac files. Based on libflac
-     (http://flac.sourceforge.net)
-
-5.6.5 Lame mp3 encoder
-----------------------
-
-Internal name
-     e_lame
-
-Module
-     e_lame.so
-
-Description
-     Encoder for mp3 files. Based on lame (http://www.mp3dev.org).
-     Supports CBR, ABR and VBR as well as ID3V1 and ID3V2 tags.
-
-5.6.6 MPEG-1 layer 1/2 audio encoder
-------------------------------------
-
-Internal name
-     e_mpegaudio
-
-Module
-     e_mpegaudio.so
-
-Description
-     Encoder for elementary MPEG-1 layer 1/2 audio streams. Based on
-     mjpegtools (http://mjpeg.sourceforge.net).
-
-5.6.7 Lame mp3 broadcaster
---------------------------
-
-Internal name
-     b_lame
-
-Module
-     b_lame.so
-
-Description
-     mp3 broadcaster for icecast servers. Based on lame
-     (http://www.mp3dev.org) and libshout (http://www.icecast.org).
-
-5.6.8 Faac encoder
-------------------
-
-Internal name
-     e_faac
-
-Module
-     e_faac.so
-
-Description
-     Plugin for encoding AAC streams (with ADTS headers). Based on faac
-     (http://faac.sourceforge.net).
-
-5.6.9 FFmpeg audio encoder
---------------------------
-
-Internal name
-     e_ffmpeg_audio
-
-Module
-     e_ffmpeg_audio.so
-
-Description
-     Plugin for encoding various audio formats with ffmpeg
-     (http://www.ffmpeg.org).
-
-5.6.10 Vorbis encoder
----------------------
-
-Internal name
-     e_vorbis
-
-Module
-     e_vorbis.so
-
-Description
-     Encoder for Vorbis files
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_ev,  Next: plugin_est,  Prev: plugin_ea,  Up: Plugins
-
-5.7 Encoders for video
-======================
-
-5.7.1 yuv4mpeg2 encoder
------------------------
-
-Internal name
-     e_y4m
-
-Module
-     e_yuv4mpeg.so
-
-Description
-     Encoder for yuv4mpeg files. Based on mjpegtools
-     (http://mjpeg.sourceforge.net).
-
-5.7.2 MPEG-1/2 video encoder
-----------------------------
-
-Internal name
-     e_mpegvideo
-
-Module
-     e_mpegvideo.so
-
-Description
-     Encoder for elementary MPEG-1/2 video streams. Based on mjpegtools
-     (http://mjpeg.sourceforge.net).
-
-5.7.3 Singlepicture encoder
----------------------------
-
-Internal name
-     e_singlepic
-
-Module
-     Internal plugin
-
-Description
-     This plugin encodes a video as a series of images. It uses the
-     installed image writers.
-
-5.7.4 FFmpeg video encoder
---------------------------
-
-Internal name
-     e_ffmpeg_video
-
-Module
-     e_ffmpeg_video.so
-
-Description
-     Plugin for encoding various video formats with ffmpeg
-     (http://www.ffmpeg.org).
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_est,  Next: plugin_eso,  Prev: plugin_ev,  Up: Plugins
-
-5.8 Encoders for text subtitles
-===============================
-
-5.8.1 Text subtitle exporter
-----------------------------
-
-Internal name
-     e_subtext
-
-Module
-     e_subtext.so
-
-Description
-     Plugin for exporting text subtitles. Supported formats are MPSub
-     and SRT
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_eso,  Next: plugin_e,  Prev: plugin_est,  Up: Plugins
-
-5.9 Encoders for overlay subtitles
-==================================
-
-5.9.1 spumux overlay exporter
------------------------------
-
-Internal name
-     e_spumux
-
-Module
-     e_spumux.so
-
-Description
-     Exports overlay subtitles into the format used by spumux
-     (http://dvdauthor.sourceforge.net)
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_e,  Next: plugin_epp,  Prev: plugin_eso,  Up: Plugins
-
-5.10 Encoders for multiple stream types
-=======================================
-
-5.10.1 Quicktime encoder
-------------------------
-
-Internal name
-     e_lqt
-
-Module
-     e_lqt.so
-
-Description
-     Encoder based on libquicktime
-     (http://libquicktime.sourceforge.net) Writes Quicktime, AVI
-     (optionally ODML), MP4, M4A and 3GPP. Supported codecs range from
-     high quality uncompressed formats for professional applications to
-     consumer level formats like H.264/AVC, AAC, MP3, Divx compatible
-     etc. Also supported are chapters and text subtitles
-
-5.10.2 Theora encoder
----------------------
-
-Internal name
-     e_theora
-
-Module
-     e_theora.so
-
-Description
-     Encoder for Theora files. Audio can be Vorbis, Flac or Speex.
-
-5.10.3 Ogg Broadcaster
-----------------------
-
-Internal name
-     b_ogg
-
-Module
-     b_ogg.so
-
-Description
-     Broadcaster for Ogg streams using libshout. Supports vorbis,
-     theora and speex.
-
-5.10.4 FFmpeg audio/video encoder
----------------------------------
-
-Internal name
-     e_ffmpeg
-
-Module
-     e_ffmpeg.so
-
-Description
-     Plugin for encoding various audio/video formats with ffmpeg
-     (http://www.ffmpeg.org).
-
-5.10.5 MPEG 1/2 program/system stream encoder
----------------------------------------------
-
-Internal name
-     e_mpeg
-
-Module
-     e_mpeg.so
-
-Description
-     Encoder for regular .mpg files as well as VCD and DVD streams.
-     Based on mjpegtools (http://mjpeg.sourceforge.net)
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_epp,  Next: plugin_ir,  Prev: plugin_e,  Up: Plugins
-
-5.11 Encoder postprocessors
-===========================
-
-5.11.1 Audio CD generator/burner
---------------------------------
-
-Internal name
-     e_pp_cdrdao
-
-Module
-     e_pp_cdrdao.so
-
-Description
-     This is a frontend for generating audio CD images (optionally with
-     CD-Text) for cdrdao (http://cdrdao.sourceforge.net). Optional
-     burning is also supported.
-
-5.11.2 VCD image generator/burner
----------------------------------
-
-Internal name
-     e_pp_vcdimager
-
-Module
-     e_pp_vcdimager.so
-
-Description
-     This is a frontend for generating (S)VCD images with the vcdimager
-     tools (http://www.vcdimager.org). Burning with cdrdao
-     (http://cdrdao.sourceforge.net) is also possible.
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_ir,  Next: plugin_iw,  Prev: plugin_epp,  Up: Plugins
-
-5.12 Image readers
-==================
-
-5.12.1 GAVL image reader
-------------------------
-
-Internal name
-     ir_gavl
-
-Module
-     ir_gavl.so
-
-Description
-     Reader for GAVL images
-
-5.12.2 PNM reader
------------------
-
-Internal name
-     ir_pnm
-
-Module
-     ir_pnm.so
-
-Description
-     Reader for PBM/PGM/PPM images
-
-5.12.3 TGA reader
------------------
-
-Internal name
-     ir_tga
-
-Module
-     ir_tga.so
-
-Description
-     Reader for TGA images
-
-5.12.4 BMP reader
------------------
-
-Internal name
-     ir_bmp
-
-Module
-     ir_bmp.so
-
-Description
-     Reader for BMP images
-
-5.12.5 PNG reader
------------------
-
-Internal name
-     ir_png
-
-Module
-     ir_png.so
-
-Description
-     Reader for PNG images
-
-5.12.6 JPEG reader
-------------------
-
-Internal name
-     ir_jpeg
-
-Module
-     ir_jpeg.so
-
-Description
-     Reader for JPEG images
-
-5.12.7 TIFF reader
-------------------
-
-Internal name
-     ir_tiff
-
-Module
-     ir_tiff.so
-
-Description
-     Reader for TIFF images
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_iw,  Next: plugin_fa,  Prev: plugin_ir,  Up: Plugins
-
-5.13 Image writers
-==================
-
-5.13.1 JPEG writer
-------------------
-
-Internal name
-     iw_jpeg
-
-Module
-     iw_jpeg.so
-
-Description
-     Writer for JPEG images
-
-5.13.2 PPM writer
------------------
-
-Internal name
-     iw_pnm
-
-Module
-     iw_pnm.so
-
-Description
-     Writer for PPM images
-
-5.13.3 BMP writer
------------------
-
-Internal name
-     iw_bmp
-
-Module
-     iw_bmp.so
-
-Description
-     Writer for BMP images
-
-5.13.4 PNG writer
------------------
-
-Internal name
-     iw_png
-
-Module
-     iw_png.so
-
-Description
-     Writer for PNG images
-
-5.13.5 TGA writer
------------------
-
-Internal name
-     iw_tga
-
-Module
-     iw_tga.so
-
-Description
-     Writer for TGA images
-
-5.13.6 TIFF writer
-------------------
-
-Internal name
-     iw_tiff
-
-Module
-     iw_tiff.so
-
-Description
-     Writer for TIFF images
-
-5.13.7 gavl image writer
-------------------------
-
-Internal name
-     iw_gavl
-
-Module
-     iw_gavl.so
-
-Description
-     Writer for GAVL images
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_fa,  Next: plugin_fv,  Prev: plugin_iw,  Up: Plugins
-
-5.14 Audio filters
-==================
-
-5.14.1 Force sampleformat
--------------------------
-
-Internal name
-     fa_sampleformat
-
-Module
-     fa_sampleformat.so
-
-Description
-     This forces a sampleformat as input for the next filter. Its
-     mainly used for testing.
-
-5.14.2 Volume control
----------------------
-
-Internal name
-     fa_volume
-
-Module
-     fa_volume.so
-
-Description
-     Simple volume control
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_fv,  Next: plugin_vis,  Prev: plugin_fa,  Up: Plugins
-
-5.15 Video filters
-==================
-
-5.15.1 1DTV
------------
-
-Internal name
-     fv_onedtv
-
-Module
-     fv_1dtv.so
-
-Description
-     1DTV is one of the most amazing effect, but that algorithm is very
-     easy. The horizontal green line is the current scanning position
-     and it moves down every frame. So only moving objects is
-     distorted. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.2 AgingTV
---------------
-
-Internal name
-     fv_agingtv
-
-Module
-     fv_agingtv.so
-
-Description
-     AgingTV ages video input stream in realtime. Discolors, scratches,
-     puts dust. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.3 BaltanTV
----------------
-
-Internal name
-     fv_baltantv
-
-Module
-     fv_baltantv.so
-
-Description
-     BaltanTV is similar to the StreakTV,but BaltanTV makes after
-     images longer than that. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.4 Blur
------------
-
-Internal name
-     fv_blur
-
-Module
-     fv_blur.so
-
-Description
-     Blur filter based on gavl. Supports triangular, box and gauss blur.
-
-5.15.5 BrokenTV
----------------
-
-Internal name
-     fv_brokentv
-
-Module
-     fv_brokentv.so
-
-Description
-     BrokenTV simulates mistuned television or mistracking video image.
-     Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.6 BurningTV
-----------------
-
-Internal name
-     fv_burningtv
-
-Module
-     fv_burningtv.so
-
-Description
-     The name describes itself. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.7 ChameleonTV
-------------------
-
-Internal name
-     fv_chameleontv
-
-Module
-     fv_chameleontv.so
-
-Description
-     When you are still in the sight of the camera for a second, you
-     will be vanishing into the background, and disappear. When you
-     move again, you will appear normally. By contrast, when you switch
-     from "disappearing mode" to "appearing mode", moving objects are
-     not shown, and a still object appears after seconds. Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.8 Colorbalance
--------------------
-
-Internal name
-     fv_colorbalance
-
-Module
-     fv_colorbalance.so
-
-Description
-     Apply gain for red, green and blue. RGB formats are processed
-     directly, Y'CbCr formats are processed by the colormatrix.
-
-5.15.9 ColstreakTV
-------------------
-
-Internal name
-     fv_colstreaktv
-
-Module
-     fv_colstreaktv.so
-
-Description
-     Make after images but the power of the effects are different
-     between red, green and blue layers, so it provides colourful after
-     images. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.10 Crop & Scale
---------------------
-
-Internal name
-     fv_cropscale
-
-Module
-     fv_cropscale.so
-
-Description
-     Crop and scale video images. Has lots of standard video formats as
-     presets. Can also do chroma placement correction and simple
-     deinterlacing
-
-5.15.11 CycleTV
----------------
-
-Internal name
-     fv_cycletv
-
-Module
-     fv_cycletv.so
-
-Description
-     CycleTV randomly cycles the color palette. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.12 Decimate
-----------------
-
-Internal name
-     fv_decimate
-
-Module
-     fv_decimate.so
-
-Description
-     Skip almost identical frames
-
-5.15.13 Deinterlacer
---------------------
-
-Internal name
-     fv_deinterlace
-
-Module
-     fv_deinterlace.so
-
-Description
-     Deinterlace with various algorithms
-
-5.15.14 DiceTV
---------------
-
-Internal name
-     fv_dicetv
-
-Module
-     fv_dicetv.so
-
-Description
-     DiceTV 'dices' the screen up into many small squares, each
-     defaulting to a size of 16 pixels by 16 pixels.. Each square is
-     rotated randomly in one of four directions: up (no change), down
-     (180 degrees, or upside down), right (90 degrees clockwise), or
-     left (90 degrees counterclockwise). The direction of each square
-     normally remains consistent between each frame. Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.15 DiffTV
---------------
-
-Internal name
-     fv_difftv
-
-Module
-     fv_difftv.so
-
-Description
-     DiffTV highlights interframe differences. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.16 Display timecodes
--------------------------
-
-Internal name
-     fv_tcdisplay
-
-Module
-     fv_tcdisplay.so
-
-Description
-     Burn timecodes into video frames
-
-5.15.17 DisplaywallTV
----------------------
-
-Internal name
-     fv_displaywalltv
-
-Module
-     fv_displaywalltv.so
-
-Description
-     Display the tiled video images. You can scroll the image or change
-     the scale. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.18 DotTV
--------------
-
-Internal name
-     fv_dottv
-
-Module
-     fv_dottv.so
-
-Description
-     DotTV converts gray scale images to set of dots. It is hard to
-     recognize what is shown when your eyes are close to the monitor.
-     Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.19 EdgeTV
---------------
-
-Internal name
-     fv_edgetv
-
-Module
-     fv_edgetv.so
-
-Description
-     Detects edges and display it like good old low resolution computer
-     way. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.20 EdgeblurTV
-------------------
-
-Internal name
-     fv_edgeblurtv
-
-Module
-     fv_edgeblurtv.so
-
-Description
-     Detects edge and display it with motion blur effect. Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.21 Equalizer
------------------
-
-Internal name
-     fv_equalizer
-
-Module
-     fv_equalizer.so
-
-Description
-     Control hue, saturation, contrast and brightness. For Y'CbCr, it
-     uses routines based on the vf_eq and vf_hue filters from the
-     MPlayer project. For RGB formats, it uses the colormatrix.
-
-5.15.22 FireTV
---------------
-
-Internal name
-     fv_firetv
-
-Module
-     fv_firetv.so
-
-Description
-     FireTV clips moving objects and burns it. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.23 Flip image
-------------------
-
-Internal name
-     fv_flip
-
-Module
-     fv_flip.so
-
-Description
-     Flip video images horizontally and/or vertically
-
-5.15.24 Force framerate
------------------------
-
-Internal name
-     fv_framerate
-
-Module
-     fv_framerate.so
-
-Description
-     Forces a framerate as input for the next filter. Its mainly used
-     for testing.
-
-5.15.25 Force pixelformat
--------------------------
-
-Internal name
-     fv_pixelformat
-
-Module
-     fv_pixelformat.so
-
-Description
-     Forces a pixelformat as input for the next filter. Its mainly used
-     for testing.
-
-5.15.26 Interlace
------------------
-
-Internal name
-     fv_interlace
-
-Module
-     fv_interlace.so
-
-Description
-     Interlace video images. Output has half the input framerate.
-
-5.15.27 Invert RGBA
--------------------
-
-Internal name
-     fv_invert
-
-Module
-     fv_invert_rgb.so
-
-Description
-     Invert single color channels. RGB(A) formats are processed
-     directly, Y'CbCr(A) formats are processed with the colormatrix.
-
-5.15.28 LensTV
---------------
-
-Internal name
-     fv_lenstv
-
-Module
-     fv_lenstv.so
-
-Description
-     LensTV - Based on Old school Demo Lens Effect. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.29 LifeTV
---------------
-
-Internal name
-     fv_lifetv
-
-Module
-     fv_lifetv.so
-
-Description
-     You can play John Horton Conway's Life Game with video input.
-     Moving objects drop seeds on the game field. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.30 MatrixTV
-----------------
-
-Internal name
-     fv_matrixtv
-
-Module
-     fv_matrixtv.so
-
-Description
-     The Matrix's visual effect has been metamorphosed to the realtime
-     video effect. Edge-enhanced input image is reflected to the
-     brightness of falling letters. Blending with the input image is
-     also available. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.31 MosaicTV
-----------------
-
-Internal name
-     fv_mosaictv
-
-Module
-     fv_mosaictv.so
-
-Description
-     MosaicTV censors the incoming objects and gives it mosaic effect.
-     Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.32 NervousHalfTV
----------------------
-
-Internal name
-     fv_halftv
-
-Module
-     fv_halftv.so
-
-Description
-     SimuraTV and NervousTV mixed, make more magic! Delaying,
-     scratching or our famous "nervous" effect can be added to a half
-     of the screen. Additionally you can add mirroring effect to it.
-     Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.33 NervousTV
------------------
-
-Internal name
-     fv_nervoustv
-
-Module
-     fv_nervoustv.so
-
-Description
-     NervousTV randomly re-arranges the past second of video, creating
-     a chaotic expression of past movements. It shuffles time. There is
-     no effect on still images. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.34 NoiseTV
----------------
-
-Internal name
-     fv_noisetv
-
-Module
-     fv_noisetv.so
-
-Description
-     Black & White noise is rendered over the incoming objects. Ported
-     from EffecTV (http://effectv.sourceforge.net).
-
-5.15.35 Old color
------------------
-
-Internal name
-     fv_oldcolor
-
-Module
-     fv_oldcolor.so
-
-Description
-     Simulate old color- and B/W movies
-
-5.15.36 OpTV
-------------
-
-Internal name
-     fv_optv
-
-Module
-     fv_optv.so
-
-Description
-     Traditional black-white optical animation is now resurrected as a
-     real-time video effect. Input images are binarized and combined
-     with various optical pattern. You can change its animation speed
-     and direction with a keyboard. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.37 PupTV
--------------
-
-Internal name
-     fv_puptv
-
-Module
-     fv_puptv.so
-
-Description
-     PupTV does pup mark effect on the video input. The pup is caused
-     by a motion or random rain drops. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.38 QuarkTV
----------------
-
-Internal name
-     fv_quarktv
-
-Module
-     fv_quarktv.so
-
-Description
-     QuarkTV dissolves moving objects. It picks up pixels from the last
-     eight frames randomly. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.39 RGB Colormatrix
------------------------
-
-Internal name
-     fv_colormatrix_rgb
-
-Module
-     fv_colormatrix_rgb.so
-
-Description
-     Generic colormatrix (RGBA). You pass the coefficients in RGB(A)
-     coordinates, but the processing will work in Y'CbCr(A) as well.
-
-5.15.40 RandomDotStereoTV
--------------------------
-
-Internal name
-     fv_rdstv
-
-Module
-     fv_rdstv.so
-
-Description
-     RdsTV does rds mark effect on the video input. The rds is caused
-     by a motion or random rain drops. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.41 RevTV
--------------
-
-Internal name
-     fv_revtv
-
-Module
-     fv_revtv.so
-
-Description
-     RevTV acts like a video waveform monitor for each line of video
-     processed. This creates a pseudo 3D effect based on the brightness
-     of the video along each line. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.42 RippleTV
-----------------
-
-Internal name
-     fv_rippletv
-
-Module
-     fv_rippletv.so
-
-Description
-     RippleTV does ripple mark effect on the video input. The ripple is
-     caused by a motion or random rain drops. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.43 RndmTV
---------------
-
-Internal name
-     fv_rndmtv
-
-Module
-     fv_rndmtv.so
-
-Description
-     RndmTV give you a noisy picture in color or B/W. Inspired by the
-     old days when reception was poor. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.44 ShagadelicTV
---------------------
-
-Internal name
-     fv_shagadelictv
-
-Module
-     fv_shagadelictv.so
-
-Description
-     Oh behave, ShagedelicTV makes images shagadelic! Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.45 Shift image
--------------------
-
-Internal name
-     fv_shift
-
-Module
-     fv_bitshift.so
-
-Description
-     Upshift 16 bit images, where only some lower bits are used
-
-5.15.46 SimuraTV
-----------------
-
-Internal name
-     fv_simuratv
-
-Module
-     fv_simuratv.so
-
-Description
-     The origin of SimuraTV is "SimuraEffect", a VJ (Video Jockey) tool
-     I made in 1995. Color effect and image mirroring are all of
-     SimuraTV. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.47 SlofastTV
------------------
-
-Internal name
-     fv_slofasttv
-
-Module
-     fv_slofasttv.so
-
-Description
-     SloFastTV plays back the current video input at non-constant
-     speed: while the buffer fills the video is played back at half the
-     frame rate, when the buffer is full it plays back at the double
-     rate until it has caught up with the live video again. This causes
-     the actual image to be delayed from 0 to about half a second.
-     Movements that previously had a constant speed will appear very
-     slow and then very fast. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.48 SparkTV
----------------
-
-Internal name
-     fv_sparktv
-
-Module
-     fv_sparktv.so
-
-Description
-     Bright sparks run on incoming objects. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.49 SpiralTV
-----------------
-
-Internal name
-     fv_spiraltv
-
-Module
-     fv_spiraltv.so
-
-Description
-     I admit that 'SpiralTV' is a misnomer; it doesn't actually spiral.
-     What it does do is segment the screen image into a series of
-     concentric circles, each of which is slightly out of phase
-     (timewise) from its neighbors. Or to put it more simply, it really
-     messes with changing (i.e. Moving) objects onscreen! Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.50 StreakTV
-----------------
-
-Internal name
-     fv_streaktv
-
-Module
-     fv_streaktv.so
-
-Description
-     StreakTV makes after images of moving objects. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.51 Temporal lowpass
-------------------------
-
-Internal name
-     fv_tlp
-
-Module
-     fv_tlp.so
-
-Description
-     Simple temporal lowpass
-
-5.15.52 TimedistTV
-------------------
-
-Internal name
-     fv_timedisttv
-
-Module
-     fv_timedisttv.so
-
-Description
-     Distorts moving objects in the sight. When it detects a moving
-     part, it rollbacks to an old frame around that. Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.53 Transform
------------------
-
-Internal name
-     fv_transform
-
-Module
-     fv_transform.so
-
-Description
-     Transform the image with different methods
-
-5.15.54 TransformTV
--------------------
-
-Internal name
-     fv_transformtv
-
-Module
-     fv_transformtv.so
-
-Description
-     TransformTV does transform mark effect on the video input. The
-     transform is caused by a motion or random rain drops. Ported from
-     EffecTV (http://effectv.sourceforge.net).
-
-5.15.55 Tweak timecodes
------------------------
-
-Internal name
-     fv_tctweak
-
-Module
-     fv_tctweak.so
-
-Description
-     Replace/remove/interpolate timecodes
-
-5.15.56 VertigoTV
------------------
-
-Internal name
-     fv_vertigotv
-
-Module
-     fv_vertigotv.so
-
-Description
-     VertigoTV is a loopback alpha blending effector with rotating and
-     scaling. Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.57 WarholTV
-----------------
-
-Internal name
-     fv_warholtv
-
-Module
-     fv_warholtv.so
-
-Description
-     WarholTV offers some effects like Andy Warhol's series of
-     paintings; 'Marilyn', 'Marilyn Three Times', 'Four Marilyns' etc.
-     Ported from EffecTV (http://effectv.sourceforge.net).
-
-5.15.58 WarpTV
---------------
-
-Internal name
-     fv_warptv
-
-Module
-     fv_warptv.so
-
-Description
-     WarpTV does realtime goo'ing of the video input. based on warp-1.1
-     SDL demo by Sam Latinga (http://libSDL.org). Original version by
-     Emmanuel Marty <core at ggi-project dawt org>. Ported from EffecTV
-     (http://effectv.sourceforge.net).
-
-5.15.59 Y'CbCr(A) Colormatrix
------------------------------
-
-Internal name
-     fv_colormatrix_yuv
-
-Module
-     fv_colormatrix_yuv.so
-
-Description
-     Generic colormatrix (Y'CbCrA). You pass the coefficients in
-     Y'CbCr(A) coordinates, but the processing will work in RGB(A) as
-     well.
-
-5.15.60 Zoom
-------------
-
-Internal name
-     fv_zoom
-
-Module
-     fv_zoom.so
-
-Description
-     Zoom horizontally and/or vertically
-
-&#x1f;
-File: gmerlin.info,  Node: plugin_vis,  Prev: plugin_fv,  Up: Plugins
-
-5.16 Visualizations
-===================
-
-5.16.1 Scope
-------------
-
-Internal name
-     vis_scope
-
-Module
-     vis_scope.so
-
-Description
-     Scope plugin
-
-5.16.2 Lemuria
---------------
-
-Internal name
-     vis_lemuria
-
-Module
-     vis_lemuria.so
-
-Description
-     OpenGL visualization with many effects
-
-5.16.3 Goom
------------
-
-Internal name
-     vis_goom
-
-Module
-     vis_goom.so
-
-Description
-     Goom plugin
-
-&#x1f;
-File: gmerlin.info,  Node: FAQ,  Next: Get involved,  Prev: Plugins,  Up: Top
-
-6 FAQ
-*****
-
-* Menu:
-
-* General questions::
-* Installation questions::
-* Usage questions::
-
-&#x1f;
-File: gmerlin.info,  Node: General questions,  Next: Installation questions,  Up: FAQ
-
-6.1 General questions
-=====================
-
-&#x1f;
-File: gmerlin.info,  Node: Installation questions,  Next: Usage questions,  Prev: General questions,  Up: FAQ
-
-6.2 Installation questions
-==========================
-
-*Q:* _Why do I have to install so many packages to get all features?_
-
-   *A:* Because having one huge package is not good for people, who
-want to use only one small subset of the included libraries or
-applications. To make installation a bit easier, there are the
-gmerlin-dependencies and gmerlin-all-in-one packages.
-
-   *Q:* _How do I enable Ladspa plugins?_
-
-   *A:* Gmerlin looks for Ladspa plugins in `/usr/lib/ladspa' and
-`/usr/local/lib/ladspa' by default. Additional paths can be set with the
-`LADSPA_PATH' enviromnent variable.
-
-   *Q:* _Which Ladspa plugins work with gmerlin?_
-
-   *A:* All plugins, which have either 1 or 2 input and output ports.
-The numbers of input- and output ports must be equal.
-
-   *Q:* How do I enable DVB?
-
-   *A:* Gmerlin looks for DVB devices in /dev/dvb. Then, you must pass
-gmerlin   a channel configuration file created with the dvb-apps
-(http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps)   tools. Check
-the documentation coming with dvb-apps for how to create channel files.
-Gmerlin looks for channel maps   in the directories `$HOME/.szap',
-`$HOME/.tzap', `$HOME/.czap',   `$HOME/.azap', `$HOME/.mplayer' and
-`$HOME/.xine'. The first time, you load the DVB plugin,   and each time
-you changed your channel map, the plugin will tune to each transponder
-and get the full   information about the programs (the information
-provided by dvp-apps is not sufficient). This can take some time.
-
-&#x1f;
-File: gmerlin.info,  Node: Usage questions,  Prev: Installation questions,  Up: FAQ
-
-6.3 Usage questions
-===================
-
-*Q:* _Ok, I compiled gmerlin and started the player, now how do I  play
-a file?_
-
-   *A:* The easiest way is to open the Incoming or Favourites album and
-use one of the buttons at the bottom to open a file or URL. Or drag the
-file from a filemanager into an album. Later you might want to create
-your own albums.
-
-   *Q:* _Can I play a VCD image from harddisk before burning?_
-
-   *A:* Yes. If you use vcdimager, you have 2 files: a .bin file and a
-.cue    file. If you load the .cue file with the avdecoder plugin,
-you'll be    able to play the VCD image.
-
-   *Q:* _Can I play a DVD image from harddisk or from a mounted DVD
-drive?_
-
-   *A:* Yes, in the dvd directory, go to the subdirectory `video_ts'
-and load the    file `video_ts.ifo'.
-
-   *Q:* _Can I play an audio CD image from harddisk before burning?_
-
-   *A:* Not yet.
-
-   *Q:* _How can I make gmerlin the default audio CD player on my
-Desktop environment?_
-
-   *A:* First, find out how to configure the default audio CD player on
-your system.     Usually, you can set a command, which is executed,
-when a new audio cd is inserted.     Assuming your cdrom device is
-`/dev/hdd', the command for opening and playing    an audio cd is:
-
-   `gmerlin_remote -launch -openplay cda:///dev/hdd'
-
-   If you just want ot open the CD (without starting playback), use:
-
-   `gmerlin_remote -launch -open cda:///dev/hdd'
-
-   *Q:* _How can I make gmerlin the default DVD player on my Desktop
-environment?_
-
-   *A:* Same as for audio CDs, but replace `cda://' with `dvd://'.
-
-   *Q:* _How can I configure gmerlin as a Mime handler for media files
-on my Desktop environment?_
-
-   *A:* Find out how to set up mime handlers (e.g. right click onto a
-file and select "Open with...").     Then, enter the command
-`gmerlin_launcher'.
-
-   *Q:* _How can I map multimedia keys on my keyboard to gmerlin
-functions?_
-
-   *A:* You need some way to configure custom shell commands for
-multimedia keys. Check the documentation of your Desktop system. To
-remote control gmerlin, use the commandline program `gmerlin_remote'.
-Type `gmerlin_remote -help' for supported options and commands.
-
-&#x1f;
-File: gmerlin.info,  Node: Get involved,  Prev: FAQ,  Up: Top
-
-7 Get involved
-**************
-
-Contribution to gmerlin can happen at several skill levels:
-
-   * Report bugs and installation problems, tell about features you'd
-     like to see.
-
-   * Tell us about files, which cannot be played. An URL and some infos
-     (other applications       which play the file fine) can help a lot.
-
-   * Make skins. In /usr/local/gmerlin/skins/Default/skin.xml, you'll
-     find an example skin description file.
-
-   * Assembler gurus can write more speed optimized routines for gavl
-
-   * Mathematics gurus can write more accurate routines for the higher
-     quality levels of gavl.
-
-

gmerlin-1.2.0.tar.gz/doc/mdate-sh Deleted

@@ -1,205 +0,0 @@
-#!/bin/sh
-# Get modification time of a file or directory and pretty-print it.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
-# Software Foundation, Inc.
-# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: mdate-sh [--help] [--version] FILE
-
-Pretty-print the modification time of FILE.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "mdate-sh $scriptversion"
-    exit $?
-    ;;
-esac
-
-# Prevent date giving response in another language.
-LANG=C
-export LANG
-LC_ALL=C
-export LC_ALL
-LC_TIME=C
-export LC_TIME
-
-# GNU ls changes its time format in response to the TIME_STYLE
-# variable.  Since we cannot assume `unset' works, revert this
-# variable to its documented default.
-if test "${TIME_STYLE+set}" = set; then
-  TIME_STYLE=posix-long-iso
-  export TIME_STYLE
-fi
-
-save_arg1=$1
-
-# Find out how to get the extended ls output of a file or directory.
-if ls -L /dev/null 1>/dev/null 2>&1; then
-  ls_command='ls -L -l -d'
-else
-  ls_command='ls -l -d'
-fi
-# Avoid user/group names that might have spaces, when possible.
-if ls -n /dev/null 1>/dev/null 2>&1; then
-  ls_command="$ls_command -n"
-fi
-
-# A `ls -l' line looks as follows on OS/2.
-#  drwxrwx---        0 Aug 11  2001 foo
-# This differs from Unix, which adds ownership information.
-#  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
-#
-# To find the date, we split the line on spaces and iterate on words
-# until we find a month.  This cannot work with files whose owner is a
-# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
-# will be owned by a user whose name is a month.  So we first look at
-# the extended ls output of the root directory to decide how many
-# words should be skipped to get the date.
-
-# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-set x`$ls_command /`
-
-# Find which argument is the month.
-month=
-command=
-until test $month
-do
-  shift
-  # Add another shift to the command.
-  command="$command shift;"
-  case $1 in
-    Jan) month=January; nummonth=1;;
-    Feb) month=February; nummonth=2;;
-    Mar) month=March; nummonth=3;;
-    Apr) month=April; nummonth=4;;
-    May) month=May; nummonth=5;;
-    Jun) month=June; nummonth=6;;
-    Jul) month=July; nummonth=7;;
-    Aug) month=August; nummonth=8;;
-    Sep) month=September; nummonth=9;;
-    Oct) month=October; nummonth=10;;
-    Nov) month=November; nummonth=11;;
-    Dec) month=December; nummonth=12;;
-  esac
-done
-
-# Get the extended ls output of the file or directory.
-set dummy x`eval "$ls_command \"\$save_arg1\""`
-
-# Remove all preceding arguments
-eval $command
-
-# Because of the dummy argument above, month is in $2.
-#
-# On a POSIX system, we should have
-#
-# $# = 5
-# $1 = file size
-# $2 = month
-# $3 = day
-# $4 = year or time
-# $5 = filename
-#
-# On Darwin 7.7.0 and 7.6.0, we have
-#
-# $# = 4
-# $1 = day
-# $2 = month
-# $3 = year or time
-# $4 = filename
-
-# Get the month.
-case $2 in
-  Jan) month=January; nummonth=1;;
-  Feb) month=February; nummonth=2;;
-  Mar) month=March; nummonth=3;;
-  Apr) month=April; nummonth=4;;
-  May) month=May; nummonth=5;;
-  Jun) month=June; nummonth=6;;
-  Jul) month=July; nummonth=7;;
-  Aug) month=August; nummonth=8;;
-  Sep) month=September; nummonth=9;;
-  Oct) month=October; nummonth=10;;
-  Nov) month=November; nummonth=11;;
-  Dec) month=December; nummonth=12;;
-esac
-
-case $3 in
-  ???*) day=$1;;
-  *) day=$3; shift;;
-esac
-
-# Here we have to deal with the problem that the ls output gives either
-# the time of day or the year.
-case $3 in
-  *:*) set `date`; eval year=\$$#
-       case $2 in
-	 Jan) nummonthtod=1;;
-	 Feb) nummonthtod=2;;
-	 Mar) nummonthtod=3;;
-	 Apr) nummonthtod=4;;
-	 May) nummonthtod=5;;
-	 Jun) nummonthtod=6;;
-	 Jul) nummonthtod=7;;
-	 Aug) nummonthtod=8;;
-	 Sep) nummonthtod=9;;
-	 Oct) nummonthtod=10;;
-	 Nov) nummonthtod=11;;
-	 Dec) nummonthtod=12;;
-       esac
-       # For the first six month of the year the time notation can also
-       # be used for files modified in the last year.
-       if (expr $nummonth \> $nummonthtod) > /dev/null;
-       then
-	 year=`expr $year - 1`
-       fi;;
-  *) year=$3;;
-esac
-
-# The result.
-echo $day $month $year
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

gmerlin-1.2.0.tar.gz/doc/stamp-vti Deleted

gmerlin-1.2.0.tar.gz/doc/texinfo.tex Deleted

@@ -1,9291 +0,0 @@
-% texinfo.tex -- TeX macros to handle Texinfo files.
-% 
-% Load plain if necessary, i.e., if running under initex.
-\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
-%
-\def\texinfoversion{2009-08-14.15}
-%
-% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009 Free Software Foundation, Inc.
-%
-% This texinfo.tex file is free software: you can redistribute it and/or
-% modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation, either version 3 of the
-% License, or (at your option) any later version.
-%
-% This texinfo.tex file 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
-% General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program.  If not, see <http://www.gnu.org/licenses/>.
-%
-% As a special exception, when this file is read by TeX when processing
-% a Texinfo source document, you may use the result without
-% restriction.  (This has been our intent since Texinfo was invented.)
-%
-% Please try the latest version of texinfo.tex before submitting bug
-% reports; you can get the latest version from:
-%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
-%   ftp://tug.org/tex/texinfo.tex
-%     (and all CTAN mirrors, see http://www.ctan.org).
-% The texinfo.tex in any given distribution could well be out
-% of date, so if that's what you're using, please check.
-%
-% Send bug reports to bug-texinfo@gnu.org.  Please include including a
-% complete document in each bug report with which we can reproduce the
-% problem.  Patches are, of course, greatly appreciated.
-%
-% To process a Texinfo manual with TeX, it's most reliable to use the
-% texi2dvi shell script that comes with the distribution.  For a simple
-% manual foo.texi, however, you can get away with this:
-%   tex foo.texi
-%   texindex foo.??
-%   tex foo.texi
-%   tex foo.texi
-%   dvips foo.dvi -o  # or whatever; this makes foo.ps.
-% The extra TeX runs get the cross-reference information correct.
-% Sometimes one run after texindex suffices, and sometimes you need more
-% than two; texi2dvi does it as many times as necessary.
-%
-% It is possible to adapt texinfo.tex for other languages, to some
-% extent.  You can get the existing language-specific files from the
-% full Texinfo distribution.
-%
-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
-
-
-\message{Loading texinfo [version \texinfoversion]:}
-
-% If in a .fmt file, print the version number
-% and turn on active characters that we couldn't do earlier because
-% they might have appeared in the input file name.
-\everyjob{\message{[Texinfo version \texinfoversion]}%
-  \catcode`+=\active \catcode`\_=\active}
-
-
-\chardef\other=12
-
-% We never want plain's \outer definition of \+ in Texinfo.
-% For @tex, we can use \tabalign.
-\let\+ = \relax
-
-% Save some plain tex macros whose names we will redefine.
-\let\ptexb=\b
-\let\ptexbullet=\bullet
-\let\ptexc=\c
-\let\ptexcomma=\,
-\let\ptexdot=\.
-\let\ptexdots=\dots
-\let\ptexend=\end
-\let\ptexequiv=\equiv
-\let\ptexexclam=\!
-\let\ptexfootnote=\footnote
-\let\ptexgtr=>
-\let\ptexhat=^
-\let\ptexi=\i
-\let\ptexindent=\indent
-\let\ptexinsert=\insert
-\let\ptexlbrace=\{
-\let\ptexless=<
-\let\ptexnewwrite\newwrite
-\let\ptexnoindent=\noindent
-\let\ptexplus=+
-\let\ptexrbrace=\}
-\let\ptexslash=\/
-\let\ptexstar=\*
-\let\ptext=\t
-\let\ptextop=\top
-{\catcode`\'=\active
-\global\let\ptexquoteright'}% Math-mode def from plain.tex.
-\let\ptexraggedright=\raggedright
-
-% If this character appears in an error message or help string, it
-% starts a new line in the output.
-\newlinechar = `^^J
-
-% Use TeX 3.0's \inputlineno to get the line number, for better error
-% messages, but if we're using an old version of TeX, don't do anything.
-%
-\ifx\inputlineno\thisisundefined
-  \let\linenumber = \empty % Pre-3.0.
-\else
-  \def\linenumber{l.\the\inputlineno:\space}
-\fi
-
-% Set up fixed words for English if not already set.
-\ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
-\ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
-\ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
-\ifx\putwordin\undefined        \gdef\putwordin{in}\fi
-\ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
-\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
-\ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
-\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
-\ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
-\ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
-\ifx\putwordof\undefined        \gdef\putwordof{of}\fi
-\ifx\putwordon\undefined        \gdef\putwordon{on}\fi
-\ifx\putwordpage\undefined      \gdef\putwordpage{page}\fi
-\ifx\putwordsection\undefined   \gdef\putwordsection{section}\fi
-\ifx\putwordSection\undefined   \gdef\putwordSection{Section}\fi
-\ifx\putwordsee\undefined       \gdef\putwordsee{see}\fi
-\ifx\putwordSee\undefined       \gdef\putwordSee{See}\fi
-\ifx\putwordShortTOC\undefined  \gdef\putwordShortTOC{Short Contents}\fi
-\ifx\putwordTOC\undefined       \gdef\putwordTOC{Table of Contents}\fi
-%
-\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
-\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
-\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
-\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
-\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
-\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
-\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
-\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
-\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
-\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
-\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
-\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
-%
-\ifx\putwordDefmac\undefined    \gdef\putwordDefmac{Macro}\fi
-\ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
-\ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
-\ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
-\ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
-
-% Since the category of space is not known, we have to be careful.
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode`\ =\spacecat}
-
-% sometimes characters are active, so we need control sequences.
-\chardef\colonChar = `\:
-\chardef\commaChar = `\,
-\chardef\dashChar  = `\-
-\chardef\dotChar   = `\.
-\chardef\exclamChar= `\!
-\chardef\lquoteChar= `\`
-\chardef\questChar = `\?
-\chardef\rquoteChar= `\'
-\chardef\semiChar  = `\;
-\chardef\underChar = `\_
-
-% Ignore a token.
-%
-\def\gobble#1{}
-
-% The following is used inside several \edef's.
-\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
-
-% Hyphenation fixes.
-\hyphenation{
-  Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
-  ap-pen-dix bit-map bit-maps
-  data-base data-bases eshell fall-ing half-way long-est man-u-script
-  man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
-  par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
-  spell-ing spell-ings
-  stand-alone strong-est time-stamp time-stamps which-ever white-space
-  wide-spread wrap-around
-}
-
-% Margin to add to right of even pages, to left of odd pages.
-\newdimen\bindingoffset
-\newdimen\normaloffset
-\newdimen\pagewidth \newdimen\pageheight
-
-% For a final copy, take out the rectangles
-% that mark overfull boxes (in case you have decided
-% that the text looks ok even though it passes the margin).
-%
-\def\finalout{\overfullrule=0pt}
-
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
-%
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
-}
-
-% Sometimes it is convenient to have everything in the transcript file
-% and nothing on the terminal.  We don't just call \tracingall here,
-% since that produces some useless output on the terminal.  We also make
-% some effort to order the tracing commands to reduce output in the log
-% file; cf. trace.sty in LaTeX.
-%
-\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
-\def\loggingall{%
-  \tracingstats2
-  \tracingpages1
-  \tracinglostchars2  % 2 gives us more in etex
-  \tracingparagraphs1
-  \tracingoutput1
-  \tracingmacros2
-  \tracingrestores1
-  \showboxbreadth\maxdimen \showboxdepth\maxdimen
-  \ifx\eTeXversion\undefined\else % etex gives us more logging
-    \tracingscantokens1
-    \tracingifs1
-    \tracinggroups1
-    \tracingnesting2
-    \tracingassigns1
-  \fi
-  \tracingcommands3  % 3 gives us more in etex
-  \errorcontextlines16
-}%
-
-% add check for \lastpenalty to plain's definitions.  If the last thing
-% we did was a \nobreak, we don't want to insert more space.
-%
-\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
-  \removelastskip\penalty-50\smallskip\fi\fi}
-\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
-  \removelastskip\penalty-100\medskip\fi\fi}
-\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
-  \removelastskip\penalty-200\bigskip\fi\fi}
-
-% For @cropmarks command.
-% Do @cropmarks to get crop marks.
-%
-\newif\ifcropmarks
-\let\cropmarks = \cropmarkstrue
-%
-% Dimensions to add cropmarks at corners.
-% Added by P. A. MacKay, 12 Nov. 1986
-%
-\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
-\newdimen\cornerlong  \cornerlong=1pc
-\newdimen\cornerthick \cornerthick=.3pt
-\newdimen\topandbottommargin \topandbottommargin=.75in
-
-% Output a mark which sets \thischapter, \thissection and \thiscolor.
-% We dump everything together because we only have one kind of mark.
-% This works because we only use \botmark / \topmark, not \firstmark.
-%
-% A mark contains a subexpression of the \ifcase ... \fi construct.
-% \get*marks macros below extract the needed part using \ifcase.
-%
-% Another complication is to let the user choose whether \thischapter
-% (\thissection) refers to the chapter (section) in effect at the top
-% of a page, or that at the bottom of a page.  The solution is
-% described on page 260 of The TeXbook.  It involves outputting two
-% marks for the sectioning macros, one before the section break, and
-% one after.  I won't pretend I can describe this better than DEK...
-\def\domark{%
-  \toks0=\expandafter{\lastchapterdefs}%
-  \toks2=\expandafter{\lastsectiondefs}%
-  \toks4=\expandafter{\prevchapterdefs}%
-  \toks6=\expandafter{\prevsectiondefs}%
-  \toks8=\expandafter{\lastcolordefs}%
-  \mark{%
-                   \the\toks0 \the\toks2
-      \noexpand\or \the\toks4 \the\toks6
-    \noexpand\else \the\toks8
-  }%
-}
-% \topmark doesn't work for the very first chapter (after the title
-% page or the contents), so we use \firstmark there -- this gets us
-% the mark with the chapter defs, unless the user sneaks in, e.g.,
-% @setcolor (or @url, or @link, etc.) between @contents and the very
-% first @chapter.
-\def\gettopheadingmarks{%
-  \ifcase0\topmark\fi
-  \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
-}
-\def\getbottomheadingmarks{\ifcase1\botmark\fi}
-\def\getcolormarks{\ifcase2\topmark\fi}
-
-% Avoid "undefined control sequence" errors.
-\def\lastchapterdefs{}
-\def\lastsectiondefs{}
-\def\prevchapterdefs{}
-\def\prevsectiondefs{}
-\def\lastcolordefs{}
-
-% Main output routine.
-\chardef\PAGE = 255
-\output = {\onepageout{\pagecontents\PAGE}}
-
-\newbox\headlinebox
-\newbox\footlinebox
-
-% \onepageout takes a vbox as an argument.  Note that \pagecontents
-% does insertions, but you have to call it yourself.
-\def\onepageout#1{%
-  \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
-  %
-  \ifodd\pageno  \advance\hoffset by \bindingoffset
-  \else \advance\hoffset by -\bindingoffset\fi
-  %
-  % Do this outside of the \shipout so @code etc. will be expanded in
-  % the headline as they should be, not taken literally (outputting ''code).
-  \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
-  \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
-  \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
-  \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
-  %
-  {%
-    % Have to do this stuff outside the \shipout because we want it to
-    % take effect in \write's, yet the group defined by the \vbox ends
-    % before the \shipout runs.
-    %
-    \indexdummies         % don't expand commands in the output.
-    \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-               % the page break happens to be in the middle of an example.
-               % We don't want .vr (or whatever) entries like this:
-               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
-               % "\acronym" won't work when it's read back in;
-               % it needs to be
-               % {\code {{\tt \backslashcurfont }acronym}
-    \shipout\vbox{%
-      % Do this early so pdf references go to the beginning of the page.
-      \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
-      %
-      \ifcropmarks \vbox to \outervsize\bgroup
-        \hsize = \outerhsize
-        \vskip-\topandbottommargin
-        \vtop to0pt{%
-          \line{\ewtop\hfil\ewtop}%
-          \nointerlineskip
-          \line{%
-            \vbox{\moveleft\cornerthick\nstop}%
-            \hfill
-            \vbox{\moveright\cornerthick\nstop}%
-          }%
-          \vss}%
-        \vskip\topandbottommargin
-        \line\bgroup
-          \hfil % center the page within the outer (page) hsize.
-          \ifodd\pageno\hskip\bindingoffset\fi
-          \vbox\bgroup
-      \fi
-      %
-      \unvbox\headlinebox
-      \pagebody{#1}%
-      \ifdim\ht\footlinebox > 0pt
-        % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingyyy.)
-        % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 24pt
-        \unvbox\footlinebox
-      \fi
-      %
-      \ifcropmarks
-          \egroup % end of \vbox\bgroup
-        \hfil\egroup % end of (centering) \line\bgroup
-        \vskip\topandbottommargin plus1fill minus1fill
-        \boxmaxdepth = \cornerthick
-        \vbox to0pt{\vss
-          \line{%
-            \vbox{\moveleft\cornerthick\nsbot}%
-            \hfill
-            \vbox{\moveright\cornerthick\nsbot}%
-          }%
-          \nointerlineskip
-          \line{\ewbot\hfil\ewbot}%
-        }%
-      \egroup % \vbox from first cropmarks clause
-      \fi
-    }% end of \shipout\vbox
-  }% end of group with \indexdummies
-  \advancepageno
-  \ifnum\outputpenalty>-20000 \else\dosupereject\fi
-}
-
-\newinsert\margin \dimen\margin=\maxdimen
-
-\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
-{\catcode`\@ =11
-\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
-% marginal hacks, juha@viisa.uucp (Juha Takala)
-\ifvoid\margin\else % marginal info is present
-  \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
-\dimen@=\dp#1\relax \unvbox#1\relax
-\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
-\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
-}
-
-% Here are the rules for the cropmarks.  Note that they are
-% offset so that the space between them is truly \outerhsize or \outervsize
-% (P. A. MacKay, 12 November, 1986)
-%
-\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
-\def\nstop{\vbox
-  {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
-\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
-\def\nsbot{\vbox
-  {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
-
-% Parse an argument, then pass it to #1.  The argument is the rest of
-% the input line (except we remove a trailing comment).  #1 should be a
-% macro which expects an ordinary undelimited TeX argument.
-%
-\def\parsearg{\parseargusing{}}
-\def\parseargusing#1#2{%
-  \def\argtorun{#2}%
-  \begingroup
-    \obeylines
-    \spaceisspace
-    #1%
-    \parseargline\empty% Insert the \empty token, see \finishparsearg below.
-}
-
-{\obeylines %
-  \gdef\parseargline#1^^M{%
-    \endgroup % End of the group started in \parsearg.
-    \argremovecomment #1\comment\ArgTerm%
-  }%
-}
-
-% First remove any @comment, then any @c comment.
-\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
-
-% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
-%
-% \argremovec might leave us with trailing space, e.g.,
-%    @end itemize  @c foo
-% This space token undergoes the same procedure and is eventually removed
-% by \finishparsearg.
-%
-\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
-\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
-\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-  \def\temp{#3}%
-  \ifx\temp\empty
-    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
-    \let\temp\finishparsearg
-  \else
-    \let\temp\argcheckspaces
-  \fi
-  % Put the space token in:
-  \temp#1 #3\ArgTerm
-}
-
-% If a _delimited_ argument is enclosed in braces, they get stripped; so
-% to get _exactly_ the rest of the line, we had to prevent such situation.
-% We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \argtorun.
-% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
-% either the null string, or it ends with \^^M---thus there is no danger
-% that a pair of braces would be stripped.
-%
-% But first, we have to remove the trailing space token.
-%
-\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
-
-% \parseargdef\foo{...}
-%	is roughly equivalent to
-% \def\foo{\parsearg\Xfoo}
-% \def\Xfoo#1{...}
-%
-% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
-% favourite TeX trick.  --kasal, 16nov03
-
-\def\parseargdef#1{%
-  \expandafter \doparseargdef \csname\string#1\endcsname #1%
-}
-\def\doparseargdef#1#2{%
-  \def#2{\parsearg#1}%
-  \def#1##1%
-}
-
-% Several utility definitions with active space:
-{
-  \obeyspaces
-  \gdef\obeyedspace{ }
-
-  % Make each space character in the input produce a normal interword
-  % space in the output.  Don't allow a line break at this space, as this
-  % is used only in environments like @example, where each line of input
-  % should produce a line of output anyway.
-  %
-  \gdef\sepspaces{\obeyspaces\let =\tie}
-
-  % If an index command is used in an @example environment, any spaces
-  % therein should become regular spaces in the raw index file, not the
-  % expansion of \tie (\leavevmode \penalty \@M \ ).
-  \gdef\unsepspaces{\let =\space}
-}
-
-
-\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
-
-% Define the framework for environments in texinfo.tex.  It's used like this:
-%
-%   \envdef\foo{...}
-%   \def\Efoo{...}
-%
-% It's the responsibility of \envdef to insert \begingroup before the
-% actual body; @end closes the group after calling \Efoo.  \envdef also
-% defines \thisenv, so the current environment is known; @end checks
-% whether the environment name matches.  The \checkenv macro can also be
-% used to check whether the current environment is the one expected.
-%
-% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
-% are not treated as environments; they don't open a group.  (The
-% implementation of @end takes care not to call \endgroup in this
-% special case.)
-
-
-% At run-time, environments start with this:
-\def\startenvironment#1{\begingroup\def\thisenv{#1}}
-% initialize
-\let\thisenv\empty
-
-% ... but they get defined via ``\envdef\foo{...}'':
-\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
-\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
-
-% Check whether we're in the right environment:
-\def\checkenv#1{%
-  \def\temp{#1}%
-  \ifx\thisenv\temp
-  \else
-    \badenverr
-  \fi
-}
-
-% Environment mismatch, #1 expected:
-\def\badenverr{%
-  \errhelp = \EMsimple
-  \errmessage{This command can appear only \inenvironment\temp,
-    not \inenvironment\thisenv}%
-}
-\def\inenvironment#1{%
-  \ifx#1\empty
-    out of any environment%
-  \else
-    in environment \expandafter\string#1%
-  \fi
-}
-
-% @end foo executes the definition of \Efoo.
-% But first, it executes a specialized version of \checkenv
-%
-\parseargdef\end{%
-  \if 1\csname iscond.#1\endcsname
-  \else
-    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
-    \expandafter\checkenv\csname#1\endcsname
-    \csname E#1\endcsname
-    \endgroup
-  \fi
-}
-
-\newhelp\EMsimple{Press RETURN to continue.}
-
-
-%% Simple single-character @ commands
-
-% @@ prints an @
-% Kludge this until the fonts are right (grr).
-\def\@{{\tt\char64}}
-
-% This is turned off because it was never documented
-% and you can use @w{...} around a quote to suppress ligatures.
-%% Define @` and @' to be the same as ` and '
-%% but suppressing ligatures.
-%\def\`{{`}}
-%\def\'{{'}}
-
-% Used to generate quoted braces.
-\def\mylbrace {{\tt\char123}}
-\def\myrbrace {{\tt\char125}}
-\let\{=\mylbrace
-\let\}=\myrbrace
-\begingroup
-  % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux/toc files.
-  \catcode`\{ = \other \catcode`\} = \other
-  \catcode`\[ = 1 \catcode`\] = 2
-  \catcode`\! = 0 \catcode`\\ = \other
-  !gdef!lbracecmd[\{]%
-  !gdef!rbracecmd[\}]%
-  !gdef!lbraceatcmd[@{]%
-  !gdef!rbraceatcmd[@}]%
-!endgroup
-
-% @comma{} to avoid , parsing problems.
-\let\comma = ,
-
-% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
-\let\, = \c
-\let\dotaccent = \.
-\def\ringaccent#1{{\accent23 #1}}
-\let\tieaccent = \t
-\let\ubaraccent = \b
-\let\udotaccent = \d
-
-% Other special characters: @questiondown @exclamdown @ordf @ordm
-% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
-\def\questiondown{?`}
-\def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
-
-% Dotless i and dotless j, used for accents.
-\def\imacro{i}
-\def\jmacro{j}
-\def\dotless#1{%
-  \def\temp{#1}%
-  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
-  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
-  \else \errmessage{@dotless can be used only with i or j}%
-  \fi\fi
-}
-
-% The \TeX{} logo, as in plain, but resetting the spacing so that a
-% period following counts as ending a sentence.  (Idea found in latex.)
-%
-\edef\TeX{\TeX \spacefactor=1000 }
-
-% @LaTeX{} logo.  Not quite the same results as the definition in
-% latex.ltx, since we use a different font for the raised A; it's most
-% convenient for us to use an explicitly smaller font, rather than using
-% the \scriptstyle font (since we don't reset \scriptstyle and
-% \scriptscriptstyle).
-%
-\def\LaTeX{%
-  L\kern-.36em
-  {\setbox0=\hbox{T}%
-   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-  \kern-.15em
-  \TeX
-}
-
-% Be sure we're in horizontal mode when doing a tie, since we make space
-% equivalent to this in @example-like environments. Otherwise, a space
-% at the beginning of a line will start with \penalty -- and
-% since \penalty is valid in vertical mode, we'd end up putting the
-% penalty on the vertical list instead of in the new paragraph.
-{\catcode`@ = 11
- % Avoid using \@M directly, because that causes trouble
- % if the definition is written into an index file.
- \global\let\tiepenalty = \@M
- \gdef\tie{\leavevmode\penalty\tiepenalty\ }
-}
-
-% @: forces normal size whitespace following.
-\def\:{\spacefactor=1000 }
-
-% @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
-
-% @/ allows a line break.
-\let\/=\allowbreak
-
-% @. is an end-of-sentence period.
-\def\.{.\spacefactor=\endofsentencespacefactor\space}
-
-% @! is an end-of-sentence bang.
-\def\!{!\spacefactor=\endofsentencespacefactor\space}
-
-% @? is an end-of-sentence query.
-\def\?{?\spacefactor=\endofsentencespacefactor\space}
-
-% @frenchspacing on|off  says whether to put extra space after punctuation.
-%
-\def\onword{on}
-\def\offword{off}
-%
-\parseargdef\frenchspacing{%
-  \def\temp{#1}%
-  \ifx\temp\onword \plainfrenchspacing
-  \else\ifx\temp\offword \plainnonfrenchspacing
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
-  \fi\fi
-}
-
-% @w prevents a word break.  Without the \leavevmode, @w at the
-% beginning of a paragraph, when TeX is still in vertical mode, would
-% produce a whole line of output instead of starting the paragraph.
-\def\w#1{\leavevmode\hbox{#1}}
-
-% @group ... @end group forces ... to be all on one page, by enclosing
-% it in a TeX vbox.  We use \vtop instead of \vbox to construct the box
-% to keep its height that of a normal line.  According to the rules for
-% \topskip (p.114 of the TeXbook), the glue inserted is
-% max (\topskip - \ht (first item), 0).  If that height is large,
-% therefore, no glue is inserted, and the space between the headline and
-% the text is small, which looks bad.
-%
-% Another complication is that the group might be very large.  This can
-% cause the glue on the previous page to be unduly stretched, because it
-% does not have much material.  In this case, it's better to add an
-% explicit \vfill so that the extra space is at the bottom.  The
-% threshold for doing this is if the group is more than \vfilllimit
-% percent of a page (\vfilllimit can be changed inside of @tex).
-%
-\newbox\groupbox
-\def\vfilllimit{0.7}
-%
-\envdef\group{%
-  \ifnum\catcode`\^^M=\active \else
-    \errhelp = \groupinvalidhelp
-    \errmessage{@group invalid in context where filling is enabled}%
-  \fi
-  \startsavinginserts
-  %
-  \setbox\groupbox = \vtop\bgroup
-    % Do @comment since we are called inside an environment such as
-    % @example, where each end-of-line in the input causes an
-    % end-of-line in the output.  We don't want the end-of-line after
-    % the `@group' to put extra space in the output.  Since @group
-    % should appear on a line by itself (according to the Texinfo
-    % manual), we don't worry about eating any user text.
-    \comment
-}
-%
-% The \vtop produces a box with normal height and large depth; thus, TeX puts
-% \baselineskip glue before it, and (when the next line of text is done)
-% \lineskip glue after it.  Thus, space below is not quite equal to space
-% above.  But it's pretty close.
-\def\Egroup{%
-    % To get correct interline space between the last line of the group
-    % and the first line afterwards, we have to propagate \prevdepth.
-    \endgraf % Not \par, as it may have been set to \lisppar.
-    \global\dimen1 = \prevdepth
-  \egroup           % End the \vtop.
-  % \dimen0 is the vertical size of the group's box.
-  \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
-  % \dimen2 is how much space is left on the page (more or less).
-  \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
-  % if the group doesn't fit on the current page, and it's a big big
-  % group, force a page break.
-  \ifdim \dimen0 > \dimen2
-    \ifdim \pagetotal < \vfilllimit\pageheight
-      \page
-    \fi
-  \fi
-  \box\groupbox
-  \prevdepth = \dimen1
-  \checkinserts
-}
-%
-% TeX puts in an \escapechar (i.e., `@') at the beginning of the help
-% message, so this ends up printing `@group can only ...'.
-%
-\newhelp\groupinvalidhelp{%
-group can only be used in environments such as @example,^^J%
-where each line of input produces a line of output.}
-
-% @need space-in-mils
-% forces a page break if there is not space-in-mils remaining.
-
-\newdimen\mil  \mil=0.001in
-
-% Old definition--didn't work.
-%\parseargdef\need{\par %
-%% This method tries to make TeX break the page naturally
-%% if the depth of the box does not fit.
-%{\baselineskip=0pt%
-%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
-%\prevdepth=-1000pt
-%}}
-
-\parseargdef\need{%
-  % Ensure vertical mode, so we don't make a big box in the middle of a
-  % paragraph.
-  \par
-  %
-  % If the @need value is less than one line space, it's useless.
-  \dimen0 = #1\mil
-  \dimen2 = \ht\strutbox
-  \advance\dimen2 by \dp\strutbox
-  \ifdim\dimen0 > \dimen2
-    %
-    % Do a \strut just to make the height of this box be normal, so the
-    % normal leading is inserted relative to the preceding line.
-    % And a page break here is fine.
-    \vtop to #1\mil{\strut\vfil}%
-    %
-    % TeX does not even consider page breaks if a penalty added to the
-    % main vertical list is 10000 or more.  But in order to see if the
-    % empty box we just added fits on the page, we must make it consider
-    % page breaks.  On the other hand, we don't want to actually break the
-    % page after the empty box.  So we use a penalty of 9999.
-    %
-    % There is an extremely small chance that TeX will actually break the
-    % page at this \penalty, if there are no other feasible breakpoints in
-    % sight.  (If the user is using lots of big @group commands, which
-    % almost-but-not-quite fill up a page, TeX will have a hard time doing
-    % good page breaking, for example.)  However, I could not construct an
-    % example where a page broke at this \penalty; if it happens in a real
-    % document, then we can reconsider our strategy.
-    \penalty9999
-    %
-    % Back up by the size of the box, whether we did a page break or not.
-    \kern -#1\mil
-    %
-    % Do not allow a page break right after this kern.
-    \nobreak
-  \fi
-}
-
-% @br   forces paragraph break (and is undocumented).
-
-\let\br = \par
-
-% @page forces the start of a new page.
-%
-\def\page{\par\vfill\supereject}
-
-% @exdent text....
-% outputs text on separate line in roman font, starting at standard page margin
-
-% This records the amount of indent in the innermost environment.
-% That's how much \exdent should take out.
-\newskip\exdentamount
-
-% This defn is used inside fill environments such as @defun.
-\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
-
-% This defn is used inside nofill environments such as @example.
-\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
-  \leftline{\hskip\leftskip{\rm#1}}}}
-
-% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
-% paragraph.  For more general purposes, use the \margin insertion
-% class.  WHICH is `l' or `r'.
-%
-\newskip\inmarginspacing \inmarginspacing=1cm
-\def\strutdepth{\dp\strutbox}
-%
-\def\doinmargin#1#2{\strut\vadjust{%
-  \nobreak
-  \kern-\strutdepth
-  \vtop to \strutdepth{%
-    \baselineskip=\strutdepth
-    \vss
-    % if you have multiple lines of stuff to put here, you'll need to
-    % make the vbox yourself of the appropriate size.
-    \ifx#1l%
-      \llap{\ignorespaces #2\hskip\inmarginspacing}%
-    \else
-      \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
-    \fi
-    \null
-  }%
-}}
-\def\inleftmargin{\doinmargin l}
-\def\inrightmargin{\doinmargin r}
-%
-% @inmargin{TEXT [, RIGHT-TEXT]}
-% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
-% else use TEXT for both).
-%
-\def\inmargin#1{\parseinmargin #1,,\finish}
-\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
-  \setbox0 = \hbox{\ignorespaces #2}%
-  \ifdim\wd0 > 0pt
-    \def\lefttext{#1}%  have both texts
-    \def\righttext{#2}%
-  \else
-    \def\lefttext{#1}%  have only one text
-    \def\righttext{#1}%
-  \fi
-  %
-  \ifodd\pageno
-    \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
-  \else
-    \def\temp{\inleftmargin\lefttext}%
-  \fi
-  \temp
-}
-
-% @include FILE -- \input text of FILE.
-%
-\def\include{\parseargusing\filenamecatcodes\includezzz}
-\def\includezzz#1{%
-  \pushthisfilestack
-  \def\thisfile{#1}%
-  {%
-    \makevalueexpandable  % we want to expand any @value in FILE.
-    \turnoffactive        % and allow special characters in the expansion
-    \indexnofonts         % Allow `@@' and other weird things in file names.
-    \edef\temp{\noexpand\input #1 }%
-    %
-    % This trickery is to read FILE outside of a group, in case it makes
-    % definitions, etc.
-    \expandafter
-  }\temp
-  \popthisfilestack
-}
-\def\filenamecatcodes{%
-  \catcode`\\=\other
-  \catcode`~=\other
-  \catcode`^=\other
-  \catcode`_=\other
-  \catcode`|=\other
-  \catcode`<=\other
-  \catcode`>=\other
-  \catcode`+=\other
-  \catcode`-=\other
-  \catcode`\`=\other
-  \catcode`\'=\other
-}
-
-\def\pushthisfilestack{%
-  \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
-}
-\def\pushthisfilestackX{%
-  \expandafter\pushthisfilestackY\thisfile\StackTerm
-}
-\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
-  \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
-}
-
-\def\popthisfilestack{\errthisfilestackempty}
-\def\errthisfilestackempty{\errmessage{Internal error:
-  the stack of filenames is empty.}}
-
-\def\thisfile{}
-
-% @center line
-% outputs that line, centered.
-%
-\parseargdef\center{%
-  \ifhmode
-    \let\next\centerH
-  \else
-    \let\next\centerV
-  \fi
-  \next{\hfil \ignorespaces#1\unskip \hfil}%
-}
-\def\centerH#1{%
-  {%
-    \hfil\break
-    \advance\hsize by -\leftskip
-    \advance\hsize by -\rightskip
-    \line{#1}%
-    \break
-  }%
-}
-\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
-
-% @sp n   outputs n lines of vertical space
-
-\parseargdef\sp{\vskip #1\baselineskip}
-
-% @comment ...line which is ignored...
-% @c is the same as @comment
-% @ignore ... @end ignore  is another way to write a comment
-
-\def\comment{\begingroup \catcode`\^^M=\other%
-\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
-\commentxxx}
-{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
-
-\let\c=\comment
-
-% @paragraphindent NCHARS
-% We'll use ems for NCHARS, close enough.
-% NCHARS can also be the word `asis' or `none'.
-% We cannot feasibly implement @paragraphindent asis, though.
-%
-\def\asisword{asis} % no translation, these are keywords
-\def\noneword{none}
-%
-\parseargdef\paragraphindent{%
-  \def\temp{#1}%
-  \ifx\temp\asisword
-  \else
-    \ifx\temp\noneword
-      \defaultparindent = 0pt
-    \else
-      \defaultparindent = #1em
-    \fi
-  \fi
-  \parindent = \defaultparindent
-}
-
-% @exampleindent NCHARS
-% We'll use ems for NCHARS like @paragraphindent.
-% It seems @exampleindent asis isn't necessary, but
-% I preserve it to make it similar to @paragraphindent.
-\parseargdef\exampleindent{%
-  \def\temp{#1}%
-  \ifx\temp\asisword
-  \else
-    \ifx\temp\noneword
-      \lispnarrowing = 0pt
-    \else
-      \lispnarrowing = #1em
-    \fi
-  \fi
-}
-
-% @firstparagraphindent WORD
-% If WORD is `none', then suppress indentation of the first paragraph
-% after a section heading.  If WORD is `insert', then do indent at such
-% paragraphs.
-%
-% The paragraph indentation is suppressed or not by calling
-% \suppressfirstparagraphindent, which the sectioning commands do.
-% We switch the definition of this back and forth according to WORD.
-% By default, we suppress indentation.
-%
-\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
-\def\insertword{insert}
-%
-\parseargdef\firstparagraphindent{%
-  \def\temp{#1}%
-  \ifx\temp\noneword
-    \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
-  \else\ifx\temp\insertword
-    \let\suppressfirstparagraphindent = \relax
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @firstparagraphindent option `\temp'}%
-  \fi\fi
-}
-
-% Here is how we actually suppress indentation.  Redefine \everypar to
-% \kern backwards by \parindent, and then reset itself to empty.
-%
-% We also make \indent itself not actually do anything until the next
-% paragraph.
-%
-\gdef\dosuppressfirstparagraphindent{%
-  \gdef\indent{%
-    \restorefirstparagraphindent
-    \indent
-  }%
-  \gdef\noindent{%
-    \restorefirstparagraphindent
-    \noindent
-  }%
-  \global\everypar = {%
-    \kern -\parindent
-    \restorefirstparagraphindent
-  }%
-}
-
-\gdef\restorefirstparagraphindent{%
-  \global \let \indent = \ptexindent
-  \global \let \noindent = \ptexnoindent
-  \global \everypar = {}%
-}
-
-
-% @asis just yields its argument.  Used with @table, for example.
-%
-\def\asis#1{#1}
-
-% @math outputs its argument in math mode.
-%
-% One complication: _ usually means subscripts, but it could also mean
-% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
-% _ active, and distinguish by seeing if the current family is \slfam,
-% which is what @var uses.
-{
-  \catcode`\_ = \active
-  \gdef\mathunderscore{%
-    \catcode`\_=\active
-    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-  }
-}
-% Another complication: we want \\ (and @\) to output a \ character.
-% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
-% this is not advertised and we don't care.  Texinfo does not
-% otherwise define @\.
-%
-% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
-\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
-%
-\def\math{%
-  \tex
-  \mathunderscore
-  \let\\ = \mathbackslash
-  \mathactive
-  % make the texinfo accent commands work in math mode
-  \let\"=\ddot
-  \let\'=\acute
-  \let\==\bar
-  \let\^=\hat
-  \let\`=\grave
-  \let\u=\breve
-  \let\v=\check
-  \let\~=\tilde
-  \let\dotaccent=\dot
-  $\finishmath
-}
-\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
-
-% Some active characters (such as <) are spaced differently in math.
-% We have to reset their definitions in case the @math was an argument
-% to a command which sets the catcodes (such as @item or @section).
-%
-{
-  \catcode`^ = \active
-  \catcode`< = \active
-  \catcode`> = \active
-  \catcode`+ = \active
-  \catcode`' = \active
-  \gdef\mathactive{%
-    \let^ = \ptexhat
-    \let< = \ptexless
-    \let> = \ptexgtr
-    \let+ = \ptexplus
-    \let' = \ptexquoteright
-  }
-}
-
-% Some math mode symbols.
-\def\bullet{$\ptexbullet$}
-\def\geq{\ifmmode \ge\else $\ge$\fi}
-\def\leq{\ifmmode \le\else $\le$\fi}
-\def\minus{\ifmmode -\else $-$\fi}
-
-% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in the cm
-% typewriter fonts as three actual period characters; on the other hand,
-% in other typewriter fonts three periods are wider than 1.5em.  So do
-% whichever is larger.
-%
-\def\dots{%
-  \leavevmode
-  \setbox0=\hbox{...}% get width of three periods
-  \ifdim\wd0 > 1.5em
-    \dimen0 = \wd0
-  \else
-    \dimen0 = 1.5em
-  \fi
-  \hbox to \dimen0{%
-    \hskip 0pt plus.25fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus.5fil
-  }%
-}
-
-% @enddots{} is an end-of-sentence ellipsis.
-%
-\def\enddots{%
-  \dots
-  \spacefactor=\endofsentencespacefactor
-}
-
-% @comma{} is so commas can be inserted into text without messing up
-% Texinfo's parsing.
-%
-\let\comma = ,
-
-% @refill is a no-op.
-\let\refill=\relax
-
-% If working on a large document in chapters, it is convenient to
-% be able to disable indexing, cross-referencing, and contents, for test runs.
-% This is done with @novalidate (before @setfilename).
-%
-\newif\iflinks \linkstrue % by default we want the aux files.
-\let\novalidate = \linksfalse
-
-% @setfilename is done at the beginning of every texinfo file.
-% So open here the files we need to have open while reading the input.
-% This makes it possible to make a .fmt file for texinfo.
-\def\setfilename{%
-   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
-   \iflinks
-     \tryauxfile
-     % Open the new aux file.  TeX will close it automatically at exit.
-     \immediate\openout\auxfile=\jobname.aux
-   \fi % \openindices needs to do some work in any case.
-   \openindices
-   \let\setfilename=\comment % Ignore extra @setfilename cmds.
-   %
-   % If texinfo.cnf is present on the system, read it.
-   % Useful for site-wide @afourpaper, etc.
-   \openin 1 texinfo.cnf
-   \ifeof 1 \else \input texinfo.cnf \fi
-   \closein 1
-   %
-   \comment % Ignore the actual filename.
-}
-
-% Called from \setfilename.
-%
-\def\openindices{%
-  \newindex{cp}%
-  \newcodeindex{fn}%
-  \newcodeindex{vr}%
-  \newcodeindex{tp}%
-  \newcodeindex{ky}%
-  \newcodeindex{pg}%
-}
-
-% @bye.
-\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
-
-
-\message{pdf,}
-% adobe `portable' document format
-\newcount\tempnum
-\newcount\lnkcount
-\newtoks\filename
-\newcount\filenamelength
-\newcount\pgn
-\newtoks\toksA
-\newtoks\toksB
-\newtoks\toksC
-\newtoks\toksD
-\newbox\boxA
-\newcount\countA
-\newif\ifpdf
-\newif\ifpdfmakepagedest
-
-% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
-% can be set).  So we test for \relax and 0 as well as \undefined,
-% borrowed from ifpdf.sty.
-\ifx\pdfoutput\undefined
-\else
-  \ifx\pdfoutput\relax
-  \else
-    \ifcase\pdfoutput
-    \else
-      \pdftrue
-    \fi
-  \fi
-\fi
-
-% PDF uses PostScript string constants for the names of xref targets,
-% for display in the outlines, and in other places.  Thus, we have to
-% double any backslashes.  Otherwise, a name like "\node" will be
-% interpreted as a newline (\n), followed by o, d, e.  Not good.
-% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
-% (and related messages, the final outcome is that it is up to the TeX
-% user to double the backslashes and otherwise make the string valid, so
-% that's what we do).
-
-% double active backslashes.
-%
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@activebackslashdouble{%
-   @catcode`@\=@active
-   @let\=@doublebackslash}
-}
-
-% To handle parens, we must adopt a different approach, since parens are
-% not active characters.  hyperref.dtx (which has the same problem as
-% us) handles it with this amazing macro to replace tokens, with minor
-% changes for Texinfo.  It is included here under the GPL by permission
-% from the author, Heiko Oberdiek.
-%
-% #1 is the tokens to replace.
-% #2 is the replacement.
-% #3 is the control sequence with the string.
-%
-\def\HyPsdSubst#1#2#3{%
-  \def\HyPsdReplace##1#1##2\END{%
-    ##1%
-    \ifx\\##2\\%
-    \else
-      #2%
-      \HyReturnAfterFi{%
-        \HyPsdReplace##2\END
-      }%
-    \fi
-  }%
-  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
-}
-\long\def\HyReturnAfterFi#1\fi{\fi#1}
-
-% #1 is a control sequence in which to do the replacements.
-\def\backslashparens#1{%
-  \xdef#1{#1}% redefine it as its expansion; the definition is simply
-             % \lastnode when called from \setref -> \pdfmkdest.
-  \HyPsdSubst{(}{\realbackslash(}{#1}%
-  \HyPsdSubst{)}{\realbackslash)}{#1}%
-}
-
-\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
-with PDF output, and none of those formats could be found.  (.eps cannot
-be supported due to the design of the PDF format; use regular TeX (DVI
-output) for that.)}
-
-\ifpdf
-  %
-  % Color manipulation macros based on pdfcolor.tex,
-  % except using rgb instead of cmyk; the latter is said to render as a
-  % very dark gray on-screen and a very dark halftone in print, instead
-  % of actual black.
-  \def\rgbDarkRed{0.50 0.09 0.12}
-  \def\rgbBlack{0 0 0}
-  %
-  % k sets the color for filling (usual text, etc.);
-  % K sets the color for stroking (thin rules, e.g., normal _'s).
-  \def\pdfsetcolor#1{\pdfliteral{#1 rg  #1 RG}}
-  %
-  % Set color, and create a mark which defines \thiscolor accordingly,
-  % so that \makeheadline knows which color to restore.
-  \def\setcolor#1{%
-    \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
-    \domark
-    \pdfsetcolor{#1}%
-  }
-  %
-  \def\maincolor{\rgbBlack}
-  \pdfsetcolor{\maincolor}
-  \edef\thiscolor{\maincolor}
-  \def\lastcolordefs{}
-  %
-  \def\makefootline{%
-    \baselineskip24pt
-    \line{\pdfsetcolor{\maincolor}\the\footline}%
-  }
-  %
-  \def\makeheadline{%
-    \vbox to 0pt{%
-      \vskip-22.5pt
-      \line{%
-        \vbox to8.5pt{}%
-        % Extract \thiscolor definition from the marks.
-        \getcolormarks
-        % Typeset the headline with \maincolor, then restore the color.
-        \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
-      }%
-      \vss
-    }%
-    \nointerlineskip
-  }
-  %
-  %
-  \pdfcatalog{/PageMode /UseOutlines}
-  %
-  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
-  \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
-    %
-    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-    % others).  Let's try in that order.
-    \let\pdfimgext=\empty
-    \begingroup
-      \openin 1 #1.png \ifeof 1
-        \openin 1 #1.jpg \ifeof 1
-          \openin 1 #1.jpeg \ifeof 1
-            \openin 1 #1.JPG \ifeof 1
-              \openin 1 #1.pdf \ifeof 1
-                \openin 1 #1.PDF \ifeof 1
-                  \errhelp = \nopdfimagehelp
-                  \errmessage{Could not find image file #1 for pdf}%
-                \else \gdef\pdfimgext{PDF}%
-                \fi
-              \else \gdef\pdfimgext{pdf}%
-              \fi
-            \else \gdef\pdfimgext{JPG}%
-            \fi
-          \else \gdef\pdfimgext{jpeg}%
-          \fi
-        \else \gdef\pdfimgext{jpg}%
-        \fi
-      \else \gdef\pdfimgext{png}%
-      \fi
-      \closein 1
-    \endgroup
-    %
-    % without \immediate, ancient pdftex seg faults when the same image is
-    % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
-    \ifnum\pdftexversion < 14
-      \immediate\pdfimage
-    \else
-      \immediate\pdfximage
-    \fi
-      \ifdim \wd0 >0pt width \imagewidth \fi
-      \ifdim \wd2 >0pt height \imageheight \fi
-      \ifnum\pdftexversion<13
-         #1.\pdfimgext
-       \else
-         {#1.\pdfimgext}%
-       \fi
-    \ifnum\pdftexversion < 14 \else
-      \pdfrefximage \pdflastximage
-    \fi}
-  %
-  \def\pdfmkdest#1{{%
-    % We have to set dummies so commands such as @code, and characters
-    % such as \, aren't expanded when present in a section title.
-    \indexnofonts
-    \turnoffactive
-    \activebackslashdouble
-    \makevalueexpandable
-    \def\pdfdestname{#1}%
-    \backslashparens\pdfdestname
-    \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
-  }}
-  %
-  % used to mark target names; must be expandable.
-  \def\pdfmkpgn#1{#1}
-  %
-  % by default, use a color that is dark enough to print on paper as
-  % nearly black, but still distinguishable for online viewing.
-  \def\urlcolor{\rgbDarkRed}
-  \def\linkcolor{\rgbDarkRed}
-  \def\endlink{\setcolor{\maincolor}\pdfendlink}
-  %
-  % Adding outlines to PDF; macros for calculating structure of outlines
-  % come from Petr Olsak
-  \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
-    \else \csname#1\endcsname \fi}
-  \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
-    \advance\tempnum by 1
-    \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
-  %
-  % #1 is the section text, which is what will be displayed in the
-  % outline by the pdf viewer.  #2 is the pdf expression for the number
-  % of subentries (or empty, for subsubsections).  #3 is the node text,
-  % which might be empty if this toc entry had no corresponding node.
-  % #4 is the page number
-  %
-  \def\dopdfoutline#1#2#3#4{%
-    % Generate a link to the node text if that exists; else, use the
-    % page number.  We could generate a destination for the section
-    % text in the case where a section has no node, but it doesn't
-    % seem worth the trouble, since most documents are normally structured.
-    \def\pdfoutlinedest{#3}%
-    \ifx\pdfoutlinedest\empty
-      \def\pdfoutlinedest{#4}%
-    \else
-      % Doubled backslashes in the name.
-      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-       \backslashparens\pdfoutlinedest}%
-    \fi
-    %
-    % Also double the backslashes in the display string.
-    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-     \backslashparens\pdfoutlinetext}%
-    %
-    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
-  }
-  %
-  \def\pdfmakeoutlines{%
-    \begingroup
-      % Thanh's hack / proper braces in bookmarks
-      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-      %
-      % Read toc silently, to get counts of subentries for \pdfoutline.
-      \def\numchapentry##1##2##3##4{%
-	\def\thischapnum{##2}%
-	\def\thissecnum{0}%
-	\def\thissubsecnum{0}%
-      }%
-      \def\numsecentry##1##2##3##4{%
-	\advancenumber{chap\thischapnum}%
-	\def\thissecnum{##2}%
-	\def\thissubsecnum{0}%
-      }%
-      \def\numsubsecentry##1##2##3##4{%
-	\advancenumber{sec\thissecnum}%
-	\def\thissubsecnum{##2}%
-      }%
-      \def\numsubsubsecentry##1##2##3##4{%
-	\advancenumber{subsec\thissubsecnum}%
-      }%
-      \def\thischapnum{0}%
-      \def\thissecnum{0}%
-      \def\thissubsecnum{0}%
-      %
-      % use \def rather than \let here because we redefine \chapentry et
-      % al. a second time, below.
-      \def\appentry{\numchapentry}%
-      \def\appsecentry{\numsecentry}%
-      \def\appsubsecentry{\numsubsecentry}%
-      \def\appsubsubsecentry{\numsubsubsecentry}%
-      \def\unnchapentry{\numchapentry}%
-      \def\unnsecentry{\numsecentry}%
-      \def\unnsubsecentry{\numsubsecentry}%
-      \def\unnsubsubsecentry{\numsubsubsecentry}%
-      \readdatafile{toc}%
-      %
-      % Read toc second time, this time actually producing the outlines.
-      % The `-' means take the \expnumber as the absolute number of
-      % subentries, which we calculated on our first read of the .toc above.
-      %
-      % We use the node names as the destinations.
-      \def\numchapentry##1##2##3##4{%
-        \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
-      \def\numsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
-      \def\numsubsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
-      \def\numsubsubsecentry##1##2##3##4{% count is always zero
-        \dopdfoutline{##1}{}{##3}{##4}}%
-      %
-      % PDF outlines are displayed using system fonts, instead of
-      % document fonts.  Therefore we cannot use special characters,
-      % since the encoding is unknown.  For example, the eogonek from
-      % Latin 2 (0xea) gets translated to a | character.  Info from
-      % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
-      %
-      % xx to do this right, we have to translate 8-bit characters to
-      % their "best" equivalent, based on the @documentencoding.  Right
-      % now, I guess we'll just let the pdf reader have its way.
-      \indexnofonts
-      \setupdatafile
-      \catcode`\\=\active \otherbackslash
-      \input \tocreadfilename
-    \endgroup
-  }
-  %
-  \def\skipspaces#1{\def\PP{#1}\def\D{|}%
-    \ifx\PP\D\let\nextsp\relax
-    \else\let\nextsp\skipspaces
-      \ifx\p\space\else\addtokens{\filename}{\PP}%
-        \advance\filenamelength by 1
-      \fi
-    \fi
-    \nextsp}
-  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
-  \ifnum\pdftexversion < 14
-    \let \startlink \pdfannotlink
-  \else
-    \let \startlink \pdfstartlink
-  \fi
-  % make a live url in pdf output.
-  \def\pdfurl#1{%
-    \begingroup
-      % it seems we really need yet another set of dummies; have not
-      % tried to figure out what each command should do in the context
-      % of @url.  for now, just make @/ a no-op, that's the only one
-      % people have actually reported a problem with.
-      %
-      \normalturnoffactive
-      \def\@{@}%
-      \let\/=\empty
-      \makevalueexpandable
-      % do we want to go so far as to use \indexnofonts instead of just
-      % special-casing \var here?
-      \def\var##1{##1}%
-      %
-      \leavevmode\setcolor{\urlcolor}%
-      \startlink attr{/Border [0 0 0]}%
-        user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
-    \endgroup}
-  \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
-  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
-  \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
-  \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
-  \def\maketoks{%
-    \expandafter\poptoks\the\toksA|ENDTOKS|\relax
-    \ifx\first0\adn0
-    \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
-    \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
-    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
-    \else
-      \ifnum0=\countA\else\makelink\fi
-      \ifx\first.\let\next=\done\else
-        \let\next=\maketoks
-        \addtokens{\toksB}{\the\toksD}
-        \ifx\first,\addtokens{\toksB}{\space}\fi
-      \fi
-    \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-    \next}
-  \def\makelink{\addtokens{\toksB}%
-    {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
-  \def\pdflink#1{%
-    \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-    \setcolor{\linkcolor}#1\endlink}
-  \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
-\else
-  % non-pdf mode
-  \let\pdfmkdest = \gobble
-  \let\pdfurl = \gobble
-  \let\endlink = \relax
-  \let\setcolor = \gobble
-  \let\pdfsetcolor = \gobble
-  \let\pdfmakeoutlines = \relax
-\fi  % \ifx\pdfoutput
-
-
-\message{fonts,}
-
-% Change the current font style to #1, remembering it in \curfontstyle.
-% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
-% italics, not bold italics.
-%
-\def\setfontstyle#1{%
-  \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
-  \csname ten#1\endcsname  % change the current font
-}
-
-% Select #1 fonts with the current style.
-%
-\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
-
-\def\rm{\fam=0 \setfontstyle{rm}}
-\def\it{\fam=\itfam \setfontstyle{it}}
-\def\sl{\fam=\slfam \setfontstyle{sl}}
-\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
-\def\tt{\fam=\ttfam \setfontstyle{tt}}
-
-% Unfortunately, we have to override this for titles and the like, since
-% in those cases "rm" is bold.  Sigh.
-\def\rmisbold{\rm\def\curfontstyle{bf}}
-
-% Texinfo sort of supports the sans serif font style, which plain TeX does not.
-% So we set up a \sf.
-\newfam\sffam
-\def\sf{\fam=\sffam \setfontstyle{sf}}
-\let\li = \sf % Sometimes we call it \li, not \sf.
-
-% We don't need math for this font style.
-\def\ttsl{\setfontstyle{ttsl}}
-
-
-% Default leading.
-\newdimen\textleading  \textleading = 13.2pt
-
-% Set the baselineskip to #1, and the lineskip and strut size
-% correspondingly.  There is no deep meaning behind these magic numbers
-% used as factors; they just match (closely enough) what Knuth defined.
-%
-\def\lineskipfactor{.08333}
-\def\strutheightpercent{.70833}
-\def\strutdepthpercent {.29167}
-%
-% can get a sort of poor man's double spacing by redefining this.
-\def\baselinefactor{1}
-%
-\def\setleading#1{%
-  \dimen0 = #1\relax
-  \normalbaselineskip = \baselinefactor\dimen0
-  \normallineskip = \lineskipfactor\normalbaselineskip
-  \normalbaselines
-  \setbox\strutbox =\hbox{%
-    \vrule width0pt height\strutheightpercent\baselineskip
-                    depth \strutdepthpercent \baselineskip
-  }%
-}
-
-% PDF CMaps.  See also LaTeX's t1.cmap.
-%
-% do nothing with this by default.
-\expandafter\let\csname cmapOT1\endcsname\gobble
-\expandafter\let\csname cmapOT1IT\endcsname\gobble
-\expandafter\let\csname cmapOT1TT\endcsname\gobble
-
-% if we are producing pdf, and we have \pdffontattr, then define cmaps.
-% (\pdffontattr was introduced many years ago, but people still run
-% older pdftex's; it's easy to conditionalize, so we do.)
-\ifpdf \ifx\pdffontattr\undefined \else
-  \begingroup
-    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
-%%DocumentNeededResources: ProcSet (CIDInit)
-%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-OT1-0)
-%%Title: (TeX-OT1-0 TeX OT1 0)
-%%Version: 1.000
-%%EndComments
-/CIDInit /ProcSet findresource begin
-12 dict begin
-begincmap
-/CIDSystemInfo
-<< /Registry (TeX)
-/Ordering (OT1)
-/Supplement 0
->> def
-/CMapName /TeX-OT1-0 def
-/CMapType 2 def
-1 begincodespacerange
-<00> <7F>
-endcodespacerange
-8 beginbfrange
-<00> <01> <0393>
-<09> <0A> <03A8>
-<23> <26> <0023>
-<28> <3B> <0028>
-<3F> <5B> <003F>
-<5D> <5E> <005D>
-<61> <7A> <0061>
-<7B> <7C> <2013>
-endbfrange
-40 beginbfchar
-<02> <0398>
-<03> <039B>
-<04> <039E>
-<05> <03A0>
-<06> <03A3>
-<07> <03D2>
-<08> <03A6>
-<0B> <00660066>
-<0C> <00660069>
-<0D> <0066006C>
-<0E> <006600660069>
-<0F> <00660066006C>
-<10> <0131>
-<11> <0237>
-<12> <0060>
-<13> <00B4>
-<14> <02C7>
-<15> <02D8>
-<16> <00AF>
-<17> <02DA>
-<18> <00B8>
-<19> <00DF>
-<1A> <00E6>
-<1B> <0153>
-<1C> <00F8>
-<1D> <00C6>
-<1E> <0152>
-<1F> <00D8>
-<21> <0021>
-<22> <201D>
-<27> <2019>
-<3C> <00A1>
-<3D> <003D>
-<3E> <00BF>
-<5C> <201C>
-<5F> <02D9>
-<60> <2018>
-<7D> <02DD>
-<7E> <007E>
-<7F> <00A8>
-endbfchar
-endcmap
-CMapName currentdict /CMap defineresource pop
-end
-end
-%%EndResource
-%%EOF
-    }\endgroup
-  \expandafter\edef\csname cmapOT1\endcsname#1{%
-    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-  }%
-%
-% \cmapOT1IT
-  \begingroup
-    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
-%%DocumentNeededResources: ProcSet (CIDInit)
-%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-OT1IT-0)
-%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
-%%Version: 1.000
-%%EndComments
-/CIDInit /ProcSet findresource begin
-12 dict begin
-begincmap
-/CIDSystemInfo
-<< /Registry (TeX)
-/Ordering (OT1IT)
-/Supplement 0
->> def
-/CMapName /TeX-OT1IT-0 def
-/CMapType 2 def
-1 begincodespacerange
-<00> <7F>
-endcodespacerange
-8 beginbfrange
-<00> <01> <0393>
-<09> <0A> <03A8>
-<25> <26> <0025>
-<28> <3B> <0028>
-<3F> <5B> <003F>
-<5D> <5E> <005D>
-<61> <7A> <0061>
-<7B> <7C> <2013>
-endbfrange
-42 beginbfchar
-<02> <0398>
-<03> <039B>
-<04> <039E>
-<05> <03A0>
-<06> <03A3>
-<07> <03D2>
-<08> <03A6>
-<0B> <00660066>
-<0C> <00660069>
-<0D> <0066006C>
-<0E> <006600660069>
-<0F> <00660066006C>
-<10> <0131>
-<11> <0237>
-<12> <0060>
-<13> <00B4>
-<14> <02C7>
-<15> <02D8>
-<16> <00AF>
-<17> <02DA>
-<18> <00B8>
-<19> <00DF>
-<1A> <00E6>
-<1B> <0153>
-<1C> <00F8>
-<1D> <00C6>
-<1E> <0152>
-<1F> <00D8>
-<21> <0021>
-<22> <201D>
-<23> <0023>
-<24> <00A3>
-<27> <2019>
-<3C> <00A1>
-<3D> <003D>
-<3E> <00BF>
-<5C> <201C>
-<5F> <02D9>
-<60> <2018>
-<7D> <02DD>
-<7E> <007E>
-<7F> <00A8>
-endbfchar
-endcmap
-CMapName currentdict /CMap defineresource pop
-end
-end
-%%EndResource
-%%EOF
-    }\endgroup
-  \expandafter\edef\csname cmapOT1IT\endcsname#1{%
-    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-  }%
-%
-% \cmapOT1TT
-  \begingroup
-    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
-%%DocumentNeededResources: ProcSet (CIDInit)
-%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-OT1TT-0)
-%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
-%%Version: 1.000
-%%EndComments
-/CIDInit /ProcSet findresource begin
-12 dict begin
-begincmap
-/CIDSystemInfo
-<< /Registry (TeX)
-/Ordering (OT1TT)
-/Supplement 0
->> def
-/CMapName /TeX-OT1TT-0 def
-/CMapType 2 def
-1 begincodespacerange
-<00> <7F>
-endcodespacerange
-5 beginbfrange
-<00> <01> <0393>
-<09> <0A> <03A8>
-<21> <26> <0021>
-<28> <5F> <0028>
-<61> <7E> <0061>
-endbfrange
-32 beginbfchar
-<02> <0398>
-<03> <039B>
-<04> <039E>
-<05> <03A0>
-<06> <03A3>
-<07> <03D2>
-<08> <03A6>
-<0B> <2191>
-<0C> <2193>
-<0D> <0027>
-<0E> <00A1>
-<0F> <00BF>
-<10> <0131>
-<11> <0237>
-<12> <0060>
-<13> <00B4>
-<14> <02C7>
-<15> <02D8>
-<16> <00AF>
-<17> <02DA>
-<18> <00B8>
-<19> <00DF>
-<1A> <00E6>
-<1B> <0153>
-<1C> <00F8>
-<1D> <00C6>
-<1E> <0152>
-<1F> <00D8>
-<20> <2423>
-<27> <2019>
-<60> <2018>
-<7F> <00A8>
-endbfchar
-endcmap
-CMapName currentdict /CMap defineresource pop
-end
-end
-%%EndResource
-%%EOF
-    }\endgroup
-  \expandafter\edef\csname cmapOT1TT\endcsname#1{%
-    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-  }%
-\fi\fi
-
-
-% Set the font macro #1 to the font named #2, adding on the
-% specified font prefix (normally `cm').
-% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
-% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
-% empty to omit).
-\def\setfont#1#2#3#4#5{%
-  \font#1=\fontprefix#2#3 scaled #4
-  \csname cmap#5\endcsname#1%
-}
-% This is what gets called when #5 of \setfont is empty.
-\let\cmap\gobble
-% emacs-page end of cmaps
-
-% Use cm as the default font prefix.
-% To specify the font prefix, you must define \fontprefix
-% before you read in texinfo.tex.
-\ifx\fontprefix\undefined
-\def\fontprefix{cm}
-\fi
-% Support font families that don't use the same naming scheme as CM.
-\def\rmshape{r}
-\def\rmbshape{bx}               %where the normal face is bold
-\def\bfshape{b}
-\def\bxshape{bx}
-\def\ttshape{tt}
-\def\ttbshape{tt}
-\def\ttslshape{sltt}
-\def\itshape{ti}
-\def\itbshape{bxti}
-\def\slshape{sl}
-\def\slbshape{bxsl}
-\def\sfshape{ss}
-\def\sfbshape{ss}
-\def\scshape{csc}
-\def\scbshape{csc}
-
-% Definitions for a main text size of 11pt.  This is the default in
-% Texinfo.
-%
-\def\definetextfontsizexi{%
-% Text fonts (11.2pt, magstep1).
-\def\textnominalsize{11pt}
-\edef\mainmagstep{\magstephalf}
-\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
-\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
-\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
-\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
-\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
-\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
-\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
-\font\texti=cmmi10 scaled \mainmagstep
-\font\textsy=cmsy10 scaled \mainmagstep
-\def\textecsize{1095}
-
-% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstep1}{OT1}
-\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
-\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
-
-% Fonts for indices, footnotes, small examples (9pt).
-\def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}{OT1}
-\setfont\smalltt\ttshape{9}{1000}{OT1TT}
-\setfont\smallbf\bfshape{10}{900}{OT1}
-\setfont\smallit\itshape{9}{1000}{OT1IT}
-\setfont\smallsl\slshape{9}{1000}{OT1}
-\setfont\smallsf\sfshape{9}{1000}{OT1}
-\setfont\smallsc\scshape{10}{900}{OT1}
-\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
-\font\smalli=cmmi9
-\font\smallsy=cmsy9
-\def\smallecsize{0900}
-
-% Fonts for small examples (8pt).
-\def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}{OT1}
-\setfont\smallertt\ttshape{8}{1000}{OT1TT}
-\setfont\smallerbf\bfshape{10}{800}{OT1}
-\setfont\smallerit\itshape{8}{1000}{OT1IT}
-\setfont\smallersl\slshape{8}{1000}{OT1}
-\setfont\smallersf\sfshape{8}{1000}{OT1}
-\setfont\smallersc\scshape{10}{800}{OT1}
-\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
-\font\smalleri=cmmi8
-\font\smallersy=cmsy8
-\def\smallerecsize{0800}
-
-% Fonts for title page (20.4pt):
-\def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
-\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
-\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
-\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
-\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
-\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
-\let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
-\font\titlei=cmmi12 scaled \magstep3
-\font\titlesy=cmsy10 scaled \magstep4
-\def\titleecsize{2074}
-
-% Chapter (and unnumbered) fonts (17.28pt).
-\def\chapnominalsize{17pt}
-\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
-\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
-\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
-\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
-\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
-\setfont\chapsf\sfbshape{17}{1000}{OT1}
-\let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
-\font\chapi=cmmi12 scaled \magstep2
-\font\chapsy=cmsy10 scaled \magstep3
-\def\chapecsize{1728}
-
-% Section fonts (14.4pt).
-\def\secnominalsize{14pt}
-\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
-\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
-\setfont\secsl\slbshape{10}{\magstep2}{OT1}
-\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
-\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
-\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
-\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}{OT1}
-\font\seci=cmmi12 scaled \magstep1
-\font\secsy=cmsy10 scaled \magstep2
-\def\sececsize{1440}
-
-% Subsection fonts (13.15pt).
-\def\ssecnominalsize{13pt}
-\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
-\setfont\ssecit\itbshape{10}{1315}{OT1IT}
-\setfont\ssecsl\slbshape{10}{1315}{OT1}
-\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
-\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
-\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1315}{OT1}
-\font\sseci=cmmi12 scaled \magstephalf
-\font\ssecsy=cmsy10 scaled 1315
-\def\ssececsize{1200}
-
-% Reduced fonts for @acro in text (10pt).
-\def\reducednominalsize{10pt}
-\setfont\reducedrm\rmshape{10}{1000}{OT1}
-\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
-\setfont\reducedbf\bfshape{10}{1000}{OT1}
-\setfont\reducedit\itshape{10}{1000}{OT1IT}
-\setfont\reducedsl\slshape{10}{1000}{OT1}
-\setfont\reducedsf\sfshape{10}{1000}{OT1}
-\setfont\reducedsc\scshape{10}{1000}{OT1}
-\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
-\font\reducedi=cmmi10
-\font\reducedsy=cmsy10
-\def\reducedecsize{1000}
-
-% reset the current fonts
-\textfonts
-\rm
-} % end of 11pt text font size definitions
-
-
-% Definitions to make the main text be 10pt Computer Modern, with
-% section, chapter, etc., sizes following suit.  This is for the GNU
-% Press printing of the Emacs 22 manual.  Maybe other manuals in the
-% future.  Used with @smallbook, which sets the leading to 12pt.
-%
-\def\definetextfontsizex{%
-% Text fonts (10pt).
-\def\textnominalsize{10pt}
-\edef\mainmagstep{1000}
-\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
-\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
-\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
-\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
-\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
-\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
-\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
-\font\texti=cmmi10 scaled \mainmagstep
-\font\textsy=cmsy10 scaled \mainmagstep
-\def\textecsize{1000}
-
-% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
-\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
-\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
-
-% Fonts for indices, footnotes, small examples (9pt).
-\def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}{OT1}
-\setfont\smalltt\ttshape{9}{1000}{OT1TT}
-\setfont\smallbf\bfshape{10}{900}{OT1}
-\setfont\smallit\itshape{9}{1000}{OT1IT}
-\setfont\smallsl\slshape{9}{1000}{OT1}
-\setfont\smallsf\sfshape{9}{1000}{OT1}
-\setfont\smallsc\scshape{10}{900}{OT1}
-\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
-\font\smalli=cmmi9
-\font\smallsy=cmsy9
-\def\smallecsize{0900}
-
-% Fonts for small examples (8pt).
-\def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}{OT1}
-\setfont\smallertt\ttshape{8}{1000}{OT1TT}
-\setfont\smallerbf\bfshape{10}{800}{OT1}
-\setfont\smallerit\itshape{8}{1000}{OT1IT}
-\setfont\smallersl\slshape{8}{1000}{OT1}
-\setfont\smallersf\sfshape{8}{1000}{OT1}
-\setfont\smallersc\scshape{10}{800}{OT1}
-\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
-\font\smalleri=cmmi8
-\font\smallersy=cmsy8
-\def\smallerecsize{0800}
-
-% Fonts for title page (20.4pt):
-\def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
-\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
-\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
-\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
-\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
-\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
-\let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
-\font\titlei=cmmi12 scaled \magstep3
-\font\titlesy=cmsy10 scaled \magstep4
-\def\titleecsize{2074}
-
-% Chapter fonts (14.4pt).
-\def\chapnominalsize{14pt}
-\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
-\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
-\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
-\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
-\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
-\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
-\let\chapbf\chaprm
-\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
-\font\chapi=cmmi12 scaled \magstep1
-\font\chapsy=cmsy10 scaled \magstep2
-\def\chapecsize{1440}
-
-% Section fonts (12pt).
-\def\secnominalsize{12pt}
-\setfont\secrm\rmbshape{12}{1000}{OT1}
-\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
-\setfont\secsl\slbshape{10}{\magstep1}{OT1}
-\setfont\sectt\ttbshape{12}{1000}{OT1TT}
-\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
-\setfont\secsf\sfbshape{12}{1000}{OT1}
-\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep1}{OT1}
-\font\seci=cmmi12
-\font\secsy=cmsy10 scaled \magstep1
-\def\sececsize{1200}
-
-% Subsection fonts (10pt).
-\def\ssecnominalsize{10pt}
-\setfont\ssecrm\rmbshape{10}{1000}{OT1}
-\setfont\ssecit\itbshape{10}{1000}{OT1IT}
-\setfont\ssecsl\slbshape{10}{1000}{OT1}
-\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
-\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
-\setfont\ssecsf\sfbshape{10}{1000}{OT1}
-\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1000}{OT1}
-\font\sseci=cmmi10
-\font\ssecsy=cmsy10
-\def\ssececsize{1000}
-
-% Reduced fonts for @acro in text (9pt).
-\def\reducednominalsize{9pt}
-\setfont\reducedrm\rmshape{9}{1000}{OT1}
-\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
-\setfont\reducedbf\bfshape{10}{900}{OT1}
-\setfont\reducedit\itshape{9}{1000}{OT1IT}
-\setfont\reducedsl\slshape{9}{1000}{OT1}
-\setfont\reducedsf\sfshape{9}{1000}{OT1}
-\setfont\reducedsc\scshape{10}{900}{OT1}
-\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
-\font\reducedi=cmmi9
-\font\reducedsy=cmsy9
-\def\reducedecsize{0900}
-
-% reduce space between paragraphs
-\divide\parskip by 2
-
-% reset the current fonts
-\textfonts
-\rm
-} % end of 10pt text font size definitions
-
-
-% We provide the user-level command
-%   @fonttextsize 10
-% (or 11) to redefine the text font size.  pt is assumed.
-%
-\def\xword{10}
-\def\xiword{11}
-%
-\parseargdef\fonttextsize{%
-  \def\textsizearg{#1}%
-  \wlog{doing @fonttextsize \textsizearg}%
-  %
-  % Set \globaldefs so that documents can use this inside @tex, since
-  % makeinfo 4.8 does not support it, but we need it nonetheless.
-  %
- \begingroup \globaldefs=1
-  \ifx\textsizearg\xword \definetextfontsizex
-  \else \ifx\textsizearg\xiword \definetextfontsizexi
-  \else
-    \errhelp=\EMsimple
-    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
-  \fi\fi
- \endgroup
-}
-
-
-% In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families.  Since
-% texinfo doesn't allow for producing subscripts and superscripts except
-% in the main text, we don't bother to reset \scriptfont and
-% \scriptscriptfont (which would also require loading a lot more fonts).
-%
-\def\resetmathfonts{%
-  \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
-  \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
-  \textfont\ttfam=\tentt \textfont\sffam=\tensf
-}
-
-% The font-changing commands redefine the meanings of \tenSTYLE, instead
-% of just \STYLE.  We do this because \STYLE needs to also set the
-% current \fam for math mode.  Our \STYLE (e.g., \rm) commands hardwire
-% \tenSTYLE to set the current font.
-%
-% Each font-changing command also sets the names \lsize (one size lower)
-% and \lllsize (three sizes lower).  These relative commands are used in
-% the LaTeX logo and acronyms.
-%
-% This all needs generalizing, badly.
-%
-\def\textfonts{%
-  \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
-  \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
-  \let\tenttsl=\textttsl
-  \def\curfontsize{text}%
-  \def\lsize{reduced}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{\textleading}}
-\def\titlefonts{%
-  \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
-  \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
-  \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
-  \let\tenttsl=\titlettsl
-  \def\curfontsize{title}%
-  \def\lsize{chap}\def\lllsize{subsec}%
-  \resetmathfonts \setleading{25pt}}
-\def\titlefont#1{{\titlefonts\rmisbold #1}}
-\def\chapfonts{%
-  \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
-  \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
-  \let\tenttsl=\chapttsl
-  \def\curfontsize{chap}%
-  \def\lsize{sec}\def\lllsize{text}%
-  \resetmathfonts \setleading{19pt}}
-\def\secfonts{%
-  \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
-  \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
-  \let\tenttsl=\secttsl
-  \def\curfontsize{sec}%
-  \def\lsize{subsec}\def\lllsize{reduced}%
-  \resetmathfonts \setleading{16pt}}
-\def\subsecfonts{%
-  \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
-  \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
-  \let\tenttsl=\ssecttsl
-  \def\curfontsize{ssec}%
-  \def\lsize{text}\def\lllsize{small}%
-  \resetmathfonts \setleading{15pt}}
-\let\subsubsecfonts = \subsecfonts
-\def\reducedfonts{%
-  \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
-  \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
-  \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
-  \let\tenttsl=\reducedttsl
-  \def\curfontsize{reduced}%
-  \def\lsize{small}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{10.5pt}}
-\def\smallfonts{%
-  \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
-  \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
-  \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
-  \let\tenttsl=\smallttsl
-  \def\curfontsize{small}%
-  \def\lsize{smaller}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{10.5pt}}
-\def\smallerfonts{%
-  \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
-  \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
-  \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
-  \let\tenttsl=\smallerttsl
-  \def\curfontsize{smaller}%
-  \def\lsize{smaller}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{9.5pt}}
-
-% Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}{OT1}
-\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1}  % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}{OT1}
-\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
-
-% Define these just so they can be easily changed for other fonts.
-\def\angleleft{$\langle$}
-\def\angleright{$\rangle$}
-
-% Set the fonts to use with the @small... environments.
-\let\smallexamplefonts = \smallfonts
-
-% About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
-% can fit this many characters:
-%   8.5x11=86   smallbook=72  a4=90  a5=69
-% If we use \scriptfonts (8pt), then we can fit this many characters:
-%   8.5x11=90+  smallbook=80  a4=90+  a5=77
-% For me, subjectively, the few extra characters that fit aren't worth
-% the additional smallness of 8pt.  So I'm making the default 9pt.
-%
-% By the way, for comparison, here's what fits with @example (10pt):
-%   8.5x11=71  smallbook=60  a4=75  a5=58
-% --karl, 24jan03.
-
-% Set up the default fonts, so we can use them for creating boxes.
-%
-\definetextfontsizexi
-
-
-\message{markup,}
-
-% Check if we are currently using a typewriter font.  Since all the
-% Computer Modern typewriter fonts have zero interword stretch (and
-% shrink), and it is reasonable to expect all typewriter fonts to have
-% this property, we can check that font parameter.
-%
-\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
-
-% Markup style infrastructure.  \defmarkupstylesetup\INITMACRO will
-% define and register \INITMACRO to be called on markup style changes.
-% \INITMACRO can check \currentmarkupstyle for the innermost
-% style and the set of \ifmarkupSTYLE switches for all styles
-% currently in effect.
-\newif\ifmarkupvar
-\newif\ifmarkupsamp
-\newif\ifmarkupkey
-%\newif\ifmarkupfile % @file == @samp.
-%\newif\ifmarkupoption % @option == @samp.
-\newif\ifmarkupcode
-\newif\ifmarkupkbd
-%\newif\ifmarkupenv % @env == @code.
-%\newif\ifmarkupcommand % @command == @code.
-\newif\ifmarkuptex % @tex (and part of @math, for now).
-\newif\ifmarkupexample
-\newif\ifmarkupverb
-\newif\ifmarkupverbatim
-
-\let\currentmarkupstyle\empty
-
-\def\setupmarkupstyle#1{%
-  \csname markup#1true\endcsname
-  \def\currentmarkupstyle{#1}%
-  \markupstylesetup
-}
-
-\let\markupstylesetup\empty
-
-\def\defmarkupstylesetup#1{%
-  \expandafter\def\expandafter\markupstylesetup
-    \expandafter{\markupstylesetup #1}%
-  \def#1%
-}
-
-% Markup style setup for left and right quotes.
-\defmarkupstylesetup\markupsetuplq{%
-  \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
-  \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
-}
-
-\defmarkupstylesetup\markupsetuprq{%
-  \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
-  \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
-}
-
-{
-\catcode`\'=\active
-\catcode`\`=\active
-
-\gdef\markupsetuplqdefault{\let`\lq}
-\gdef\markupsetuprqdefault{\let'\rq}
-
-\gdef\markupsetcodequoteleft{\let`\codequoteleft}
-\gdef\markupsetcodequoteright{\let'\codequoteright}
-
-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
-}
-
-\let\markupsetuplqcode \markupsetcodequoteleft
-\let\markupsetuprqcode \markupsetcodequoteright
-\let\markupsetuplqexample \markupsetcodequoteleft
-\let\markupsetuprqexample \markupsetcodequoteright
-\let\markupsetuplqverb \markupsetcodequoteleft
-\let\markupsetuprqverb \markupsetcodequoteright
-\let\markupsetuplqverbatim \markupsetcodequoteleft
-\let\markupsetuprqverbatim \markupsetcodequoteright
-
-\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
-
-% Allow an option to not replace quotes with a regular directed right
-% quote/apostrophe (char 0x27), but instead use the undirected quote
-% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
-% the default, but it works for pasting with more pdf viewers (at least
-% evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.
-%
-\def\codequoteright{%
-  \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
-    \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-      '%
-    \else \char'15 \fi
-  \else \char'15 \fi
-}
-%
-% and a similar option for the left quote char vs. a grave accent.
-% Modern fonts display ASCII 0x60 as a grave accent, so some people like
-% the code environments to do likewise.
-%
-\def\codequoteleft{%
-  \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
-    \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-      % [Knuth] pp. 380,381,391
-      % \relax disables Spanish ligatures ?` and !` of \tt font.
-      \relax`%
-    \else \char'22 \fi
-  \else \char'22 \fi
-}
-
-% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
-\def\noligaturesquoteleft{\relax\lq}
-
-% Count depth in font-changes, for error checks
-\newcount\fontdepth \fontdepth=0
-
-%% Add scribe-like font environments, plus @l for inline lisp (usually sans
-%% serif) and @ii for TeX italic
-
-% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
-% unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-                    \ptexslash\fi\fi\fi}
-\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
-\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
-
-% like \smartslanted except unconditionally uses \ttsl.
-% @var is set to this for defun arguments.
-\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
-
-% @cite is like \smartslanted except unconditionally use \sl.  We never want
-% ttsl for book titles, do we?
-\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
-
-\let\i=\smartitalic
-\let\slanted=\smartslanted
-\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
-\let\dfn=\smartslanted
-\let\emph=\smartitalic
-
-% Explicit font changes: @r, @sc, undocumented @ii.
-\def\r#1{{\rm #1}}              % roman font
-\def\sc#1{{\smallcaps#1}}       % smallcaps font
-\def\ii#1{{\it #1}}             % italic font
-
-% @b, explicit bold.  Also @strong.
-\def\b#1{{\bf #1}}
-\let\strong=\b
-
-% @sansserif, explicit sans.
-\def\sansserif#1{{\sf #1}}
-
-% We can't just use \exhyphenpenalty, because that only has effect at
-% the end of a paragraph.  Restore normal hyphenation at the end of the
-% group within which \nohyphenation is presumably called.
-%
-\def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
-\def\restorehyphenation{\hyphenchar\font = `- }
-
-% Set sfcode to normal for the chars that usually have another value.
-% Can't use plain's \frenchspacing because it uses the `\x notation, and
-% sometimes \x has an active definition that messes things up.
-%
-\catcode`@=11
-  \def\plainfrenchspacing{%
-    \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
-    \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
-    \def\endofsentencespacefactor{1000}% for @. and friends
-  }
-  \def\plainnonfrenchspacing{%
-    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
-    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
-    \def\endofsentencespacefactor{3000}% for @. and friends
-  }
-\catcode`@=\other
-\def\endofsentencespacefactor{3000}% default
-
-% @t, explicit typewriter.
-\def\t#1{%
-  {\tt \rawbackslash \plainfrenchspacing #1}%
-  \null
-}
-
-% @samp.
-\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
-
-% definition of @key that produces a lozenge.  Doesn't adjust to text size.
-%\setfont\keyrm\rmshape{8}{1000}{OT1}
-%\font\keysy=cmsy9
-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-%    \vbox{\hrule\kern-0.4pt
-%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-%    \kern-0.4pt\hrule}%
-%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-
-% definition of @key with no lozenge.  If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle.  But
-% if it isn't monospace, then use \tt.
-%
-\def\key#1{{\setupmarkupstyle{key}%
-  \nohyphenation
-  \ifmonospace\else\tt\fi
-  #1}\null}
-
-% ctrl is no longer a Texinfo command.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
-% @file, @option are the same as @samp.
-\let\file=\samp
-\let\option=\samp
-
-% @code is a modification of @t,
-% which makes spaces the same size as normal in the surrounding text.
-\def\tclose#1{%
-  {%
-    % Change normal interword space to be same as for the current font.
-    \spaceskip = \fontdimen2\font
-    %
-    % Switch to typewriter.
-    \tt
-    %
-    % But `\ ' produces the large typewriter interword space.
-    \def\ {{\spaceskip = 0pt{} }}%
-    %
-    % Turn off hyphenation.
-    \nohyphenation
-    %
-    \rawbackslash
-    \plainfrenchspacing
-    #1%
-  }%
-  \null
-}
-
-% We *must* turn on hyphenation at `-' and `_' in @code.
-% Otherwise, it is too hard to avoid overfull hboxes
-% in the Emacs manual, the Library manual, etc.
-
-% Unfortunately, TeX uses one parameter (\hyphenchar) to control
-% both hyphenation at - and hyphenation within words.
-% We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
-%  -- rms.
-{
-  \catcode`\-=\active \catcode`\_=\active
-  \catcode`\'=\active \catcode`\`=\active
-  \global\let'=\rq \global\let`=\lq  % default definitions
-  %
-  \global\def\code{\begingroup
-    \setupmarkupstyle{code}%
-    % The following should really be moved into \setupmarkupstyle handlers.
-    \catcode\dashChar=\active  \catcode\underChar=\active
-    \ifallowcodebreaks
-     \let-\codedash
-     \let_\codeunder
-    \else
-     \let-\realdash
-     \let_\realunder
-    \fi
-    \codex
-  }
-}
-
-\def\realdash{-}
-\def\codedash{-\discretionary{}{}{}}
-\def\codeunder{%
-  % this is all so @math{@code{var_name}+1} can work.  In math mode, _
-  % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
-  % will therefore expand the active definition of _, which is us
-  % (inside @code that is), therefore an endless loop.
-  \ifusingtt{\ifmmode
-               \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
-             \else\normalunderscore \fi
-             \discretionary{}{}{}}%
-            {\_}%
-}
-\def\codex #1{\tclose{#1}\endgroup}
-
-% An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__.  This is undesirable in
-% some manuals, especially if they don't have long identifiers in
-% general.  @allowcodebreaks provides a way to control this.
-%
-\newif\ifallowcodebreaks  \allowcodebreakstrue
-
-\def\keywordtrue{true}
-\def\keywordfalse{false}
-
-\parseargdef\allowcodebreaks{%
-  \def\txiarg{#1}%
-  \ifx\txiarg\keywordtrue
-    \allowcodebreakstrue
-  \else\ifx\txiarg\keywordfalse
-    \allowcodebreaksfalse
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
-  \fi\fi
-}
-
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
-
-% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
-%   `example' (@kbd uses ttsl only inside of @example and friends),
-%   or `code' (@kbd uses normal tty font always).
-\parseargdef\kbdinputstyle{%
-  \def\txiarg{#1}%
-  \ifx\txiarg\worddistinct
-    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\txiarg\wordexample
-    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\txiarg\wordcode
-    \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
-  \fi\fi\fi
-}
-\def\worddistinct{distinct}
-\def\wordexample{example}
-\def\wordcode{code}
-
-% Default is `distinct'.
-\kbdinputstyle distinct
-
-\def\xkey{\key}
-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
-\ifx\one\xkey\ifx\threex\three \key{#2}%
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
-
-% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
-\let\indicateurl=\code
-\let\env=\code
-\let\command=\code
-
-% @clicksequence{File @click{} Open ...}
-\def\clicksequence#1{\begingroup #1\endgroup}
-
-% @clickstyle @arrow   (by default)
-\parseargdef\clickstyle{\def\click{#1}}
-\def\click{\arrow}
-
-% @uref (abbreviation for `urlref') takes an optional (comma-separated)
-% second argument specifying the text to display and an optional third
-% arg as text to display instead of (rather than in addition to) the url
-% itself.  First (mandatory) arg is the url.  Perhaps eventually put in
-% a hypertex \special here.
-%
-\def\uref#1{\douref #1,,,\finish}
-\def\douref#1,#2,#3,#4\finish{\begingroup
-  \unsepspaces
-  \pdfurl{#1}%
-  \setbox0 = \hbox{\ignorespaces #3}%
-  \ifdim\wd0 > 0pt
-    \unhbox0 % third arg given, show only that
-  \else
-    \setbox0 = \hbox{\ignorespaces #2}%
-    \ifdim\wd0 > 0pt
-      \ifpdf
-        \unhbox0             % PDF: 2nd arg given, show only it
-      \else
-        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
-      \fi
-    \else
-      \code{#1}% only url given, so show it
-    \fi
-  \fi
-  \endlink
-\endgroup}
-
-% @url synonym for @uref, since that's how everyone uses it.
-%
-\let\url=\uref
-
-% rms does not like angle brackets --karl, 17may97.
-% So now @email is just like @uref, unless we are pdf.
-%
-%\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
-  \def\email#1{\doemail#1,,\finish}
-  \def\doemail#1,#2,#3\finish{\begingroup
-    \unsepspaces
-    \pdfurl{mailto:#1}%
-    \setbox0 = \hbox{\ignorespaces #2}%
-    \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
-    \endlink
-  \endgroup}
-\else
-  \let\email=\uref
-\fi
-
-% Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
-% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
-%
-\def\dmn#1{\thinspace #1}
-
-% @l was never documented to mean ``switch to the Lisp font'',
-% and it is not used as such in any manual I can find.  We need it for
-% Polish suppressed-l.  --karl, 22sep96.
-%\def\l#1{{\li #1}\null}
-
-% @acronym for "FBI", "NATO", and the like.
-% We print this one point size smaller, since it's intended for
-% all-uppercase.
-%
-\def\acronym#1{\doacronym #1,,\finish}
-\def\doacronym#1,#2,#3\finish{%
-  {\selectfonts\lsize #1}%
-  \def\temp{#2}%
-  \ifx\temp\empty \else
-    \space ({\unsepspaces \ignorespaces \temp \unskip})%
-  \fi
-}
-
-% @abbr for "Comput. J." and the like.
-% No font change, but don't do end-of-sentence spacing.
-%
-\def\abbr#1{\doabbr #1,,\finish}
-\def\doabbr#1,#2,#3\finish{%
-  {\plainfrenchspacing #1}%
-  \def\temp{#2}%
-  \ifx\temp\empty \else
-    \space ({\unsepspaces \ignorespaces \temp \unskip})%
-  \fi
-}
-
-
-\message{glyphs,}
-
-% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
-%
-% Since these characters are used in examples, they should be an even number of
-% \tt widths. Each \tt character is 1en, so two makes it 1em.
-%
-\def\point{$\star$}
-\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
-\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
-\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
-\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
-
-% The @error{} command.
-% Adapted from the TeXbook's \boxit.
-%
-\newbox\errorbox
-%
-{\tentt \global\dimen0 = 3em}% Width of the box.
-\dimen2 = .55pt % Thickness of rules
-% The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
-%
-\setbox\errorbox=\hbox to \dimen0{\hfil
-   \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-   \advance\hsize by -2\dimen2 % Rules.
-   \vbox{%
-      \hrule height\dimen2
-      \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
-         \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-         \kern3pt\vrule width\dimen2}% Space to right.
-      \hrule height\dimen2}
-    \hfil}
-%
-\def\error{\leavevmode\lower.7ex\copy\errorbox}
-
-% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
-%
-\def\pounds{{\it\$}}
-
-% @euro{} comes from a separate font, depending on the current style.
-% We use the free feym* fonts from the eurosym package by Henrik
-% Theiling, which support regular, slanted, bold and bold slanted (and
-% "outlined" (blackboard board, sort of) versions, which we don't need).
-% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
-%
-% Although only regular is the truly official Euro symbol, we ignore
-% that.  The Euro is designed to be slightly taller than the regular
-% font height.
-%
-% feymr - regular
-% feymo - slanted
-% feybr - bold
-% feybo - bold slanted
-%
-% There is no good (free) typewriter version, to my knowledge.
-% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
-% Hmm.
-%
-% Also doesn't work in math.  Do we need to do math with euro symbols?
-% Hope not.
-%
-%
-\def\euro{{\eurofont e}}
-\def\eurofont{%
-  % We set the font at each command, rather than predefining it in
-  % \textfonts and the other font-switching commands, so that
-  % installations which never need the symbol don't have to have the
-  % font installed.
-  %
-  % There is only one designed size (nominal 10pt), so we always scale
-  % that to the current nominal size.
-  %
-  % By the way, simply using "at 1em" works for cmr10 and the like, but
-  % does not work for cmbx10 and other extended/shrunken fonts.
-  %
-  \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
-  %
-  \ifx\curfontstyle\bfstylename
-    % bold:
-    \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-  \else
-    % regular:
-    \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
-  \fi
-  \thiseurofont
-}
-
-% Glyphs from the EC fonts.  We don't use \let for the aliases, because
-% sometimes we redefine the original macro, and the alias should reflect
-% the redefinition.
-%
-% Use LaTeX names for the Icelandic letters.
-\def\DH{{\ecfont \char"D0}} % Eth
-\def\dh{{\ecfont \char"F0}} % eth
-\def\TH{{\ecfont \char"DE}} % Thorn
-\def\th{{\ecfont \char"FE}} % thorn
-%
-\def\guillemetleft{{\ecfont \char"13}}
-\def\guillemotleft{\guillemetleft}
-\def\guillemetright{{\ecfont \char"14}}
-\def\guillemotright{\guillemetright}
-\def\guilsinglleft{{\ecfont \char"0E}}
-\def\guilsinglright{{\ecfont \char"0F}}
-\def\quotedblbase{{\ecfont \char"12}}
-\def\quotesinglbase{{\ecfont \char"0D}}
-%
-% This positioning is not perfect (see the ogonek LaTeX package), but
-% we have the precomposed glyphs for the most common cases.  We put the
-% tests to use those glyphs in the single \ogonek macro so we have fewer
-% dummy definitions to worry about for index entries, etc.
-%
-% ogonek is also used with other letters in Lithuanian (IOU), but using
-% the precomposed glyphs for those is not so easy since they aren't in
-% the same EC font.
-\def\ogonek#1{{%
-  \def\temp{#1}%
-  \ifx\temp\macrocharA\Aogonek
-  \else\ifx\temp\macrochara\aogonek
-  \else\ifx\temp\macrocharE\Eogonek
-  \else\ifx\temp\macrochare\eogonek
-  \else
-    \ecfont \setbox0=\hbox{#1}%
-    \ifdim\ht0=1ex\accent"0C #1%
-    \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}%
-    \fi
-  \fi\fi\fi\fi
-  }%
-}
-\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A}
-\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a}
-\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
-\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
-%
-% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
-\def\ecfont{%
-  % We can't distinguish serif/sans and italic/slanted, but this
-  % is used for crude hacks anyway (like adding French and German
-  % quotes to documents typeset with CM, where we lose kerning), so
-  % hopefully nobody will notice/care.
-  \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
-  \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
-  \ifx\curfontstyle\bfstylename
-    % bold:
-    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
-  \else
-    % regular:
-    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
-  \fi
-  \thisecfont
-}
-
-% @registeredsymbol - R in a circle.  The font for the R should really
-% be smaller yet, but lllsize is the best we can do for now.
-% Adapted from the plain.tex definition of \copyright.
-%
-\def\registeredsymbol{%
-  $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
-               \hfil\crcr\Orb}}%
-    }$%
-}
-
-% @textdegree - the normal degrees sign.
-%
-\def\textdegree{$^\circ$}
-
-% Laurent Siebenmann reports \Orb undefined with:
-%  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
-% so we'll define it if necessary.
-%
-\ifx\Orb\undefined
-\def\Orb{\mathhexbox20D}
-\fi
-
-% Quotes.
-\chardef\quotedblleft="5C
-\chardef\quotedblright=`\"
-\chardef\quoteleft=`\`
-\chardef\quoteright=`\'
-
-
-\message{page headings,}
-
-\newskip\titlepagetopglue \titlepagetopglue = 1.5in
-\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
-
-% First the title page.  Must do @settitle before @titlepage.
-\newif\ifseenauthor
-\newif\iffinishedtitlepage
-
-% Do an implicit @contents or @shortcontents after @end titlepage if the
-% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
-%
-\newif\ifsetcontentsaftertitlepage
- \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
-\newif\ifsetshortcontentsaftertitlepage
- \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
-
-\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-        \endgroup\page\hbox{}\page}
-
-\envdef\titlepage{%
-  % Open one extra group, as we want to close it in the middle of \Etitlepage.
-  \begingroup
-    \parindent=0pt \textfonts
-    % Leave some space at the very top of the page.
-    \vglue\titlepagetopglue
-    % No rule at page bottom unless we print one at the top with @title.
-    \finishedtitlepagetrue
-    %
-    % Most title ``pages'' are actually two pages long, with space
-    % at the top of the second.  We don't want the ragged left on the second.
-    \let\oldpage = \page
-    \def\page{%
-      \iffinishedtitlepage\else
-	 \finishtitlepage
-      \fi
-      \let\page = \oldpage
-      \page
-      \null
-    }%
-}
-
-\def\Etitlepage{%
-    \iffinishedtitlepage\else
-	\finishtitlepage
-    \fi
-    % It is important to do the page break before ending the group,
-    % because the headline and footline are only empty inside the group.
-    % If we use the new definition of \page, we always get a blank page
-    % after the title page, which we certainly don't want.
-    \oldpage
-  \endgroup
-  %
-  % Need this before the \...aftertitlepage checks so that if they are
-  % in effect the toc pages will come out with page numbers.
-  \HEADINGSon
-  %
-  % If they want short, they certainly want long too.
-  \ifsetshortcontentsaftertitlepage
-    \shortcontents
-    \contents
-    \global\let\shortcontents = \relax
-    \global\let\contents = \relax
-  \fi
-  %
-  \ifsetcontentsaftertitlepage
-    \contents
-    \global\let\contents = \relax
-    \global\let\shortcontents = \relax
-  \fi
-}
-
-\def\finishtitlepage{%
-  \vskip4pt \hrule height 2pt width \hsize
-  \vskip\titlepagebottomglue
-  \finishedtitlepagetrue
-}
-
-%%% Macros to be used within @titlepage:
-
-\let\subtitlerm=\tenrm
-\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
-
-\parseargdef\title{%
-  \checkenv\titlepage
-  \leftline{\titlefonts\rmisbold #1}
-  % print a rule at the page bottom also.
-  \finishedtitlepagefalse
-  \vskip4pt \hrule height 4pt width \hsize \vskip4pt
-}
-
-\parseargdef\subtitle{%
-  \checkenv\titlepage
-  {\subtitlefont \rightline{#1}}%
-}
-
-% @author should come last, but may come many times.
-% It can also be used inside @quotation.
-%
-\parseargdef\author{%
-  \def\temp{\quotation}%
-  \ifx\thisenv\temp
-    \def\quotationauthor{#1}% printed in \Equotation.
-  \else
-    \checkenv\titlepage
-    \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
-    {\secfonts\rmisbold \leftline{#1}}%
-  \fi
-}
-
-
-%%% Set up page headings and footings.
-
-\let\thispage=\folio
-
-\newtoks\evenheadline    % headline on even pages
-\newtoks\oddheadline     % headline on odd pages
-\newtoks\evenfootline    % footline on even pages
-\newtoks\oddfootline     % footline on odd pages
-
-% Now make TeX use those variables
-\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
-                            \else \the\evenheadline \fi}}
-\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
-                            \else \the\evenfootline \fi}\HEADINGShook}
-\let\HEADINGShook=\relax
-
-% Commands to set those variables.
-% For example, this is what  @headings on  does
-% @evenheading @thistitle|@thispage|@thischapter
-% @oddheading @thischapter|@thispage|@thistitle
-% @evenfooting @thisfile||
-% @oddfooting ||@thisfile
-
-
-\def\evenheading{\parsearg\evenheadingxxx}
-\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
-\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
-\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\def\oddheading{\parsearg\oddheadingxxx}
-\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
-\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
-\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
-
-\def\evenfooting{\parsearg\evenfootingxxx}
-\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
-\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
-\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\def\oddfooting{\parsearg\oddfootingxxx}
-\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
-\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
-  \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
-  %
-  % Leave some space for the footline.  Hopefully ok to assume
-  % @evenfooting will not be used by itself.
-  \global\advance\pageheight by -12pt
-  \global\advance\vsize by -12pt
-}
-
-\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
-
-% @evenheadingmarks top     \thischapter <- chapter at the top of a page
-% @evenheadingmarks bottom  \thischapter <- chapter at the bottom of a page
-%
-% The same set of arguments for:
-%
-% @oddheadingmarks
-% @evenfootingmarks
-% @oddfootingmarks
-% @everyheadingmarks
-% @everyfootingmarks
-
-\def\evenheadingmarks{\headingmarks{even}{heading}}
-\def\oddheadingmarks{\headingmarks{odd}{heading}}
-\def\evenfootingmarks{\headingmarks{even}{footing}}
-\def\oddfootingmarks{\headingmarks{odd}{footing}}
-\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
-                          \headingmarks{odd}{heading}{#1} }
-\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
-                          \headingmarks{odd}{footing}{#1} }
-% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
-\def\headingmarks#1#2#3 {%
-  \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
-  \global\expandafter\let\csname get#1#2marks\endcsname \temp
-}
-
-\everyheadingmarks bottom
-\everyfootingmarks bottom
-
-% @headings double      turns headings on for double-sided printing.
-% @headings single      turns headings on for single-sided printing.
-% @headings off         turns them off.
-% @headings on          same as @headings double, retained for compatibility.
-% @headings after       turns on double-sided headings after this page.
-% @headings doubleafter turns on double-sided headings after this page.
-% @headings singleafter turns on single-sided headings after this page.
-% By default, they are off at the start of a document,
-% and turned `on' after @end titlepage.
-
-\def\headings #1 {\csname HEADINGS#1\endcsname}
-
-\def\HEADINGSoff{%
-\global\evenheadline={\hfil} \global\evenfootline={\hfil}
-\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
-\HEADINGSoff
-% When we turn headings on, set the page number to 1.
-% For double-sided printing, put current file name in lower left corner,
-% chapter name on inside top of right hand pages, document
-% title on inside top of left hand pages, and page numbers on outside top
-% edge of all pages.
-\def\HEADINGSdouble{%
-\global\pageno=1
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\folio\hfil\thistitle}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chapoddpage
-}
-\let\contentsalignmacro = \chappager
-
-% For single-sided printing, chapter title goes across top left of page,
-% page number on top right.
-\def\HEADINGSsingle{%
-\global\pageno=1
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\thischapter\hfil\folio}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chappager
-}
-\def\HEADINGSon{\HEADINGSdouble}
-
-\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
-\let\HEADINGSdoubleafter=\HEADINGSafter
-\def\HEADINGSdoublex{%
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\folio\hfil\thistitle}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chapoddpage
-}
-
-\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
-\def\HEADINGSsinglex{%
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\thischapter\hfil\folio}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\let\contentsalignmacro = \chappager
-}
-
-% Subroutines used in generating headings
-% This produces Day Month Year style of output.
-% Only define if not already defined, in case a txi-??.tex file has set
-% up a different format (e.g., txi-cs.tex does this).
-\ifx\today\undefined
-\def\today{%
-  \number\day\space
-  \ifcase\month
-  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
-  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
-  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
-  \fi
-  \space\number\year}
-\fi
-
-% @settitle line...  specifies the title of the document, for headings.
-% It generates no output of its own.
-\def\thistitle{\putwordNoTitle}
-\def\settitle{\parsearg{\gdef\thistitle}}
-
-
-\message{tables,}
-% Tables -- @table, @ftable, @vtable, @item(x).
-
-% default indentation of table text
-\newdimen\tableindent \tableindent=.8in
-% default indentation of @itemize and @enumerate text
-\newdimen\itemindent  \itemindent=.3in
-% margin between end of table item and start of table text.
-\newdimen\itemmargin  \itemmargin=.1in
-
-% used internally for \itemindent minus \itemmargin
-\newdimen\itemmax
-
-% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
-% these defs.
-% They also define \itemindex
-% to index the item name in whatever manner is desired (perhaps none).
-
-\newif\ifitemxneedsnegativevskip
-
-\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
-
-\def\internalBitem{\smallbreak \parsearg\itemzzz}
-\def\internalBitemx{\itemxpar \parsearg\itemzzz}
-
-\def\itemzzz #1{\begingroup %
-  \advance\hsize by -\rightskip
-  \advance\hsize by -\tableindent
-  \setbox0=\hbox{\itemindicate{#1}}%
-  \itemindex{#1}%
-  \nobreak % This prevents a break before @itemx.
-  %
-  % If the item text does not fit in the space we have, put it on a line
-  % by itself, and do not allow a page break either before or after that
-  % line.  We do not start a paragraph here because then if the next
-  % command is, e.g., @kindex, the whatsit would get put into the
-  % horizontal list on a line by itself, resulting in extra blank space.
-  \ifdim \wd0>\itemmax
-    %
-    % Make this a paragraph so we get the \parskip glue and wrapping,
-    % but leave it ragged-right.
-    \begingroup
-      \advance\leftskip by-\tableindent
-      \advance\hsize by\tableindent
-      \advance\rightskip by0pt plus1fil
-      \leavevmode\unhbox0\par
-    \endgroup
-    %
-    % We're going to be starting a paragraph, but we don't want the
-    % \parskip glue -- logically it's part of the @item we just started.
-    \nobreak \vskip-\parskip
-    %
-    % Stop a page break at the \parskip glue coming up.  However, if
-    % what follows is an environment such as @example, there will be no
-    % \parskip glue; then the negative vskip we just inserted would
-    % cause the example and the item to crash together.  So we use this
-    % bizarre value of 10001 as a signal to \aboveenvbreak to insert
-    % \parskip glue after all.  Section titles are handled this way also.
-    %
-    \penalty 10001
-    \endgroup
-    \itemxneedsnegativevskipfalse
-  \else
-    % The item text fits into the space.  Start a paragraph, so that the
-    % following text (if any) will end up on the same line.
-    \noindent
-    % Do this with kerns and \unhbox so that if there is a footnote in
-    % the item text, it can migrate to the main vertical list and
-    % eventually be printed.
-    \nobreak\kern-\tableindent
-    \dimen0 = \itemmax  \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
-    \unhbox0
-    \nobreak\kern\dimen0
-    \endgroup
-    \itemxneedsnegativevskiptrue
-  \fi
-}
-
-\def\item{\errmessage{@item while not in a list environment}}
-\def\itemx{\errmessage{@itemx while not in a list environment}}
-
-% @table, @ftable, @vtable.
-\envdef\table{%
-  \let\itemindex\gobble
-  \tablecheck{table}%
-}
-\envdef\ftable{%
-  \def\itemindex ##1{\doind {fn}{\code{##1}}}%
-  \tablecheck{ftable}%
-}
-\envdef\vtable{%
-  \def\itemindex ##1{\doind {vr}{\code{##1}}}%
-  \tablecheck{vtable}%
-}
-\def\tablecheck#1{%
-  \ifnum \the\catcode`\^^M=\active
-    \endgroup
-    \errmessage{This command won't work in this context; perhaps the problem is
-      that we are \inenvironment\thisenv}%
-    \def\next{\doignore{#1}}%
-  \else
-    \let\next\tablex
-  \fi
-  \next
-}
-\def\tablex#1{%
-  \def\itemindicate{#1}%
-  \parsearg\tabley
-}
-\def\tabley#1{%
-  {%
-    \makevalueexpandable
-    \edef\temp{\noexpand\tablez #1\space\space\space}%
-    \expandafter
-  }\temp \endtablez
-}
-\def\tablez #1 #2 #3 #4\endtablez{%
-  \aboveenvbreak
-  \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
-  \ifnum 0#2>0 \tableindent=#2\mil \fi
-  \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
-  \itemmax=\tableindent
-  \advance \itemmax by -\itemmargin
-  \advance \leftskip by \tableindent
-  \exdentamount=\tableindent
-  \parindent = 0pt
-  \parskip = \smallskipamount
-  \ifdim \parskip=0pt \parskip=2pt \fi
-  \let\item = \internalBitem
-  \let\itemx = \internalBitemx
-}
-\def\Etable{\endgraf\afterenvbreak}
-\let\Eftable\Etable
-\let\Evtable\Etable
-\let\Eitemize\Etable
-\let\Eenumerate\Etable
-
-% This is the counter used by @enumerate, which is really @itemize
-
-\newcount \itemno
-
-\envdef\itemize{\parsearg\doitemize}
-
-\def\doitemize#1{%
-  \aboveenvbreak
-  \itemmax=\itemindent
-  \advance\itemmax by -\itemmargin
-  \advance\leftskip by \itemindent
-  \exdentamount=\itemindent
-  \parindent=0pt
-  \parskip=\smallskipamount
-  \ifdim\parskip=0pt \parskip=2pt \fi
-  %
-  % Try typesetting the item mark that if the document erroneously says
-  % something like @itemize @samp (intending @table), there's an error
-  % right away at the @itemize.  It's not the best error message in the
-  % world, but it's better than leaving it to the @item.  This means if
-  % the user wants an empty mark, they have to say @w{} not just @w.
-  \def\itemcontents{#1}%
-  \setbox0 = \hbox{\itemcontents}%
-  %
-  % @itemize with no arg is equivalent to @itemize @bullet.
-  \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
-  %
-  \let\item=\itemizeitem
-}
-
-% Definition of @item while inside @itemize and @enumerate.
-%
-\def\itemizeitem{%
-  \advance\itemno by 1  % for enumerations
-  {\let\par=\endgraf \smallbreak}% reasonable place to break
-  {%
-   % If the document has an @itemize directly after a section title, a
-   % \nobreak will be last on the list, and \sectionheading will have
-   % done a \vskip-\parskip.  In that case, we don't want to zero
-   % parskip, or the item text will crash with the heading.  On the
-   % other hand, when there is normal text preceding the item (as there
-   % usually is), we do want to zero parskip, or there would be too much
-   % space.  In that case, we won't have a \nobreak before.  At least
-   % that's the theory.
-   \ifnum\lastpenalty<10000 \parskip=0in \fi
-   \noindent
-   \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
-   %
-   \vadjust{\penalty 1200}}% not good to break after first line of item.
-  \flushcr
-}
-
-% \splitoff TOKENS\endmark defines \first to be the first token in
-% TOKENS, and \rest to be the remainder.
-%
-\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
-
-% Allow an optional argument of an uppercase letter, lowercase letter,
-% or number, to specify the first label in the enumerated list.  No
-% argument is the same as `1'.
-%
-\envparseargdef\enumerate{\enumeratey #1  \endenumeratey}
-\def\enumeratey #1 #2\endenumeratey{%
-  % If we were given no argument, pretend we were given `1'.
-  \def\thearg{#1}%
-  \ifx\thearg\empty \def\thearg{1}\fi
-  %
-  % Detect if the argument is a single token.  If so, it might be a
-  % letter.  Otherwise, the only valid thing it can be is a number.
-  % (We will always have one token, because of the test we just made.
-  % This is a good thing, since \splitoff doesn't work given nothing at
-  % all -- the first parameter is undelimited.)
-  \expandafter\splitoff\thearg\endmark
-  \ifx\rest\empty
-    % Only one token in the argument.  It could still be anything.
-    % A ``lowercase letter'' is one whose \lccode is nonzero.
-    % An ``uppercase letter'' is one whose \lccode is both nonzero, and
-    %   not equal to itself.
-    % Otherwise, we assume it's a number.
-    %
-    % We need the \relax at the end of the \ifnum lines to stop TeX from
-    % continuing to look for a <number>.
-    %
-    \ifnum\lccode\expandafter`\thearg=0\relax
-      \numericenumerate % a number (we hope)
-    \else
-      % It's a letter.
-      \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
-        \lowercaseenumerate % lowercase letter
-      \else
-        \uppercaseenumerate % uppercase letter
-      \fi
-    \fi
-  \else
-    % Multiple tokens in the argument.  We hope it's a number.
-    \numericenumerate
-  \fi
-}
-
-% An @enumerate whose labels are integers.  The starting integer is
-% given in \thearg.
-%
-\def\numericenumerate{%
-  \itemno = \thearg
-  \startenumeration{\the\itemno}%
-}
-
-% The starting (lowercase) letter is in \thearg.
-\def\lowercaseenumerate{%
-  \itemno = \expandafter`\thearg
-  \startenumeration{%
-    % Be sure we're not beyond the end of the alphabet.
-    \ifnum\itemno=0
-      \errmessage{No more lowercase letters in @enumerate; get a bigger
-                  alphabet}%
-    \fi
-    \char\lccode\itemno
-  }%
-}
-
-% The starting (uppercase) letter is in \thearg.
-\def\uppercaseenumerate{%
-  \itemno = \expandafter`\thearg
-  \startenumeration{%
-    % Be sure we're not beyond the end of the alphabet.
-    \ifnum\itemno=0
-      \errmessage{No more uppercase letters in @enumerate; get a bigger
-                  alphabet}
-    \fi
-    \char\uccode\itemno
-  }%
-}
-
-% Call \doitemize, adding a period to the first argument and supplying the
-% common last two arguments.  Also subtract one from the initial value in
-% \itemno, since @item increments \itemno.
-%
-\def\startenumeration#1{%
-  \advance\itemno by -1
-  \doitemize{#1.}\flushcr
-}
-
-% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
-% to @enumerate.
-%
-\def\alphaenumerate{\enumerate{a}}
-\def\capsenumerate{\enumerate{A}}
-\def\Ealphaenumerate{\Eenumerate}
-\def\Ecapsenumerate{\Eenumerate}
-
-
-% @multitable macros
-% Amy Hendrickson, 8/18/94, 3/6/96
-%
-% @multitable ... @end multitable will make as many columns as desired.
-% Contents of each column will wrap at width given in preamble.  Width
-% can be specified either with sample text given in a template line,
-% or in percent of \hsize, the current width of text on page.
-
-% Table can continue over pages but will only break between lines.
-
-% To make preamble:
-%
-% Either define widths of columns in terms of percent of \hsize:
-%   @multitable @columnfractions .25 .3 .45
-%   @item ...
-%
-%   Numbers following @columnfractions are the percent of the total
-%   current hsize to be used for each column. You may use as many
-%   columns as desired.
-
-
-% Or use a template:
-%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-%   @item ...
-%   using the widest term desired in each column.
-
-% Each new table line starts with @item, each subsequent new column
-% starts with @tab. Empty columns may be produced by supplying @tab's
-% with nothing between them for as many times as empty columns are needed,
-% ie, @tab@tab@tab will produce two empty columns.
-
-% @item, @tab do not need to be on their own lines, but it will not hurt
-% if they are.
-
-% Sample multitable:
-
-%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-%   @item first col stuff @tab second col stuff @tab third col
-%   @item
-%   first col stuff
-%   @tab
-%   second col stuff
-%   @tab
-%   third col
-%   @item first col stuff @tab second col stuff
-%   @tab Many paragraphs of text may be used in any column.
-%
-%         They will wrap at the width determined by the template.
-%   @item@tab@tab This will be in third column.
-%   @end multitable
-
-% Default dimensions may be reset by user.
-% @multitableparskip is vertical space between paragraphs in table.
-% @multitableparindent is paragraph indent in table.
-% @multitablecolmargin is horizontal space to be left between columns.
-% @multitablelinespace is space to leave between table items, baseline
-%                                                            to baseline.
-%   0pt means it depends on current normal line spacing.
-%
-\newskip\multitableparskip
-\newskip\multitableparindent
-\newdimen\multitablecolspace
-\newskip\multitablelinespace
-\multitableparskip=0pt
-\multitableparindent=6pt
-\multitablecolspace=12pt
-\multitablelinespace=0pt
-
-% Macros used to set up halign preamble:
-%
-\let\endsetuptable\relax
-\def\xendsetuptable{\endsetuptable}
-\let\columnfractions\relax
-\def\xcolumnfractions{\columnfractions}
-\newif\ifsetpercent
-
-% #1 is the @columnfraction, usually a decimal number like .5, but might
-% be just 1.  We just use it, whatever it is.
-%
-\def\pickupwholefraction#1 {%
-  \global\advance\colcount by 1
-  \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
-  \setuptable
-}
-
-\newcount\colcount
-\def\setuptable#1{%
-  \def\firstarg{#1}%
-  \ifx\firstarg\xendsetuptable
-    \let\go = \relax
-  \else
-    \ifx\firstarg\xcolumnfractions
-      \global\setpercenttrue
-    \else
-      \ifsetpercent
-         \let\go\pickupwholefraction
-      \else
-         \global\advance\colcount by 1
-         \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
-                   % separator; typically that is always in the input, anyway.
-         \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
-      \fi
-    \fi
-    \ifx\go\pickupwholefraction
-      % Put the argument back for the \pickupwholefraction call, so
-      % we'll always have a period there to be parsed.
-      \def\go{\pickupwholefraction#1}%
-    \else
-      \let\go = \setuptable
-    \fi%
-  \fi
-  \go
-}
-
-% multitable-only commands.
-%
-% @headitem starts a heading row, which we typeset in bold.
-% Assignments have to be global since we are inside the implicit group
-% of an alignment entry.  \everycr resets \everytab so we don't have to
-% undo it ourselves.
-\def\headitemfont{\b}% for people to use in the template row; not changeable
-\def\headitem{%
-  \checkenv\multitable
-  \crcr
-  \global\everytab={\bf}% can't use \headitemfont since the parsing differs
-  \the\everytab % for the first item
-}%
-%
-% A \tab used to include \hskip1sp.  But then the space in a template
-% line is not enough.  That is bad.  So let's go back to just `&' until
-% we again encounter the problem the 1sp was intended to solve.
-%					--karl, nathan@acm.org, 20apr99.
-\def\tab{\checkenv\multitable &\the\everytab}%
-
-% @multitable ... @end multitable definitions:
-%
-\newtoks\everytab  % insert after every tab.
-%
-\envdef\multitable{%
-  \vskip\parskip
-  \startsavinginserts
-  %
-  % @item within a multitable starts a normal row.
-  % We use \def instead of \let so that if one of the multitable entries
-  % contains an @itemize, we don't choke on the \item (seen as \crcr aka
-  % \endtemplate) expanding \doitemize.
-  \def\item{\crcr}%
-  %
-  \tolerance=9500
-  \hbadness=9500
-  \setmultitablespacing
-  \parskip=\multitableparskip
-  \parindent=\multitableparindent
-  \overfullrule=0pt
-  \global\colcount=0
-  %
-  \everycr = {%
-    \noalign{%
-      \global\everytab={}%
-      \global\colcount=0 % Reset the column counter.
-      % Check for saved footnotes, etc.
-      \checkinserts
-      % Keeps underfull box messages off when table breaks over pages.
-      %\filbreak
-	% Maybe so, but it also creates really weird page breaks when the
-	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
-	% problem manifests itself, so it can be fixed for real --karl.
-    }%
-  }%
-  %
-  \parsearg\domultitable
-}
-\def\domultitable#1{%
-  % To parse everything between @multitable and @item:
-  \setuptable#1 \endsetuptable
-  %
-  % This preamble sets up a generic column definition, which will
-  % be used as many times as user calls for columns.
-  % \vtop will set a single line and will also let text wrap and
-  % continue for many paragraphs if desired.
-  \halign\bgroup &%
-    \global\advance\colcount by 1
-    \multistrut
-    \vtop{%
-      % Use the current \colcount to find the correct column width:
-      \hsize=\expandafter\csname col\the\colcount\endcsname
-      %
-      % In order to keep entries from bumping into each other
-      % we will add a \leftskip of \multitablecolspace to all columns after
-      % the first one.
-      %
-      % If a template has been used, we will add \multitablecolspace
-      % to the width of each template entry.
-      %
-      % If the user has set preamble in terms of percent of \hsize we will
-      % use that dimension as the width of the column, and the \leftskip
-      % will keep entries from bumping into each other.  Table will start at
-      % left margin and final column will justify at right margin.
-      %
-      % Make sure we don't inherit \rightskip from the outer environment.
-      \rightskip=0pt
-      \ifnum\colcount=1
-	% The first column will be indented with the surrounding text.
-	\advance\hsize by\leftskip
-      \else
-	\ifsetpercent \else
-	  % If user has not set preamble in terms of percent of \hsize
-	  % we will advance \hsize by \multitablecolspace.
-	  \advance\hsize by \multitablecolspace
-	\fi
-       % In either case we will make \leftskip=\multitablecolspace:
-      \leftskip=\multitablecolspace
-      \fi
-      % Ignoring space at the beginning and end avoids an occasional spurious
-      % blank line, when TeX decides to break the line at the space before the
-      % box from the multistrut, so the strut ends up on a line by itself.
-      % For example:
-      % @multitable @columnfractions .11 .89
-      % @item @code{#}
-      % @tab Legal holiday which is valid in major parts of the whole country.
-      % Is automatically provided with highlighting sequences respectively
-      % marking characters.
-      \noindent\ignorespaces##\unskip\multistrut
-    }\cr
-}
-\def\Emultitable{%
-  \crcr
-  \egroup % end the \halign
-  \global\setpercentfalse
-}
-
-\def\setmultitablespacing{%
-  \def\multistrut{\strut}% just use the standard line spacing
-  %
-  % Compute \multitablelinespace (if not defined by user) for use in
-  % \multitableparskip calculation.  We used define \multistrut based on
-  % this, but (ironically) that caused the spacing to be off.
-  % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
-\ifdim\multitablelinespace=0pt
-\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
-\global\advance\multitablelinespace by-\ht0
-\fi
-%% Test to see if parskip is larger than space between lines of
-%% table. If not, do nothing.
-%%        If so, set to same dimension as multitablelinespace.
-\ifdim\multitableparskip>\multitablelinespace
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
-\fi%
-\ifdim\multitableparskip=0pt
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
-\fi}
-
-
-\message{conditionals,}
-
-% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
-% @ifnotxml always succeed.  They currently do nothing; we don't
-% attempt to check whether the conditionals are properly nested.  But we
-% have to remember that they are conditionals, so that @end doesn't
-% attempt to close an environment group.
-%
-\def\makecond#1{%
-  \expandafter\let\csname #1\endcsname = \relax
-  \expandafter\let\csname iscond.#1\endcsname = 1
-}
-\makecond{iftex}
-\makecond{ifnotdocbook}
-\makecond{ifnothtml}
-\makecond{ifnotinfo}
-\makecond{ifnotplaintext}
-\makecond{ifnotxml}
-
-% Ignore @ignore, @ifhtml, @ifinfo, and the like.
-%
-\def\direntry{\doignore{direntry}}
-\def\documentdescription{\doignore{documentdescription}}
-\def\docbook{\doignore{docbook}}
-\def\html{\doignore{html}}
-\def\ifdocbook{\doignore{ifdocbook}}
-\def\ifhtml{\doignore{ifhtml}}
-\def\ifinfo{\doignore{ifinfo}}
-\def\ifnottex{\doignore{ifnottex}}
-\def\ifplaintext{\doignore{ifplaintext}}
-\def\ifxml{\doignore{ifxml}}
-\def\ignore{\doignore{ignore}}
-\def\menu{\doignore{menu}}
-\def\xml{\doignore{xml}}
-
-% Ignore text until a line `@end #1', keeping track of nested conditionals.
-%
-% A count to remember the depth of nesting.
-\newcount\doignorecount
-
-\def\doignore#1{\begingroup
-  % Scan in ``verbatim'' mode:
-  \obeylines
-  \catcode`\@ = \other
-  \catcode`\{ = \other
-  \catcode`\} = \other
-  %
-  % Make sure that spaces turn into tokens that match what \doignoretext wants.
-  \spaceisspace
-  %
-  % Count number of #1's that we've seen.
-  \doignorecount = 0
-  %
-  % Swallow text until we reach the matching `@end #1'.
-  \dodoignore{#1}%
-}
-
-{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
-  \obeylines %
-  %
-  \gdef\dodoignore#1{%
-    % #1 contains the command name as a string, e.g., `ifinfo'.
-    %
-    % Define a command to find the next `@end #1'.
-    \long\def\doignoretext##1^^M@end #1{%
-      \doignoretextyyy##1^^M@#1\_STOP_}%
-    %
-    % And this command to find another #1 command, at the beginning of a
-    % line.  (Otherwise, we would consider a line `@c @ifset', for
-    % example, to count as an @ifset for nesting.)
-    \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
-    %
-    % And now expand that command.
-    \doignoretext ^^M%
-  }%
-}
-
-\def\doignoreyyy#1{%
-  \def\temp{#1}%
-  \ifx\temp\empty			% Nothing found.
-    \let\next\doignoretextzzz
-  \else					% Found a nested condition, ...
-    \advance\doignorecount by 1
-    \let\next\doignoretextyyy		% ..., look for another.
-    % If we're here, #1 ends with ^^M\ifinfo (for example).
-  \fi
-  \next #1% the token \_STOP_ is present just after this macro.
-}
-
-% We have to swallow the remaining "\_STOP_".
-%
-\def\doignoretextzzz#1{%
-  \ifnum\doignorecount = 0	% We have just found the outermost @end.
-    \let\next\enddoignore
-  \else				% Still inside a nested condition.
-    \advance\doignorecount by -1
-    \let\next\doignoretext      % Look for the next @end.
-  \fi
-  \next
-}
-
-% Finish off ignored text.
-{ \obeylines%
-  % Ignore anything after the last `@end #1'; this matters in verbatim
-  % environments, where otherwise the newline after an ignored conditional
-  % would result in a blank line in the output.
-  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
-}
-
-
-% @set VAR sets the variable VAR to an empty value.
-% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
-%
-% Since we want to separate VAR from REST-OF-LINE (which might be
-% empty), we can't just use \parsearg; we have to insert a space of our
-% own to delimit the rest of the line, and then take it out again if we
-% didn't need it.
-% We rely on the fact that \parsearg sets \catcode`\ =10.
-%
-\parseargdef\set{\setyyy#1 \endsetyyy}
-\def\setyyy#1 #2\endsetyyy{%
-  {%
-    \makevalueexpandable
-    \def\temp{#2}%
-    \edef\next{\gdef\makecsname{SET#1}}%
-    \ifx\temp\empty
-      \next{}%
-    \else
-      \setzzz#2\endsetzzz
-    \fi
-  }%
-}
-% Remove the trailing space \setxxx inserted.
-\def\setzzz#1 \endsetzzz{\next{#1}}
-
-% @clear VAR clears (i.e., unsets) the variable VAR.
-%
-\parseargdef\clear{%
-  {%
-    \makevalueexpandable
-    \global\expandafter\let\csname SET#1\endcsname=\relax
-  }%
-}
-
-% @value{foo} gets the text saved in variable foo.
-\def\value{\begingroup\makevalueexpandable\valuexxx}
-\def\valuexxx#1{\expandablevalue{#1}\endgroup}
-{
-  \catcode`\- = \active \catcode`\_ = \active
-  %
-  \gdef\makevalueexpandable{%
-    \let\value = \expandablevalue
-    % We don't want these characters active, ...
-    \catcode`\-=\other \catcode`\_=\other
-    % ..., but we might end up with active ones in the argument if
-    % we're called from @code, as @code{@value{foo-bar_}}, though.
-    % So \let them to their normal equivalents.
-    \let-\realdash \let_\normalunderscore
-  }
-}
-
-% We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we call \makevalueexpandable in \indexdummies).
-% The command has to be fully expandable (if the variable is set), since
-% the result winds up in the index file.  This means that if the
-% variable's value contains other Texinfo commands, it's almost certain
-% it will fail (although perhaps we could fix that with sufficient work
-% to do a one-level expansion on the result, instead of complete).
-%
-\def\expandablevalue#1{%
-  \expandafter\ifx\csname SET#1\endcsname\relax
-    {[No value for ``#1'']}%
-    \message{Variable `#1', used in @value, is not set.}%
-  \else
-    \csname SET#1\endcsname
-  \fi
-}
-
-% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
-% with @set.
-%
-% To get special treatment of `@end ifset,' call \makeond and the redefine.
-%
-\makecond{ifset}
-\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
-\def\doifset#1#2{%
-  {%
-    \makevalueexpandable
-    \let\next=\empty
-    \expandafter\ifx\csname SET#2\endcsname\relax
-      #1% If not set, redefine \next.
-    \fi
-    \expandafter
-  }\next
-}
-\def\ifsetfail{\doignore{ifset}}
-
-% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
-% defined with @set, or has been undefined with @clear.
-%
-% The `\else' inside the `\doifset' parameter is a trick to reuse the
-% above code: if the variable is not set, do nothing, if it is set,
-% then redefine \next to \ifclearfail.
-%
-\makecond{ifclear}
-\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
-\def\ifclearfail{\doignore{ifclear}}
-
-% @dircategory CATEGORY  -- specify a category of the dir file
-% which this file should belong to.  Ignore this in TeX.
-\let\dircategory=\comment
-
-% @defininfoenclose.
-\let\definfoenclose=\comment
-
-
-\message{indexing,}
-% Index generation facilities
-
-% Define \newwrite to be identical to plain tex's \newwrite
-% except not \outer, so it can be used within macros and \if's.
-\edef\newwrite{\makecsname{ptexnewwrite}}
-
-% \newindex {foo} defines an index named foo.
-% It automatically defines \fooindex such that
-% \fooindex ...rest of line... puts an entry in the index foo.
-% It also defines \fooindfile to be the number of the output channel for
-% the file that accumulates this index.  The file's extension is foo.
-% The name of an index should be no more than 2 characters long
-% for the sake of vms.
-%
-\def\newindex#1{%
-  \iflinks
-    \expandafter\newwrite \csname#1indfile\endcsname
-    \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
-  \fi
-  \expandafter\xdef\csname#1index\endcsname{%     % Define @#1index
-    \noexpand\doindex{#1}}
-}
-
-% @defindex foo  ==  \newindex{foo}
-%
-\def\defindex{\parsearg\newindex}
-
-% Define @defcodeindex, like @defindex except put all entries in @code.
-%
-\def\defcodeindex{\parsearg\newcodeindex}
-%
-\def\newcodeindex#1{%
-  \iflinks
-    \expandafter\newwrite \csname#1indfile\endcsname
-    \openout \csname#1indfile\endcsname \jobname.#1
-  \fi
-  \expandafter\xdef\csname#1index\endcsname{%
-    \noexpand\docodeindex{#1}}%
-}
-
-
-% @synindex foo bar    makes index foo feed into index bar.
-% Do this instead of @defindex foo if you don't want it as a separate index.
-%
-% @syncodeindex foo bar   similar, but put all entries made for index foo
-% inside @code.
-%
-\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
-\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
-
-% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
-% #3 the target index (bar).
-\def\dosynindex#1#2#3{%
-  % Only do \closeout if we haven't already done it, else we'll end up
-  % closing the target index.
-  \expandafter \ifx\csname donesynindex#2\endcsname \relax
-    % The \closeout helps reduce unnecessary open files; the limit on the
-    % Acorn RISC OS is a mere 16 files.
-    \expandafter\closeout\csname#2indfile\endcsname
-    \expandafter\let\csname donesynindex#2\endcsname = 1
-  \fi
-  % redefine \fooindfile:
-  \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
-  \expandafter\let\csname#2indfile\endcsname=\temp
-  % redefine \fooindex:
-  \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
-}
-
-% Define \doindex, the driver for all \fooindex macros.
-% Argument #1 is generated by the calling \fooindex macro,
-%  and it is "foo", the name of the index.
-
-% \doindex just uses \parsearg; it calls \doind for the actual work.
-% This is because \doind is more useful to call from other macros.
-
-% There is also \dosubind {index}{topic}{subtopic}
-% which makes an entry in a two-level index such as the operation index.
-
-\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
-\def\singleindexer #1{\doind{\indexname}{#1}}
-
-% like the previous two, but they put @code around the argument.
-\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
-\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
-
-% Take care of Texinfo commands that can appear in an index entry.
-% Since there are some commands we want to expand, and others we don't,
-% we have to laboriously prevent expansion for those that we don't.
-%
-\def\indexdummies{%
-  \escapechar = `\\     % use backslash in output files.
-  \def\@{@}% change to @@ when we switch to @ as escape char in index files.
-  \def\ {\realbackslash\space }%
-  %
-  % Need these in case \tex is in effect and \{ is a \delimiter again.
-  % But can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.
-  \let\{ = \mylbrace
-  \let\} = \myrbrace
-  %
-  % I don't entirely understand this, but when an index entry is
-  % generated from a macro call, the \endinput which \scanmacro inserts
-  % causes processing to be prematurely terminated.  This is,
-  % apparently, because \indexsorttmp is fully expanded, and \endinput
-  % is an expandable command.  The redefinition below makes \endinput
-  % disappear altogether for that purpose -- although logging shows that
-  % processing continues to some further point.  On the other hand, it
-  % seems \endinput does not hurt in the printed index arg, since that
-  % is still getting written without apparent harm.
-  %
-  % Sample source (mac-idx3.tex, reported by Graham Percival to
-  % help-texinfo, 22may06):
-  % @macro funindex {WORD}
-  % @findex xyz
-  % @end macro
-  % ...
-  % @funindex commtest
-  %
-  % The above is not enough to reproduce the bug, but it gives the flavor.
-  %
-  % Sample whatsit resulting:
-  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-  %
-  % So:
-  \let\endinput = \empty
-  %
-  % Do the redefinitions.
-  \commondummies
-}
-
-% For the aux and toc files, @ is the escape character.  So we want to
-% redefine everything using @ as the escape character (instead of
-% \realbackslash, still used for index files).  When everything uses @,
-% this will be simpler.
-%
-\def\atdummies{%
-  \def\@{@@}%
-  \def\ {@ }%
-  \let\{ = \lbraceatcmd
-  \let\} = \rbraceatcmd
-  %
-  % Do the redefinitions.
-  \commondummies
-  \otherbackslash
-}
-
-% Called from \indexdummies and \atdummies.
-%
-\def\commondummies{%
-  %
-  % \definedummyword defines \#1 as \string\#1\space, thus effectively
-  % preventing its expansion.  This is used only for control% words,
-  % not control letters, because the \space would be incorrect for
-  % control characters, but is needed to separate the control word
-  % from whatever follows.
-  %
-  % For control letters, we have \definedummyletter, which omits the
-  % space.
-  %
-  % These can be used both for control words that take an argument and
-  % those that do not.  If it is followed by {arg} in the input, then
-  % that will dutifully get written to the index (or wherever).
-  %
-  \def\definedummyword  ##1{\def##1{\string##1\space}}%
-  \def\definedummyletter##1{\def##1{\string##1}}%
-  \let\definedummyaccent\definedummyletter
-  %
-  \commondummiesnofonts
-  %
-  \definedummyletter\_%
-  %
-  % Non-English letters.
-  \definedummyword\AA
-  \definedummyword\AE
-  \definedummyword\DH
-  \definedummyword\L
-  \definedummyword\O
-  \definedummyword\OE
-  \definedummyword\TH
-  \definedummyword\aa
-  \definedummyword\ae
-  \definedummyword\dh
-  \definedummyword\exclamdown
-  \definedummyword\l
-  \definedummyword\o
-  \definedummyword\oe
-  \definedummyword\ordf
-  \definedummyword\ordm
-  \definedummyword\questiondown
-  \definedummyword\ss
-  \definedummyword\th
-  %
-  % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword\bf
-  \definedummyword\gtr
-  \definedummyword\hat
-  \definedummyword\less
-  \definedummyword\sf
-  \definedummyword\sl
-  \definedummyword\tclose
-  \definedummyword\tt
-  %
-  \definedummyword\LaTeX
-  \definedummyword\TeX
-  %
-  % Assorted special characters.
-  \definedummyword\bullet
-  \definedummyword\comma
-  \definedummyword\copyright
-  \definedummyword\registeredsymbol
-  \definedummyword\dots
-  \definedummyword\enddots
-  \definedummyword\equiv
-  \definedummyword\error
-  \definedummyword\euro
-  \definedummyword\guillemetleft
-  \definedummyword\guillemetright
-  \definedummyword\guilsinglleft
-  \definedummyword\guilsinglright
-  \definedummyword\expansion
-  \definedummyword\minus
-  \definedummyword\ogonek
-  \definedummyword\pounds
-  \definedummyword\point
-  \definedummyword\print
-  \definedummyword\quotedblbase
-  \definedummyword\quotedblleft
-  \definedummyword\quotedblright
-  \definedummyword\quoteleft
-  \definedummyword\quoteright
-  \definedummyword\quotesinglbase
-  \definedummyword\result
-  \definedummyword\textdegree
-  %
-  % We want to disable all macros so that they are not expanded by \write.
-  \macrolist
-  %
-  \normalturnoffactive
-  %
-  % Handle some cases of @value -- where it does not contain any
-  % (non-fully-expandable) commands.
-  \makevalueexpandable
-}
-
-% \commondummiesnofonts: common to \commondummies and \indexnofonts.
-%
-\def\commondummiesnofonts{%
-  % Control letters and accents.
-  \definedummyletter\!%
-  \definedummyaccent\"%
-  \definedummyaccent\'%
-  \definedummyletter\*%
-  \definedummyaccent\,%
-  \definedummyletter\.%
-  \definedummyletter\/%
-  \definedummyletter\:%
-  \definedummyaccent\=%
-  \definedummyletter\?%
-  \definedummyaccent\^%
-  \definedummyaccent\`%
-  \definedummyaccent\~%
-  \definedummyword\u
-  \definedummyword\v
-  \definedummyword\H
-  \definedummyword\dotaccent
-  \definedummyword\ogonek
-  \definedummyword\ringaccent
-  \definedummyword\tieaccent
-  \definedummyword\ubaraccent
-  \definedummyword\udotaccent
-  \definedummyword\dotless
-  %
-  % Texinfo font commands.
-  \definedummyword\b
-  \definedummyword\i
-  \definedummyword\r
-  \definedummyword\sc
-  \definedummyword\t
-  %
-  % Commands that take arguments.
-  \definedummyword\acronym
-  \definedummyword\cite
-  \definedummyword\code
-  \definedummyword\command
-  \definedummyword\dfn
-  \definedummyword\email
-  \definedummyword\emph
-  \definedummyword\env
-  \definedummyword\file
-  \definedummyword\kbd
-  \definedummyword\key
-  \definedummyword\math
-  \definedummyword\option
-  \definedummyword\pxref
-  \definedummyword\ref
-  \definedummyword\samp
-  \definedummyword\strong
-  \definedummyword\tie
-  \definedummyword\uref
-  \definedummyword\url
-  \definedummyword\var
-  \definedummyword\verb
-  \definedummyword\w
-  \definedummyword\xref
-}
-
-% \indexnofonts is used when outputting the strings to sort the index
-% by, and when constructing control sequence names.  It eliminates all
-% control sequences and just writes whatever the best ASCII sort string
-% would be for a given command (usually its argument).
-%
-\def\indexnofonts{%
-  % Accent commands should become @asis.
-  \def\definedummyaccent##1{\let##1\asis}%
-  % We can just ignore other control letters.
-  \def\definedummyletter##1{\let##1\empty}%
-  % Hopefully, all control words can become @asis.
-  \let\definedummyword\definedummyaccent
-  %
-  \commondummiesnofonts
-  %
-  % Don't no-op \tt, since it isn't a user-level command
-  % and is used in the definitions of the active chars like <, >, |, etc.
-  % Likewise with the other plain tex font commands.
-  %\let\tt=\asis
-  %
-  \def\ { }%
-  \def\@{@}%
-  % how to handle braces?
-  \def\_{\normalunderscore}%
-  %
-  % Non-English letters.
-  \def\AA{AA}%
-  \def\AE{AE}%
-  \def\DH{DZZ}%
-  \def\L{L}%
-  \def\OE{OE}%
-  \def\O{O}%
-  \def\TH{ZZZ}%
-  \def\aa{aa}%
-  \def\ae{ae}%
-  \def\dh{dzz}%
-  \def\exclamdown{!}%
-  \def\l{l}%
-  \def\oe{oe}%
-  \def\ordf{a}%
-  \def\ordm{o}%
-  \def\o{o}%
-  \def\questiondown{?}%
-  \def\ss{ss}%
-  \def\th{zzz}%
-  %
-  \def\LaTeX{LaTeX}%
-  \def\TeX{TeX}%
-  %
-  % Assorted special characters.
-  % (The following {} will end up in the sort string, but that's ok.)
-  \def\bullet{bullet}%
-  \def\comma{,}%
-  \def\copyright{copyright}%
-  \def\dots{...}%
-  \def\enddots{...}%
-  \def\equiv{==}%
-  \def\error{error}%
-  \def\euro{euro}%
-  \def\expansion{==>}%
-  \def\guillemetleft{<<}%
-  \def\guillemetright{>>}%
-  \def\guilsinglleft{<}%
-  \def\guilsinglright{>}%
-  \def\minus{-}%
-  \def\point{.}%
-  \def\pounds{pounds}%
-  \def\print{-|}%
-  \def\quotedblbase{"}%
-  \def\quotedblleft{"}%
-  \def\quotedblright{"}%
-  \def\quoteleft{`}%
-  \def\quoteright{'}%
-  \def\quotesinglbase{,}%
-  \def\registeredsymbol{R}%
-  \def\result{=>}%
-  \def\textdegree{o}%
-  %
-  % We need to get rid of all macros, leaving only the arguments (if present).
-  % Of course this is not nearly correct, but it is the best we can do for now.
-  % makeinfo does not expand macros in the argument to @deffn, which ends up
-  % writing an index entry, and texindex isn't prepared for an index sort entry
-  % that starts with \.
-  %
-  % Since macro invocations are followed by braces, we can just redefine them
-  % to take a single TeX argument.  The case of a macro invocation that
-  % goes to end-of-line is not handled.
-  %
-  \macrolist
-}
-
-\let\indexbackslash=0  %overridden during \printindex.
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
-% Most index entries go through here, but \dosubind is the general case.
-% #1 is the index name, #2 is the entry text.
-\def\doind#1#2{\dosubind{#1}{#2}{}}
-
-% Workhorse for all \fooindexes.
-% #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% empty if called from \doind, as we usually are (the main exception
-% is with most defuns, which call us directly).
-%
-\def\dosubind#1#2#3{%
-  \iflinks
-  {%
-    % Store the main index entry text (including the third arg).
-    \toks0 = {#2}%
-    % If third arg is present, precede it with a space.
-    \def\thirdarg{#3}%
-    \ifx\thirdarg\empty \else
-      \toks0 = \expandafter{\the\toks0 \space #3}%
-    \fi
-    %
-    \edef\writeto{\csname#1indfile\endcsname}%
-    %
-    \safewhatsit\dosubindwrite
-  }%
-  \fi
-}
-
-% Write the entry in \toks0 to the index file:
-%
-\def\dosubindwrite{%
-  % Put the index entry in the margin if desired.
-  \ifx\SETmarginindex\relax\else
-    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
-  \fi
-  %
-  % Remember, we are within a group.
-  \indexdummies % Must do this here, since \bf, etc expand at this stage
-  \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
-      % so it will be output as is; and it will print as backslash.
-  %
-  % Process the index entry with all font commands turned off, to
-  % get the string to sort by.
-  {\indexnofonts
-   \edef\temp{\the\toks0}% need full expansion
-   \xdef\indexsorttmp{\temp}%
-  }%
-  %
-  % Set up the complete index entry, with both the sort key and
-  % the original text, including any font commands.  We write
-  % three arguments to \entry to the .?? file (four in the
-  % subentry case), texindex reduces to two when writing the .??s
-  % sorted result.
-  \edef\temp{%
-    \write\writeto{%
-      \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
-  }%
-  \temp
-}
-
-% Take care of unwanted page breaks/skips around a whatsit:
-%
-% If a skip is the last thing on the list now, preserve it
-% by backing up by \lastskip, doing the \write, then inserting
-% the skip again.  Otherwise, the whatsit generated by the
-% \write or \pdfdest will make \lastskip zero.  The result is that
-% sequences like this:
-% @end defun
-% @tindex whatever
-% @defun ...
-% will have extra space inserted, because the \medbreak in the
-% start of the @defun won't see the skip inserted by the @end of
-% the previous defun.
-%
-% But don't do any of this if we're not in vertical mode.  We
-% don't want to do a \vskip and prematurely end a paragraph.
-%
-% Avoid page breaks due to these extra skips, too.
-%
-% But wait, there is a catch there:
-% We'll have to check whether \lastskip is zero skip.  \ifdim is not
-% sufficient for this purpose, as it ignores stretch and shrink parts
-% of the skip.  The only way seems to be to check the textual
-% representation of the skip.
-%
-% The following is almost like \def\zeroskipmacro{0.0pt} except that
-% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
-%
-\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
-%
-\newskip\whatsitskip
-\newcount\whatsitpenalty
-%
-% ..., ready, GO:
-%
-\def\safewhatsit#1{%
-\ifhmode
-  #1%
-\else
-  % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-  \whatsitskip = \lastskip
-  \edef\lastskipmacro{\the\lastskip}%
-  \whatsitpenalty = \lastpenalty
-  %
-  % If \lastskip is nonzero, that means the last item was a
-  % skip.  And since a skip is discardable, that means this
-  % -\whatsitskip glue we're inserting is preceded by a
-  % non-discardable item, therefore it is not a potential
-  % breakpoint, therefore no \nobreak needed.
-  \ifx\lastskipmacro\zeroskipmacro
-  \else
-    \vskip-\whatsitskip
-  \fi
-  %
-  #1%
-  %
-  \ifx\lastskipmacro\zeroskipmacro
-    % If \lastskip was zero, perhaps the last item was a penalty, and
-    % perhaps it was >=10000, e.g., a \nobreak.  In that case, we want
-    % to re-insert the same penalty (values >10000 are used for various
-    % signals); since we just inserted a non-discardable item, any
-    % following glue (such as a \parskip) would be a breakpoint.  For example:
-    %
-    %   @deffn deffn-whatever
-    %   @vindex index-whatever
-    %   Description.
-    % would allow a break between the index-whatever whatsit
-    % and the "Description." paragraph.
-    \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
-  \else
-    % On the other hand, if we had a nonzero \lastskip,
-    % this make-up glue would be preceded by a non-discardable item
-    % (the whatsit from the \write), so we must insert a \nobreak.
-    \nobreak\vskip\whatsitskip
-  \fi
-\fi
-}
-
-% The index entry written in the file actually looks like
-%  \entry {sortstring}{page}{topic}
-% or
-%  \entry {sortstring}{page}{topic}{subtopic}
-% The texindex program reads in these files and writes files
-% containing these kinds of lines:
-%  \initial {c}
-%     before the first topic whose initial is c
-%  \entry {topic}{pagelist}
-%     for a topic that is used without subtopics
-%  \primary {topic}
-%     for the beginning of a topic that is used with subtopics
-%  \secondary {subtopic}{pagelist}
-%     for each subtopic.
-
-% Define the user-accessible indexing commands
-% @findex, @vindex, @kindex, @cindex.
-
-\def\findex {\fnindex}
-\def\kindex {\kyindex}
-\def\cindex {\cpindex}
-\def\vindex {\vrindex}
-\def\tindex {\tpindex}
-\def\pindex {\pgindex}
-
-\def\cindexsub {\begingroup\obeylines\cindexsub}
-{\obeylines %
-\gdef\cindexsub "#1" #2^^M{\endgroup %
-\dosubind{cp}{#2}{#1}}}
-
-% Define the macros used in formatting output of the sorted index material.
-
-% @printindex causes a particular index (the ??s file) to get printed.
-% It does not print any chapter heading (usually an @unnumbered).
-%
-\parseargdef\printindex{\begingroup
-  \dobreak \chapheadingskip{10000}%
-  %
-  \smallfonts \rm
-  \tolerance = 9500
-  \plainfrenchspacing
-  \everypar = {}% don't want the \kern\-parindent from indentation suppression.
-  %
-  % See if the index file exists and is nonempty.
-  % Change catcode of @ here so that if the index file contains
-  % \initial {@}
-  % as its first line, TeX doesn't complain about mismatched braces
-  % (because it thinks @} is a control sequence).
-  \catcode`\@ = 11
-  \openin 1 \jobname.#1s
-  \ifeof 1
-    % \enddoublecolumns gets confused if there is no text in the index,
-    % and it loses the chapter title and the aux file entries for the
-    % index.  The easiest way to prevent this problem is to make sure
-    % there is some text.
-    \putwordIndexNonexistent
-  \else
-    %
-    % If the index file exists but is empty, then \openin leaves \ifeof
-    % false.  We have to make TeX try to read something from the file, so
-    % it can discover if there is anything in it.
-    \read 1 to \temp
-    \ifeof 1
-      \putwordIndexIsEmpty
-    \else
-      % Index files are almost Texinfo source, but we use \ as the escape
-      % character.  It would be better to use @, but that's too big a change
-      % to make right now.
-      \def\indexbackslash{\backslashcurfont}%
-      \catcode`\\ = 0
-      \escapechar = `\\
-      \begindoublecolumns
-      \input \jobname.#1s
-      \enddoublecolumns
-    \fi
-  \fi
-  \closein 1
-\endgroup}
-
-% These macros are used by the sorted index file itself.
-% Change them to control the appearance of the index.
-
-\def\initial#1{{%
-  % Some minor font changes for the special characters.
-  \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
-  %
-  % Remove any glue we may have, we'll be inserting our own.
-  \removelastskip
-  %
-  % We like breaks before the index initials, so insert a bonus.
-  \nobreak
-  \vskip 0pt plus 3\baselineskip
-  \penalty 0
-  \vskip 0pt plus -3\baselineskip
-  %
-  % Typeset the initial.  Making this add up to a whole number of
-  % baselineskips increases the chance of the dots lining up from column
-  % to column.  It still won't often be perfect, because of the stretch
-  % we need before each entry, but it's better.
-  %
-  % No shrink because it confuses \balancecolumns.
-  \vskip 1.67\baselineskip plus .5\baselineskip
-  \leftline{\secbf #1}%
-  % Do our best not to break after the initial.
-  \nobreak
-  \vskip .33\baselineskip plus .1\baselineskip
-}}
-
-% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
-% then page number (#2) flushed to the right margin.  It is used for index
-% and table of contents entries.  The paragraph is indented by \leftskip.
-%
-% A straightforward implementation would start like this:
-%	\def\entry#1#2{...
-% But this freezes the catcodes in the argument, and can cause problems to
-% @code, which sets - active.  This problem was fixed by a kludge---
-% ``-'' was active throughout whole index, but this isn't really right.
-%
-% The right solution is to prevent \entry from swallowing the whole text.
-%                                 --kasal, 21nov03
-\def\entry{%
-  \begingroup
-    %
-    % Start a new paragraph if necessary, so our assignments below can't
-    % affect previous text.
-    \par
-    %
-    % Do not fill out the last line with white space.
-    \parfillskip = 0in
-    %
-    % No extra space above this paragraph.
-    \parskip = 0in
-    %
-    % Do not prefer a separate line ending with a hyphen to fewer lines.
-    \finalhyphendemerits = 0
-    %
-    % \hangindent is only relevant when the entry text and page number
-    % don't both fit on one line.  In that case, bob suggests starting the
-    % dots pretty far over on the line.  Unfortunately, a large
-    % indentation looks wrong when the entry text itself is broken across
-    % lines.  So we use a small indentation and put up with long leaders.
-    %
-    % \hangafter is reset to 1 (which is the value we want) at the start
-    % of each paragraph, so we need not do anything with that.
-    \hangindent = 2em
-    %
-    % When the entry text needs to be broken, just fill out the first line
-    % with blank space.
-    \rightskip = 0pt plus1fil
-    %
-    % A bit of stretch before each entry for the benefit of balancing
-    % columns.
-    \vskip 0pt plus1pt
-    %
-    % Swallow the left brace of the text (first parameter):
-    \afterassignment\doentry
-    \let\temp =
-}
-\def\doentry{%
-    \bgroup % Instead of the swallowed brace.
-      \noindent
-      \aftergroup\finishentry
-      % And now comes the text of the entry.
-}
-\def\finishentry#1{%
-    % #1 is the page number.
-    %
-    % The following is kludged to not output a line of dots in the index if
-    % there are no page numbers.  The next person who breaks this will be
-    % cursed by a Unix daemon.
-    \setbox\boxA = \hbox{#1}%
-    \ifdim\wd\boxA = 0pt
-      \ %
-    \else
-      %
-      % If we must, put the page number on a line of its own, and fill out
-      % this line with blank space.  (The \hfil is overwhelmed with the
-      % fill leaders glue in \indexdotfill if the page number does fit.)
-      \hfil\penalty50
-      \null\nobreak\indexdotfill % Have leaders before the page number.
-      %
-      % The `\ ' here is removed by the implicit \unskip that TeX does as
-      % part of (the primitive) \par.  Without it, a spurious underfull
-      % \hbox ensues.
-      \ifpdf
-	\pdfgettoks#1.%
-	\ \the\toksA
-      \else
-	\ #1%
-      \fi
-    \fi
-    \par
-  \endgroup
-}
-
-% Like plain.tex's \dotfill, except uses up at least 1 em.
-\def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
-
-\def\primary #1{\line{#1\hfil}}
-
-\newskip\secondaryindent \secondaryindent=0.5cm
-\def\secondary#1#2{{%
-  \parfillskip=0in
-  \parskip=0in
-  \hangindent=1in
-  \hangafter=1
-  \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
-  \ifpdf
-    \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
-  \else
-    #2
-  \fi
-  \par
-}}
-
-% Define two-column mode, which we use to typeset indexes.
-% Adapted from the TeXbook, page 416, which is to say,
-% the manmac.tex format used to print the TeXbook itself.
-\catcode`\@=11
-
-\newbox\partialpage
-\newdimen\doublecolumnhsize
-
-\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
-  % Grab any single-column material above us.
-  \output = {%
-    %
-    % Here is a possibility not foreseen in manmac: if we accumulate a
-    % whole lot of material, we might end up calling this \output
-    % routine twice in a row (see the doublecol-lose test, which is
-    % essentially a couple of indexes with @setchapternewpage off).  In
-    % that case we just ship out what is in \partialpage with the normal
-    % output routine.  Generally, \partialpage will be empty when this
-    % runs and this will be a no-op.  See the indexspread.tex test case.
-    \ifvoid\partialpage \else
-      \onepageout{\pagecontents\partialpage}%
-    \fi
-    %
-    \global\setbox\partialpage = \vbox{%
-      % Unvbox the main output page.
-      \unvbox\PAGE
-      \kern-\topskip \kern\baselineskip
-    }%
-  }%
-  \eject % run that output routine to set \partialpage
-  %
-  % Use the double-column output routine for subsequent pages.
-  \output = {\doublecolumnout}%
-  %
-  % Change the page size parameters.  We could do this once outside this
-  % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
-  % format, but then we repeat the same computation.  Repeating a couple
-  % of assignments once per index is clearly meaningless for the
-  % execution time, so we may as well do it in one place.
-  %
-  % First we halve the line length, less a little for the gutter between
-  % the columns.  We compute the gutter based on the line length, so it
-  % changes automatically with the paper format.  The magic constant
-  % below is chosen so that the gutter has the same value (well, +-<1pt)
-  % as it did when we hard-coded it.
-  %
-  % We put the result in a separate register, \doublecolumhsize, so we
-  % can restore it in \pagesofar, after \hsize itself has (potentially)
-  % been clobbered.
-  %
-  \doublecolumnhsize = \hsize
-    \advance\doublecolumnhsize by -.04154\hsize
-    \divide\doublecolumnhsize by 2
-  \hsize = \doublecolumnhsize
-  %
-  % Double the \vsize as well.  (We don't need a separate register here,
-  % since nobody clobbers \vsize.)
-  \vsize = 2\vsize
-}
-
-% The double-column output routine for all double-column pages except
-% the last.
-%
-\def\doublecolumnout{%
-  \splittopskip=\topskip \splitmaxdepth=\maxdepth
-  % Get the available space for the double columns -- the normal
-  % (undoubled) page height minus any material left over from the
-  % previous page.
-  \dimen@ = \vsize
-  \divide\dimen@ by 2
-  \advance\dimen@ by -\ht\partialpage
-  %
-  % box0 will be the left-hand column, box2 the right.
-  \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
-  \onepageout\pagesofar
-  \unvbox255
-  \penalty\outputpenalty
-}
-%
-% Re-output the contents of the output page -- any previous material,
-% followed by the two boxes we just split, in box0 and box2.
-\def\pagesofar{%
-  \unvbox\partialpage
-  %
-  \hsize = \doublecolumnhsize
-  \wd0=\hsize \wd2=\hsize
-  \hbox to\pagewidth{\box0\hfil\box2}%
-}
-%
-% All done with double columns.
-\def\enddoublecolumns{%
-  % The following penalty ensures that the page builder is exercised
-  % _before_ we change the output routine.  This is necessary in the
-  % following situation:
-  %
-  % The last section of the index consists only of a single entry.
-  % Before this section, \pagetotal is less than \pagegoal, so no
-  % break occurs before the last section starts.  However, the last
-  % section, consisting of \initial and the single \entry, does not
-  % fit on the page and has to be broken off.  Without the following
-  % penalty the page builder will not be exercised until \eject
-  % below, and by that time we'll already have changed the output
-  % routine to the \balancecolumns version, so the next-to-last
-  % double-column page will be processed with \balancecolumns, which
-  % is wrong:  The two columns will go to the main vertical list, with
-  % the broken-off section in the recent contributions.  As soon as
-  % the output routine finishes, TeX starts reconsidering the page
-  % break.  The two columns and the broken-off section both fit on the
-  % page, because the two columns now take up only half of the page
-  % goal.  When TeX sees \eject from below which follows the final
-  % section, it invokes the new output routine that we've set after
-  % \balancecolumns below; \onepageout will try to fit the two columns
-  % and the final section into the vbox of \pageheight (see
-  % \pagebody), causing an overfull box.
-  %
-  % Note that glue won't work here, because glue does not exercise the
-  % page builder, unlike penalties (see The TeXbook, pp. 280-281).
-  \penalty0
-  %
-  \output = {%
-    % Split the last of the double-column material.  Leave it on the
-    % current page, no automatic page break.
-    \balancecolumns
-    %
-    % If we end up splitting too much material for the current page,
-    % though, there will be another page break right after this \output
-    % invocation ends.  Having called \balancecolumns once, we do not
-    % want to call it again.  Therefore, reset \output to its normal
-    % definition right away.  (We hope \balancecolumns will never be
-    % called on to balance too much material, but if it is, this makes
-    % the output somewhat more palatable.)
-    \global\output = {\onepageout{\pagecontents\PAGE}}%
-  }%
-  \eject
-  \endgroup % started in \begindoublecolumns
-  %
-  % \pagegoal was set to the doubled \vsize above, since we restarted
-  % the current page.  We're now back to normal single-column
-  % typesetting, so reset \pagegoal to the normal \vsize (after the
-  % \endgroup where \vsize got restored).
-  \pagegoal = \vsize
-}
-%
-% Called at the end of the double column material.
-\def\balancecolumns{%
-  \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
-  \dimen@ = \ht0
-  \advance\dimen@ by \topskip
-  \advance\dimen@ by-\baselineskip
-  \divide\dimen@ by 2 % target to split to
-  %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}%
-  \splittopskip = \topskip
-  % Loop until we get a decent breakpoint.
-  {%
-    \vbadness = 10000
-    \loop
-      \global\setbox3 = \copy0
-      \global\setbox1 = \vsplit3 to \dimen@
-    \ifdim\ht3>\dimen@
-      \global\advance\dimen@ by 1pt
-    \repeat
-  }%
-  %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
-  \setbox0=\vbox to\dimen@{\unvbox1}%
-  \setbox2=\vbox to\dimen@{\unvbox3}%
-  %
-  \pagesofar
-}
-\catcode`\@ = \other
-
-
-\message{sectioning,}
-% Chapters, sections, etc.
-
-% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
-% sections so that we can refer to them unambiguously in the pdf
-% outlines by their "section number".  We avoid collisions with chapter
-% numbers by starting them at 10000.  (If a document ever has 10000
-% chapters, we're in trouble anyway, I'm sure.)
-\newcount\unnumberedno \unnumberedno = 10000
-\newcount\chapno
-\newcount\secno        \secno=0
-\newcount\subsecno     \subsecno=0
-\newcount\subsubsecno  \subsubsecno=0
-
-% This counter is funny since it counts through charcodes of letters A, B, ...
-\newcount\appendixno  \appendixno = `\@
-%
-% \def\appendixletter{\char\the\appendixno}
-% We do the following ugly conditional instead of the above simple
-% construct for the sake of pdftex, which needs the actual
-% letter in the expansion, not just typeset.
-%
-\def\appendixletter{%
-  \ifnum\appendixno=`A A%
-  \else\ifnum\appendixno=`B B%
-  \else\ifnum\appendixno=`C C%
-  \else\ifnum\appendixno=`D D%
-  \else\ifnum\appendixno=`E E%
-  \else\ifnum\appendixno=`F F%
-  \else\ifnum\appendixno=`G G%
-  \else\ifnum\appendixno=`H H%
-  \else\ifnum\appendixno=`I I%
-  \else\ifnum\appendixno=`J J%
-  \else\ifnum\appendixno=`K K%
-  \else\ifnum\appendixno=`L L%
-  \else\ifnum\appendixno=`M M%
-  \else\ifnum\appendixno=`N N%
-  \else\ifnum\appendixno=`O O%
-  \else\ifnum\appendixno=`P P%
-  \else\ifnum\appendixno=`Q Q%
-  \else\ifnum\appendixno=`R R%
-  \else\ifnum\appendixno=`S S%
-  \else\ifnum\appendixno=`T T%
-  \else\ifnum\appendixno=`U U%
-  \else\ifnum\appendixno=`V V%
-  \else\ifnum\appendixno=`W W%
-  \else\ifnum\appendixno=`X X%
-  \else\ifnum\appendixno=`Y Y%
-  \else\ifnum\appendixno=`Z Z%
-  % The \the is necessary, despite appearances, because \appendixletter is
-  % expanded while writing the .toc file.  \char\appendixno is not
-  % expandable, thus it is written literally, thus all appendixes come out
-  % with the same letter (or @) in the toc without it.
-  \else\char\the\appendixno
-  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-
-% Each @chapter defines these (using marks) as the number+name, number
-% and name of the chapter.  Page headings and footings can use
-% these.  @section does likewise.
-\def\thischapter{}
-\def\thischapternum{}
-\def\thischaptername{}
-\def\thissection{}
-\def\thissectionnum{}
-\def\thissectionname{}
-
-\newcount\absseclevel % used to calculate proper heading level
-\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
-
-% @raisesections: treat @section as chapter, @subsection as section, etc.
-\def\raisesections{\global\advance\secbase by -1}
-\let\up=\raisesections % original BFox name
-
-% @lowersections: treat @chapter as section, @section as subsection, etc.
-\def\lowersections{\global\advance\secbase by 1}
-\let\down=\lowersections % original BFox name
-
-% we only have subsub.
-\chardef\maxseclevel = 3
-%
-% A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
-\chardef\unmlevel = \maxseclevel
-%
-% Trace whether the current chapter is an appendix or not:
-% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
-\def\chapheadtype{N}
-
-% Choose a heading macro
-% #1 is heading type
-% #2 is heading level
-% #3 is text for heading
-\def\genhead#1#2#3{%
-  % Compute the abs. sec. level:
-  \absseclevel=#2
-  \advance\absseclevel by \secbase
-  % Make sure \absseclevel doesn't fall outside the range:
-  \ifnum \absseclevel < 0
-    \absseclevel = 0
-  \else
-    \ifnum \absseclevel > 3
-      \absseclevel = 3
-    \fi
-  \fi
-  % The heading type:
-  \def\headtype{#1}%
-  \if \headtype U%
-    \ifnum \absseclevel < \unmlevel
-      \chardef\unmlevel = \absseclevel
-    \fi
-  \else
-    % Check for appendix sections:
-    \ifnum \absseclevel = 0
-      \edef\chapheadtype{\headtype}%
-    \else
-      \if \headtype A\if \chapheadtype N%
-	\errmessage{@appendix... within a non-appendix chapter}%
-      \fi\fi
-    \fi
-    % Check for numbered within unnumbered:
-    \ifnum \absseclevel > \unmlevel
-      \def\headtype{U}%
-    \else
-      \chardef\unmlevel = 3
-    \fi
-  \fi
-  % Now print the heading:
-  \if \headtype U%
-    \ifcase\absseclevel
-	\unnumberedzzz{#3}%
-    \or \unnumberedseczzz{#3}%
-    \or \unnumberedsubseczzz{#3}%
-    \or \unnumberedsubsubseczzz{#3}%
-    \fi
-  \else
-    \if \headtype A%
-      \ifcase\absseclevel
-	  \appendixzzz{#3}%
-      \or \appendixsectionzzz{#3}%
-      \or \appendixsubseczzz{#3}%
-      \or \appendixsubsubseczzz{#3}%
-      \fi
-    \else
-      \ifcase\absseclevel
-	  \chapterzzz{#3}%
-      \or \seczzz{#3}%
-      \or \numberedsubseczzz{#3}%
-      \or \numberedsubsubseczzz{#3}%
-      \fi
-    \fi
-  \fi
-  \suppressfirstparagraphindent
-}
-
-% an interface:
-\def\numhead{\genhead N}
-\def\apphead{\genhead A}
-\def\unnmhead{\genhead U}
-
-% @chapter, @appendix, @unnumbered.  Increment top-level counter, reset
-% all lower-level sectioning counters to zero.
-%
-% Also set \chaplevelprefix, which we prepend to @float sequence numbers
-% (e.g., figures), q.v.  By default (before any chapter), that is empty.
-\let\chaplevelprefix = \empty
-%
-\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
-\def\chapterzzz#1{%
-  % section resetting is \global in case the chapter is in a group, such
-  % as an @include file.
-  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-    \global\advance\chapno by 1
-  %
-  % Used for \float.
-  \gdef\chaplevelprefix{\the\chapno.}%
-  \resetallfloatnos
-  %
-  % \putwordChapter can contain complex things in translations.
-  \toks0=\expandafter{\putwordChapter}%
-  \message{\the\toks0 \space \the\chapno}%
-  %
-  % Write the actual heading.
-  \chapmacro{#1}{Ynumbered}{\the\chapno}%
-  %
-  % So @section and the like are numbered underneath this chapter.
-  \global\let\section = \numberedsec
-  \global\let\subsection = \numberedsubsec
-  \global\let\subsubsection = \numberedsubsubsec
-}
-
-\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
-%
-\def\appendixzzz#1{%
-  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-    \global\advance\appendixno by 1
-  \gdef\chaplevelprefix{\appendixletter.}%
-  \resetallfloatnos
-  %
-  % \putwordAppendix can contain complex things in translations.
-  \toks0=\expandafter{\putwordAppendix}%
-  \message{\the\toks0 \space \appendixletter}%
-  %
-  \chapmacro{#1}{Yappendix}{\appendixletter}%
-  %
-  \global\let\section = \appendixsec
-  \global\let\subsection = \appendixsubsec
-  \global\let\subsubsection = \appendixsubsubsec
-}
-
-\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
-\def\unnumberedzzz#1{%
-  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-    \global\advance\unnumberedno by 1
-  %
-  % Since an unnumbered has no number, no prefix for figures.
-  \global\let\chaplevelprefix = \empty
-  \resetallfloatnos
-  %
-  % This used to be simply \message{#1}, but TeX fully expands the
-  % argument to \message.  Therefore, if #1 contained @-commands, TeX
-  % expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
-  % expanded @cite (which turns out to cause errors because \cite is meant
-  % to be executed, not expanded).
-  %
-  % Anyway, we don't want the fully-expanded definition of @cite to appear
-  % as a result of the \message, we just want `@cite' itself.  We use
-  % \the<toks register> to achieve this: TeX expands \the<toks> only once,
-  % simply yielding the contents of <toks register>.  (We also do this for
-  % the toc entries.)
-  \toks0 = {#1}%
-  \message{(\the\toks0)}%
-  %
-  \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
-  %
-  \global\let\section = \unnumberedsec
-  \global\let\subsection = \unnumberedsubsec
-  \global\let\subsubsection = \unnumberedsubsubsec
-}
-
-% @centerchap is like @unnumbered, but the heading is centered.
-\outer\parseargdef\centerchap{%
-  % Well, we could do the following in a group, but that would break
-  % an assumption that \chapmacro is called at the outermost level.
-  % Thus we are safer this way:		--kasal, 24feb04
-  \let\centerparametersmaybe = \centerparameters
-  \unnmhead0{#1}%
-  \let\centerparametersmaybe = \relax
-}
-
-% @top is like @unnumbered.
-\let\top\unnumbered
-
-% Sections.
-\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
-\def\seczzz#1{%
-  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
-  \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
-}
-
-\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
-\def\appendixsectionzzz#1{%
-  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
-  \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
-}
-\let\appendixsec\appendixsection
-
-\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
-\def\unnumberedseczzz#1{%
-  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
-  \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
-}
-
-% Subsections.
-\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
-\def\numberedsubseczzz#1{%
-  \global\subsubsecno=0  \global\advance\subsecno by 1
-  \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
-}
-
-\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
-\def\appendixsubseczzz#1{%
-  \global\subsubsecno=0  \global\advance\subsecno by 1
-  \sectionheading{#1}{subsec}{Yappendix}%
-                 {\appendixletter.\the\secno.\the\subsecno}%
-}
-
-\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
-\def\unnumberedsubseczzz#1{%
-  \global\subsubsecno=0  \global\advance\subsecno by 1
-  \sectionheading{#1}{subsec}{Ynothing}%
-                 {\the\unnumberedno.\the\secno.\the\subsecno}%
-}
-
-% Subsubsections.
-\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
-\def\numberedsubsubseczzz#1{%
-  \global\advance\subsubsecno by 1
-  \sectionheading{#1}{subsubsec}{Ynumbered}%
-                 {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
-}
-
-\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
-\def\appendixsubsubseczzz#1{%
-  \global\advance\subsubsecno by 1
-  \sectionheading{#1}{subsubsec}{Yappendix}%
-                 {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
-}
-
-\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
-\def\unnumberedsubsubseczzz#1{%
-  \global\advance\subsubsecno by 1
-  \sectionheading{#1}{subsubsec}{Ynothing}%
-                 {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
-}
-
-% These macros control what the section commands do, according
-% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
-% Define them by default for a numbered chapter.
-\let\section = \numberedsec
-\let\subsection = \numberedsubsec
-\let\subsubsection = \numberedsubsubsec
-
-% Define @majorheading, @heading and @subheading
-
-% NOTE on use of \vbox for chapter headings, section headings, and such:
-%       1) We use \vbox rather than the earlier \line to permit
-%          overlong headings to fold.
-%       2) \hyphenpenalty is set to 10000 because hyphenation in a
-%          heading is obnoxious; this forbids it.
-%       3) Likewise, headings look best if no \parindent is used, and
-%          if justification is not attempted.  Hence \raggedright.
-
-\def\majorheading{%
-  {\advance\chapheadingskip by 10pt \chapbreak }%
-  \parsearg\chapheadingzzz
-}
-
-\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
-\def\chapheadingzzz#1{%
-  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                    \parindent=0pt\ptexraggedright
-                    \rmisbold #1\hfill}}%
-  \bigskip \par\penalty 200\relax
-  \suppressfirstparagraphindent
-}
-
-% @heading, @subheading, @subsubheading.
-\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
-  \suppressfirstparagraphindent}
-\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
-  \suppressfirstparagraphindent}
-\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
-  \suppressfirstparagraphindent}
-
-% These macros generate a chapter, section, etc. heading only
-% (including whitespace, linebreaking, etc. around it),
-% given all the information in convenient, parsed form.
-
-%%% Args are the skip and penalty (usually negative)
-\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
-
-%%% Define plain chapter starts, and page on/off switching for it
-% Parameter controlling skip before chapter headings (if needed)
-
-\newskip\chapheadingskip
-
-\def\chapbreak{\dobreak \chapheadingskip {-4000}}
-\def\chappager{\par\vfill\supereject}
-% Because \domark is called before \chapoddpage, the filler page will
-% get the headings for the next chapter, which is wrong.  But we don't
-% care -- we just disable all headings on the filler page.
-\def\chapoddpage{%
-  \chappager
-  \ifodd\pageno \else
-    \begingroup
-      \evenheadline={\hfil}\evenfootline={\hfil}%
-      \oddheadline={\hfil}\oddfootline={\hfil}%
-      \hbox to 0pt{}%
-      \chappager
-    \endgroup
-  \fi
-}
-
-\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
-
-\def\CHAPPAGoff{%
-\global\let\contentsalignmacro = \chappager
-\global\let\pchapsepmacro=\chapbreak
-\global\let\pagealignmacro=\chappager}
-
-\def\CHAPPAGon{%
-\global\let\contentsalignmacro = \chappager
-\global\let\pchapsepmacro=\chappager
-\global\let\pagealignmacro=\chappager
-\global\def\HEADINGSon{\HEADINGSsingle}}
-
-\def\CHAPPAGodd{%
-\global\let\contentsalignmacro = \chapoddpage
-\global\let\pchapsepmacro=\chapoddpage
-\global\let\pagealignmacro=\chapoddpage
-\global\def\HEADINGSon{\HEADINGSdouble}}
-
-\CHAPPAGon
-
-% Chapter opening.
-%
-% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
-% Yappendix, Yomitfromtoc), #3 the chapter number.
-%
-% To test against our argument.
-\def\Ynothingkeyword{Ynothing}
-\def\Yomitfromtockeyword{Yomitfromtoc}
-\def\Yappendixkeyword{Yappendix}
-%
-\def\chapmacro#1#2#3{%
-  % Insert the first mark before the heading break (see notes for \domark).
-  \let\prevchapterdefs=\lastchapterdefs
-  \let\prevsectiondefs=\lastsectiondefs
-  \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
-                        \gdef\thissection{}}%
-  %
-  \def\temptype{#2}%
-  \ifx\temptype\Ynothingkeyword
-    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
-                          \gdef\thischapter{\thischaptername}}%
-  \else\ifx\temptype\Yomitfromtockeyword
-    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
-                          \gdef\thischapter{}}%
-  \else\ifx\temptype\Yappendixkeyword
-    \toks0={#1}%
-    \xdef\lastchapterdefs{%
-      \gdef\noexpand\thischaptername{\the\toks0}%
-      \gdef\noexpand\thischapternum{\appendixletter}%
-      % \noexpand\putwordAppendix avoids expanding indigestible
-      % commands in some of the translations.
-      \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
-                                 \noexpand\thischapternum:
-                                 \noexpand\thischaptername}%
-    }%
-  \else
-    \toks0={#1}%
-    \xdef\lastchapterdefs{%
-      \gdef\noexpand\thischaptername{\the\toks0}%
-      \gdef\noexpand\thischapternum{\the\chapno}%
-      % \noexpand\putwordChapter avoids expanding indigestible
-      % commands in some of the translations.
-      \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
-                                 \noexpand\thischapternum:
-                                 \noexpand\thischaptername}%
-    }%
-  \fi\fi\fi
-  %
-  % Output the mark.  Pass it through \safewhatsit, to take care of
-  % the preceding space.
-  \safewhatsit\domark
-  %
-  % Insert the chapter heading break.
-  \pchapsepmacro
-  %
-  % Now the second mark, after the heading break.  No break points
-  % between here and the heading.
-  \let\prevchapterdefs=\lastchapterdefs
-  \let\prevsectiondefs=\lastsectiondefs
-  \domark
-  %
-  {%
-    \chapfonts \rmisbold
-    %
-    % Have to define \lastsection before calling \donoderef, because the
-    % xref code eventually uses it.  On the other hand, it has to be called
-    % after \pchapsepmacro, or the headline will change too soon.
-    \gdef\lastsection{#1}%
-    %
-    % Only insert the separating space if we have a chapter/appendix
-    % number, and don't print the unnumbered ``number''.
-    \ifx\temptype\Ynothingkeyword
-      \setbox0 = \hbox{}%
-      \def\toctype{unnchap}%
-    \else\ifx\temptype\Yomitfromtockeyword
-      \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
-      \def\toctype{omit}%
-    \else\ifx\temptype\Yappendixkeyword
-      \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
-      \def\toctype{app}%
-    \else
-      \setbox0 = \hbox{#3\enspace}%
-      \def\toctype{numchap}%
-    \fi\fi\fi
-    %
-    % Write the toc entry for this chapter.  Must come before the
-    % \donoderef, because we include the current node name in the toc
-    % entry, and \donoderef resets it to empty.
-    \writetocentry{\toctype}{#1}{#3}%
-    %
-    % For pdftex, we have to write out the node definition (aka, make
-    % the pdfdest) after any page break, but before the actual text has
-    % been typeset.  If the destination for the pdf outline is after the
-    % text, then jumping from the outline may wind up with the text not
-    % being visible, for instance under high magnification.
-    \donoderef{#2}%
-    %
-    % Typeset the actual heading.
-    \nobreak % Avoid page breaks at the interline glue.
-    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
-          \hangindent=\wd0 \centerparametersmaybe
-          \unhbox0 #1\par}%
-  }%
-  \nobreak\bigskip % no page break after a chapter title
-  \nobreak
-}
-
-% @centerchap -- centered and unnumbered.
-\let\centerparametersmaybe = \relax
-\def\centerparameters{%
-  \advance\rightskip by 3\rightskip
-  \leftskip = \rightskip
-  \parfillskip = 0pt
-}
-
-
-% I don't think this chapter style is supported any more, so I'm not
-% updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
-%
-\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
-%
-\def\unnchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\ptexraggedright
-                       \rmisbold #1\hfill}}\bigskip \par\nobreak
-}
-\def\chfopen #1#2{\chapoddpage {\chapfonts
-\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
-\par\penalty 5000 %
-}
-\def\centerchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt
-                       \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak
-}
-\def\CHAPFopen{%
-  \global\let\chapmacro=\chfopen
-  \global\let\centerchapmacro=\centerchfopen}
-
-
-% Section titles.  These macros combine the section number parts and
-% call the generic \sectionheading to do the printing.
-%
-\newskip\secheadingskip
-\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
-
-% Subsection titles.
-\newskip\subsecheadingskip
-\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
-
-% Subsubsection titles.
-\def\subsubsecheadingskip{\subsecheadingskip}
-\def\subsubsecheadingbreak{\subsecheadingbreak}
-
-
-% Print any size, any type, section title.
-%
-% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
-% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
-% section number.
-%
-\def\seckeyword{sec}
-%
-\def\sectionheading#1#2#3#4{%
-  {%
-    % Switch to the right set of fonts.
-    \csname #2fonts\endcsname \rmisbold
-    %
-    \def\sectionlevel{#2}%
-    \def\temptype{#3}%
-    %
-    % Insert first mark before the heading break (see notes for \domark).
-    \let\prevsectiondefs=\lastsectiondefs
-    \ifx\temptype\Ynothingkeyword
-      \ifx\sectionlevel\seckeyword
-        \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
-                              \gdef\thissection{\thissectionname}}%
-      \fi
-    \else\ifx\temptype\Yomitfromtockeyword
-      % Don't redefine \thissection.
-    \else\ifx\temptype\Yappendixkeyword
-      \ifx\sectionlevel\seckeyword
-        \toks0={#1}%
-        \xdef\lastsectiondefs{%
-          \gdef\noexpand\thissectionname{\the\toks0}%
-          \gdef\noexpand\thissectionnum{#4}%
-          % \noexpand\putwordSection avoids expanding indigestible
-          % commands in some of the translations.
-          \gdef\noexpand\thissection{\noexpand\putwordSection{}
-                                     \noexpand\thissectionnum:
-                                     \noexpand\thissectionname}%
-        }%
-      \fi
-    \else
-      \ifx\sectionlevel\seckeyword
-        \toks0={#1}%
-        \xdef\lastsectiondefs{%
-          \gdef\noexpand\thissectionname{\the\toks0}%
-          \gdef\noexpand\thissectionnum{#4}%
-          % \noexpand\putwordSection avoids expanding indigestible
-          % commands in some of the translations.
-          \gdef\noexpand\thissection{\noexpand\putwordSection{}
-                                     \noexpand\thissectionnum:
-                                     \noexpand\thissectionname}%
-        }%
-      \fi
-    \fi\fi\fi
-    %
-    % Go into vertical mode.  Usually we'll already be there, but we
-    % don't want the following whatsit to end up in a preceding paragraph
-    % if the document didn't happen to have a blank line.
-    \par
-    %
-    % Output the mark.  Pass it through \safewhatsit, to take care of
-    % the preceding space.
-    \safewhatsit\domark
-    %
-    % Insert space above the heading.
-    \csname #2headingbreak\endcsname
-    %
-    % Now the second mark, after the heading break.  No break points
-    % between here and the heading.
-    \let\prevsectiondefs=\lastsectiondefs
-    \domark
-    %
-    % Only insert the space after the number if we have a section number.
-    \ifx\temptype\Ynothingkeyword
-      \setbox0 = \hbox{}%
-      \def\toctype{unn}%
-      \gdef\lastsection{#1}%
-    \else\ifx\temptype\Yomitfromtockeyword
-      % for @headings -- no section number, don't include in toc,
-      % and don't redefine \lastsection.
-      \setbox0 = \hbox{}%
-      \def\toctype{omit}%
-      \let\sectionlevel=\empty
-    \else\ifx\temptype\Yappendixkeyword
-      \setbox0 = \hbox{#4\enspace}%
-      \def\toctype{app}%
-      \gdef\lastsection{#1}%
-    \else
-      \setbox0 = \hbox{#4\enspace}%
-      \def\toctype{num}%
-      \gdef\lastsection{#1}%
-    \fi\fi\fi
-    %
-    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
-    \writetocentry{\toctype\sectionlevel}{#1}{#4}%
-    %
-    % Write the node reference (= pdf destination for pdftex).
-    % Again, see comments in \chapmacro.
-    \donoderef{#3}%
-    %
-    % Interline glue will be inserted when the vbox is completed.
-    % That glue will be a valid breakpoint for the page, since it'll be
-    % preceded by a whatsit (usually from the \donoderef, or from the
-    % \writetocentry if there was no node).  We don't want to allow that
-    % break, since then the whatsits could end up on page n while the
-    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
-    \nobreak
-    %
-    % Output the actual section heading.
-    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
-          \hangindent=\wd0  % zero if no section number
-          \unhbox0 #1}%
-  }%
-  % Add extra space after the heading -- half of whatever came above it.
-  % Don't allow stretch, though.
-  \kern .5 \csname #2headingskip\endcsname
-  %
-  % Do not let the kern be a potential breakpoint, as it would be if it
-  % was followed by glue.
-  \nobreak
-  %
-  % We'll almost certainly start a paragraph next, so don't let that
-  % glue accumulate.  (Not a breakpoint because it's preceded by a
-  % discardable item.)
-  \vskip-\parskip
-  %
-  % This is purely so the last item on the list is a known \penalty >
-  % 10000.  This is so \startdefun can avoid allowing breakpoints after
-  % section headings.  Otherwise, it would insert a valid breakpoint between:
-  %
-  %   @section sec-whatever
-  %   @deffn def-whatever
-  \penalty 10001
-}
-
-
-\message{toc,}
-% Table of contents.
-\newwrite\tocfile
-
-% Write an entry to the toc file, opening it if necessary.
-% Called from @chapter, etc.
-%
-% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
-% We append the current node name (if any) and page number as additional
-% arguments for the \{chap,sec,...}entry macros which will eventually
-% read this.  The node name is used in the pdf outlines as the
-% destination to jump to.
-%
-% We open the .toc file for writing here instead of at @setfilename (or
-% any other fixed time) so that @contents can be anywhere in the document.
-% But if #1 is `omit', then we don't do anything.  This is used for the
-% table of contents chapter openings themselves.
-%
-\newif\iftocfileopened
-\def\omitkeyword{omit}%
-%
-\def\writetocentry#1#2#3{%
-  \edef\writetoctype{#1}%
-  \ifx\writetoctype\omitkeyword \else
-    \iftocfileopened\else
-      \immediate\openout\tocfile = \jobname.toc
-      \global\tocfileopenedtrue
-    \fi
-    %
-    \iflinks
-      {\atdummies
-       \edef\temp{%
-         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
-       \temp
-      }%
-    \fi
-  \fi
-  %
-  % Tell \shipout to create a pdf destination on each page, if we're
-  % writing pdf.  These are used in the table of contents.  We can't
-  % just write one on every page because the title pages are numbered
-  % 1 and 2 (the page numbers aren't printed), and so are the first
-  % two pages of the document.  Thus, we'd have two destinations named
-  % `1', and two named `2'.
-  \ifpdf \global\pdfmakepagedesttrue \fi
-}
-
-
-% These characters do not print properly in the Computer Modern roman
-% fonts, so we must take special care.  This is more or less redundant
-% with the Texinfo input format setup at the end of this file.
-%
-\def\activecatcodes{%
-  \catcode`\"=\active
-  \catcode`\$=\active
-  \catcode`\<=\active
-  \catcode`\>=\active
-  \catcode`\\=\active
-  \catcode`\^=\active
-  \catcode`\_=\active
-  \catcode`\|=\active
-  \catcode`\~=\active
-}
-
-
-% Read the toc file, which is essentially Texinfo input.
-\def\readtocfile{%
-  \setupdatafile
-  \activecatcodes
-  \input \tocreadfilename
-}
-
-\newskip\contentsrightmargin \contentsrightmargin=1in
-\newcount\savepageno
-\newcount\lastnegativepageno \lastnegativepageno = -1
-
-% Prepare to read what we've written to \tocfile.
-%
-\def\startcontents#1{%
-  % If @setchapternewpage on, and @headings double, the contents should
-  % start on an odd page, unlike chapters.  Thus, we maintain
-  % \contentsalignmacro in parallel with \pagealignmacro.
-  % From: Torbjorn Granlund <tege@matematik.su.se>
-  \contentsalignmacro
-  \immediate\closeout\tocfile
-  %
-  % Don't need to put `Contents' or `Short Contents' in the headline.
-  % It is abundantly clear what they are.
-  \chapmacro{#1}{Yomitfromtoc}{}%
-  %
-  \savepageno = \pageno
-  \begingroup                  % Set up to handle contents files properly.
-    \raggedbottom              % Worry more about breakpoints than the bottom.
-    \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-    %
-    % Roman numerals for page numbers.
-    \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
-}
-
-% redefined for the two-volume lispref.  We always output on
-% \jobname.toc even if this is redefined.
-%
-\def\tocreadfilename{\jobname.toc}
-
-% Normal (long) toc.
-%
-\def\contents{%
-  \startcontents{\putwordTOC}%
-    \openin 1 \tocreadfilename\space
-    \ifeof 1 \else
-      \readtocfile
-    \fi
-    \vfill \eject
-    \contentsalignmacro % in case @setchapternewpage odd is in effect
-    \ifeof 1 \else
-      \pdfmakeoutlines
-    \fi
-    \closein 1
-  \endgroup
-  \lastnegativepageno = \pageno
-  \global\pageno = \savepageno
-}
-
-% And just the chapters.
-\def\summarycontents{%
-  \startcontents{\putwordShortTOC}%
-    %
-    \let\numchapentry = \shortchapentry
-    \let\appentry = \shortchapentry
-    \let\unnchapentry = \shortunnchapentry
-    % We want a true roman here for the page numbers.
-    \secfonts
-    \let\rm=\shortcontrm \let\bf=\shortcontbf
-    \let\sl=\shortcontsl \let\tt=\shortconttt
-    \rm
-    \hyphenpenalty = 10000
-    \advance\baselineskip by 1pt % Open it up a little.
-    \def\numsecentry##1##2##3##4{}
-    \let\appsecentry = \numsecentry
-    \let\unnsecentry = \numsecentry
-    \let\numsubsecentry = \numsecentry
-    \let\appsubsecentry = \numsecentry
-    \let\unnsubsecentry = \numsecentry
-    \let\numsubsubsecentry = \numsecentry
-    \let\appsubsubsecentry = \numsecentry
-    \let\unnsubsubsecentry = \numsecentry
-    \openin 1 \tocreadfilename\space
-    \ifeof 1 \else
-      \readtocfile
-    \fi
-    \closein 1
-    \vfill \eject
-    \contentsalignmacro % in case @setchapternewpage odd is in effect
-  \endgroup
-  \lastnegativepageno = \pageno
-  \global\pageno = \savepageno
-}
-\let\shortcontents = \summarycontents
-
-% Typeset the label for a chapter or appendix for the short contents.
-% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
-%
-\def\shortchaplabel#1{%
-  % This space should be enough, since a single number is .5em, and the
-  % widest letter (M) is 1em, at least in the Computer Modern fonts.
-  % But use \hss just in case.
-  % (This space doesn't include the extra space that gets added after
-  % the label; that gets put in by \shortchapentry above.)
-  %
-  % We'd like to right-justify chapter numbers, but that looks strange
-  % with appendix letters.  And right-justifying numbers and
-  % left-justifying letters looks strange when there is less than 10
-  % chapters.  Have to read the whole toc once to know how many chapters
-  % there are before deciding ...
-  \hbox to 1em{#1\hss}%
-}
-
-% These macros generate individual entries in the table of contents.
-% The first argument is the chapter or section name.
-% The last argument is the page number.
-% The arguments in between are the chapter number, section number, ...
-
-% Chapters, in the main contents.
-\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
-%
-% Chapters, in the short toc.
-% See comments in \dochapentry re vbox and related settings.
-\def\shortchapentry#1#2#3#4{%
-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
-}
-
-% Appendices, in the main contents.
-% Need the word Appendix, and a fixed-size box.
-%
-\def\appendixbox#1{%
-  % We use M since it's probably the widest letter.
-  \setbox0 = \hbox{\putwordAppendix{} M}%
-  \hbox to \wd0{\putwordAppendix{} #1\hss}}
-%
-\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
-
-% Unnumbered chapters.
-\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
-\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
-
-% Sections.
-\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
-\let\appsecentry=\numsecentry
-\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
-
-% Subsections.
-\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
-\let\appsubsecentry=\numsubsecentry
-\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
-
-% And subsubsections.
-\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
-\let\appsubsubsecentry=\numsubsubsecentry
-\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
-
-% This parameter controls the indentation of the various levels.
-% Same as \defaultparindent.
-\newdimen\tocindent \tocindent = 15pt
-
-% Now for the actual typesetting. In all these, #1 is the text and #2 is the
-% page number.
-%
-% If the toc has to be broken over pages, we want it to be at chapters
-% if at all possible; hence the \penalty.
-\def\dochapentry#1#2{%
-   \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
-   \begingroup
-     \chapentryfonts
-     \tocentry{#1}{\dopageno\bgroup#2\egroup}%
-   \endgroup
-   \nobreak\vskip .25\baselineskip plus.1\baselineskip
-}
-
-\def\dosecentry#1#2{\begingroup
-  \secentryfonts \leftskip=\tocindent
-  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
-\endgroup}
-
-\def\dosubsecentry#1#2{\begingroup
-  \subsecentryfonts \leftskip=2\tocindent
-  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
-\endgroup}
-
-\def\dosubsubsecentry#1#2{\begingroup
-  \subsubsecentryfonts \leftskip=3\tocindent
-  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
-\endgroup}
-
-% We use the same \entry macro as for the index entries.
-\let\tocentry = \entry
-
-% Space between chapter (or whatever) number and the title.
-\def\labelspace{\hskip1em \relax}
-
-\def\dopageno#1{{\rm #1}}
-\def\doshortpageno#1{{\rm #1}}
-
-\def\chapentryfonts{\secfonts \rm}
-\def\secentryfonts{\textfonts}
-\def\subsecentryfonts{\textfonts}
-\def\subsubsecentryfonts{\textfonts}
-
-
-\message{environments,}
-% @foo ... @end foo.
-
-% @tex ... @end tex    escapes into raw Tex temporarily.
-% One exception: @ is still an escape character, so that @end tex works.
-% But \@ or @@ will get a plain tex @ character.
-
-\envdef\tex{%
-  \setupmarkupstyle{tex}%
-  \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
-  \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-  \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
-  \catcode `\%=14
-  \catcode `\+=\other
-  \catcode `\"=\other
-  \catcode `\|=\other
-  \catcode `\<=\other
-  \catcode `\>=\other
-  \catcode`\`=\other
-  \catcode`\'=\other
-  \escapechar=`\\
-  %
-  \let\b=\ptexb
-  \let\bullet=\ptexbullet
-  \let\c=\ptexc
-  \let\,=\ptexcomma
-  \let\.=\ptexdot
-  \let\dots=\ptexdots
-  \let\equiv=\ptexequiv
-  \let\!=\ptexexclam
-  \let\i=\ptexi
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
-  \let\{=\ptexlbrace
-  \let\+=\tabalign
-  \let\}=\ptexrbrace
-  \let\/=\ptexslash
-  \let\*=\ptexstar
-  \let\t=\ptext
-  \expandafter \let\csname top\endcsname=\ptextop  % outer
-  \let\frenchspacing=\plainfrenchspacing
-  %
-  \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-  \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
-  \def\@{@}%
-}
-% There is no need to define \Etex.
-
-% Define @lisp ... @end lisp.
-% @lisp environment forms a group so it can rebind things,
-% including the definition of @end lisp (which normally is erroneous).
-
-% Amount to narrow the margins by for @lisp.
-\newskip\lispnarrowing \lispnarrowing=0.4in
-
-% This is the definition that ^^M gets inside @lisp, @example, and other
-% such environments.  \null is better than a space, since it doesn't
-% have any width.
-\def\lisppar{\null\endgraf}
-
-% This space is always present above and below environments.
-\newskip\envskipamount \envskipamount = 0pt
-
-% Make spacing and below environment symmetrical.  We use \parskip here
-% to help in doing that, since in @example-like environments \parskip
-% is reset to zero; thus the \afterenvbreak inserts no space -- but the
-% start of the next paragraph will insert \parskip.
-%
-\def\aboveenvbreak{{%
-  % =10000 instead of <10000 because of a special case in \itemzzz and
-  % \sectionheading, q.v.
-  \ifnum \lastpenalty=10000 \else
-    \advance\envskipamount by \parskip
-    \endgraf
-    \ifdim\lastskip<\envskipamount
-      \removelastskip
-      % it's not a good place to break if the last penalty was \nobreak
-      % or better ...
-      \ifnum\lastpenalty<10000 \penalty-50 \fi
-      \vskip\envskipamount
-    \fi
-  \fi
-}}
-
-\let\afterenvbreak = \aboveenvbreak
-
-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
-% also clear it, so that its embedded environments do the narrowing again.
-\let\nonarrowing=\relax
-
-% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
-% environment contents.
-\font\circle=lcircle10
-\newdimen\circthick
-\newdimen\cartouter\newdimen\cartinner
-\newskip\normbskip\newskip\normpskip\newskip\normlskip
-\circthick=\fontdimen8\circle
-%
-\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
-\def\ctr{{\hskip 6pt\circle\char'010}}
-\def\cbl{{\circle\char'012\hskip -6pt}}
-\def\cbr{{\hskip 6pt\circle\char'011}}
-\def\carttop{\hbox to \cartouter{\hskip\lskip
-        \ctl\leaders\hrule height\circthick\hfil\ctr
-        \hskip\rskip}}
-\def\cartbot{\hbox to \cartouter{\hskip\lskip
-        \cbl\leaders\hrule height\circthick\hfil\cbr
-        \hskip\rskip}}
-%
-\newskip\lskip\newskip\rskip
-
-\envdef\cartouche{%
-  \ifhmode\par\fi  % can't be in the midst of a paragraph.
-  \startsavinginserts
-  \lskip=\leftskip \rskip=\rightskip
-  \leftskip=0pt\rightskip=0pt % we want these *outside*.
-  \cartinner=\hsize \advance\cartinner by-\lskip
-  \advance\cartinner by-\rskip
-  \cartouter=\hsize
-  \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
-				% side, and for 6pt waste from
-				% each corner char, and rule thickness
-  \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-  % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing = t%
-  \vbox\bgroup
-      \baselineskip=0pt\parskip=0pt\lineskip=0pt
-      \carttop
-      \hbox\bgroup
-	  \hskip\lskip
-	  \vrule\kern3pt
-	  \vbox\bgroup
-	      \kern3pt
-	      \hsize=\cartinner
-	      \baselineskip=\normbskip
-	      \lineskip=\normlskip
-	      \parskip=\normpskip
-	      \vskip -\parskip
-	      \comment % For explanation, see the end of \def\group.
-}
-\def\Ecartouche{%
-              \ifhmode\par\fi
-	      \kern3pt
-	  \egroup
-	  \kern3pt\vrule
-	  \hskip\rskip
-      \egroup
-      \cartbot
-  \egroup
-  \checkinserts
-}
-
-
-% This macro is called at the beginning of all the @example variants,
-% inside a group.
-\newdimen\nonfillparindent
-\def\nonfillstart{%
-  \aboveenvbreak
-  \hfuzz = 12pt % Don't be fussy
-  \sepspaces % Make spaces be word-separators rather than space tokens.
-  \let\par = \lisppar % don't ignore blank lines
-  \obeylines % each line of input is a line of output
-  \parskip = 0pt
-  % Turn off paragraph indentation but redefine \indent to emulate
-  % the normal \indent.
-  \nonfillparindent=\parindent
-  \parindent = 0pt
-  \let\indent\nonfillindent
-  %
-  \emergencystretch = 0pt % don't try to avoid overfull boxes
-  \ifx\nonarrowing\relax
-    \advance \leftskip by \lispnarrowing
-    \exdentamount=\lispnarrowing
-  \else
-    \let\nonarrowing = \relax
-  \fi
-  \let\exdent=\nofillexdent
-}
-
-\begingroup
-\obeyspaces
-% We want to swallow spaces (but not other tokens) after the fake
-% @indent in our nonfill-environments, where spaces are normally
-% active and set to @tie, resulting in them not being ignored after
-% @indent.
-\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
-\gdef\nonfillindentcheck{%
-\ifx\temp %
-\expandafter\nonfillindentgobble%
-\else%
-\leavevmode\nonfillindentbox%
-\fi%
-}%
-\endgroup
-\def\nonfillindentgobble#1{\nonfillindent}
-\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
-
-% If you want all examples etc. small: @set dispenvsize small.
-% If you want even small examples the full size: @set dispenvsize nosmall.
-% This affects the following displayed environments:
-%    @example, @display, @format, @lisp
-%
-\def\smallword{small}
-\def\nosmallword{nosmall}
-\let\SETdispenvsize\relax
-\def\setnormaldispenv{%
-  \ifx\SETdispenvsize\smallword
-    % end paragraph for sake of leading, in case document has no blank
-    % line.  This is redundant with what happens in \aboveenvbreak, but
-    % we need to do it before changing the fonts, and it's inconvenient
-    % to change the fonts afterward.
-    \ifnum \lastpenalty=10000 \else \endgraf \fi
-    \smallexamplefonts \rm
-  \fi
-}
-\def\setsmalldispenv{%
-  \ifx\SETdispenvsize\nosmallword
-  \else
-    \ifnum \lastpenalty=10000 \else \endgraf \fi
-    \smallexamplefonts \rm
-  \fi
-}
-
-% We often define two environments, @foo and @smallfoo.
-% Let's do it by one command:
-\def\makedispenv #1#2{
-  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
-  \expandafter\let\csname E#1\endcsname \afterenvbreak
-  \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
-}
-
-% Define two synonyms:
-\def\maketwodispenvs #1#2#3{
-  \makedispenv{#1}{#3}
-  \makedispenv{#2}{#3}
-}
-
-% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
-%
-% @smallexample and @smalllisp: use smaller fonts.
-% Originally contributed by Pavel@xerox.
-%
-\maketwodispenvs {lisp}{example}{%
-  \nonfillstart
-  \tt\setupmarkupstyle{example}%
-  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble       % eat return
-}
-% @display/@smalldisplay: same as @lisp except keep current font.
-%
-\makedispenv {display}{%
-  \nonfillstart
-  \gobble
-}
-
-% @format/@smallformat: same as @display except don't narrow margins.
-%
-\makedispenv{format}{%
-  \let\nonarrowing = t%
-  \nonfillstart
-  \gobble
-}
-
-% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
-\envdef\flushleft{%
-  \let\nonarrowing = t%
-  \nonfillstart
-  \gobble
-}
-\let\Eflushleft = \afterenvbreak
-
-% @flushright.
-%
-\envdef\flushright{%
-  \let\nonarrowing = t%
-  \nonfillstart
-  \advance\leftskip by 0pt plus 1fill
-  \gobble
-}
-\let\Eflushright = \afterenvbreak
-
-
-% @raggedright does more-or-less normal line breaking but no right
-% justification.  From plain.tex.
-\envdef\raggedright{%
-  \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
-}
-\let\Eraggedright\par
-
-\envdef\raggedleft{%
-  \parindent=0pt \leftskip0pt plus2em
-  \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
-  \hbadness=10000 % Last line will usually be underfull, so turn off
-                  % badness reporting.
-}
-\let\Eraggedleft\par
-
-\envdef\raggedcenter{%
-  \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
-  \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
-  \hbadness=10000 % Last line will usually be underfull, so turn off
-                  % badness reporting.
-}
-\let\Eraggedcenter\par
-
-
-% @quotation does normal linebreaking (hence we can't use \nonfillstart)
-% and narrows the margins.  We keep \parskip nonzero in general, since
-% we're doing normal filling.  So, when using \aboveenvbreak and
-% \afterenvbreak, temporarily make \parskip 0.
-%
-\def\quotationstart{%
-  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \parindent=0pt
-  %
-  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
-  \ifx\nonarrowing\relax
-    \advance\leftskip by \lispnarrowing
-    \advance\rightskip by \lispnarrowing
-    \exdentamount = \lispnarrowing
-  \else
-    \let\nonarrowing = \relax
-  \fi
-  \parsearg\quotationlabel
-}
-
-\envdef\quotation{%
-  \setnormaldispenv
-  \quotationstart
-}
-
-\envdef\smallquotation{%
-  \setsmalldispenv
-  \quotationstart
-}
-\let\Esmallquotation = \Equotation
-
-% We have retained a nonzero parskip for the environment, since we're
-% doing normal filling.
-%
-\def\Equotation{%
-  \par
-  \ifx\quotationauthor\undefined\else
-    % indent a bit.
-    \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
-  \fi
-  {\parskip=0pt \afterenvbreak}%
-}
-
-% If we're given an argument, typeset it in bold with a colon after.
-\def\quotationlabel#1{%
-  \def\temp{#1}%
-  \ifx\temp\empty \else
-    {\bf #1: }%
-  \fi
-}
-
-
-% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
-% If we want to allow any <char> as delimiter,
-% we need the curly braces so that makeinfo sees the @verb command, eg:
-% `@verbx...x' would look like the '@verbx' command.  --janneke@gnu.org
-%
-% [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
-%
-% [Knuth] p.344; only we need to do the other characters Texinfo sets
-% active too.  Otherwise, they get lost as the first character on a
-% verbatim line.
-\def\dospecials{%
-  \do\ \do\\\do\{\do\}\do\$\do\&%
-  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
-  \do\<\do\>\do\|\do\@\do+\do\"%
-  % Don't do the quotes -- if we do, @set txicodequoteundirected and
-  % @set txicodequotebacktick will not have effect on @verb and
-  % @verbatim, and ?` and !` ligatures won't get disabled.
-  %\do\`\do\'%
-}
-%
-% [Knuth] p. 380
-\def\uncatcodespecials{%
-  \def\do##1{\catcode`##1=\other}\dospecials}
-%
-% Setup for the @verb command.
-%
-% Eight spaces for a tab
-\begingroup
-  \catcode`\^^I=\active
-  \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
-\endgroup
-%
-\def\setupverb{%
-  \tt  % easiest (and conventionally used) font for verbatim
-  \def\par{\leavevmode\endgraf}%
-  \setupmarkupstyle{verb}%
-  \tabeightspaces
-  % Respect line breaks,
-  % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
-  \obeylines \uncatcodespecials \sepspaces
-}
-
-% Setup for the @verbatim environment
-%
-% Real tab expansion
-\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
-%
-\def\starttabbox{\setbox0=\hbox\bgroup}
-%
-\begingroup
-  \catcode`\^^I=\active
-  \gdef\tabexpand{%
-    \catcode`\^^I=\active
-    \def^^I{\leavevmode\egroup
-      \dimen0=\wd0 % the width so far, or since the previous tab
-      \divide\dimen0 by\tabw
-      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
-      \wd0=\dimen0 \box0 \starttabbox
-    }%
-  }
-\endgroup
-
-% start the verbatim environment.
-\def\setupverbatim{%
-  \let\nonarrowing = t%
-  \nonfillstart
-  % Easiest (and conventionally used) font for verbatim
-  \tt
-  \def\par{\leavevmode\egroup\box0\endgraf}%
-  \tabexpand
-  \setupmarkupstyle{verbatim}%
-  % Respect line breaks,
-  % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
-  \obeylines \uncatcodespecials \sepspaces
-  \everypar{\starttabbox}%
-}
-
-% Do the @verb magic: verbatim text is quoted by unique
-% delimiter characters.  Before first delimiter expect a
-% right brace, after last delimiter expect closing brace:
-%
-%    \def\doverb'{'<char>#1<char>'}'{#1}
-%
-% [Knuth] p. 382; only eat outer {}
-\begingroup
-  \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
-  \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
-\endgroup
-%
-\def\verb{\begingroup\setupverb\doverb}
-%
-%
-% Do the @verbatim magic: define the macro \doverbatim so that
-% the (first) argument ends when '@end verbatim' is reached, ie:
-%
-%     \def\doverbatim#1@end verbatim{#1}
-%
-% For Texinfo it's a lot easier than for LaTeX,
-% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
-% we need not redefine '\', '{' and '}'.
-%
-% Inspired by LaTeX's verbatim command set [latex.ltx]
-%
-\begingroup
-  \catcode`\ =\active
-  \obeylines %
-  % ignore everything up to the first ^^M, that's the newline at the end
-  % of the @verbatim input line itself.  Otherwise we get an extra blank
-  % line in the output.
-  \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}%
-  % We really want {...\end verbatim} in the body of the macro, but
-  % without the active space; thus we have to use \xdef and \gobble.
-\endgroup
-%
-\envdef\verbatim{%
-    \setupverbatim\doverbatim
-}
-\let\Everbatim = \afterenvbreak
-
-
-% @verbatiminclude FILE - insert text of file in verbatim environment.
-%
-\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
-%
-\def\doverbatiminclude#1{%
-  {%
-    \makevalueexpandable
-    \setupverbatim
-    \indexnofonts       % Allow `@@' and other weird things in file names.
-    \input #1
-    \afterenvbreak
-  }%
-}
-
-% @copying ... @end copying.
-% Save the text away for @insertcopying later.
-%
-% We save the uninterpreted tokens, rather than creating a box.
-% Saving the text in a box would be much easier, but then all the
-% typesetting commands (@smallbook, font changes, etc.) have to be done
-% beforehand -- and a) we want @copying to be done first in the source
-% file; b) letting users define the frontmatter in as flexible order as
-% possible is very desirable.
-%
-\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
-\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
-%
-\def\insertcopying{%
-  \begingroup
-    \parindent = 0pt  % paragraph indentation looks wrong on title page
-    \scanexp\copyingtext
-  \endgroup
-}
-
-
-\message{defuns,}
-% @defun etc.
-
-\newskip\defbodyindent \defbodyindent=.4in
-\newskip\defargsindent \defargsindent=50pt
-\newskip\deflastargmargin \deflastargmargin=18pt
-\newcount\defunpenalty
-
-% Start the processing of @deffn:
-\def\startdefun{%
-  \ifnum\lastpenalty<10000
-    \medbreak
-    \defunpenalty=10003 % Will keep this @deffn together with the
-                        % following @def command, see below.
-  \else
-    % If there are two @def commands in a row, we'll have a \nobreak,
-    % which is there to keep the function description together with its
-    % header.  But if there's nothing but headers, we need to allow a
-    % break somewhere.  Check specifically for penalty 10002, inserted
-    % by \printdefunline, instead of 10000, since the sectioning
-    % commands also insert a nobreak penalty, and we don't want to allow
-    % a break between a section heading and a defun.
-    %
-    % As a minor refinement, we avoid "club" headers by signalling
-    % with penalty of 10003 after the very first @deffn in the
-    % sequence (see above), and penalty of 10002 after any following
-    % @def command.
-    \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
-    %
-    % Similarly, after a section heading, do not allow a break.
-    % But do insert the glue.
-    \medskip  % preceded by discardable penalty, so not a breakpoint
-  \fi
-  %
-  \parindent=0in
-  \advance\leftskip by \defbodyindent
-  \exdentamount=\defbodyindent
-}
-
-\def\dodefunx#1{%
-  % First, check whether we are in the right environment:
-  \checkenv#1%
-  %
-  % As above, allow line break if we have multiple x headers in a row.
-  % It's not a great place, though.
-  \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
-  %
-  % And now, it's time to reuse the body of the original defun:
-  \expandafter\gobbledefun#1%
-}
-\def\gobbledefun#1\startdefun{}
-
-% \printdefunline \deffnheader{text}
-%
-\def\printdefunline#1#2{%
-  \begingroup
-    % call \deffnheader:
-    #1#2 \endheader
-    % common ending:
-    \interlinepenalty = 10000
-    \advance\rightskip by 0pt plus 1fil
-    \endgraf
-    \nobreak\vskip -\parskip
-    \penalty\defunpenalty  % signal to \startdefun and \dodefunx
-    % Some of the @defun-type tags do not enable magic parentheses,
-    % rendering the following check redundant.  But we don't optimize.
-    \checkparencounts
-  \endgroup
-}
-
-\def\Edefun{\endgraf\medbreak}
-
-% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
-% the only thing remaining is to define \deffnheader.
-%
-\def\makedefun#1{%
-  \expandafter\let\csname E#1\endcsname = \Edefun
-  \edef\temp{\noexpand\domakedefun
-    \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
-  \temp
-}
-
-% \domakedefun \deffn \deffnx \deffnheader
-%
-% Define \deffn and \deffnx, without parameters.
-% \deffnheader has to be defined explicitly.
-%
-\def\domakedefun#1#2#3{%
-  \envdef#1{%
-    \startdefun
-    \parseargusing\activeparens{\printdefunline#3}%
-  }%
-  \def#2{\dodefunx#1}%
-  \def#3%
-}
-
-%%% Untyped functions:
-
-% @deffn category name args
-\makedefun{deffn}{\deffngeneral{}}
-
-% @deffn category class name args
-\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
-
-% \defopon {category on}class name args
-\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
-
-% \deffngeneral {subind}category name args
-%
-\def\deffngeneral#1#2 #3 #4\endheader{%
-  % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
-  \dosubind{fn}{\code{#3}}{#1}%
-  \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
-}
-
-%%% Typed functions:
-
-% @deftypefn category type name args
-\makedefun{deftypefn}{\deftypefngeneral{}}
-
-% @deftypeop category class type name args
-\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
-
-% \deftypeopon {category on}class type name args
-\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
-
-% \deftypefngeneral {subind}category type name args
-%
-\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
-  \dosubind{fn}{\code{#4}}{#1}%
-  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
-}
-
-%%% Typed variables:
-
-% @deftypevr category type var args
-\makedefun{deftypevr}{\deftypecvgeneral{}}
-
-% @deftypecv category class type var args
-\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
-
-% \deftypecvof {category of}class type var args
-\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
-
-% \deftypecvgeneral {subind}category type var args
-%
-\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
-  \dosubind{vr}{\code{#4}}{#1}%
-  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
-}
-
-%%% Untyped variables:
-
-% @defvr category var args
-\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
-
-% @defcv category class var args
-\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
-
-% \defcvof {category of}class var args
-\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
-
-%%% Type:
-% @deftp category name args
-\makedefun{deftp}#1 #2 #3\endheader{%
-  \doind{tp}{\code{#2}}%
-  \defname{#1}{}{#2}\defunargs{#3\unskip}%
-}
-
-% Remaining @defun-like shortcuts:
-\makedefun{defun}{\deffnheader{\putwordDeffunc} }
-\makedefun{defmac}{\deffnheader{\putwordDefmac} }
-\makedefun{defspec}{\deffnheader{\putwordDefspec} }
-\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
-\makedefun{defvar}{\defvrheader{\putwordDefvar} }
-\makedefun{defopt}{\defvrheader{\putwordDefopt} }
-\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
-\makedefun{defmethod}{\defopon\putwordMethodon}
-\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
-\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
-\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
-
-% \defname, which formats the name of the @def (not the args).
-% #1 is the category, such as "Function".
-% #2 is the return type, if any.
-% #3 is the function name.
-%
-% We are followed by (but not passed) the arguments, if any.
-%
-\def\defname#1#2#3{%
-  % Get the values of \leftskip and \rightskip as they were outside the @def...
-  \advance\leftskip by -\defbodyindent
-  %
-  % How we'll format the type name.  Putting it in brackets helps
-  % distinguish it from the body text that may end up on the next line
-  % just below it.
-  \def\temp{#1}%
-  \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
-  %
-  % Figure out line sizes for the paragraph shape.
-  % The first line needs space for \box0; but if \rightskip is nonzero,
-  % we need only space for the part of \box0 which exceeds it:
-  \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
-  % The continuations:
-  \dimen2=\hsize  \advance\dimen2 by -\defargsindent
-  % (plain.tex says that \dimen1 should be used only as global.)
-  \parshape 2 0in \dimen0 \defargsindent \dimen2
-  %
-  % Put the type name to the right margin.
-  \noindent
-  \hbox to 0pt{%
-    \hfil\box0 \kern-\hsize
-    % \hsize has to be shortened this way:
-    \kern\leftskip
-    % Intentionally do not respect \rightskip, since we need the space.
-  }%
-  %
-  % Allow all lines to be underfull without complaint:
-  \tolerance=10000 \hbadness=10000
-  \exdentamount=\defbodyindent
-  {%
-    % defun fonts. We use typewriter by default (used to be bold) because:
-    % . we're printing identifiers, they should be in tt in principle.
-    % . in languages with many accents, such as Czech or French, it's
-    %   common to leave accents off identifiers.  The result looks ok in
-    %   tt, but exceedingly strange in rm.
-    % . we don't want -- and --- to be treated as ligatures.
-    % . this still does not fix the ?` and !` ligatures, but so far no
-    %   one has made identifiers using them :).
-    \df \tt
-    \def\temp{#2}% return value type
-    \ifx\temp\empty\else \tclose{\temp} \fi
-    #3% output function name
-  }%
-  {\rm\enskip}% hskip 0.5 em of \tenrm
-  %
-  \boldbrax
-  % arguments will be output next, if any.
-}
-
-% Print arguments in slanted roman (not ttsl), inconsistently with using
-% tt for the name.  This is because literal text is sometimes needed in
-% the argument list (groff manual), and ttsl and tt are not very
-% distinguishable.  Prevent hyphenation at `-' chars.
-%
-\def\defunargs#1{%
-  % use sl by default (not ttsl),
-  % tt for the names.
-  \df \sl \hyphenchar\font=0
-  %
-  % On the other hand, if an argument has two dashes (for instance), we
-  % want a way to get ttsl.  Let's try @var for that.
-  \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
-  #1%
-  \sl\hyphenchar\font=45
-}
-
-% We want ()&[] to print specially on the defun line.
-%
-\def\activeparens{%
-  \catcode`$=\active \catcode`$=\active
-  \catcode`\[=\active \catcode`\]=\active
-  \catcode`\&=\active
-}
-
-% Make control sequences which act like normal parenthesis chars.
-\let\lparen = ( \let\rparen = )
-
-% Be sure that we always have a definition for `(', etc.  For example,
-% if the fn name has parens in it, \boldbrax will not be in effect yet,
-% so TeX would otherwise complain about undefined control sequence.
-{
-  \activeparens
-  \global\let(=\lparen \global\let)=\rparen
-  \global\let[=\lbrack \global\let]=\rbrack
-  \global\let& = \&
-
-  \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
-  \gdef\magicamp{\let&=\amprm}
-}
-
-\newcount\parencount
-
-% If we encounter &foo, then turn on ()-hacking afterwards
-\newif\ifampseen
-\def\amprm#1 {\ampseentrue{\bf\&#1 }}
-
-\def\parenfont{%
-  \ifampseen
-    % At the first level, print parens in roman,
-    % otherwise use the default font.
-    \ifnum \parencount=1 \rm \fi
-  \else
-    % The \sf parens (in \boldbrax) actually are a little bolder than
-    % the contained text.  This is especially needed for [ and ] .
-    \sf
-  \fi
-}
-\def\infirstlevel#1{%
-  \ifampseen
-    \ifnum\parencount=1
-      #1%
-    \fi
-  \fi
-}
-\def\bfafterword#1 {#1 \bf}
-
-\def\opnr{%
-  \global\advance\parencount by 1
-  {\parenfont(}%
-  \infirstlevel \bfafterword
-}
-\def\clnr{%
-  {\parenfont)}%
-  \infirstlevel \sl
-  \global\advance\parencount by -1
-}
-
-\newcount\brackcount
-\def\lbrb{%
-  \global\advance\brackcount by 1
-  {\bf[}%
-}
-\def\rbrb{%
-  {\bf]}%
-  \global\advance\brackcount by -1
-}
-
-\def\checkparencounts{%
-  \ifnum\parencount=0 \else \badparencount \fi
-  \ifnum\brackcount=0 \else \badbrackcount \fi
-}
-% these should not use \errmessage; the glibc manual, at least, actually
-% has such constructs (when documenting function pointers).
-\def\badparencount{%
-  \message{Warning: unbalanced parentheses in @def...}%
-  \global\parencount=0
-}
-\def\badbrackcount{%
-  \message{Warning: unbalanced square brackets in @def...}%
-  \global\brackcount=0
-}
-
-
-\message{macros,}
-% @macro.
-
-% To do this right we need a feature of e-TeX, \scantokens,
-% which we arrange to emulate with a temporary file in ordinary TeX.
-\ifx\eTeXversion\undefined
-  \newwrite\macscribble
-  \def\scantokens#1{%
-    \toks0={#1}%
-    \immediate\openout\macscribble=\jobname.tmp
-    \immediate\write\macscribble{\the\toks0}%
-    \immediate\closeout\macscribble
-    \input \jobname.tmp
-  }
-\fi
-
-\def\scanmacro#1{%
-  \begingroup
-    \newlinechar`\^^M
-    \let\xeatspaces\eatspaces
-    % Undo catcode changes of \startcontents and \doprintindex
-    % When called from @insertcopying or (short)caption, we need active
-    % backslash to get it printed correctly.  Previously, we had
-    % \catcode`\\=\other instead.  We'll see whether a problem appears
-    % with macro expansion.				--kasal, 19aug04
-    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-    % ... and \example
-    \spaceisspace
-    %
-    % Append \endinput to make sure that TeX does not see the ending newline.
-    % I've verified that it is necessary both for e-TeX and for ordinary TeX
-    %							--kasal, 29nov03
-    \scantokens{#1\endinput}%
-  \endgroup
-}
-
-\def\scanexp#1{%
-  \edef\temp{\noexpand\scanmacro{#1}}%
-  \temp
-}
-
-\newcount\paramno   % Count of parameters
-\newtoks\macname    % Macro name
-\newif\ifrecursive  % Is it recursive?
-
-% List of all defined macros in the form
-%    \definedummyword\macro1\definedummyword\macro2...
-% Currently is also contains all @aliases; the list can be split
-% if there is a need.
-\def\macrolist{}
-
-% Add the macro to \macrolist
-\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
-\def\addtomacrolistxxx#1{%
-     \toks0 = \expandafter{\macrolist\definedummyword#1}%
-     \xdef\macrolist{\the\toks0}%
-}
-
-% Utility routines.
-% This does \let #1 = #2, with \csnames; that is,
-%   \let \csname#1\endcsname = \csname#2\endcsname
-% (except of course we have to play expansion games).
-%
-\def\cslet#1#2{%
-  \expandafter\let
-  \csname#1\expandafter\endcsname
-  \csname#2\endcsname
-}
-
-% Trim leading and trailing spaces off a string.
-% Concepts from aro-bend problem 15 (see CTAN).
-{\catcode`\@=11
-\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }}
-\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@}
-\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}
-\def\unbrace#1{#1}
-\unbrace{\gdef\trim@@@ #1 } #2@{#1}
-}
-
-% Trim a single trailing ^^M off a string.
-{\catcode`\^^M=\other \catcode`\Q=3%
-\gdef\eatcr #1{\eatcra #1Q^^MQ}%
-\gdef\eatcra#1^^MQ{\eatcrb#1Q}%
-\gdef\eatcrb#1Q#2Q{#1}%
-}
-
-% Macro bodies are absorbed as an argument in a context where
-% all characters are catcode 10, 11 or 12, except \ which is active
-% (as in normal texinfo). It is necessary to change the definition of \.
-
-% Non-ASCII encodings make 8-bit characters active, so un-activate
-% them to avoid their expansion.  Must do this non-globally, to
-% confine the change to the current group.
-
-% It's necessary to have hard CRs when the macro is executed. This is
-% done by  making ^^M (\endlinechar) catcode 12 when reading the macro
-% body, and then making it the \newlinechar in \scanmacro.
-
-\def\scanctxt{%
-  \catcode`\"=\other
-  \catcode`\+=\other
-  \catcode`\<=\other
-  \catcode`\>=\other
-  \catcode`\@=\other
-  \catcode`\^=\other
-  \catcode`\_=\other
-  \catcode`\|=\other
-  \catcode`\~=\other
-  \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
-}
-
-\def\scanargctxt{%
-  \scanctxt
-  \catcode`\\=\other
-  \catcode`\^^M=\other
-}
-
-\def\macrobodyctxt{%
-  \scanctxt
-  \catcode`\{=\other
-  \catcode`\}=\other
-  \catcode`\^^M=\other
-  \usembodybackslash
-}
-
-\def\macroargctxt{%
-  \scanctxt
-  \catcode`\\=\other
-}
-
-% \mbodybackslash is the definition of \ in @macro bodies.
-% It maps \foo\ => \csname macarg.foo\endcsname => #N
-% where N is the macro parameter number.
-% We define \csname macarg.\endcsname to be \realbackslash, so
-% \\ in macro replacement text gets you a backslash.
-
-{\catcode`@=0 @catcode`@\=@active
- @gdef@usembodybackslash{@let\=@mbodybackslash}
- @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
-}
-\expandafter\def\csname macarg.\endcsname{\realbackslash}
-
-\def\macro{\recursivefalse\parsearg\macroxxx}
-\def\rmacro{\recursivetrue\parsearg\macroxxx}
-
-\def\macroxxx#1{%
-  \getargs{#1}%           now \macname is the macname and \argl the arglist
-  \ifx\argl\empty       % no arguments
-     \paramno=0%
-  \else
-     \expandafter\parsemargdef \argl;%
-  \fi
-  \if1\csname ismacro.\the\macname\endcsname
-     \message{Warning: redefining \the\macname}%
-  \else
-     \expandafter\ifx\csname \the\macname\endcsname \relax
-     \else \errmessage{Macro name \the\macname\space already defined}\fi
-     \global\cslet{macsave.\the\macname}{\the\macname}%
-     \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-     \addtomacrolist{\the\macname}%
-  \fi
-  \begingroup \macrobodyctxt
-  \ifrecursive \expandafter\parsermacbody
-  \else \expandafter\parsemacbody
-  \fi}
-
-\parseargdef\unmacro{%
-  \if1\csname ismacro.#1\endcsname
-    \global\cslet{#1}{macsave.#1}%
-    \global\expandafter\let \csname ismacro.#1\endcsname=0%
-    % Remove the macro name from \macrolist:
-    \begingroup
-      \expandafter\let\csname#1\endcsname \relax
-      \let\definedummyword\unmacrodo
-      \xdef\macrolist{\macrolist}%
-    \endgroup
-  \else
-    \errmessage{Macro #1 not defined}%
-  \fi
-}
-
-% Called by \do from \dounmacro on each macro.  The idea is to omit any
-% macro definitions that have been changed to \relax.
-%
-\def\unmacrodo#1{%
-  \ifx #1\relax
-    % remove this
-  \else
-    \noexpand\definedummyword \noexpand#1%
-  \fi
-}
-
-% This makes use of the obscure feature that if the last token of a
-% <parameter list> is #, then the preceding argument is delimited by
-% an opening brace, and that opening brace is not consumed.
-\def\getargs#1{\getargsxxx#1{}}
-\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
-\def\getmacname #1 #2\relax{\macname={#1}}
-\def\getmacargs#1{\def\argl{#1}}
-
-% Parse the optional {params} list.  Set up \paramno and \paramlist
-% so \defmacro knows what to do.  Define \macarg.blah for each blah
-% in the params list, to be ##N where N is the position in that list.
-% That gets used by \mbodybackslash (above).
-
-% We need to get `macro parameter char #' into several definitions.
-% The technique used is stolen from LaTeX:  let \hash be something
-% unexpandable, insert that wherever you need a #, and then redefine
-% it to # just before using the token list produced.
-%
-% The same technique is used to protect \eatspaces till just before
-% the macro is used.
-
-\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-        \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
-\def\parsemargdefxxx#1,{%
-  \if#1;\let\next=\relax
-  \else \let\next=\parsemargdefxxx
-    \advance\paramno by 1%
-    \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-        {\xeatspaces{\hash\the\paramno}}%
-    \edef\paramlist{\paramlist\hash\the\paramno,}%
-  \fi\next}
-
-% These two commands read recursive and nonrecursive macro bodies.
-% (They're different since rec and nonrec macros end differently.)
-
-\long\def\parsemacbody#1@end macro%
-{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
-\long\def\parsermacbody#1@end rmacro%
-{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
-
-% This defines the macro itself. There are six cases: recursive and
-% nonrecursive macros of zero, one, and many arguments.
-% Much magic with \expandafter here.
-% \xdef is used so that macro definitions will survive the file
-% they're defined in; @include reads the file inside a group.
-\def\defmacro{%
-  \let\hash=##% convert placeholders to macro parameter chars
-  \ifrecursive
-    \ifcase\paramno
-    % 0
-      \expandafter\xdef\csname\the\macname\endcsname{%
-        \noexpand\scanmacro{\temp}}%
-    \or % 1
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\braceorline
-         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-      \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-         \egroup\noexpand\scanmacro{\temp}}%
-    \else % many
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\csname\the\macname xx\endcsname}%
-      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-      \expandafter\expandafter
-      \expandafter\xdef
-      \expandafter\expandafter
-        \csname\the\macname xxx\endcsname
-          \paramlist{\egroup\noexpand\scanmacro{\temp}}%
-    \fi
-  \else
-    \ifcase\paramno
-    % 0
-      \expandafter\xdef\csname\the\macname\endcsname{%
-        \noexpand\norecurse{\the\macname}%
-        \noexpand\scanmacro{\temp}\egroup}%
-    \or % 1
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\braceorline
-         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-      \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-        \egroup
-        \noexpand\norecurse{\the\macname}%
-        \noexpand\scanmacro{\temp}\egroup}%
-    \else % many
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \expandafter\noexpand\csname\the\macname xx\endcsname}%
-      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-      \expandafter\expandafter
-      \expandafter\xdef
-      \expandafter\expandafter
-      \csname\the\macname xxx\endcsname
-      \paramlist{%
-          \egroup
-          \noexpand\norecurse{\the\macname}%
-          \noexpand\scanmacro{\temp}\egroup}%
-    \fi
-  \fi}
-
-\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
-
-% \braceorline decides whether the next nonwhitespace character is a
-% {.  If so it reads up to the closing }, if not, it reads the whole
-% line.  Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
-\def\braceorlinexxx{%
-  \ifx\nchar\bgroup\else
-    \expandafter\parsearg
-  \fi \macnamexxx}
-
-
-% @alias.
-% We need some trickery to remove the optional spaces around the equal
-% sign.  Just make them active and then expand them all to nothing.
-\def\alias{\parseargusing\obeyspaces\aliasxxx}
-\def\aliasxxx #1{\aliasyyy#1\relax}
-\def\aliasyyy #1=#2\relax{%
-  {%
-    \expandafter\let\obeyedspace=\empty
-    \addtomacrolist{#1}%
-    \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
-  }%
-  \next
-}
-
-
-\message{cross references,}
-
-\newwrite\auxfile
-\newif\ifhavexrefs    % True if xref values are known.
-\newif\ifwarnedxrefs  % True if we warned once that they aren't known.
-
-% @inforef is relatively simple.
-\def\inforef #1{\inforefzzz #1,,,,**}
-\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-  node \samp{\ignorespaces#1{}}}
-
-% @node's only job in TeX is to define \lastnode, which is used in
-% cross-references.  The @node line might or might not have commas, and
-% might or might not have spaces before the first comma, like:
-% @node foo , bar , ...
-% We don't want such trailing spaces in the node name.
-%
-\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
-%
-% also remove a trailing comma, in case of something like this:
-% @node Help-Cross,  ,  , Cross-refs
-\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
-\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
-
-\let\nwnode=\node
-\let\lastnode=\empty
-
-% Write a cross-reference definition for the current node.  #1 is the
-% type (Ynumbered, Yappendix, Ynothing).
-%
-\def\donoderef#1{%
-  \ifx\lastnode\empty\else
-    \setref{\lastnode}{#1}%
-    \global\let\lastnode=\empty
-  \fi
-}
-
-% @anchor{NAME} -- define xref target at arbitrary point.
-%
-\newcount\savesfregister
-%
-\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
-\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
-\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
-
-% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
-% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \lastsection,
-%                 or the anchor name.
-% 2) NAME-snt   - section number and type, passed as the SNT arg, or
-%                 empty for anchors.
-% 3) NAME-pg    - the page number.
-%
-% This is called from \donoderef, \anchor, and \dofloat.  In the case of
-% floats, there is an additional part, which is not written here:
-% 4) NAME-lof   - the text as it should appear in a @listoffloats.
-%
-\def\setref#1#2{%
-  \pdfmkdest{#1}%
-  \iflinks
-    {%
-      \atdummies  % preserve commands, but don't expand them
-      \edef\writexrdef##1##2{%
-	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
-	  ##1}{##2}}% these are parameters of \writexrdef
-      }%
-      \toks0 = \expandafter{\lastsection}%
-      \immediate \writexrdef{title}{\the\toks0 }%
-      \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
-    }%
-  \fi
-}
-
-% @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
-% the node name, #2 the name of the Info cross-reference, #3 the printed
-% node name, #4 the name of the Info file, #5 the name of the printed
-% manual.  All but the node name can be omitted.
-%
-\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
-\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
-\def\ref#1{\xrefX[#1,,,,,,,]}
-\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
-  \unsepspaces
-  \def\printedmanual{\ignorespaces #5}%
-  \def\printedrefname{\ignorespaces #3}%
-  \setbox1=\hbox{\printedmanual\unskip}%
-  \setbox0=\hbox{\printedrefname\unskip}%
-  \ifdim \wd0 = 0pt
-    % No printed node name was explicitly given.
-    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
-      % Use the node name inside the square brackets.
-      \def\printedrefname{\ignorespaces #1}%
-    \else
-      % Use the actual chapter/section title appear inside
-      % the square brackets.  Use the real section title if we have it.
-      \ifdim \wd1 > 0pt
-        % It is in another manual, so we don't have it.
-        \def\printedrefname{\ignorespaces #1}%
-      \else
-        \ifhavexrefs
-          % We know the real title if we have the xref values.
-          \def\printedrefname{\refx{#1-title}{}}%
-        \else
-          % Otherwise just copy the Info node name.
-          \def\printedrefname{\ignorespaces #1}%
-        \fi%
-      \fi
-    \fi
-  \fi
-  %
-  % Make link in pdf output.
-  \ifpdf
-    {\indexnofonts
-     \turnoffactive
-     % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
-     \getfilename{#4}%
-     %
-     % See comments at \activebackslashdouble.
-     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-      \backslashparens\pdfxrefdest}%
-     %
-     \leavevmode
-     \startlink attr{/Border [0 0 0]}%
-     \ifnum\filenamelength>0
-       goto file{\the\filename.pdf} name{\pdfxrefdest}%
-     \else
-       goto name{\pdfmkpgn{\pdfxrefdest}}%
-     \fi
-    }%
-    \setcolor{\linkcolor}%
-  \fi
-  %
-  % Float references are printed completely differently: "Figure 1.2"
-  % instead of "[somenode], p.3".  We distinguish them by the
-  % LABEL-title being set to a magic string.
-  {%
-    % Have to otherify everything special to allow the \csname to
-    % include an _ in the xref name, etc.
-    \indexnofonts
-    \turnoffactive
-    \expandafter\global\expandafter\let\expandafter\Xthisreftitle
-      \csname XR#1-title\endcsname
-  }%
-  \iffloat\Xthisreftitle
-    % If the user specified the print name (third arg) to the ref,
-    % print it instead of our usual "Figure 1.2".
-    \ifdim\wd0 = 0pt
-      \refx{#1-snt}{}%
-    \else
-      \printedrefname
-    \fi
-    %
-    % if the user also gave the printed manual name (fifth arg), append
-    % "in MANUALNAME".
-    \ifdim \wd1 > 0pt
-      \space \putwordin{} \cite{\printedmanual}%
-    \fi
-  \else
-    % node/anchor (non-float) references.
-    %
-    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-    % insert empty discretionaries after hyphens, which means that it will
-    % not find a line break at a hyphen in a node names.  Since some manuals
-    % are best written with fairly long node names, containing hyphens, this
-    % is a loss.  Therefore, we give the text of the node name again, so it
-    % is as if TeX is seeing it for the first time.
-    \ifdim \wd1 > 0pt
-      \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
-    \else
-      % _ (for example) has to be the character _ for the purposes of the
-      % control sequence corresponding to the node, but it has to expand
-      % into the usual \leavevmode...\vrule stuff for purposes of
-      % printing. So we \turnoffactive for the \refx-snt, back on for the
-      % printing, back off for the \refx-pg.
-      {\turnoffactive
-       % Only output a following space if the -snt ref is nonempty; for
-       % @unnumbered and @anchor, it won't be.
-       \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
-      }%
-      % output the `[mynode]' via a macro so it can be overridden.
-      \xrefprintnodename\printedrefname
-      %
-      % But we always want a comma and a space:
-      ,\space
-      %
-      % output the `page 3'.
-      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
-  \fi
-  \endlink
-\endgroup}
-
-% This macro is called from \xrefX for the `[nodename]' part of xref
-% output.  It's a separate macro only so it can be changed more easily,
-% since square brackets don't work well in some documents.  Particularly
-% one that Bob is working on :).
-%
-\def\xrefprintnodename#1{[#1]}
-
-% Things referred to by \setref.
-%
-\def\Ynothing{}
-\def\Yomitfromtoc{}
-\def\Ynumbered{%
-  \ifnum\secno=0
-    \putwordChapter@tie \the\chapno
-  \else \ifnum\subsecno=0
-    \putwordSection@tie \the\chapno.\the\secno
-  \else \ifnum\subsubsecno=0
-    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
-  \else
-    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
-  \fi\fi\fi
-}
-\def\Yappendix{%
-  \ifnum\secno=0
-     \putwordAppendix@tie @char\the\appendixno{}%
-  \else \ifnum\subsecno=0
-     \putwordSection@tie @char\the\appendixno.\the\secno
-  \else \ifnum\subsubsecno=0
-    \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
-  \else
-    \putwordSection@tie
-      @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
-  \fi\fi\fi
-}
-
-% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
-% If its value is nonempty, SUFFIX is output afterward.
-%
-\def\refx#1#2{%
-  {%
-    \indexnofonts
-    \otherbackslash
-    \expandafter\global\expandafter\let\expandafter\thisrefX
-      \csname XR#1\endcsname
-  }%
-  \ifx\thisrefX\relax
-    % If not defined, say something at least.
-    \angleleft un\-de\-fined\angleright
-    \iflinks
-      \ifhavexrefs
-        \message{\linenumber Undefined cross reference `#1'.}%
-      \else
-        \ifwarnedxrefs\else
-          \global\warnedxrefstrue
-          \message{Cross reference values unknown; you must run TeX again.}%
-        \fi
-      \fi
-    \fi
-  \else
-    % It's defined, so just use it.
-    \thisrefX
-  \fi
-  #2% Output the suffix in any case.
-}
-
-% This is the macro invoked by entries in the aux file.  Usually it's
-% just a \def (we prepend XR to the control sequence name to avoid
-% collisions).  But if this is a float type, we have more work to do.
-%
-\def\xrdef#1#2{%
-  {% The node name might contain 8-bit characters, which in our current
-   % implementation are changed to commands like @'e.  Don't let these
-   % mess up the control sequence name.
-    \indexnofonts
-    \turnoffactive
-    \xdef\safexrefname{#1}%
-  }%
-  %
-  \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
-  %
-  % Was that xref control sequence that we just defined for a float?
-  \expandafter\iffloat\csname XR\safexrefname\endcsname
-    % it was a float, and we have the (safe) float type in \iffloattype.
-    \expandafter\let\expandafter\floatlist
-      \csname floatlist\iffloattype\endcsname
-    %
-    % Is this the first time we've seen this float type?
-    \expandafter\ifx\floatlist\relax
-      \toks0 = {\do}% yes, so just \do
-    \else
-      % had it before, so preserve previous elements in list.
-      \toks0 = \expandafter{\floatlist\do}%
-    \fi
-    %
-    % Remember this xref in the control sequence \floatlistFLOATTYPE,
-    % for later use in \listoffloats.
-    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
-      {\safexrefname}}%
-  \fi
-}
-
-% Read the last existing aux file, if any.  No error if none exists.
-%
-\def\tryauxfile{%
-  \openin 1 \jobname.aux
-  \ifeof 1 \else
-    \readdatafile{aux}%
-    \global\havexrefstrue
-  \fi
-  \closein 1
-}
-
-\def\setupdatafile{%
-  \catcode`\^^@=\other
-  \catcode`\^^A=\other
-  \catcode`\^^B=\other
-  \catcode`\^^C=\other
-  \catcode`\^^D=\other
-  \catcode`\^^E=\other
-  \catcode`\^^F=\other
-  \catcode`\^^G=\other
-  \catcode`\^^H=\other
-  \catcode`\^^K=\other
-  \catcode`\^^L=\other
-  \catcode`\^^N=\other
-  \catcode`\^^P=\other
-  \catcode`\^^Q=\other
-  \catcode`\^^R=\other
-  \catcode`\^^S=\other
-  \catcode`\^^T=\other
-  \catcode`\^^U=\other
-  \catcode`\^^V=\other
-  \catcode`\^^W=\other
-  \catcode`\^^X=\other
-  \catcode`\^^Z=\other
-  \catcode`\^^[=\other
-  \catcode`\^^\=\other
-  \catcode`\^^]=\other
-  \catcode`\^^^=\other
-  \catcode`\^^_=\other
-  % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
-  % in xref tags, i.e., node names.  But since ^^e4 notation isn't
-  % supported in the main text, it doesn't seem desirable.  Furthermore,
-  % that is not enough: for node names that actually contain a ^
-  % character, we would end up writing a line like this: 'xrdef {'hat
-  % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
-  % argument, and \hat is not an expandable control sequence.  It could
-  % all be worked out, but why?  Either we support ^^ or we don't.
-  %
-  % The other change necessary for this was to define \auxhat:
-  % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
-  % and then to call \auxhat in \setq.
-  %
-  \catcode`\^=\other
-  %
-  % Special characters.  Should be turned off anyway, but...
-  \catcode`\~=\other
-  \catcode`\[=\other
-  \catcode`\]=\other
-  \catcode`\"=\other
-  \catcode`\_=\other
-  \catcode`\|=\other
-  \catcode`\<=\other
-  \catcode`\>=\other
-  \catcode`\$=\other
-  \catcode`\#=\other
-  \catcode`\&=\other
-  \catcode`\%=\other
-  \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
-  %
-  % This is to support \ in node names and titles, since the \
-  % characters end up in a \csname.  It's easier than
-  % leaving it active and making its active definition an actual \
-  % character.  What I don't understand is why it works in the *value*
-  % of the xrdef.  Seems like it should be a catcode12 \, and that
-  % should not typeset properly.  But it works, so I'm moving on for
-  % now.  --karl, 15jan04.
-  \catcode`\\=\other
-  %
-  % Make the characters 128-255 be printing characters.
-  {%
-    \count1=128
-    \def\loop{%
-      \catcode\count1=\other
-      \advance\count1 by 1
-      \ifnum \count1<256 \loop \fi
-    }%
-  }%
-  %
-  % @ is our escape character in .aux files, and we need braces.
-  \catcode`\{=1
-  \catcode`\}=2
-  \catcode`\@=0
-}
-
-\def\readdatafile#1{%
-\begingroup
-  \setupdatafile
-  \input\jobname.#1
-\endgroup}
-
-
-\message{insertions,}
-% including footnotes.
-
-\newcount \footnoteno
-
-% The trailing space in the following definition for supereject is
-% vital for proper filling; pages come out unaligned when you do a
-% pagealignmacro call if that space before the closing brace is
-% removed. (Generally, numeric constants should always be followed by a
-% space to prevent strange expansion errors.)
-\def\supereject{\par\penalty -20000\footnoteno =0 }
-
-% @footnotestyle is meaningful for info output only.
-\let\footnotestyle=\comment
-
-{\catcode `\@=11
-%
-% Auto-number footnotes.  Otherwise like plain.
-\gdef\footnote{%
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
-  \global\advance\footnoteno by \@ne
-  \edef\thisfootno{$^{\the\footnoteno}$}%
-  %
-  % In case the footnote comes at the end of a sentence, preserve the
-  % extra spacing after we do the footnote number.
-  \let\@sf\empty
-  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
-  %
-  % Remove inadvertent blank space before typesetting the footnote number.
-  \unskip
-  \thisfootno\@sf
-  \dofootnote
-}%
-
-% Don't bother with the trickery in plain.tex to not require the
-% footnote text as a parameter.  Our footnotes don't need to be so general.
-%
-% Oh yes, they do; otherwise, @ifset (and anything else that uses
-% \parseargline) fails inside footnotes because the tokens are fixed when
-% the footnote is read.  --karl, 16nov96.
-%
-\gdef\dofootnote{%
-  \insert\footins\bgroup
-  % We want to typeset this text as a normal paragraph, even if the
-  % footnote reference occurs in (for example) a display environment.
-  % So reset some parameters.
-  \hsize=\pagewidth
-  \interlinepenalty\interfootnotelinepenalty
-  \splittopskip\ht\strutbox % top baseline for broken footnotes
-  \splitmaxdepth\dp\strutbox
-  \floatingpenalty\@MM
-  \leftskip\z@skip
-  \rightskip\z@skip
-  \spaceskip\z@skip
-  \xspaceskip\z@skip
-  \parindent\defaultparindent
-  %
-  \smallfonts \rm
-  %
-  % Because we use hanging indentation in footnotes, a @noindent appears
-  % to exdent this text, so make it be a no-op.  makeinfo does not use
-  % hanging indentation so @noindent can still be needed within footnote
-  % text after an @example or the like (not that this is good style).
-  \let\noindent = \relax
-  %
-  % Hang the footnote text off the number.  Use \everypar in case the
-  % footnote extends for more than one paragraph.
-  \everypar = {\hang}%
-  \textindent{\thisfootno}%
-  %
-  % Don't crash into the line above the footnote text.  Since this
-  % expands into a box, it must come within the paragraph, lest it
-  % provide a place where TeX can split the footnote.
-  \footstrut
-  \futurelet\next\fo@t
-}
-}%end \catcode `\@=11
-
-% In case a @footnote appears in a vbox, save the footnote text and create
-% the real \insert just after the vbox finished.  Otherwise, the insertion
-% would be lost.
-% Similarly, if a @footnote appears inside an alignment, save the footnote
-% text to a box and make the \insert when a row of the table is finished.
-% And the same can be done for other insert classes.  --kasal, 16nov03.
-
-% Replace the \insert primitive by a cheating macro.
-% Deeper inside, just make sure that the saved insertions are not spilled
-% out prematurely.
-%
-\def\startsavinginserts{%
-  \ifx \insert\ptexinsert
-    \let\insert\saveinsert
-  \else
-    \let\checkinserts\relax
-  \fi
-}
-
-% This \insert replacement works for both \insert\footins{foo} and
-% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
-%
-\def\saveinsert#1{%
-  \edef\next{\noexpand\savetobox \makeSAVEname#1}%
-  \afterassignment\next
-  % swallow the left brace
-  \let\temp =
-}
-\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
-\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
-
-\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
-
-\def\placesaveins#1{%
-  \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
-    {\box#1}%
-}
-
-% eat @SAVE -- beware, all of them have catcode \other:
-{
-  \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials  %  ;-)
-  \gdef\gobblesave @SAVE{}
-}
-
-% initialization:
-\def\newsaveins #1{%
-  \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
-  \next
-}
-\def\newsaveinsX #1{%
-  \csname newbox\endcsname #1%
-  \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
-    \checksaveins #1}%
-}
-
-% initialize:
-\let\checkinserts\empty
-\newsaveins\footins
-\newsaveins\margin
-
-
-% @image.  We use the macros from epsf.tex to support this.
-% If epsf.tex is not installed and @image is used, we complain.
-%
-% Check for and read epsf.tex up front.  If we read it only at @image
-% time, we might be inside a group, and then its definitions would get
-% undone and the next image would fail.
-\openin 1 = epsf.tex
-\ifeof 1 \else
-  % Do not bother showing banner with epsf.tex v2.7k (available in
-  % doc/epsf.tex and on ctan).
-  \def\epsfannounce{\toks0 = }%
-  \input epsf.tex
-\fi
-\closein 1
-%
-% We will only complain once about lack of epsf.tex.
-\newif\ifwarnednoepsf
-\newhelp\noepsfhelp{epsf.tex must be installed for images to
-  work.  It is also included in the Texinfo distribution, or you can get
-  it from ftp://tug.org/tex/epsf.tex.}
-%
-\def\image#1{%
-  \ifx\epsfbox\undefined
-    \ifwarnednoepsf \else
-      \errhelp = \noepsfhelp
-      \errmessage{epsf.tex not found, images will be ignored}%
-      \global\warnednoepsftrue
-    \fi
-  \else
-    \imagexxx #1,,,,,\finish
-  \fi
-}
-%
-% Arguments to @image:
-% #1 is (mandatory) image filename; we tack on .eps extension.
-% #2 is (optional) width, #3 is (optional) height.
-% #4 is (ignored optional) html alt text.
-% #5 is (ignored optional) extension.
-% #6 is just the usual extra ignored arg for parsing this stuff.
-\newif\ifimagevmode
-\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
-  \catcode`\^^M = 5     % in case we're inside an example
-  \normalturnoffactive  % allow _ et al. in names
-  % If the image is by itself, center it.
-  \ifvmode
-    \imagevmodetrue
-    \nobreak\medskip
-    % Usually we'll have text after the image which will insert
-    % \parskip glue, so insert it here too to equalize the space
-    % above and below.
-    \nobreak\vskip\parskip
-    \nobreak
-  \fi
-  %
-  % Leave vertical mode so that indentation from an enclosing
-  % environment such as @quotation is respected.  On the other hand, if
-  % it's at the top level, we don't want the normal paragraph indentation.
-  \noindent
-  %
-  % Output the image.
-  \ifpdf
-    \dopdfimage{#1}{#2}{#3}%
-  \else
-    % \epsfbox itself resets \epsf?size at each figure.
-    \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
-    \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
-    \epsfbox{#1.eps}%
-  \fi
-  %
-  \ifimagevmode \medskip \fi  % space after the standalone image
-\endgroup}
-
-
-% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
-% etc.  We don't actually implement floating yet, we always include the
-% float "here".  But it seemed the best name for the future.
-%
-\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
-
-% There may be a space before second and/or third parameter; delete it.
-\def\eatcommaspace#1, {#1,}
-
-% #1 is the optional FLOATTYPE, the text label for this float, typically
-% "Figure", "Table", "Example", etc.  Can't contain commas.  If omitted,
-% this float will not be numbered and cannot be referred to.
-%
-% #2 is the optional xref label.  Also must be present for the float to
-% be referable.
-%
-% #3 is the optional positioning argument; for now, it is ignored.  It
-% will somehow specify the positions allowed to float to (here, top, bottom).
-%
-% We keep a separate counter for each FLOATTYPE, which we reset at each
-% chapter-level command.
-\let\resetallfloatnos=\empty
-%
-\def\dofloat#1,#2,#3,#4\finish{%
-  \let\thiscaption=\empty
-  \let\thisshortcaption=\empty
-  %
-  % don't lose footnotes inside @float.
-  %
-  % BEWARE: when the floats start float, we have to issue warning whenever an
-  % insert appears inside a float which could possibly float. --kasal, 26may04
-  %
-  \startsavinginserts
-  %
-  % We can't be used inside a paragraph.
-  \par
-  %
-  \vtop\bgroup
-    \def\floattype{#1}%
-    \def\floatlabel{#2}%
-    \def\floatloc{#3}% we do nothing with this yet.
-    %
-    \ifx\floattype\empty
-      \let\safefloattype=\empty
-    \else
-      {%
-        % the floattype might have accents or other special characters,
-        % but we need to use it in a control sequence name.
-        \indexnofonts
-        \turnoffactive
-        \xdef\safefloattype{\floattype}%
-      }%
-    \fi
-    %
-    % If label is given but no type, we handle that as the empty type.
-    \ifx\floatlabel\empty \else
-      % We want each FLOATTYPE to be numbered separately (Figure 1,
-      % Table 1, Figure 2, ...).  (And if no label, no number.)
-      %
-      \expandafter\getfloatno\csname\safefloattype floatno\endcsname
-      \global\advance\floatno by 1
-      %
-      {%
-        % This magic value for \lastsection is output by \setref as the
-        % XREFLABEL-title value.  \xrefX uses it to distinguish float
-        % labels (which have a completely different output format) from
-        % node and anchor labels.  And \xrdef uses it to construct the
-        % lists of floats.
-        %
-        \edef\lastsection{\floatmagic=\safefloattype}%
-        \setref{\floatlabel}{Yfloat}%
-      }%
-    \fi
-    %
-    % start with \parskip glue, I guess.
-    \vskip\parskip
-    %
-    % Don't suppress indentation if a float happens to start a section.
-    \restorefirstparagraphindent
-}
-
-% we have these possibilities:
-% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
-% @float Foo,lbl & no caption:    Foo 1.1
-% @float Foo & @caption{Cap}:     Foo: Cap
-% @float Foo & no caption:        Foo
-% @float ,lbl & Caption{Cap}:     1.1: Cap
-% @float ,lbl & no caption:       1.1
-% @float & @caption{Cap}:         Cap
-% @float & no caption:
-%
-\def\Efloat{%
-    \let\floatident = \empty
-    %
-    % In all cases, if we have a float type, it comes first.
-    \ifx\floattype\empty \else \def\floatident{\floattype}\fi
-    %
-    % If we have an xref label, the number comes next.
-    \ifx\floatlabel\empty \else
-      \ifx\floattype\empty \else % if also had float type, need tie first.
-        \appendtomacro\floatident{\tie}%
-      \fi
-      % the number.
-      \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
-    \fi
-    %
-    % Start the printed caption with what we've constructed in
-    % \floatident, but keep it separate; we need \floatident again.
-    \let\captionline = \floatident
-    %
-    \ifx\thiscaption\empty \else
-      \ifx\floatident\empty \else
-	\appendtomacro\captionline{: }% had ident, so need a colon between
-      \fi
-      %
-      % caption text.
-      \appendtomacro\captionline{\scanexp\thiscaption}%
-    \fi
-    %
-    % If we have anything to print, print it, with space before.
-    % Eventually this needs to become an \insert.
-    \ifx\captionline\empty \else
-      \vskip.5\parskip
-      \captionline
-      %
-      % Space below caption.
-      \vskip\parskip
-    \fi
-    %
-    % If have an xref label, write the list of floats info.  Do this
-    % after the caption, to avoid chance of it being a breakpoint.
-    \ifx\floatlabel\empty \else
-      % Write the text that goes in the lof to the aux file as
-      % \floatlabel-lof.  Besides \floatident, we include the short
-      % caption if specified, else the full caption if specified, else nothing.
-      {%
-        \atdummies
-        %
-        % since we read the caption text in the macro world, where ^^M
-        % is turned into a normal character, we have to scan it back, so
-        % we don't write the literal three characters "^^M" into the aux file.
-	\scanexp{%
-	  \xdef\noexpand\gtemp{%
-	    \ifx\thisshortcaption\empty
-	      \thiscaption
-	    \else
-	      \thisshortcaption
-	    \fi
-	  }%
-	}%
-        \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
-	  \ifx\gtemp\empty \else : \gtemp \fi}}%
-      }%
-    \fi
-  \egroup  % end of \vtop
-  %
-  % place the captured inserts
-  %
-  % BEWARE: when the floats start floating, we have to issue warning
-  % whenever an insert appears inside a float which could possibly
-  % float. --kasal, 26may04
-  %
-  \checkinserts
-}
-
-% Append the tokens #2 to the definition of macro #1, not expanding either.
-%
-\def\appendtomacro#1#2{%
-  \expandafter\def\expandafter#1\expandafter{#1#2}%
-}
-
-% @caption, @shortcaption
-%
-\def\caption{\docaption\thiscaption}
-\def\shortcaption{\docaption\thisshortcaption}
-\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
-\def\defcaption#1#2{\egroup \def#1{#2}}
-
-% The parameter is the control sequence identifying the counter we are
-% going to use.  Create it if it doesn't exist and assign it to \floatno.
-\def\getfloatno#1{%
-  \ifx#1\relax
-      % Haven't seen this figure type before.
-      \csname newcount\endcsname #1%
-      %
-      % Remember to reset this floatno at the next chap.
-      \expandafter\gdef\expandafter\resetallfloatnos
-        \expandafter{\resetallfloatnos #1=0 }%
-  \fi
-  \let\floatno#1%
-}
-
-% \setref calls this to get the XREFLABEL-snt value.  We want an @xref
-% to the FLOATLABEL to expand to "Figure 3.1".  We call \setref when we
-% first read the @float command.
-%
-\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
-
-% Magic string used for the XREFLABEL-title value, so \xrefX can
-% distinguish floats from other xref types.
-\def\floatmagic{!!float!!}
-
-% #1 is the control sequence we are passed; we expand into a conditional
-% which is true if #1 represents a float ref.  That is, the magic
-% \lastsection value which we \setref above.
-%
-\def\iffloat#1{\expandafter\doiffloat#1==\finish}
-%
-% #1 is (maybe) the \floatmagic string.  If so, #2 will be the
-% (safe) float type for this float.  We set \iffloattype to #2.
-%
-\def\doiffloat#1=#2=#3\finish{%
-  \def\temp{#1}%
-  \def\iffloattype{#2}%
-  \ifx\temp\floatmagic
-}
-
-% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
-%
-\parseargdef\listoffloats{%
-  \def\floattype{#1}% floattype
-  {%
-    % the floattype might have accents or other special characters,
-    % but we need to use it in a control sequence name.
-    \indexnofonts
-    \turnoffactive
-    \xdef\safefloattype{\floattype}%
-  }%
-  %
-  % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
-  \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
-    \ifhavexrefs
-      % if the user said @listoffloats foo but never @float foo.
-      \message{\linenumber No `\safefloattype' floats to list.}%
-    \fi
-  \else
-    \begingroup
-      \leftskip=\tocindent  % indent these entries like a toc
-      \let\do=\listoffloatsdo
-      \csname floatlist\safefloattype\endcsname
-    \endgroup
-  \fi
-}
-
-% This is called on each entry in a list of floats.  We're passed the
-% xref label, in the form LABEL-title, which is how we save it in the
-% aux file.  We strip off the -title and look up \XRLABEL-lof, which
-% has the text we're supposed to typeset here.
-%
-% Figures without xref labels will not be included in the list (since
-% they won't appear in the aux file).
-%
-\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
-\def\listoffloatsdoentry#1-title\finish{{%
-  % Can't fully expand XR#1-lof because it can contain anything.  Just
-  % pass the control sequence.  On the other hand, XR#1-pg is just the
-  % page number, and we want to fully expand that so we can get a link
-  % in pdf output.
-  \toksA = \expandafter{\csname XR#1-lof\endcsname}%
-  %
-  % use the same \entry macro we use to generate the TOC and index.
-  \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
-  \writeentry
-}}
-
-
-\message{localization,}
-
-% For single-language documents, @documentlanguage is usually given very
-% early, just after @documentencoding.  Single argument is the language
-% (de) or locale (de_DE) abbreviation.
-%
-{
-  \catcode`\_ = \active
-  \globaldefs=1
-\parseargdef\documentlanguage{\begingroup
-  \let_=\normalunderscore  % normal _ character for filenames
-  \tex % read txi-??.tex file in plain TeX.
-    % Read the file by the name they passed if it exists.
-    \openin 1 txi-#1.tex
-    \ifeof 1
-      \documentlanguagetrywithoutunderscore{#1_\finish}%
-    \else
-      \globaldefs = 1  % everything in the txi-LL files needs to persist
-      \input txi-#1.tex
-    \fi
-    \closein 1
-  \endgroup % end raw TeX
-\endgroup}
-%
-% If they passed de_DE, and txi-de_DE.tex doesn't exist,
-% try txi-de.tex.
-%
-\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
-  \openin 1 txi-#1.tex
-  \ifeof 1
-    \errhelp = \nolanghelp
-    \errmessage{Cannot read language file txi-#1.tex}%
-  \else
-    \globaldefs = 1  % everything in the txi-LL files needs to persist
-    \input txi-#1.tex
-  \fi
-  \closein 1
-}
-}% end of special _ catcode
-%
-\newhelp\nolanghelp{The given language definition file cannot be found or
-is empty.  Maybe you need to install it?  Putting it in the current
-directory should work if nowhere else does.}
-
-% This macro is called from txi-??.tex files; the first argument is the
-% \language name to set (without the "\lang@" prefix), the second and
-% third args are \{left,right}hyphenmin.
-%
-% The language names to pass are determined when the format is built.
-% See the etex.log file created at that time, e.g.,
-% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
-%
-% With TeX Live 2008, etex now includes hyphenation patterns for all
-% available languages.  This means we can support hyphenation in
-% Texinfo, at least to some extent.  (This still doesn't solve the
-% accented characters problem.)
-%
-\catcode`@=11
-\def\txisetlanguage#1#2#3{%
-  % do not set the language if the name is undefined in the current TeX.
-  \expandafter\ifx\csname lang@#1\endcsname \relax
-    \message{no patterns for #1}%
-  \else
-    \global\language = \csname lang@#1\endcsname
-  \fi
-  % but there is no harm in adjusting the hyphenmin values regardless.
-  \global\lefthyphenmin = #2\relax
-  \global\righthyphenmin = #3\relax
-}
-
-% Helpers for encodings.
-% Set the catcode of characters 128 through 255 to the specified number.
-%
-\def\setnonasciicharscatcode#1{%
-   \count255=128
-   \loop\ifnum\count255<256
-      \global\catcode\count255=#1\relax
-      \advance\count255 by 1
-   \repeat
-}
-
-\def\setnonasciicharscatcodenonglobal#1{%
-   \count255=128
-   \loop\ifnum\count255<256
-      \catcode\count255=#1\relax
-      \advance\count255 by 1
-   \repeat
-}
-
-% @documentencoding sets the definition of non-ASCII characters
-% according to the specified encoding.
-%
-\parseargdef\documentencoding{%
-  % Encoding being declared for the document.
-  \def\declaredencoding{\csname #1.enc\endcsname}%
-  %
-  % Supported encodings: names converted to tokens in order to be able
-  % to compare them with \ifx.
-  \def\ascii{\csname US-ASCII.enc\endcsname}%
-  \def\latnine{\csname ISO-8859-15.enc\endcsname}%
-  \def\latone{\csname ISO-8859-1.enc\endcsname}%
-  \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
-  \def\utfeight{\csname UTF-8.enc\endcsname}%
-  %
-  \ifx \declaredencoding \ascii
-     \asciichardefs
-  %
-  \else \ifx \declaredencoding \lattwo
-     \setnonasciicharscatcode\active
-     \lattwochardefs
-  %
-  \else \ifx \declaredencoding \latone
-     \setnonasciicharscatcode\active
-     \latonechardefs
-  %
-  \else \ifx \declaredencoding \latnine
-     \setnonasciicharscatcode\active
-     \latninechardefs
-  %
-  \else \ifx \declaredencoding \utfeight
-     \setnonasciicharscatcode\active
-     \utfeightchardefs
-  %
-  \else
-    \message{Unknown document encoding #1, ignoring.}%
-  %
-  \fi % utfeight
-  \fi % latnine
-  \fi % latone
-  \fi % lattwo
-  \fi % ascii
-}
-
-% A message to be logged when using a character that isn't available
-% the default font encoding (OT1).
-%
-\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
-
-% Take account of \c (plain) vs. \, (Texinfo) difference.
-\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
-
-% First, make active non-ASCII characters in order for them to be
-% correctly categorized when TeX reads the replacement text of
-% macros containing the character definitions.
-\setnonasciicharscatcode\active
-%
-% Latin1 (ISO-8859-1) character definitions.
-\def\latonechardefs{%
-  \gdef^^a0{~}
-  \gdef^^a1{\exclamdown}
-  \gdef^^a2{\missingcharmsg{CENT SIGN}}
-  \gdef^^a3{{\pounds}}
-  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-  \gdef^^a5{\missingcharmsg{YEN SIGN}}
-  \gdef^^a6{\missingcharmsg{BROKEN BAR}}
-  \gdef^^a7{\S}
-  \gdef^^a8{\"{}}
-  \gdef^^a9{\copyright}
-  \gdef^^aa{\ordf}
-  \gdef^^ab{\guillemetleft}
-  \gdef^^ac{$\lnot$}
-  \gdef^^ad{\-}
-  \gdef^^ae{\registeredsymbol}
-  \gdef^^af{\={}}
-  %
-  \gdef^^b0{\textdegree}
-  \gdef^^b1{$\pm$}
-  \gdef^^b2{$^2$}
-  \gdef^^b3{$^3$}
-  \gdef^^b4{\'{}}
-  \gdef^^b5{$\mu$}
-  \gdef^^b6{\P}
-  %
-  \gdef^^b7{$^.$}
-  \gdef^^b8{\cedilla\ }
-  \gdef^^b9{$^1$}
-  \gdef^^ba{\ordm}
-  %
-  \gdef^^bb{\guilletright}
-  \gdef^^bc{$1\over4$}
-  \gdef^^bd{$1\over2$}
-  \gdef^^be{$3\over4$}
-  \gdef^^bf{\questiondown}
-  %
-  \gdef^^c0{\`A}
-  \gdef^^c1{\'A}
-  \gdef^^c2{\^A}
-  \gdef^^c3{\~A}
-  \gdef^^c4{\"A}
-  \gdef^^c5{\ringaccent A}
-  \gdef^^c6{\AE}
-  \gdef^^c7{\cedilla C}
-  \gdef^^c8{\`E}
-  \gdef^^c9{\'E}
-  \gdef^^ca{\^E}
-  \gdef^^cb{\"E}
-  \gdef^^cc{\`I}
-  \gdef^^cd{\'I}
-  \gdef^^ce{\^I}
-  \gdef^^cf{\"I}
-  %
-  \gdef^^d0{\DH}
-  \gdef^^d1{\~N}
-  \gdef^^d2{\`O}
-  \gdef^^d3{\'O}
-  \gdef^^d4{\^O}
-  \gdef^^d5{\~O}
-  \gdef^^d6{\"O}
-  \gdef^^d7{$\times$}
-  \gdef^^d8{\O}
-  \gdef^^d9{\`U}
-  \gdef^^da{\'U}
-  \gdef^^db{\^U}
-  \gdef^^dc{\"U}
-  \gdef^^dd{\'Y}
-  \gdef^^de{\TH}
-  \gdef^^df{\ss}
-  %
-  \gdef^^e0{\`a}
-  \gdef^^e1{\'a}
-  \gdef^^e2{\^a}
-  \gdef^^e3{\~a}
-  \gdef^^e4{\"a}
-  \gdef^^e5{\ringaccent a}
-  \gdef^^e6{\ae}
-  \gdef^^e7{\cedilla c}
-  \gdef^^e8{\`e}
-  \gdef^^e9{\'e}
-  \gdef^^ea{\^e}
-  \gdef^^eb{\"e}
-  \gdef^^ec{\`{\dotless i}}
-  \gdef^^ed{\'{\dotless i}}
-  \gdef^^ee{\^{\dotless i}}
-  \gdef^^ef{\"{\dotless i}}
-  %
-  \gdef^^f0{\dh}
-  \gdef^^f1{\~n}
-  \gdef^^f2{\`o}
-  \gdef^^f3{\'o}
-  \gdef^^f4{\^o}
-  \gdef^^f5{\~o}
-  \gdef^^f6{\"o}
-  \gdef^^f7{$\div$}
-  \gdef^^f8{\o}
-  \gdef^^f9{\`u}
-  \gdef^^fa{\'u}
-  \gdef^^fb{\^u}
-  \gdef^^fc{\"u}
-  \gdef^^fd{\'y}
-  \gdef^^fe{\th}
-  \gdef^^ff{\"y}
-}
-
-% Latin9 (ISO-8859-15) encoding character definitions.
-\def\latninechardefs{%
-  % Encoding is almost identical to Latin1.
-  \latonechardefs
-  %
-  \gdef^^a4{\euro}
-  \gdef^^a6{\v S}
-  \gdef^^a8{\v s}
-  \gdef^^b4{\v Z}
-  \gdef^^b8{\v z}
-  \gdef^^bc{\OE}
-  \gdef^^bd{\oe}
-  \gdef^^be{\"Y}
-}
-
-% Latin2 (ISO-8859-2) character definitions.
-\def\lattwochardefs{%
-  \gdef^^a0{~}
-  \gdef^^a1{\ogonek{A}}
-  \gdef^^a2{\u{}}
-  \gdef^^a3{\L}
-  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-  \gdef^^a5{\v L}
-  \gdef^^a6{\'S}
-  \gdef^^a7{\S}
-  \gdef^^a8{\"{}}
-  \gdef^^a9{\v S}
-  \gdef^^aa{\cedilla S}
-  \gdef^^ab{\v T}
-  \gdef^^ac{\'Z}
-  \gdef^^ad{\-}
-  \gdef^^ae{\v Z}
-  \gdef^^af{\dotaccent Z}
-  %
-  \gdef^^b0{\textdegree}
-  \gdef^^b1{\ogonek{a}}
-  \gdef^^b2{\ogonek{ }}
-  \gdef^^b3{\l}
-  \gdef^^b4{\'{}}
-  \gdef^^b5{\v l}
-  \gdef^^b6{\'s}
-  \gdef^^b7{\v{}}
-  \gdef^^b8{\cedilla\ }
-  \gdef^^b9{\v s}
-  \gdef^^ba{\cedilla s}
-  \gdef^^bb{\v t}
-  \gdef^^bc{\'z}
-  \gdef^^bd{\H{}}
-  \gdef^^be{\v z}
-  \gdef^^bf{\dotaccent z}
-  %
-  \gdef^^c0{\'R}
-  \gdef^^c1{\'A}
-  \gdef^^c2{\^A}
-  \gdef^^c3{\u A}
-  \gdef^^c4{\"A}
-  \gdef^^c5{\'L}
-  \gdef^^c6{\'C}
-  \gdef^^c7{\cedilla C}
-  \gdef^^c8{\v C}
-  \gdef^^c9{\'E}
-  \gdef^^ca{\ogonek{E}}
-  \gdef^^cb{\"E}
-  \gdef^^cc{\v E}
-  \gdef^^cd{\'I}
-  \gdef^^ce{\^I}
-  \gdef^^cf{\v D}
-  %
-  \gdef^^d0{\DH}
-  \gdef^^d1{\'N}
-  \gdef^^d2{\v N}
-  \gdef^^d3{\'O}
-  \gdef^^d4{\^O}
-  \gdef^^d5{\H O}
-  \gdef^^d6{\"O}
-  \gdef^^d7{$\times$}
-  \gdef^^d8{\v R}
-  \gdef^^d9{\ringaccent U}
-  \gdef^^da{\'U}
-  \gdef^^db{\H U}
-  \gdef^^dc{\"U}
-  \gdef^^dd{\'Y}
-  \gdef^^de{\cedilla T}
-  \gdef^^df{\ss}
-  %
-  \gdef^^e0{\'r}
-  \gdef^^e1{\'a}
-  \gdef^^e2{\^a}
-  \gdef^^e3{\u a}
-  \gdef^^e4{\"a}
-  \gdef^^e5{\'l}
-  \gdef^^e6{\'c}
-  \gdef^^e7{\cedilla c}
-  \gdef^^e8{\v c}
-  \gdef^^e9{\'e}
-  \gdef^^ea{\ogonek{e}}
-  \gdef^^eb{\"e}
-  \gdef^^ec{\v e}
-  \gdef^^ed{\'\i}
-  \gdef^^ee{\^\i}
-  \gdef^^ef{\v d}
-  %
-  \gdef^^f0{\dh}
-  \gdef^^f1{\'n}
-  \gdef^^f2{\v n}
-  \gdef^^f3{\'o}
-  \gdef^^f4{\^o}
-  \gdef^^f5{\H o}
-  \gdef^^f6{\"o}
-  \gdef^^f7{$\div$}
-  \gdef^^f8{\v r}
-  \gdef^^f9{\ringaccent u}
-  \gdef^^fa{\'u}
-  \gdef^^fb{\H u}
-  \gdef^^fc{\"u}
-  \gdef^^fd{\'y}
-  \gdef^^fe{\cedilla t}
-  \gdef^^ff{\dotaccent{}}
-}
-
-% UTF-8 character definitions.
-%
-% This code to support UTF-8 is based on LaTeX's utf8.def, with some
-% changes for Texinfo conventions.  It is included here under the GPL by
-% permission from Frank Mittelbach and the LaTeX team.
-%
-\newcount\countUTFx
-\newcount\countUTFy
-\newcount\countUTFz
-
-\gdef\UTFviiiTwoOctets#1#2{\expandafter
-   \UTFviiiDefined\csname u8:#1\string #2\endcsname}
-%
-\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
-   \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
-%
-\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
-   \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
-
-\gdef\UTFviiiDefined#1{%
-  \ifx #1\relax
-    \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
-  \else
-    \expandafter #1%
-  \fi
-}
-
-\begingroup
-  \catcode`\~13
-  \catcode`\"12
-
-  \def\UTFviiiLoop{%
-    \global\catcode\countUTFx\active
-    \uccode`\~\countUTFx
-    \uppercase\expandafter{\UTFviiiTmp}%
-    \advance\countUTFx by 1
-    \ifnum\countUTFx < \countUTFy
-      \expandafter\UTFviiiLoop
-    \fi}
-
-  \countUTFx = "C2
-  \countUTFy = "E0
-  \def\UTFviiiTmp{%
-    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
-  \UTFviiiLoop
-
-  \countUTFx = "E0
-  \countUTFy = "F0
-  \def\UTFviiiTmp{%
-    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
-  \UTFviiiLoop
-
-  \countUTFx = "F0
-  \countUTFy = "F4
-  \def\UTFviiiTmp{%
-    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
-  \UTFviiiLoop
-\endgroup
-
-\begingroup
-  \catcode`\"=12
-  \catcode`\<=12
-  \catcode`\.=12
-  \catcode`\,=12
-  \catcode`\;=12
-  \catcode`\!=12
-  \catcode`\~=13
-
-  \gdef\DeclareUnicodeCharacter#1#2{%
-    \countUTFz = "#1\relax
-    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
-    \begingroup
-      \parseXMLCharref
-      \def\UTFviiiTwoOctets##1##2{%
-        \csname u8:##1\string ##2\endcsname}%
-      \def\UTFviiiThreeOctets##1##2##3{%
-        \csname u8:##1\string ##2\string ##3\endcsname}%
-      \def\UTFviiiFourOctets##1##2##3##4{%
-        \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
-      \expandafter\expandafter\expandafter\expandafter
-       \expandafter\expandafter\expandafter
-       \gdef\UTFviiiTmp{#2}%
-    \endgroup}
-
-  \gdef\parseXMLCharref{%
-    \ifnum\countUTFz < "A0\relax
-      \errhelp = \EMsimple
-      \errmessage{Cannot define Unicode char value < 00A0}%
-    \else\ifnum\countUTFz < "800\relax
-      \parseUTFviiiA,%
-      \parseUTFviiiB C\UTFviiiTwoOctets.,%
-    \else\ifnum\countUTFz < "10000\relax
-      \parseUTFviiiA;%
-      \parseUTFviiiA,%
-      \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
-    \else
-      \parseUTFviiiA;%
-      \parseUTFviiiA,%
-      \parseUTFviiiA!%
-      \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
-    \fi\fi\fi
-  }
-
-  \gdef\parseUTFviiiA#1{%
-    \countUTFx = \countUTFz
-    \divide\countUTFz by 64
-    \countUTFy = \countUTFz
-    \multiply\countUTFz by 64
-    \advance\countUTFx by -\countUTFz
-    \advance\countUTFx by 128
-    \uccode `#1\countUTFx
-    \countUTFz = \countUTFy}
-
-  \gdef\parseUTFviiiB#1#2#3#4{%
-    \advance\countUTFz by "#10\relax
-    \uccode `#3\countUTFz
-    \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
-\endgroup
-
-\def\utfeightchardefs{%
-  \DeclareUnicodeCharacter{00A0}{\tie}
-  \DeclareUnicodeCharacter{00A1}{\exclamdown}
-  \DeclareUnicodeCharacter{00A3}{\pounds}
-  \DeclareUnicodeCharacter{00A8}{\"{ }}
-  \DeclareUnicodeCharacter{00A9}{\copyright}
-  \DeclareUnicodeCharacter{00AA}{\ordf}
-  \DeclareUnicodeCharacter{00AB}{\guillemetleft}
-  \DeclareUnicodeCharacter{00AD}{\-}
-  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
-  \DeclareUnicodeCharacter{00AF}{\={ }}
-
-  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
-  \DeclareUnicodeCharacter{00B4}{\'{ }}
-  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
-  \DeclareUnicodeCharacter{00BA}{\ordm}
-  \DeclareUnicodeCharacter{00BB}{\guillemetright}
-  \DeclareUnicodeCharacter{00BF}{\questiondown}
-
-  \DeclareUnicodeCharacter{00C0}{\`A}
-  \DeclareUnicodeCharacter{00C1}{\'A}
-  \DeclareUnicodeCharacter{00C2}{\^A}
-  \DeclareUnicodeCharacter{00C3}{\~A}
-  \DeclareUnicodeCharacter{00C4}{\"A}
-  \DeclareUnicodeCharacter{00C5}{\AA}
-  \DeclareUnicodeCharacter{00C6}{\AE}
-  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
-  \DeclareUnicodeCharacter{00C8}{\`E}
-  \DeclareUnicodeCharacter{00C9}{\'E}
-  \DeclareUnicodeCharacter{00CA}{\^E}
-  \DeclareUnicodeCharacter{00CB}{\"E}
-  \DeclareUnicodeCharacter{00CC}{\`I}
-  \DeclareUnicodeCharacter{00CD}{\'I}
-  \DeclareUnicodeCharacter{00CE}{\^I}
-  \DeclareUnicodeCharacter{00CF}{\"I}
-
-  \DeclareUnicodeCharacter{00D0}{\DH}
-  \DeclareUnicodeCharacter{00D1}{\~N}
-  \DeclareUnicodeCharacter{00D2}{\`O}
-  \DeclareUnicodeCharacter{00D3}{\'O}
-  \DeclareUnicodeCharacter{00D4}{\^O}
-  \DeclareUnicodeCharacter{00D5}{\~O}
-  \DeclareUnicodeCharacter{00D6}{\"O}
-  \DeclareUnicodeCharacter{00D8}{\O}
-  \DeclareUnicodeCharacter{00D9}{\`U}
-  \DeclareUnicodeCharacter{00DA}{\'U}
-  \DeclareUnicodeCharacter{00DB}{\^U}
-  \DeclareUnicodeCharacter{00DC}{\"U}
-  \DeclareUnicodeCharacter{00DD}{\'Y}
-  \DeclareUnicodeCharacter{00DE}{\TH}
-  \DeclareUnicodeCharacter{00DF}{\ss}
-
-  \DeclareUnicodeCharacter{00E0}{\`a}
-  \DeclareUnicodeCharacter{00E1}{\'a}
-  \DeclareUnicodeCharacter{00E2}{\^a}
-  \DeclareUnicodeCharacter{00E3}{\~a}
-  \DeclareUnicodeCharacter{00E4}{\"a}
-  \DeclareUnicodeCharacter{00E5}{\aa}
-  \DeclareUnicodeCharacter{00E6}{\ae}
-  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
-  \DeclareUnicodeCharacter{00E8}{\`e}
-  \DeclareUnicodeCharacter{00E9}{\'e}
-  \DeclareUnicodeCharacter{00EA}{\^e}
-  \DeclareUnicodeCharacter{00EB}{\"e}
-  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
-  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
-  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
-  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
-
-  \DeclareUnicodeCharacter{00F0}{\dh}
-  \DeclareUnicodeCharacter{00F1}{\~n}
-  \DeclareUnicodeCharacter{00F2}{\`o}
-  \DeclareUnicodeCharacter{00F3}{\'o}
-  \DeclareUnicodeCharacter{00F4}{\^o}
-  \DeclareUnicodeCharacter{00F5}{\~o}
-  \DeclareUnicodeCharacter{00F6}{\"o}
-  \DeclareUnicodeCharacter{00F8}{\o}
-  \DeclareUnicodeCharacter{00F9}{\`u}
-  \DeclareUnicodeCharacter{00FA}{\'u}
-  \DeclareUnicodeCharacter{00FB}{\^u}
-  \DeclareUnicodeCharacter{00FC}{\"u}
-  \DeclareUnicodeCharacter{00FD}{\'y}
-  \DeclareUnicodeCharacter{00FE}{\th}
-  \DeclareUnicodeCharacter{00FF}{\"y}
-
-  \DeclareUnicodeCharacter{0100}{\=A}
-  \DeclareUnicodeCharacter{0101}{\=a}
-  \DeclareUnicodeCharacter{0102}{\u{A}}
-  \DeclareUnicodeCharacter{0103}{\u{a}}
-  \DeclareUnicodeCharacter{0104}{\ogonek{A}}
-  \DeclareUnicodeCharacter{0105}{\ogonek{a}}
-  \DeclareUnicodeCharacter{0106}{\'C}
-  \DeclareUnicodeCharacter{0107}{\'c}
-  \DeclareUnicodeCharacter{0108}{\^C}
-  \DeclareUnicodeCharacter{0109}{\^c}
-  \DeclareUnicodeCharacter{0118}{\ogonek{E}}
-  \DeclareUnicodeCharacter{0119}{\ogonek{e}}
-  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
-  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
-  \DeclareUnicodeCharacter{010C}{\v{C}}
-  \DeclareUnicodeCharacter{010D}{\v{c}}
-  \DeclareUnicodeCharacter{010E}{\v{D}}
-
-  \DeclareUnicodeCharacter{0112}{\=E}
-  \DeclareUnicodeCharacter{0113}{\=e}
-  \DeclareUnicodeCharacter{0114}{\u{E}}
-  \DeclareUnicodeCharacter{0115}{\u{e}}
-  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
-  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
-  \DeclareUnicodeCharacter{011A}{\v{E}}
-  \DeclareUnicodeCharacter{011B}{\v{e}}
-  \DeclareUnicodeCharacter{011C}{\^G}
-  \DeclareUnicodeCharacter{011D}{\^g}
-  \DeclareUnicodeCharacter{011E}{\u{G}}
-  \DeclareUnicodeCharacter{011F}{\u{g}}
-
-  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
-  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
-  \DeclareUnicodeCharacter{0124}{\^H}
-  \DeclareUnicodeCharacter{0125}{\^h}
-  \DeclareUnicodeCharacter{0128}{\~I}
-  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
-  \DeclareUnicodeCharacter{012A}{\=I}
-  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
-  \DeclareUnicodeCharacter{012C}{\u{I}}
-  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
-
-  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
-  \DeclareUnicodeCharacter{0131}{\dotless{i}}
-  \DeclareUnicodeCharacter{0132}{IJ}
-  \DeclareUnicodeCharacter{0133}{ij}
-  \DeclareUnicodeCharacter{0134}{\^J}
-  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
-  \DeclareUnicodeCharacter{0139}{\'L}
-  \DeclareUnicodeCharacter{013A}{\'l}
-
-  \DeclareUnicodeCharacter{0141}{\L}
-  \DeclareUnicodeCharacter{0142}{\l}
-  \DeclareUnicodeCharacter{0143}{\'N}
-  \DeclareUnicodeCharacter{0144}{\'n}
-  \DeclareUnicodeCharacter{0147}{\v{N}}
-  \DeclareUnicodeCharacter{0148}{\v{n}}
-  \DeclareUnicodeCharacter{014C}{\=O}
-  \DeclareUnicodeCharacter{014D}{\=o}
-  \DeclareUnicodeCharacter{014E}{\u{O}}
-  \DeclareUnicodeCharacter{014F}{\u{o}}
-
-  \DeclareUnicodeCharacter{0150}{\H{O}}
-  \DeclareUnicodeCharacter{0151}{\H{o}}
-  \DeclareUnicodeCharacter{0152}{\OE}
-  \DeclareUnicodeCharacter{0153}{\oe}
-  \DeclareUnicodeCharacter{0154}{\'R}
-  \DeclareUnicodeCharacter{0155}{\'r}
-  \DeclareUnicodeCharacter{0158}{\v{R}}
-  \DeclareUnicodeCharacter{0159}{\v{r}}
-  \DeclareUnicodeCharacter{015A}{\'S}
-  \DeclareUnicodeCharacter{015B}{\'s}
-  \DeclareUnicodeCharacter{015C}{\^S}
-  \DeclareUnicodeCharacter{015D}{\^s}
-  \DeclareUnicodeCharacter{015E}{\cedilla{S}}
-  \DeclareUnicodeCharacter{015F}{\cedilla{s}}
-
-  \DeclareUnicodeCharacter{0160}{\v{S}}
-  \DeclareUnicodeCharacter{0161}{\v{s}}
-  \DeclareUnicodeCharacter{0162}{\cedilla{t}}
-  \DeclareUnicodeCharacter{0163}{\cedilla{T}}
-  \DeclareUnicodeCharacter{0164}{\v{T}}
-
-  \DeclareUnicodeCharacter{0168}{\~U}
-  \DeclareUnicodeCharacter{0169}{\~u}
-  \DeclareUnicodeCharacter{016A}{\=U}
-  \DeclareUnicodeCharacter{016B}{\=u}
-  \DeclareUnicodeCharacter{016C}{\u{U}}
-  \DeclareUnicodeCharacter{016D}{\u{u}}
-  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
-  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
-
-  \DeclareUnicodeCharacter{0170}{\H{U}}
-  \DeclareUnicodeCharacter{0171}{\H{u}}
-  \DeclareUnicodeCharacter{0174}{\^W}
-  \DeclareUnicodeCharacter{0175}{\^w}
-  \DeclareUnicodeCharacter{0176}{\^Y}
-  \DeclareUnicodeCharacter{0177}{\^y}
-  \DeclareUnicodeCharacter{0178}{\"Y}
-  \DeclareUnicodeCharacter{0179}{\'Z}
-  \DeclareUnicodeCharacter{017A}{\'z}
-  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
-  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
-  \DeclareUnicodeCharacter{017D}{\v{Z}}
-  \DeclareUnicodeCharacter{017E}{\v{z}}
-
-  \DeclareUnicodeCharacter{01C4}{D\v{Z}}
-  \DeclareUnicodeCharacter{01C5}{D\v{z}}
-  \DeclareUnicodeCharacter{01C6}{d\v{z}}
-  \DeclareUnicodeCharacter{01C7}{LJ}
-  \DeclareUnicodeCharacter{01C8}{Lj}
-  \DeclareUnicodeCharacter{01C9}{lj}
-  \DeclareUnicodeCharacter{01CA}{NJ}
-  \DeclareUnicodeCharacter{01CB}{Nj}
-  \DeclareUnicodeCharacter{01CC}{nj}
-  \DeclareUnicodeCharacter{01CD}{\v{A}}
-  \DeclareUnicodeCharacter{01CE}{\v{a}}
-  \DeclareUnicodeCharacter{01CF}{\v{I}}
-
-  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
-  \DeclareUnicodeCharacter{01D1}{\v{O}}
-  \DeclareUnicodeCharacter{01D2}{\v{o}}
-  \DeclareUnicodeCharacter{01D3}{\v{U}}
-  \DeclareUnicodeCharacter{01D4}{\v{u}}
-
-  \DeclareUnicodeCharacter{01E2}{\={\AE}}
-  \DeclareUnicodeCharacter{01E3}{\={\ae}}
-  \DeclareUnicodeCharacter{01E6}{\v{G}}
-  \DeclareUnicodeCharacter{01E7}{\v{g}}
-  \DeclareUnicodeCharacter{01E8}{\v{K}}
-  \DeclareUnicodeCharacter{01E9}{\v{k}}
-
-  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
-  \DeclareUnicodeCharacter{01F1}{DZ}
-  \DeclareUnicodeCharacter{01F2}{Dz}
-  \DeclareUnicodeCharacter{01F3}{dz}
-  \DeclareUnicodeCharacter{01F4}{\'G}
-  \DeclareUnicodeCharacter{01F5}{\'g}
-  \DeclareUnicodeCharacter{01F8}{\`N}
-  \DeclareUnicodeCharacter{01F9}{\`n}
-  \DeclareUnicodeCharacter{01FC}{\'{\AE}}
-  \DeclareUnicodeCharacter{01FD}{\'{\ae}}
-  \DeclareUnicodeCharacter{01FE}{\'{\O}}
-  \DeclareUnicodeCharacter{01FF}{\'{\o}}
-
-  \DeclareUnicodeCharacter{021E}{\v{H}}
-  \DeclareUnicodeCharacter{021F}{\v{h}}
-
-  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
-  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
-  \DeclareUnicodeCharacter{0228}{\cedilla{E}}
-  \DeclareUnicodeCharacter{0229}{\cedilla{e}}
-  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
-  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
-
-  \DeclareUnicodeCharacter{0232}{\=Y}
-  \DeclareUnicodeCharacter{0233}{\=y}
-  \DeclareUnicodeCharacter{0237}{\dotless{j}}
-
-  \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
-
-  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
-  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
-  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
-  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
-  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
-  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
-  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
-  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
-  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
-  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
-  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
-  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
-
-  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
-  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
-
-  \DeclareUnicodeCharacter{1E20}{\=G}
-  \DeclareUnicodeCharacter{1E21}{\=g}
-  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
-  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
-  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
-  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
-  \DeclareUnicodeCharacter{1E26}{\"H}
-  \DeclareUnicodeCharacter{1E27}{\"h}
-
-  \DeclareUnicodeCharacter{1E30}{\'K}
-  \DeclareUnicodeCharacter{1E31}{\'k}
-  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
-  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
-  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
-  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
-  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
-  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
-  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
-  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
-  \DeclareUnicodeCharacter{1E3E}{\'M}
-  \DeclareUnicodeCharacter{1E3F}{\'m}
-
-  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
-  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
-  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
-  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
-  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
-  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
-  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
-  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
-  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
-  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
-
-  \DeclareUnicodeCharacter{1E54}{\'P}
-  \DeclareUnicodeCharacter{1E55}{\'p}
-  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
-  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
-  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
-  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
-  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
-  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
-  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
-  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
-
-  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
-  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
-  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
-  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
-  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
-  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
-  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
-  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
-  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
-  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
-
-  \DeclareUnicodeCharacter{1E7C}{\~V}
-  \DeclareUnicodeCharacter{1E7D}{\~v}
-  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
-  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
-
-  \DeclareUnicodeCharacter{1E80}{\`W}
-  \DeclareUnicodeCharacter{1E81}{\`w}
-  \DeclareUnicodeCharacter{1E82}{\'W}
-  \DeclareUnicodeCharacter{1E83}{\'w}
-  \DeclareUnicodeCharacter{1E84}{\"W}
-  \DeclareUnicodeCharacter{1E85}{\"w}
-  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
-  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
-  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
-  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
-  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
-  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
-  \DeclareUnicodeCharacter{1E8C}{\"X}
-  \DeclareUnicodeCharacter{1E8D}{\"x}
-  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
-  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
-
-  \DeclareUnicodeCharacter{1E90}{\^Z}
-  \DeclareUnicodeCharacter{1E91}{\^z}
-  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
-  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
-  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
-  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
-  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
-  \DeclareUnicodeCharacter{1E97}{\"t}
-  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
-  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
-
-  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
-  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
-
-  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
-  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
-  \DeclareUnicodeCharacter{1EBC}{\~E}
-  \DeclareUnicodeCharacter{1EBD}{\~e}
-
-  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
-  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
-  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
-  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
-
-  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
-  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
-
-  \DeclareUnicodeCharacter{1EF2}{\`Y}
-  \DeclareUnicodeCharacter{1EF3}{\`y}
-  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
-
-  \DeclareUnicodeCharacter{1EF8}{\~Y}
-  \DeclareUnicodeCharacter{1EF9}{\~y}
-
-  \DeclareUnicodeCharacter{2013}{--}
-  \DeclareUnicodeCharacter{2014}{---}
-  \DeclareUnicodeCharacter{2018}{\quoteleft}
-  \DeclareUnicodeCharacter{2019}{\quoteright}
-  \DeclareUnicodeCharacter{201A}{\quotesinglbase}
-  \DeclareUnicodeCharacter{201C}{\quotedblleft}
-  \DeclareUnicodeCharacter{201D}{\quotedblright}
-  \DeclareUnicodeCharacter{201E}{\quotedblbase}
-  \DeclareUnicodeCharacter{2022}{\bullet}
-  \DeclareUnicodeCharacter{2026}{\dots}
-  \DeclareUnicodeCharacter{2039}{\guilsinglleft}
-  \DeclareUnicodeCharacter{203A}{\guilsinglright}
-  \DeclareUnicodeCharacter{20AC}{\euro}
-
-  \DeclareUnicodeCharacter{2192}{\expansion}
-  \DeclareUnicodeCharacter{21D2}{\result}
-
-  \DeclareUnicodeCharacter{2212}{\minus}
-  \DeclareUnicodeCharacter{2217}{\point}
-  \DeclareUnicodeCharacter{2261}{\equiv}
-}% end of \utfeightchardefs
-
-
-% US-ASCII character definitions.
-\def\asciichardefs{% nothing need be done
-   \relax
-}
-
-% Make non-ASCII characters printable again for compatibility with
-% existing Texinfo documents that may use them, even without declaring a
-% document encoding.
-%
-\setnonasciicharscatcode \other
-
-
-\message{formatting,}
-
-\newdimen\defaultparindent \defaultparindent = 15pt
-
-\chapheadingskip = 15pt plus 4pt minus 2pt
-\secheadingskip = 12pt plus 3pt minus 2pt
-\subsecheadingskip = 9pt plus 2pt minus 2pt
-
-% Prevent underfull vbox error messages.
-\vbadness = 10000
-
-% Don't be so finicky about underfull hboxes, either.
-\hbadness = 2000
-
-% Following George Bush, get rid of widows and orphans.
-\widowpenalty=10000
-\clubpenalty=10000
-
-% Use TeX 3.0's \emergencystretch to help line breaking, but if we're
-% using an old version of TeX, don't do anything.  We want the amount of
-% stretch added to depend on the line length, hence the dependence on
-% \hsize.  We call this whenever the paper size is set.
-%
-\def\setemergencystretch{%
-  \ifx\emergencystretch\thisisundefined
-    % Allow us to assign to \emergencystretch anyway.
-    \def\emergencystretch{\dimen0}%
-  \else
-    \emergencystretch = .15\hsize
-  \fi
-}
-
-% Parameters in order: 1) textheight; 2) textwidth;
-% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
-% 7) physical page height; 8) physical page width.
-%
-% We also call \setleading{\textleading}, so the caller should define
-% \textleading.  The caller should also set \parskip.
-%
-\def\internalpagesizes#1#2#3#4#5#6#7#8{%
-  \voffset = #3\relax
-  \topskip = #6\relax
-  \splittopskip = \topskip
-  %
-  \vsize = #1\relax
-  \advance\vsize by \topskip
-  \outervsize = \vsize
-  \advance\outervsize by 2\topandbottommargin
-  \pageheight = \vsize
-  %
-  \hsize = #2\relax
-  \outerhsize = \hsize
-  \advance\outerhsize by 0.5in
-  \pagewidth = \hsize
-  %
-  \normaloffset = #4\relax
-  \bindingoffset = #5\relax
-  %
-  \ifpdf
-    \pdfpageheight #7\relax
-    \pdfpagewidth #8\relax
-    % if we don't reset these, they will remain at "1 true in" of
-    % whatever layout pdftex was dumped with.
-    \pdfhorigin = 1 true in
-    \pdfvorigin = 1 true in
-  \fi
-  %
-  \setleading{\textleading}
-  %
-  \parindent = \defaultparindent
-  \setemergencystretch
-}
-
-% @letterpaper (the default).
-\def\letterpaper{{\globaldefs = 1
-  \parskip = 3pt plus 2pt minus 1pt
-  \textleading = 13.2pt
-  %
-  % If page is nothing but text, make it come out even.
-  \internalpagesizes{607.2pt}{6in}% that's 46 lines
-                    {\voffset}{.25in}%
-                    {\bindingoffset}{36pt}%
-                    {11in}{8.5in}%
-}}
-
-% Use @smallbook to reset parameters for 7x9.25 trim size.
-\def\smallbook{{\globaldefs = 1
-  \parskip = 2pt plus 1pt
-  \textleading = 12pt
-  %
-  \internalpagesizes{7.5in}{5in}%
-                    {-.2in}{0in}%
-                    {\bindingoffset}{16pt}%
-                    {9.25in}{7in}%
-  %
-  \lispnarrowing = 0.3in
-  \tolerance = 700
-  \hfuzz = 1pt
-  \contentsrightmargin = 0pt
-  \defbodyindent = .5cm
-}}
-
-% Use @smallerbook to reset parameters for 6x9 trim size.
-% (Just testing, parameters still in flux.)
-\def\smallerbook{{\globaldefs = 1
-  \parskip = 1.5pt plus 1pt
-  \textleading = 12pt
-  %
-  \internalpagesizes{7.4in}{4.8in}%
-                    {-.2in}{-.4in}%
-                    {0pt}{14pt}%
-                    {9in}{6in}%
-  %
-  \lispnarrowing = 0.25in
-  \tolerance = 700
-  \hfuzz = 1pt
-  \contentsrightmargin = 0pt
-  \defbodyindent = .4cm
-}}
-
-% Use @afourpaper to print on European A4 paper.
-\def\afourpaper{{\globaldefs = 1
-  \parskip = 3pt plus 2pt minus 1pt
-  \textleading = 13.2pt
-  %
-  % Double-side printing via postscript on Laserjet 4050
-  % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
-  % To change the settings for a different printer or situation, adjust
-  % \normaloffset until the front-side and back-side texts align.  Then
-  % do the same for \bindingoffset.  You can set these for testing in
-  % your texinfo source file like this:
-  % @tex
-  % \global\normaloffset = -6mm
-  % \global\bindingoffset = 10mm
-  % @end tex
-  \internalpagesizes{673.2pt}{160mm}% that's 51 lines
-                    {\voffset}{\hoffset}%
-                    {\bindingoffset}{44pt}%
-                    {297mm}{210mm}%
-  %
-  \tolerance = 700
-  \hfuzz = 1pt
-  \contentsrightmargin = 0pt
-  \defbodyindent = 5mm
-}}
-
-% Use @afivepaper to print on European A5 paper.
-% From romildo@urano.iceb.ufop.br, 2 July 2000.
-% He also recommends making @example and @lisp be small.
-\def\afivepaper{{\globaldefs = 1
-  \parskip = 2pt plus 1pt minus 0.1pt
-  \textleading = 12.5pt
-  %
-  \internalpagesizes{160mm}{120mm}%
-                    {\voffset}{\hoffset}%
-                    {\bindingoffset}{8pt}%
-                    {210mm}{148mm}%
-  %
-  \lispnarrowing = 0.2in
-  \tolerance = 800
-  \hfuzz = 1.2pt
-  \contentsrightmargin = 0pt
-  \defbodyindent = 2mm
-  \tableindent = 12mm
-}}
-
-% A specific text layout, 24x15cm overall, intended for A4 paper.
-\def\afourlatex{{\globaldefs = 1
-  \afourpaper
-  \internalpagesizes{237mm}{150mm}%
-                    {\voffset}{4.6mm}%
-                    {\bindingoffset}{7mm}%
-                    {297mm}{210mm}%
-  %
-  % Must explicitly reset to 0 because we call \afourpaper.
-  \globaldefs = 0
-}}
-
-% Use @afourwide to print on A4 paper in landscape format.
-\def\afourwide{{\globaldefs = 1
-  \afourpaper
-  \internalpagesizes{241mm}{165mm}%
-                    {\voffset}{-2.95mm}%
-                    {\bindingoffset}{7mm}%
-                    {297mm}{210mm}%
-  \globaldefs = 0
-}}
-
-% @pagesizes TEXTHEIGHT[,TEXTWIDTH]
-% Perhaps we should allow setting the margins, \topskip, \parskip,
-% and/or leading, also. Or perhaps we should compute them somehow.
-%
-\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
-\def\pagesizesyyy#1,#2,#3\finish{{%
-  \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
-  \globaldefs = 1
-  %
-  \parskip = 3pt plus 2pt minus 1pt
-  \setleading{\textleading}%
-  %
-  \dimen0 = #1\relax
-  \advance\dimen0 by \voffset
-  %
-  \dimen2 = \hsize
-  \advance\dimen2 by \normaloffset
-  %
-  \internalpagesizes{#1}{\hsize}%
-                    {\voffset}{\normaloffset}%
-                    {\bindingoffset}{44pt}%
-                    {\dimen0}{\dimen2}%
-}}
-
-% Set default to letter.
-%
-\letterpaper
-
-
-\message{and turning on texinfo input format.}
-
-% DEL is a comment character, in case @c does not suffice.
-\catcode`\^^? = 14
-
-% Define macros to output various characters with catcode for normal text.
-\catcode`\"=\other
-\catcode`\~=\other
-\catcode`\^=\other
-\catcode`\_=\other
-\catcode`\|=\other
-\catcode`\<=\other
-\catcode`\>=\other
-\catcode`\+=\other
-\catcode`\$=\other
-\def\normaldoublequote{"}
-\def\normaltilde{~}
-\def\normalcaret{^}
-\def\normalunderscore{_}
-\def\normalverticalbar{|}
-\def\normalless{<}
-\def\normalgreater{>}
-\def\normalplus{+}
-\def\normaldollar{$}%$ font-lock fix
-
-% This macro is used to make a character print one way in \tt
-% (where it can probably be output as-is), and another way in other fonts,
-% where something hairier probably needs to be done.
-%
-% #1 is what to print if we are indeed using \tt; #2 is what to print
-% otherwise.  Since all the Computer Modern typewriter fonts have zero
-% interword stretch (and shrink), and it is reasonable to expect all
-% typewriter fonts to have this, we can check that font parameter.
-%
-\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
-
-% Same as above, but check for italic font.  Actually this also catches
-% non-italic slanted fonts since it is impossible to distinguish them from
-% italic fonts.  But since this is only used by $ and it uses \sl anyway
-% this is not a problem.
-\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
-
-% Turn off all special characters except @
-% (and those which the user can use as if they were ordinary).
-% Most of these we simply print from the \tt font, but for some, we can
-% use math or other variants that look better in normal text.
-
-\catcode`\"=\active
-\def\activedoublequote{{\tt\char34}}
-\let"=\activedoublequote
-\catcode`\~=\active
-\def~{{\tt\char126}}
-\chardef\hat=`\^
-\catcode`\^=\active
-\def^{{\tt \hat}}
-
-\catcode`\_=\active
-\def_{\ifusingtt\normalunderscore\_}
-\let\realunder=_
-% Subroutine for the previous macro.
-\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
-
-\catcode`\|=\active
-\def|{{\tt\char124}}
-\chardef \less=`\<
-\catcode`\<=\active
-\def<{{\tt \less}}
-\chardef \gtr=`\>
-\catcode`\>=\active
-\def>{{\tt \gtr}}
-\catcode`\+=\active
-\def+{{\tt \char 43}}
-\catcode`\$=\active
-\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
-
-% If a .fmt file is being used, characters that might appear in a file
-% name cannot be active until we have parsed the command line.
-% So turn them off again, and have \everyjob (or @setfilename) turn them on.
-% \otherifyactive is called near the end of this file.
-\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
-
-% Used sometimes to turn off (effectively) the active characters even after
-% parsing them.
-\def\turnoffactive{%
-  \normalturnoffactive
-  \otherbackslash
-}
-
-\catcode`\@=0
-
-% \backslashcurfont outputs one backslash character in current font,
-% as in \char`\\.
-\global\chardef\backslashcurfont=`\\
-\global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
-
-% \realbackslash is an actual character `\' with catcode other, and
-% \doublebackslash is two of them (for the pdf outlines).
-{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
-
-% In texinfo, backslash is an active character; it prints the backslash
-% in fixed width font.
-\catcode`\\=\active
-@def@normalbackslash{{@tt@backslashcurfont}}
-% On startup, @fixbackslash assigns:
-%  @let \ = @normalbackslash
-
-% \rawbackslash defines an active \ to do \backslashcurfont.
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
-@gdef@rawbackslash{@let\=@backslashcurfont}
-@gdef@otherbackslash{@let\=@realbackslash}
-
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
-%
-@def@normalturnoffactive{%
-  @let\=@normalbackslash
-  @let"=@normaldoublequote
-  @let~=@normaltilde
-  @let^=@normalcaret
-  @let_=@normalunderscore
-  @let|=@normalverticalbar
-  @let<=@normalless
-  @let>=@normalgreater
-  @let+=@normalplus
-  @let$=@normaldollar %$ font-lock fix
-  @markupsetuplqdefault
-  @markupsetuprqdefault
-  @unsepspaces
-}
-
-% Make _ and + \other characters, temporarily.
-% This is canceled by @fixbackslash.
-@otherifyactive
-
-% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
-% That is what \eatinput is for; after that, the `\' should revert to printing
-% a backslash.
-%
-@gdef@eatinput input texinfo{@fixbackslash}
-@global@let\ = @eatinput
-
-% On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\' in the file would cause an error. This macro tries to fix
-% that, assuming it is called before the first `\' could plausibly occur.
-% Also turn back on active characters that might appear in the input
-% file name, in case not using a pre-dumped format.
-%
-@gdef@fixbackslash{%
-  @ifx\@eatinput @let\ = @normalbackslash @fi
-  @catcode`+=@active
-  @catcode`@_=@active
-}
-
-% Say @foo, not \foo, in error messages.
-@escapechar = `@@
-
-% These look ok in all fonts, so just make them not special.
-@catcode`@& = @other
-@catcode`@# = @other
-@catcode`@% = @other
-
-@c Finally, make ` and ' active, so that txicodequoteundirected and
-@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}.  If we
-@c don't make ` and ' active, @code will not get them as active chars.
-@c Do this last of all since we use ` in the previous @catcode assignments.
-@catcode`@'=@active
-@catcode`@`=@active
-@markupsetuplqdefault
-@markupsetuprqdefault
-
-@c Local variables:
-@c eval: (add-hook 'write-file-hooks 'time-stamp)
-@c page-delimiter: "^\\\\message"
-@c time-stamp-start: "def\\\\texinfoversion{"
-@c time-stamp-format: "%:y-%02m-%02d.%02H"
-@c time-stamp-end: "}"
-@c End:
-
-@c vim:sw=2:
-
-@ignore
-   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
-@end ignore

gmerlin-1.2.0.tar.gz/doc/version.texi Deleted

gmerlin-1.2.0.tar.gz/icons/Makefile.in Deleted

@@ -1,655 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = icons
-DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
-DATA = $(dist_pkgdata_DATA) $(pkgdata_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/gmerlin/icons
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-icons = \
-about_16.png \
-add_16.png \
-audio_16.png \
-bottom_16.png \
-camelot_icon.png \
-chapter_16.png \
-config_16.png \
-close_16.png \
-copy_16.png \
-cut_16.png \
-digit_0.png \
-digit_1.png \
-digit_2.png \
-digit_3.png \
-digit_4.png \
-digit_5.png \
-digit_6.png \
-digit_7.png \
-digit_8.png \
-digit_9.png \
-digit_colon.png \
-digit_dot.png \
-digit_minus.png \
-display_mode_all.png \
-display_mode_all_rem.png \
-display_mode_none.png \
-display_mode_rem.png \
-down_16.png \
-drive_16.png \
-drive_error_16.png \
-drive_running_16.png \
-earth_16.png \
-eject_16.png \
-favourites_16.png \
-favourites_closed_16.png \
-favourites_open_16.png \
-filter_16.png \
-find_16.png \
-first_16.png \
-folder_closed_16.png \
-folder_new_16.png \
-folder_open_16.png \
-fullscreen_16.png \
-goto_current_16.png \
-hardware_16.png \
-help_16.png \
-image_16.png \
-incoming_closed_16.png \
-incoming_open_16.png \
-info_16.png \
-kbd_icon.png \
-last_16.png \
-left_16.png \
-lock_16.png \
-log_16.png \
-mixer_icon.png \
-mute_16.png \
-paste_16.png \
-player_icon.png \
-plugin_16.png \
-plugincfg_icon.png \
-quit_16.png \
-record_16.png \
-recorder_icon.png \
-refresh_16.png \
-rename_16.png \
-repeat_mode_1.png \
-repeat_mode_all.png \
-repeat_mode_none.png \
-right_16.png \
-run_16.png \
-save_16.png \
-snapshot_16.png \
-sort_16.png \
-state_buffering_1.png \
-state_buffering_2.png \
-state_buffering_3.png \
-state_buffering_4.png \
-state_buffering_5.png \
-state_changing.png \
-state_error.png \
-state_mute.png \
-state_paused.png \
-state_playing.png \
-state_seeking.png \
-state_stopped.png \
-stop_16.png \
-tab_close.png \
-top_16.png \
-tearoff_16.png \
-tracks_dnd_32.png \
-trash_16.png \
-transcoder_icon.png \
-tree_root_16.png \
-tuner_16.png \
-up_16.png \
-video_16.png \
-visualizer_icon.png \
-windowed_16.png \
-gmerlin.jpg
-
-pkgdata_DATA = $(icons)
-dist_pkgdata_DATA = $(icons)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu icons/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-dist_pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_pkgdataDATA install-pkgdataDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_pkgdataDATA uninstall-local \
-	uninstall-pkgdataDATA
-
-.MAKE: install-am install-data-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook \
-	install-dist_pkgdataDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-dist_pkgdataDATA \
-	uninstall-local uninstall-pkgdataDATA
-
-
-install-data-hook:
-	test -z $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps || $(mkdir_p) $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
-	ln -sf $(DESTDIR)$(pkgdatadir)/mixer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/player_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/transcoder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/camelot_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-camelot.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/kbd_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-kbd.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/plugincfg_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/recorder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-recorder.png
-	ln -sf $(DESTDIR)$(pkgdatadir)/visualizer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
-
-uninstall-local:
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-camelot.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-kbd.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-recorder.png
-	-rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/include/Makefile.in Deleted

@@ -1,702 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-HEADERS = $(noinst_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = gmerlin gui_gtk x11
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$[^/]*$/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/$[^/]*$$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_X11_FALSE@x11_subdirs = 
-@HAVE_X11_TRUE@x11_subdirs = x11
-SUBDIRS = gmerlin gui_gtk $(x11_subdirs)
-noinst_HEADERS = \
-bgfreetype.h \
-bgfrei0r.h \
-bglv.h \
-bgladspa.h \
-float_cast.h \
-frei0r.h \
-ladspa.h \
-language_table.h \
-md5.h \
-ovl2text.h \
-playerprivate.h \
-player_thread.h \
-recorder_private.h \
-registry_priv.h \
-treeprivate.h \
-pluginreg_priv.h \
-visualize_priv.h
-
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(HEADERS) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/include/config.h.in Deleted

@@ -1,230 +0,0 @@
-/* include/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* PowerPC Architecture */
-#undef ARCH_PPC
-
-/* Intel Architecture (32/64) */
-#undef ARCH_X86
-
-/* Intel Architecture (64) */
-#undef ARCH_X86_64
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* 3Dnow Supported */
-#undef HAVE_3DNOW
-
-/* Define to 1 if you have the `canonicalize_file_name' function. */
-#undef HAVE_CANONICALIZE_FILE_NAME
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the declaration of `MSG_NOSIGNAL', and to 0 if you
-   don't. */
-#undef HAVE_DECL_MSG_NOSIGNAL
-
-/* Define to 1 if you have the declaration of `SO_NOSIGPIPE', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SO_NOSIGPIPE
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* OpenGL available */
-#undef HAVE_GL
-
-/* GLX available */
-#undef HAVE_GLX
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* System supports inotify */
-#undef HAVE_INOTIFY
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `asound' library (-lasound). */
-#undef HAVE_LIBASOUND
-
-/* Do we have libcddb installed? */
-#undef HAVE_LIBCDDB
-
-/* Do we have libexif installed? */
-#undef HAVE_LIBEXIF
-
-/* Do we have libjpeg installed? */
-#undef HAVE_LIBJPEG
-
-/* Enable png codec */
-#undef HAVE_LIBPNG
-
-/* Enable tiff codec */
-#undef HAVE_LIBTIFF
-
-/* Do we have xinerama installed? */
-#undef HAVE_LIBXINERAMA
-
-/* Do we have xv installed? */
-#undef HAVE_LIBXV
-
-/* Define to 1 if you have the <linux/videodev2.h> header file. */
-#undef HAVE_LINUX_VIDEODEV2_H
-
-/* Define to 1 if you have the <linux/videodev.h> header file. */
-#undef HAVE_LINUX_VIDEODEV_H
-
-/* Define if you have C99's lrint function. */
-#undef HAVE_LRINT
-
-/* Define if you have C99's lrintf function. */
-#undef HAVE_LRINTF
-
-/* Do we have libvisual installed? */
-#undef HAVE_LV
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* MMX Supported */
-#undef HAVE_MMX
-
-/* Do we have libmusicbrainz installed? */
-#undef HAVE_MUSICBRAINZ
-
-/* System supports POSIX semaphores */
-#undef HAVE_POSIX_SEMAPHORES
-
-/* Do we have pulseaudio installed? */
-#undef HAVE_PULSEAUDIO
-
-/* Define to 1 if you have the <soundcard.h> header file. */
-#undef HAVE_SOUNDCARD_H
-
-/* SSE Supported */
-#undef HAVE_SSE
-
-/* SSE2 Supported */
-#undef HAVE_SSE2
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-#undef HAVE_SYS_SOUNDCARD_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Do we have v4l support? */
-#undef HAVE_V4L
-
-/* Do we have libv4lconvert installed? */
-#undef HAVE_V4LCONVERT
-
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
-
-/* Do we have X11 dpms extension installed? */
-#undef HAVE_XDPMS
-
-/* Do we have XFixes extension installed? */
-#undef HAVE_XFIXES
-
-/* Do we have xtest installed? */
-#undef HAVE_XTEST
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* libvisual plugin directory */
-#undef LV_PLUGIN_DIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Installation prefix */
-#undef PREFIX
-
-/* The size of `double', as computed by sizeof. */
-#undef SIZEOF_DOUBLE
-
-/* The size of `float', as computed by sizeof. */
-#undef SIZEOF_FLOAT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif

gmerlin-1.2.0.tar.gz/include/gmerlin/Makefile.in Deleted

@@ -1,604 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include/gmerlin
-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/bg_version.h.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES = bg_version.h
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgincludedir)"
-HEADERS = $(pkginclude_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pkginclude_HEADERS = \
-accelerator.h \
-bg_sem.h \
-bg_version.h \
-bggavl.h \
-bgsocket.h \
-cfg_dialog.h \
-cfg_registry.h \
-charset.h \
-cmdline.h \
-converters.h \
-edl.h \
-encoder.h \
-fileformat.h \
-filters.h \
-keycodes.h \
-lcdproc.h \
-log.h \
-mediafiledevice.h \
-msgqueue.h \
-ocr.h \
-osd.h \
-ov.h \
-parameter.h \
-player.h \
-playermsg.h \
-plugin.h \
-pluginfuncs.h \
-pluginregistry.h \
-preset.h \
-recorder.h \
-remote.h \
-serialize.h \
-singlepic.h \
-streaminfo.h \
-subprocess.h \
-textrenderer.h \
-transcoder.h \
-transcodermsg.h \
-transcoder_track.h \
-translation.h \
-tree.h \
-utils.h \
-visualize.h \
-xmlutils.h
-
-EXTRA_DIST = bg_version.h.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/gmerlin/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/gmerlin/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-bg_version.h: $(top_builddir)/config.status $(srcdir)/bg_version.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkgincludeHEADERS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/include/gmerlin/bg_version.h Deleted

gmerlin-1.2.0.tar.gz/include/gmerlin/fileformat.h Deleted

@@ -1,109 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#define BG_MK_FOURCC(a, b, c, d) ((a<<24)|(b<<16)|(c<<8)|d)
-
-typedef struct
-  {
-  int (*read_callback)(void * priv, uint8_t * data, int len);
-  int (*write_callback)(void * priv, const uint8_t * data, int len);
-  int64_t (*ftell_callback)(void * priv);
-  int64_t (*seek_callback)(void * priv, int64_t pos, int whence);
-  void (*close_callback)(void * priv);
-  void * data;
-
-  uint8_t * buffer;
-  int buffer_alloc;
-  } bg_f_io_t;
-
-int bg_f_io_open_stdio_read(bg_f_io_t * io, const char * filename);
-int bg_f_io_open_stdio_write(bg_f_io_t * io, const char * filename);
-
-void bg_f_io_close(bg_f_io_t * io);
-
-
-typedef enum
-  {
-    CHUNK_TYPE_SIGNATURE           = BG_MK_FOURCC('G','A','V','L'), 
-    CHUNK_TYPE_AUDIO_STREAM_HEADER = BG_MK_FOURCC('A','S','T','R'),
-    CHUNK_TYPE_VIDEO_STREAM_HEADER = BG_MK_FOURCC('V','S','T','R'),
-    CHUNK_TYPE_AUDIO_FORMAT        = BG_MK_FOURCC('A','F','M','T'),
-    CHUNK_TYPE_VIDEO_FORMAT        = BG_MK_FOURCC('V','F','M','T'),
-
-    CHUNK_TYPE_AUDIO_FRAME         = BG_MK_FOURCC('A','F','R','M'),
-    CHUNK_TYPE_VIDEO_FRAME         = BG_MK_FOURCC('V','F','R','M'),
-  } bg_f_chunk_type_t;
-
-typedef enum
-  {
-    SIG_TYPE_IMAGE               = BG_MK_FOURCC('I','M','A','G'), 
-  } bg_f_sig_type_t;
-
-typedef struct
-  {
-  uint32_t type;
-  uint64_t size;
-  uint64_t start; /* Set during writing */
-  } bg_f_chunk_t;
-
-int bg_f_chunk_read(bg_f_io_t * io, bg_f_chunk_t * ch);
-int bg_f_chunk_write_header(bg_f_io_t * io, bg_f_chunk_t * ch, bg_f_chunk_type_t type);
-int bg_f_chunk_write_footer(bg_f_io_t * io, bg_f_chunk_t * ch);
-
-typedef struct
-  {
-  uint32_t type;
-  } bg_f_signature_t;
-
-int bg_f_signature_read(bg_f_io_t * io, bg_f_chunk_t * ch, bg_f_signature_t * sig);
-int bg_f_signature_write(bg_f_io_t * io, bg_f_signature_t * sig);
-
-int bg_f_audio_format_read(bg_f_io_t * io, bg_f_chunk_t * ch, gavl_audio_format_t * f, int * big_endian);
-int bg_f_audio_format_write(bg_f_io_t * io, const gavl_audio_format_t * f);
-
-int bg_f_video_format_read(bg_f_io_t * io, bg_f_chunk_t * ch, gavl_video_format_t * f, int * big_endian);
-int bg_f_video_format_write(bg_f_io_t * io, const gavl_video_format_t * f);
-
-int bg_f_audio_frame_read(bg_f_io_t * io, bg_f_chunk_t * ch,
-                          const gavl_audio_format_t * format,
-                          gavl_audio_frame_t * f, int big_endian,
-                          gavl_dsp_context_t * ctx);
-
-int bg_f_audio_frame_write(bg_f_io_t * io,
-                           const gavl_audio_format_t * format,
-                           const gavl_audio_frame_t * f);
-
-int bg_f_video_frame_read(bg_f_io_t * io, bg_f_chunk_t * ch,
-                          const gavl_video_format_t * format,
-                          gavl_video_frame_t * f, int big_endian,
-                          gavl_dsp_context_t * ctx);
-
-int bg_f_video_frame_write(bg_f_io_t * io,
-                           const gavl_video_format_t * format,
-                           const gavl_video_frame_t * f);
-
-typedef struct
-  {
-  uint32_t id;
-  uint32_t language;
-  uint64_t duration;
-  } bg_f_stream_header_t;
-

gmerlin-1.2.0.tar.gz/include/gui_gtk/Makefile.in Deleted

@@ -1,581 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include/gui_gtk
-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgincludedir)"
-HEADERS = $(pkginclude_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/gmerlin/gui_gtk
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pkginclude_HEADERS = \
-aboutwindow.h \
-albumentry.h \
-audio.h \
-auth.h \
-button.h \
-multiinfo.h \
-chapterdialog.h \
-display.h \
-fileentry.h \
-driveselect.h \
-fileselect.h \
-gtkutils.h \
-infowindow.h \
-logwindow.h \
-message.h \
-plugin.h \
-presetmenu.h \
-question.h \
-scrolltext.h \
-slider.h \
-textview.h \
-tree.h \
-urllink.h \
-urlselect.h
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/gui_gtk/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/gui_gtk/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkgincludeHEADERS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/include/player_thread.h Deleted

@@ -1,55 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-typedef struct bg_player_thread_common_s bg_player_thread_common_t;
-typedef struct bg_player_thread_s        bg_player_thread_t;
-
-
-bg_player_thread_common_t *
-bg_player_thread_common_create();
-
-void bg_player_thread_common_destroy(bg_player_thread_common_t * com);
-
-bg_player_thread_t *
-bg_player_thread_create(bg_player_thread_common_t * com);
-
-void bg_player_thread_destroy(bg_player_thread_t * th);
-
-void bg_player_thread_set_func(bg_player_thread_t * th,
-                               void * (*func)(void*), void * arg);
-
-void bg_player_threads_init(bg_player_thread_t ** th, int num);
-
-void bg_player_threads_start(bg_player_thread_t ** th, int num);
-
-/* Pause all threads, resume with bg_player_threads_start */
-void bg_player_threads_pause(bg_player_thread_t ** th, int num);
-
-/* Stop and join all threads, must call bg_player_threads_init() after */
-void bg_player_threads_join(bg_player_thread_t ** th, int num);
-
-/* Returns 1 if the thread should continue, 0 else.
-   If the thread was paused, this function blocks until we restart */
-   
-int bg_player_thread_check(bg_player_thread_t * th);
-int bg_player_thread_wait_for_start(bg_player_thread_t * th);
-
-

gmerlin-1.2.0.tar.gz/include/x11/Makefile.in Deleted

@@ -1,561 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include/x11
-DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgincludedir)"
-HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/gmerlin/x11
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pkginclude_HEADERS = \
-x11.h
-
-noinst_HEADERS = \
-x11_window_private.h
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/x11/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkgincludeHEADERS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/install-sh Deleted

@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X$//$[^/]' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/$.*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

gmerlin-1.2.0.tar.gz/lib/Makefile.in Deleted

@@ -1,1067 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = gmerlin_visualizer_slave$(EXEEXT)
-subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-@HAVE_X11_TRUE@am__DEPENDENCIES_1 = x11/libx11.la
-am__DEPENDENCIES_2 =
-libgmerlin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
-am__libgmerlin_la_SOURCES_DIST = bglv.c uthread_sem.c accelerator.c \
-	album.c album_xml.c bggavl.c bgladspa.c bgfrei0r.c bgxml.c \
-	cfg_item.c cfg_registry.c cfg_section.c cfg_xml.c \
-	chapterlist.c chapterlist_xml.c charset.c cmdline.c \
-	converters.c device.c edl.c edldec.c edl_xml.c encoder.c \
-	fileformat.c filters.c formats.c hexdump.c language_table.c \
-	lcdproc.c log.c md5.c mediafiledevice.c metadata.c \
-	metadata_xml.c msgqueue.c ocr.c osd.c ov.c ovl2text.c \
-	parameter.c parameter_xml.c player.c player_input.c \
-	player_oa.c player_ov.c player_audio.c player_loop.c \
-	player_subtitle.c player_thread.c player_time.c player_video.c \
-	playercmd.c pluginfuncs.c pluginregistry.c pluginreg_xml.c \
-	preset.c preset_xml.c recorder.c recorder_audio.c \
-	recorder_video.c remote.c searchpath.c serialize.c singlepic.c \
-	socket.c streaminfo.c stringutils.c subprocess.c \
-	textrenderer.c threadpool.c thumbnail.c transcoder.c \
-	transcoder_pp.c transcoder_track.c transcoder_track_xml.c \
-	translation.c tree.c tree_xml.c urilist.c utf8.c visualize.c
-@HAVE_LV_TRUE@am__objects_1 = bglv.lo
-@HAVE_POSIX_SEMAPHORES_FALSE@am__objects_2 = uthread_sem.lo
-am_libgmerlin_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-	accelerator.lo album.lo album_xml.lo bggavl.lo bgladspa.lo \
-	bgfrei0r.lo bgxml.lo cfg_item.lo cfg_registry.lo \
-	cfg_section.lo cfg_xml.lo chapterlist.lo chapterlist_xml.lo \
-	charset.lo cmdline.lo converters.lo device.lo edl.lo edldec.lo \
-	edl_xml.lo encoder.lo fileformat.lo filters.lo formats.lo \
-	hexdump.lo language_table.lo lcdproc.lo log.lo md5.lo \
-	mediafiledevice.lo metadata.lo metadata_xml.lo msgqueue.lo \
-	ocr.lo osd.lo ov.lo ovl2text.lo parameter.lo parameter_xml.lo \
-	player.lo player_input.lo player_oa.lo player_ov.lo \
-	player_audio.lo player_loop.lo player_subtitle.lo \
-	player_thread.lo player_time.lo player_video.lo playercmd.lo \
-	pluginfuncs.lo pluginregistry.lo pluginreg_xml.lo preset.lo \
-	preset_xml.lo recorder.lo recorder_audio.lo recorder_video.lo \
-	remote.lo searchpath.lo serialize.lo singlepic.lo socket.lo \
-	streaminfo.lo stringutils.lo subprocess.lo textrenderer.lo \
-	threadpool.lo thumbnail.lo transcoder.lo transcoder_pp.lo \
-	transcoder_track.lo transcoder_track_xml.lo translation.lo \
-	tree.lo tree_xml.lo urilist.lo utf8.lo visualize.lo
-libgmerlin_la_OBJECTS = $(am_libgmerlin_la_OBJECTS)
-libgmerlin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgmerlin_la_LDFLAGS) $(LDFLAGS) -o $@
-PROGRAMS = $(bin_PROGRAMS)
-am_gmerlin_visualizer_slave_OBJECTS = visualize_slave.$(OBJEXT)
-gmerlin_visualizer_slave_OBJECTS =  \
-	$(am_gmerlin_visualizer_slave_OBJECTS)
-gmerlin_visualizer_slave_DEPENDENCIES = libgmerlin.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libgmerlin_la_SOURCES) $(gmerlin_visualizer_slave_SOURCES)
-DIST_SOURCES = $(am__libgmerlin_la_SOURCES_DIST) \
-	$(gmerlin_visualizer_slave_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = x11 . gtk
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$[^/]*$/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/$[^/]*$$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-@HAVE_X11_FALSE@x11_subdirs = 
-@HAVE_X11_TRUE@x11_subdirs = x11
-@HAVE_X11_FALSE@x11_libadd = 
-@HAVE_X11_TRUE@x11_libadd = x11/libx11.la
-@HAVE_GTK_FALSE@gtk_subdirs = 
-@HAVE_GTK_TRUE@gtk_subdirs = gtk
-@HAVE_LV_FALSE@lv_sources = 
-@HAVE_LV_TRUE@lv_sources = bglv.c
-@HAVE_LV_FALSE@lv_cflags = 
-@HAVE_LV_TRUE@lv_cflags = @LV_CFLAGS@
-@HAVE_LV_FALSE@lv_libs = 
-@HAVE_LV_TRUE@lv_libs = @LV_LIBS@
-@HAVE_POSIX_SEMAPHORES_FALSE@sem_sources = uthread_sem.c
-@HAVE_POSIX_SEMAPHORES_TRUE@sem_sources = 
-SUBDIRS = $(x11_subdirs) . $(gtk_subdirs)
-AM_CFLAGS = \
-@FONTCONFIG_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\"  \
--DDATA_DIR=\"$(pkgdatadir)\" \
-$(lv_cflags)
-
-libgmerlin_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ -export-symbols-regex ^bg_
-libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread
-gmerlin_visualizer_slave_SOURCES = visualize_slave.c
-gmerlin_visualizer_slave_LDADD = libgmerlin.la
-lib_LTLIBRARIES = libgmerlin.la
-libgmerlin_la_SOURCES = \
-$(lv_sources) \
-$(sem_sources) \
-accelerator.c \
-album.c \
-album_xml.c \
-bggavl.c \
-bgladspa.c \
-bgfrei0r.c \
-bgxml.c \
-cfg_item.c \
-cfg_registry.c \
-cfg_section.c \
-cfg_xml.c \
-chapterlist.c \
-chapterlist_xml.c \
-charset.c \
-cmdline.c \
-converters.c \
-device.c \
-edl.c \
-edldec.c \
-edl_xml.c \
-encoder.c \
-fileformat.c \
-filters.c \
-formats.c \
-hexdump.c \
-language_table.c \
-lcdproc.c \
-log.c \
-md5.c \
-mediafiledevice.c \
-metadata.c \
-metadata_xml.c \
-msgqueue.c \
-ocr.c \
-osd.c \
-ov.c \
-ovl2text.c \
-parameter.c \
-parameter_xml.c \
-player.c \
-player_input.c \
-player_oa.c \
-player_ov.c \
-player_audio.c \
-player_loop.c \
-player_subtitle.c \
-player_thread.c \
-player_time.c \
-player_video.c \
-playercmd.c \
-pluginfuncs.c \
-pluginregistry.c \
-pluginreg_xml.c \
-preset.c \
-preset_xml.c \
-recorder.c \
-recorder_audio.c \
-recorder_video.c \
-remote.c \
-searchpath.c \
-serialize.c \
-singlepic.c \
-socket.c \
-streaminfo.c \
-stringutils.c \
-subprocess.c \
-textrenderer.c \
-threadpool.c \
-thumbnail.c \
-transcoder.c \
-transcoder_pp.c \
-transcoder_track.c \
-transcoder_track_xml.c \
-translation.c \
-tree.c \
-tree_xml.c \
-urilist.c \
-utf8.c \
-visualize.c
-
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libgmerlin.la: $(libgmerlin_la_OBJECTS) $(libgmerlin_la_DEPENDENCIES) 
-	$(libgmerlin_la_LINK) -rpath $(libdir) $(libgmerlin_la_OBJECTS) $(libgmerlin_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-gmerlin_visualizer_slave$(EXEEXT): $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_DEPENDENCIES) 
-	@rm -f gmerlin_visualizer_slave$(EXEEXT)
-	$(LINK) $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accelerator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/album.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/album_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgfrei0r.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bggavl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgladspa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bglv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgxml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_registry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_section.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chapterlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chapterlist_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmdline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converters.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edl_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edldec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileformat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/formats.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hexdump.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/language_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcdproc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mediafiledevice.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msgqueue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ov.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovl2text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parameter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parameter_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_audio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_input.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_loop.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_oa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_ov.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_subtitle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_thread.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_time.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player_video.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playercmd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pluginfuncs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pluginreg_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pluginregistry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preset_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recorder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recorder_audio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recorder_video.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/searchpath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serialize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlepic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/streaminfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subprocess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textrenderer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadpool.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnail.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transcoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transcoder_pp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transcoder_track.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transcoder_track_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/translation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urilist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uthread_sem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/visualize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/visualize_slave.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-libLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/lib/fileformat.c Deleted

@@ -1,355 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <config.h>
-#include <gavl/gavl.h>
-#include <gavl/gavldsp.h>
-#include <gmerlin/fileformat.h>
-#include <gmerlin/serialize.h>
-
-
-
-static int read_stdio(void * priv, uint8_t * data, int len)
-  {
-  FILE * f = priv;
-  return fread(data, 1, len, f);
-  }
-
-static int write_stdio(void * priv, const uint8_t * data, int len)
-  {
-  FILE * f = priv;
-  return fwrite(data, 1, len, f);
-  }
-
-static int64_t ftell_stdio(void * priv)
-  {
-  FILE * f = priv;
-  return ftell(f);
-  }
-
-static int64_t seek_stdio(void * priv, int64_t pos, int whence)
-  {
-  FILE * f = priv;
-  fseek(f, pos, whence);
-  return ftell(f);
-  }
-
-static void close_stdio(void * priv)
-  {
-  FILE * f = priv;
-  if(f)
-    fclose(f);
-  }
-
-int bg_f_io_open_stdio_read(bg_f_io_t * io, const char * filename)
-  {
-  FILE * f;
-  f = fopen(filename, "r");
-  if(!f)
-    return 0;
-  io->data = f;
-  io->read_callback = read_stdio;
-  io->seek_callback = seek_stdio;
-  io->ftell_callback = ftell_stdio;
-  io->close_callback = close_stdio;
-  return 1;
-  }
-
-int bg_f_io_open_stdio_write(bg_f_io_t * io, const char * filename)
-  {
-  FILE * f;
-  f = fopen(filename, "w");
-  if(!f)
-    return 0;
-  io->data = f;
-  io->write_callback = write_stdio;
-  io->seek_callback = seek_stdio;
-  io->ftell_callback = ftell_stdio;
-  io->close_callback = close_stdio;
-  return 1;
-  }
-
-void  bg_f_io_close(bg_f_io_t * io)
-  {
-  if(io->close_callback)
-    io->close_callback(io->data);
-  if(io->buffer)
-    free(io->buffer);
-  
-  }
-
-static void bg_f_io_buffer_alloc(bg_f_io_t * io, int len)
-  {
-  if(len <= io->buffer_alloc)
-    return;
-  io->buffer_alloc = len + 512;
-  io->buffer = realloc(io->buffer, io->buffer_alloc);
-  }
-
-static inline int read_32(bg_f_io_t * io, uint32_t * val)
-  {
-  uint8_t data[4];
-  if(io->read_callback(io->data, data, 4) < 4)
-    return 0;
-  *val = ((data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]);
-  return 1;
-  }
-
-static inline int read_64(bg_f_io_t * io, uint64_t * val)
-  {
-  uint8_t data[8];
-  if(io->read_callback(io->data, data, 8) < 8)
-    return 0;
-  *val  = data[0]; *val <<= 8;
-  *val |= data[1]; *val <<= 8;
-  *val |= data[2]; *val <<= 8;
-  *val |= data[3]; *val <<= 8;
-  *val |= data[4]; *val <<= 8;
-  *val |= data[5]; *val <<= 8;
-  *val |= data[6]; *val <<= 8;
-  *val |= data[7];
-  return 1;
-  }
-
-static inline int write_32(bg_f_io_t * io, uint32_t val)
-  {
-  uint8_t data[4];
-  data[0] = (val & 0xff000000) >> 24;
-  data[1] = (val & 0xff0000) >> 16;
-  data[2] = (val & 0xff00) >> 8;
-  data[3] = (val & 0xff);
-  
-  return io->write_callback(io->data, data, 4);
-  }
-
-static inline int write_64(bg_f_io_t * io, uint64_t val)
-  {
-  uint8_t data[8];
-  data[0] = (val & 0xff00000000000000LL) >> 56;
-  data[1] = (val & 0x00ff000000000000LL) >> 48;
-  data[2] = (val & 0x0000ff0000000000LL) >> 40;
-  data[3] = (val & 0x000000ff00000000LL) >> 32;
-  data[4] = (val & 0x00000000ff000000LL) >> 24;
-  data[5] = (val & 0x0000000000ff0000LL) >> 16;
-  data[6] = (val & 0x000000000000ff00LL) >> 8;
-  data[7] = (val & 0x00000000000000ffLL);
-  return io->write_callback(io->data, data, 8);
-  }
-
-int bg_f_chunk_read(bg_f_io_t * io, bg_f_chunk_t * ch)
-  {
-  ch->start = io->ftell_callback(io->data);
-  if(!read_32(io, &ch->type) ||
-     !read_64(io, &ch->size))
-    return 0;
-  return 1;
-  }
-
-int bg_f_chunk_write_header(bg_f_io_t * io, bg_f_chunk_t * ch, bg_f_chunk_type_t type)
-  {
-  ch->type = type;
-  ch->start = io->ftell_callback(io->data);
-  if(!write_32(io, ch->type) ||
-     !write_64(io, ch->size))
-    return 0;
-  return 1;
-  }
-
-int bg_f_chunk_write_footer(bg_f_io_t * io, bg_f_chunk_t * ch)
-  {
-  int64_t end_pos = io->ftell_callback(io->data);
-  io->seek_callback(io->data, ch->start + 4, SEEK_SET);
-  ch->size = end_pos - ch->start - 12;
-  if(!write_64(io, ch->size))
-    return 0;
-  io->seek_callback(io->data, end_pos, SEEK_SET);
-  return 1;
-  }
-
-int bg_f_signature_read(bg_f_io_t * io, bg_f_chunk_t * ch, bg_f_signature_t * sig)
-  {
-  if(!read_32(io, &sig->type))
-    return 0;
-  return 1;
-  }
-
-int bg_f_signature_write(bg_f_io_t * io, bg_f_signature_t * sig)
-  {
-  bg_f_chunk_t ch;
-  if(!bg_f_chunk_write_header(io, &ch, CHUNK_TYPE_SIGNATURE))
-    return 0;
-  if(!write_32(io, sig->type))
-    return 0;
-  if(!bg_f_chunk_write_footer(io, &ch))
-    return 0;
-  return 1;
-  }
-
-int bg_f_audio_format_read(bg_f_io_t * io, bg_f_chunk_t * ch, gavl_audio_format_t * f,
-                           int * big_endian)
-  {
-  bg_f_io_buffer_alloc(io, ch->size);
-  if(io->read_callback(io->data, io->buffer, ch->size) < ch->size)
-    return 0;
-  bg_deserialize_audio_format(f, io->buffer, ch->size, big_endian);
-  return 1;
-  }
-
-int bg_f_audio_format_write(bg_f_io_t * io, const gavl_audio_format_t * f)
-  {
-  bg_f_chunk_t ch;
-  int len;
-  
-  if(!bg_f_chunk_write_header(io, &ch, CHUNK_TYPE_AUDIO_FORMAT))
-    return 0;
-
-  len = bg_serialize_audio_format(f, NULL, 0);
-  bg_f_io_buffer_alloc(io, len);
-  len = bg_serialize_audio_format(f, io->buffer, len);
-
-  if(io->write_callback(io->data, io->buffer, len) < len)
-    return 0;
-
-  if(!bg_f_chunk_write_footer(io, &ch))
-    return 0;
-  return 1;
-  }
-
-int bg_f_video_format_read(bg_f_io_t * io, bg_f_chunk_t * ch, gavl_video_format_t * f,
-                           int * big_endian)
-  {
-  bg_f_io_buffer_alloc(io, ch->size);
-  if(io->read_callback(io->data, io->buffer, ch->size) < ch->size)
-    return 0;
-  bg_deserialize_video_format(f, io->buffer, ch->size, big_endian);
-  return 1;
-
-  }
-
-int bg_f_video_format_write(bg_f_io_t * io, const gavl_video_format_t * f)
-  {
-  bg_f_chunk_t ch;
-  int len;
-  
-  if(!bg_f_chunk_write_header(io, &ch, CHUNK_TYPE_VIDEO_FORMAT))
-    return 0;
-
-  len = bg_serialize_video_format(f, NULL, 0);
-  bg_f_io_buffer_alloc(io, len);
-  len = bg_serialize_video_format(f, io->buffer, len);
-
-  if(io->write_callback(io->data, io->buffer, len) < len)
-    return 0;
-
-  if(!bg_f_chunk_write_footer(io, &ch))
-    return 0;
-  return 1;
-  }
-
-int bg_f_audio_frame_read(bg_f_io_t * io, bg_f_chunk_t * ch,
-                          const gavl_audio_format_t * format,
-                          gavl_audio_frame_t * f, int big_endian,
-                          gavl_dsp_context_t * ctx)
-  {
-  int len;
-  len = bg_serialize_audio_frame_header(format, f, NULL, 0);
-  bg_f_io_buffer_alloc(io, len);
-  if(io->read_callback(io->data, io->buffer, len) < len)
-    return 0;
-  bg_deserialize_audio_frame_header(format, f, io->buffer, len);
-
-  return bg_deserialize_audio_frame(ctx,
-                                    format, f, io->read_callback,
-                                    io->data, big_endian);  
-  }
-
-int bg_f_audio_frame_write(bg_f_io_t * io,
-                           const gavl_audio_format_t * format,
-                           const gavl_audio_frame_t * f)
-  {
-  int len;
-  bg_f_chunk_t ch;
-  
-  if(!bg_f_chunk_write_header(io, &ch, CHUNK_TYPE_AUDIO_FRAME))
-    return 0;
-  
-  len = bg_serialize_audio_frame_header(format, f, NULL, 0);
-  bg_f_io_buffer_alloc(io, len);
-  bg_serialize_audio_frame_header(format, f, io->buffer, len);
-  if(io->write_callback(io->data, io->buffer, len) < len)
-    return 0;
-
-  if(!bg_serialize_audio_frame(format,
-                               f, io->write_callback,
-                               io->data))
-    return 0;
-  if(!bg_f_chunk_write_footer(io, &ch))
-    return 0;
-  return 1;
-  }
-
-int bg_f_video_frame_read(bg_f_io_t * io, bg_f_chunk_t * ch,
-                          const gavl_video_format_t * format,
-                          gavl_video_frame_t * f, int big_endian,
-                          gavl_dsp_context_t * ctx)
-  {
-  int len;
-  len = bg_serialize_video_frame_header(format, f, NULL, 0);
-  bg_f_io_buffer_alloc(io, len);
-  if(io->read_callback(io->data, io->buffer, len) < len)
-    return 0;
-  bg_deserialize_video_frame_header(format, f, io->buffer, len);
-
-  return bg_deserialize_video_frame(ctx,
-                                    format, f, io->read_callback,
-                                    io->data, big_endian);  
-  
-  }
-
-
-int bg_f_video_frame_write(bg_f_io_t * io,
-                           const gavl_video_format_t * format,
-                           const gavl_video_frame_t * f)
-  {
-  int len;
-  bg_f_chunk_t ch;
-  
-  if(!bg_f_chunk_write_header(io, &ch, CHUNK_TYPE_VIDEO_FRAME))
-    return 0;
-  
-  len = bg_serialize_video_frame_header(format, f, NULL, 0);
-  bg_f_io_buffer_alloc(io, len);
-  bg_serialize_video_frame_header(format, f, io->buffer, len);
-  if(io->write_callback(io->data, io->buffer, len) < len)
-    return 0;
-
-  if(!bg_serialize_video_frame(format,
-                               f, io->write_callback,
-                               io->data))
-    return 0;
-  if(!bg_f_chunk_write_footer(io, &ch))
-    return 0;
-  return 1;
-  
-  }

gmerlin-1.2.0.tar.gz/lib/filters.c Deleted

@@ -1,903 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <config.h>
-#include <gmerlin/translation.h>
-
-#include <gmerlin/pluginregistry.h>
-#include <gmerlin/converters.h>
-
-
-#include <gmerlin/utils.h>
-
-#include <gmerlin/filters.h>
-
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "filters"
-
-/* Audio */
-
-typedef struct
-  {
-  bg_plugin_handle_t * handle;
-  bg_fa_plugin_t     * plugin;
-  bg_audio_converter_t * cnv;
-  int do_convert;
-  } audio_filter_t;
-
-struct bg_audio_filter_chain_s
-  {
-  int num_filters;
-  audio_filter_t * filters;
-  const bg_gavl_audio_options_t * opt;
-  bg_plugin_registry_t * plugin_reg;
-  
-  bg_parameter_info_t * parameters;
-  
-  char * filter_string;
-  int need_rebuild;
-  int need_restart;
-
-  bg_audio_converter_t * cnv_out;
-  gavl_audio_frame_t     * frame;
-  gavl_audio_format_t    out_format_1;
-  gavl_audio_format_t    in_format_1;
-  gavl_audio_format_t    in_format_2;
-  
-  gavl_audio_format_t    in_format;  /* Input format of first filter */
-  gavl_audio_format_t    out_format; /* Output format of chain */
-  
-  pthread_mutex_t mutex;
-  
-  bg_read_audio_func_t in_func;
-  void * in_data;
-  int in_stream;
-
-  bg_read_audio_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
-  };
-
-int bg_audio_filter_chain_need_restart(bg_audio_filter_chain_t * ch)
-  {
-  gavl_audio_format_t test_format;
-
-  if(!ch->need_restart)
-    {
-    gavl_audio_format_copy(&test_format, &ch->in_format_1);
-    bg_gavl_audio_options_set_format(ch->opt, &ch->in_format_1, &test_format);
-    if(!gavl_audio_formats_equal(&test_format, &ch->in_format_2))
-      ch->need_restart = 1;
-    }
-  
-  return ch->need_restart || ch->need_rebuild;
-  }
-
-
-static int audio_filter_create(audio_filter_t * f,
-                               bg_audio_filter_chain_t * ch,
-                                const char * name)
-  {
-  const bg_plugin_info_t * info;
-  info = bg_plugin_find_by_name(ch->plugin_reg, name);
-  if(!info)
-    return 0;
-  f->handle = bg_plugin_load(ch->plugin_reg, info);
-  if(!f->handle)
-    return 0;
-
-  f->plugin = (bg_fa_plugin_t*)(f->handle->plugin);
-  f->cnv = bg_audio_converter_create(ch->opt->opt);
-  return 1;
-  }
-
-void bg_audio_filter_chain_lock(bg_audio_filter_chain_t * cnv)
-  {
-  pthread_mutex_lock(&cnv->mutex);
-  }
-
-void bg_audio_filter_chain_unlock(bg_audio_filter_chain_t * cnv)
-  {
-  pthread_mutex_unlock(&cnv->mutex);
-  }
-
-
-static void audio_filter_destroy(audio_filter_t * f)
-  {
-  bg_audio_converter_destroy(f->cnv);
-  if(f->handle)
-    bg_plugin_unref_nolock(f->handle);
-  }
-
-static void destroy_audio_chain(bg_audio_filter_chain_t * ch)
-  {
-  int i;
-  
-  /* Destroy previous filters */
-  for(i = 0; i < ch->num_filters; i++)
-    audio_filter_destroy(&ch->filters[i]);
-  if(ch->filters)
-    {
-    free(ch->filters);
-    ch->filters = NULL;
-    }
-  ch->num_filters = 0;
-  }
-
-static void bg_audio_filter_chain_rebuild(bg_audio_filter_chain_t * ch)
-  {
-  int i;
-  char ** filter_names;
-
-  ch->need_rebuild = 0;
-  filter_names = bg_strbreak(ch->filter_string, ',');
-  
-  destroy_audio_chain(ch);
-  
-  if(!filter_names)
-    return;
-  
-  while(filter_names[ch->num_filters])
-    ch->num_filters++;
-
-  ch->filters = calloc(ch->num_filters, sizeof(*ch->filters));
-  for(i = 0; i < ch->num_filters; i++)
-    {
-    audio_filter_create(&ch->filters[i], ch,
-                        filter_names[i]);
-    }
-  bg_strbreak_free(filter_names);
-  }
-
-bg_audio_filter_chain_t *
-bg_audio_filter_chain_create(const bg_gavl_audio_options_t * opt,
-                             bg_plugin_registry_t * plugin_reg)
-  {
-  bg_audio_filter_chain_t * ret;
-  ret = calloc(1, sizeof(*ret));
-  ret->opt = opt;
-  ret->plugin_reg = plugin_reg;
-  ret->cnv_out = bg_audio_converter_create(opt->opt);
-  
-  pthread_mutex_init(&ret->mutex, NULL);
-  return ret;
-  }
-
-static void create_audio_parameters(bg_audio_filter_chain_t * ch)
-  {
-  ch->parameters = calloc(2, sizeof(*ch->parameters));
-  ch->parameters->name      = bg_strdup(NULL, "audio_filters");
-  ch->parameters->long_name = bg_strdup(NULL, TRS("Audio Filters"));
-  ch->parameters->preset_path = bg_strdup(NULL, "audiofilters");
-  ch->parameters->gettext_domain = bg_strdup(NULL, PACKAGE);
-  ch->parameters->gettext_directory = bg_strdup(NULL, LOCALE_DIR);
-  ch->parameters->type = BG_PARAMETER_MULTI_CHAIN;
-  ch->parameters->flags |= BG_PARAMETER_SYNC;
-  bg_plugin_registry_set_parameter_info(ch->plugin_reg,
-                                        BG_PLUGIN_FILTER_AUDIO,
-                                        BG_PLUGIN_FILTER_1,
-                                        ch->parameters);
-  }
-
-const bg_parameter_info_t *
-bg_audio_filter_chain_get_parameters(bg_audio_filter_chain_t * ch)
-  {
-  if(!ch->parameters)
-    create_audio_parameters(ch);
-  return ch->parameters;
-  }
-
-void
-bg_audio_filter_chain_set_parameter(void * data, const char * name,
-                                    const bg_parameter_value_t * val)
-  {
-  bg_audio_filter_chain_t * ch;
-  int i;
-  char * pos;
-  audio_filter_t * f;
-  
-  ch = (bg_audio_filter_chain_t *)data;
-  
-  if(!name)
-    {
-    for(i = 0; i < ch->num_filters; i++)
-      {
-      if(ch->filters[i].plugin->common.set_parameter)
-        ch->filters[i].plugin->common.set_parameter(ch->filters[i].handle->priv,
-                                             NULL, NULL);
-      }
-    return;
-    }
-
-  if(!strcmp(name, "audio_filters"))
-    {
-    if(!ch->filter_string && !val->val_str)
-      goto the_end;
-    
-    if(ch->filter_string && val->val_str &&
-       !strcmp(ch->filter_string, val->val_str))
-      {
-      goto the_end;
-      }
-    /* Rebuild chain */
-    ch->filter_string = bg_strdup(ch->filter_string, val->val_str);
-    ch->need_rebuild = 1;
-    }
-  else if(!strncmp(name, "audio_filters.", 14))
-    {
-    if(ch->need_rebuild)
-      bg_audio_filter_chain_rebuild(ch);
-    
-    pos = strchr(name, '.');
-    pos++;
-    i = atoi(pos);
-    f = ch->filters + i;
-
-    pos = strchr(pos, '.');
-    if(!pos)
-      goto the_end;
-    pos++;
-    if(f->plugin->common.set_parameter)
-      {
-      f->plugin->common.set_parameter(f->handle->priv, pos, val);
-      if(f->plugin->need_restart && f->plugin->need_restart(f->handle->priv))
-        ch->need_restart = 1;
-      }
-    }
-  the_end:
-  return;
-  }
-
-int bg_audio_filter_chain_init(bg_audio_filter_chain_t * ch,
-                               const gavl_audio_format_t * in_format,
-                               gavl_audio_format_t * out_format)
-  {
-  int i;
-  
-  gavl_audio_format_t format_1;
-  gavl_audio_format_t format_2;
-  audio_filter_t * f;
-
-  ch->need_restart = 0;
-  
-  if(ch->need_rebuild)
-    bg_audio_filter_chain_rebuild(ch);
-  
-  //  if(!ch->num_filters)
-  //    return 0;
-
-  gavl_audio_format_copy(&format_1, in_format);
-  gavl_audio_format_copy(&ch->out_format_1, in_format);
-  
-  /* Set user defined format */
-  bg_gavl_audio_options_set_format(ch->opt,
-                                   in_format,
-                                   &format_1);
-
-  gavl_audio_format_copy(&ch->in_format_1, in_format);
-  gavl_audio_format_copy(&ch->in_format_2, &format_1);
-  
-  
-  f = ch->filters;
-  
-  if(ch->opt->force_format != GAVL_SAMPLE_NONE)
-    format_1.sample_format = ch->opt->force_format;
-  
-  ch->read_func   = ch->in_func;
-  ch->read_data   = ch->in_data;
-  ch->read_stream = ch->in_stream;
-  
-  for(i = 0; i < ch->num_filters; i++)
-    {
-    gavl_audio_format_copy(&format_2, &format_1);
-    
-    if(!i && (ch->opt->force_format != GAVL_SAMPLE_NONE))
-      format_2.sample_format = ch->opt->force_format;
-    
-    f->plugin->set_input_format(f->handle->priv, &format_2, 0);
-    
-    if(!i)
-      {
-      f->do_convert =
-        bg_audio_converter_init(f->cnv, in_format, &format_2);
-      gavl_audio_format_copy(&ch->in_format, &format_2);
-      }
-    else
-      f->do_convert =
-        bg_audio_converter_init(f->cnv, &format_1, &format_2);
-    
-    if(f->do_convert)
-      {
-      bg_audio_converter_connect_input(f->cnv,
-                                       ch->read_func, ch->read_data, ch->read_stream);
-      
-      f->plugin->connect_input_port(f->handle->priv,
-                                    bg_audio_converter_read,
-                                    f->cnv, 0, 0);
-      }
-    else
-      f->plugin->connect_input_port(f->handle->priv, ch->read_func, ch->read_data,
-                                    ch->read_stream, 0);
-
-    ch->read_func   = f->plugin->read_audio;
-    ch->read_data   = f->handle->priv;
-    ch->read_stream = 0;
-    
-    //    if(f->plugin->init)
-    //      f->plugin->init(f->handle->priv);
-    f->plugin->get_output_format(f->handle->priv, &format_1);
-
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Initialized audio filter %s",
-           TRD(f->handle->info->long_name,
-               f->handle->info->gettext_domain));
-    f++;
-    }
-  gavl_audio_format_copy(out_format, &format_1);
-  gavl_audio_format_copy(&ch->out_format, &format_1);
-  
-  if(ch->num_filters)
-    gavl_audio_format_copy(&ch->out_format_1, &format_1);
-  else
-    gavl_audio_format_copy(&ch->out_format_1, in_format);
-  
-  return ch->num_filters;
-  }
-
-void bg_audio_filter_chain_set_input_format(bg_audio_filter_chain_t * ch,
-                                            const gavl_audio_format_t * format)
-  {
-  if(!ch->num_filters)
-    {
-    int do_convert_out;
-    
-    do_convert_out = bg_audio_converter_init(ch->cnv_out,
-                                             &ch->out_format_1,
-                                             &ch->out_format);
-    if(do_convert_out)
-      {
-      bg_audio_converter_connect_input(ch->cnv_out,
-                                       ch->in_func, ch->in_data, ch->in_stream);
-      ch->read_func   = bg_audio_converter_read;
-      ch->read_data   = ch->cnv_out;
-      ch->read_stream = 0;
-      }
-    }
-  else
-    {
-    audio_filter_t * f = ch->filters;
-
-    f->do_convert =
-      bg_audio_converter_init(f->cnv, format, &ch->in_format);
-
-    if(f->do_convert)
-      {
-      bg_audio_converter_connect_input(f->cnv,
-                                       ch->in_func, ch->in_data, ch->in_stream);
-      
-      f->plugin->connect_input_port(f->handle->priv,
-                                    bg_audio_converter_read,
-                                    f->cnv, 0, 0);
-      }
-    else
-      f->plugin->connect_input_port(f->handle->priv, ch->in_func, ch->in_data,
-                                    ch->in_stream, 0);
-    }
-  }
-
-int bg_audio_filter_chain_set_out_format(bg_audio_filter_chain_t * ch,
-                                         const gavl_audio_format_t * out_format)
-  {
-  int do_convert_out;
-  
-  do_convert_out = bg_audio_converter_init(ch->cnv_out,
-                                           &ch->out_format_1,
-                                           out_format);
-  if(do_convert_out)
-    {
-    bg_audio_converter_connect_input(ch->cnv_out,
-                                     ch->read_func, ch->read_data, ch->read_stream);
-    
-    ch->read_func   = bg_audio_converter_read;
-    ch->read_data   = ch->cnv_out;
-    ch->read_stream = 0;
-    }
-  gavl_audio_format_copy(&ch->out_format, out_format);
-  
-  return do_convert_out;
-  }
-
-void bg_audio_filter_chain_connect_input(bg_audio_filter_chain_t * ch,
-                                         bg_read_audio_func_t func,
-                                         void * priv, int stream)
-  {
-  ch->in_func = func;
-  ch->in_data = priv;
-  ch->in_stream = stream;
-  }
-
-int bg_audio_filter_chain_read(void * priv, gavl_audio_frame_t* frame,
-                               int stream, int num_samples)
-  {
-  int ret;
-  bg_audio_filter_chain_t * ch;
-  ch = (bg_audio_filter_chain_t *)priv;
-  
-  bg_audio_filter_chain_lock(ch);
-  ret = ch->read_func(ch->read_data, frame, ch->read_stream, num_samples);
-  bg_audio_filter_chain_unlock(ch);
-  return ret;
-  }
-
-void bg_audio_filter_chain_destroy(bg_audio_filter_chain_t * ch)
-  {
-  if(ch->parameters)
-    bg_parameter_info_destroy_array(ch->parameters);
-
-  if(ch->filter_string)
-    free(ch->filter_string);
-
-  bg_audio_converter_destroy(ch->cnv_out);
-
-  destroy_audio_chain(ch);
-  pthread_mutex_destroy(&ch->mutex);
-  free(ch);
-  }
-
-void bg_audio_filter_chain_reset(bg_audio_filter_chain_t * ch)
-  {
-  int i;
-  for(i = 0; i < ch->num_filters; i++)
-    {
-    if(ch->filters[i].plugin->reset)
-      ch->filters[i].plugin->reset(ch->filters[i].handle->priv);
-    bg_audio_converter_reset(ch->filters[i].cnv);
-    }
-  bg_audio_converter_reset(ch->cnv_out);
-  }
-
-
-/* Video */
-
-typedef struct
-  {
-  bg_plugin_handle_t * handle;
-  bg_fv_plugin_t     * plugin;
-  bg_video_converter_t * cnv;
-  int do_convert;
-  } video_filter_t;
-
-struct bg_video_filter_chain_s
-  {
-  int num_filters;
-  video_filter_t * filters;
-  const bg_gavl_video_options_t * opt;
-  bg_plugin_registry_t * plugin_reg;
-  
-  bg_parameter_info_t * parameters;
-
-  char * filter_string;
-  
-  int need_rebuild;
-  int need_restart;
-
-  bg_video_converter_t * cnv_out;
-  gavl_video_frame_t   * frame;
-  gavl_video_format_t  out_format_1;
-  gavl_video_format_t  in_format_1;
-  gavl_video_format_t  in_format_2;
-
-  gavl_video_format_t  out_format; /* Final output format */
-  gavl_video_format_t  in_format;  /* Input format of first filter */
-  
-  bg_read_video_func_t in_func;
-  void * in_data;
-  int in_stream;
-
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
-  pthread_mutex_t mutex;
-  };
-
-int bg_video_filter_chain_need_restart(bg_video_filter_chain_t * ch)
-  {
-  gavl_video_format_t test_format;
-
-  if(!ch->need_restart)
-    {
-    gavl_video_format_copy(&test_format, &ch->in_format_1);
-    bg_gavl_video_options_set_format(ch->opt, &ch->in_format_1, &test_format);
-    if(!gavl_video_formats_equal(&test_format, &ch->in_format_2))
-      ch->need_restart = 1;
-    }
-  
-  return ch->need_restart || ch->need_rebuild;
-  }
-
-static int
-video_filter_create(video_filter_t * f, bg_video_filter_chain_t * ch,
-                    const char * name)
-  {
-  const bg_plugin_info_t * info;
-  info = bg_plugin_find_by_name(ch->plugin_reg, name);
-  if(!info)
-    return 0;
-  f->handle = bg_plugin_load(ch->plugin_reg, info);
-  if(!f->handle)
-    return 0;
-
-  f->plugin = (bg_fv_plugin_t*)(f->handle->plugin);
-  f->cnv = bg_video_converter_create(ch->opt->opt);
-  return 1;
-  }
-
-static void video_filter_destroy(video_filter_t * f)
-  {
-  bg_video_converter_destroy(f->cnv);
-  if(f->handle)
-    bg_plugin_unref_nolock(f->handle);
-  }
-
-static void destroy_video_chain(bg_video_filter_chain_t * ch)
-  {
-  int i;
-  
-  /* Destroy previous filters */
-  for(i = 0; i < ch->num_filters; i++)
-    video_filter_destroy(&ch->filters[i]);
-  if(ch->filters)
-    {
-    free(ch->filters);
-    ch->filters = NULL;
-    }
-  ch->num_filters = 0;
-  }
-
-static void bg_video_filter_chain_rebuild(bg_video_filter_chain_t * ch)
-  {
-  int i;
-  char ** filter_names;
-  filter_names = bg_strbreak(ch->filter_string, ',');
-  
-  destroy_video_chain(ch);
-  
-  if(!filter_names)
-    return;
-  
-  while(filter_names[ch->num_filters])
-    ch->num_filters++;
-
-  ch->filters = calloc(ch->num_filters, sizeof(*ch->filters));
-  for(i = 0; i < ch->num_filters; i++)
-    {
-    video_filter_create(&ch->filters[i], ch,
-                        filter_names[i]);
-    }
-  bg_strbreak_free(filter_names);
-  ch->need_rebuild = 0;
-  }
-
-bg_video_filter_chain_t *
-bg_video_filter_chain_create(const bg_gavl_video_options_t * opt,
-                             bg_plugin_registry_t * plugin_reg)
-  {
-  bg_video_filter_chain_t * ret;
-  ret = calloc(1, sizeof(*ret));
-  ret->opt = opt;
-  ret->plugin_reg = plugin_reg;
-
-  ret->cnv_out = bg_video_converter_create(opt->opt);
-
-  pthread_mutex_init(&ret->mutex, NULL);
-  return ret;
-  }
-
-static void create_video_parameters(bg_video_filter_chain_t * ch)
-  {
-  ch->parameters = calloc(2, sizeof(*ch->parameters));
-  ch->parameters->name      = bg_strdup(NULL, "video_filters");
-  ch->parameters->long_name = bg_strdup(NULL, TRS("Video Filters"));
-  ch->parameters->preset_path = bg_strdup(NULL, "videofilters");
-  ch->parameters->gettext_domain = bg_strdup(NULL, PACKAGE);
-  ch->parameters->gettext_directory = bg_strdup(NULL, LOCALE_DIR);
-  ch->parameters->type = BG_PARAMETER_MULTI_CHAIN;
-  ch->parameters->flags |= BG_PARAMETER_SYNC;
-  bg_plugin_registry_set_parameter_info(ch->plugin_reg,
-                                        BG_PLUGIN_FILTER_VIDEO,
-                                        BG_PLUGIN_FILTER_1,
-                                        ch->parameters);
-  }
-
-
-const bg_parameter_info_t *
-bg_video_filter_chain_get_parameters(bg_video_filter_chain_t * ch)
-  {
-  if(!ch->parameters)
-    create_video_parameters(ch);
-  return ch->parameters;
-  }
-
-void
-bg_video_filter_chain_set_parameter(void * data, const char * name,
-                                    const bg_parameter_value_t * val)
-  {
-  int i;
-  char * pos;
-  video_filter_t * f;
-  
-  bg_video_filter_chain_t * ch;
-  ch = (bg_video_filter_chain_t *)data;
-    
-  if(!name)
-    {
-    for(i = 0; i < ch->num_filters; i++)
-      {
-      if(ch->filters[i].plugin->common.set_parameter)
-        ch->filters[i].plugin->common.set_parameter(ch->filters[i].handle->priv,
-                                             NULL, NULL);
-      }
-    return;
-    }
-
-  
-  if(!strcmp(name, "video_filters"))
-    {
-    if(!ch->filter_string && !val->val_str)
-      goto the_end;
-    
-    if(ch->filter_string && val->val_str &&
-       !strcmp(ch->filter_string, val->val_str))
-      {
-      goto the_end;
-      }
-    /* Rebuild chain */
-    ch->filter_string = bg_strdup(ch->filter_string, val->val_str);
-    ch->need_rebuild = 1;
-    }
-  else if(!strncmp(name, "video_filters.", 14))
-    {
-    if(ch->need_rebuild)
-      bg_video_filter_chain_rebuild(ch);
-    
-    pos = strchr(name, '.');
-    pos++;
-    i = atoi(pos);
-    f = ch->filters + i;
-
-    pos = strchr(pos, '.');
-    if(!pos)
-      goto the_end;
-    pos++;
-    if(f->plugin->common.set_parameter)
-      {
-      f->plugin->common.set_parameter(f->handle->priv, pos, val);
-      if(f->plugin->need_restart && f->plugin->need_restart(f->handle->priv))
-        ch->need_restart = 1;
-      }
-    }
-  the_end:
-  return;
-  }
-
-int bg_video_filter_chain_init(bg_video_filter_chain_t * ch,
-                               const gavl_video_format_t * in_format,
-                               gavl_video_format_t * out_format)
-  {
-  int i;
-  gavl_video_options_t * opt;
-  gavl_video_format_t format_1;
-  gavl_video_format_t format_2;
-  video_filter_t * f;
-
-  ch->need_restart = 0;
-
-  if(ch->need_rebuild)
-    bg_video_filter_chain_rebuild(ch);
-  
-  gavl_video_format_copy(&format_1, in_format);
-  
-  f = ch->filters;
-  
-  /* Set user defined format */
-  bg_gavl_video_options_set_format(ch->opt,
-                                   in_format,
-                                   &format_1);
-
-  gavl_video_format_copy(&ch->in_format_1, in_format);
-  gavl_video_format_copy(&ch->in_format_2, &format_1);
-
-  ch->read_func   = ch->in_func;
-  ch->read_data   = ch->in_data;
-  ch->read_stream = ch->in_stream;
-  
-  for(i = 0; i < ch->num_filters; i++)
-    {
-    gavl_video_format_copy(&format_2, &format_1);
-
-    if(f->plugin->get_options)
-      {
-      opt = f->plugin->get_options(f->handle->priv);
-      gavl_video_options_copy(opt, ch->opt->opt);
-      }
-    
-    f->plugin->set_input_format(f->handle->priv, &format_2, 0);
-    
-    if(!i)
-      {
-      f->do_convert =
-        bg_video_converter_init(f->cnv, in_format, &format_2);
-      gavl_video_format_copy(&ch->in_format, &format_2);
-      }
-    else
-      f->do_convert =
-        bg_video_converter_init(f->cnv, &format_1, &format_2);
-    
-    if(f->do_convert)
-      {
-      bg_video_converter_connect_input(f->cnv, ch->read_func, ch->read_data, ch->read_stream);
-      
-      f->plugin->connect_input_port(f->handle->priv,
-                                    bg_video_converter_read, f->cnv, 0, 0);
-      }
-    else
-      f->plugin->connect_input_port(f->handle->priv,
-                                    ch->read_func, ch->read_data, ch->read_stream, 0);
-    
-    ch->read_func   = f->plugin->read_video;
-    ch->read_data   = f->handle->priv;
-    ch->read_stream = 0;
-    
-    //    if(f->plugin->init)
-    //      f->plugin->init(f->handle->priv);
-    f->plugin->get_output_format(f->handle->priv, &format_1);
-
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Initialized video filter %s",
-           TRD(f->handle->info->long_name, f->handle->info->gettext_domain));
-    f++;
-    }
-  gavl_video_format_copy(&ch->out_format, &format_1);
-  gavl_video_format_copy(out_format, &format_1);
-  if(ch->num_filters)
-    gavl_video_format_copy(&ch->out_format_1, &format_1);
-  else
-    gavl_video_format_copy(&ch->out_format_1, in_format);
-  return ch->num_filters;
-  }
-
-void bg_video_filter_chain_set_input_format(bg_video_filter_chain_t * ch,
-                                            const gavl_video_format_t * format)
-  {
-  if(!ch->num_filters)
-    {
-    int do_convert_out;
-    
-    do_convert_out = bg_video_converter_init(ch->cnv_out,
-                                             &ch->out_format_1,
-                                             &ch->out_format);
-    if(do_convert_out)
-      {
-      bg_video_converter_connect_input(ch->cnv_out,
-                                       ch->in_func, ch->in_data, ch->in_stream);
-      ch->read_func   = bg_video_converter_read;
-      ch->read_data   = ch->cnv_out;
-      ch->read_stream = 0;
-      }
-    }
-  else
-    {
-    video_filter_t * f = ch->filters;
-
-    f->do_convert =
-      bg_video_converter_init(f->cnv, format, &ch->in_format);
-
-    if(f->do_convert)
-      {
-      bg_video_converter_connect_input(f->cnv,
-                                       ch->in_func, ch->in_data, ch->in_stream);
-      
-      f->plugin->connect_input_port(f->handle->priv,
-                                    bg_video_converter_read,
-                                    f->cnv, 0, 0);
-      }
-    else
-      f->plugin->connect_input_port(f->handle->priv, ch->in_func, ch->in_data,
-                                    ch->in_stream, 0);
-    }
-  }
-
-void bg_video_filter_chain_connect_input(bg_video_filter_chain_t * ch,
-                                         bg_read_video_func_t func, void * priv,
-                                         int stream)
-  {
-  ch->in_func = func;
-  ch->in_data = priv;
-  ch->in_stream = stream;
-  }
-
-int bg_video_filter_chain_read(void * priv, gavl_video_frame_t* frame, int stream)
-  {
-  bg_video_filter_chain_t * ch;
-  int ret;
-  ch = (bg_video_filter_chain_t *)priv;
-
-  bg_video_filter_chain_lock(ch);
-  ret = ch->read_func(ch->read_data, frame, ch->read_stream);
-  bg_video_filter_chain_unlock(ch);
-  return ret;
-  }
-
-int bg_video_filter_chain_set_out_format(bg_video_filter_chain_t * ch,
-                                         const gavl_video_format_t * out_format)
-  {
-  int do_convert;
-  do_convert = bg_video_converter_init(ch->cnv_out, &ch->out_format_1, out_format);
-  if(do_convert)
-    {
-    bg_video_converter_connect_input(ch->cnv_out, ch->read_func, ch->read_data, ch->read_stream);
-    ch->read_func = bg_video_converter_read;
-    ch->read_data = ch->cnv_out;
-    ch->read_stream = 0;
-    }
-  gavl_video_format_copy(&ch->out_format, out_format);
-  return do_convert;
-  }
-
-
-void bg_video_filter_chain_destroy(bg_video_filter_chain_t * ch)
-  {
-  if(ch->parameters)
-    bg_parameter_info_destroy_array(ch->parameters);
-  if(ch->filter_string)
-    free(ch->filter_string);
-  destroy_video_chain(ch);
-  pthread_mutex_destroy(&ch->mutex);
-  bg_video_converter_destroy(ch->cnv_out);
-
-  free(ch);
-  }
-
-void bg_video_filter_chain_lock(bg_video_filter_chain_t * cnv)
-  {
-  pthread_mutex_lock(&cnv->mutex);
-  }
-
-void bg_video_filter_chain_unlock(bg_video_filter_chain_t * cnv)
-  {
-  pthread_mutex_unlock(&cnv->mutex);
-  }
-
-void bg_video_filter_chain_reset(bg_video_filter_chain_t * ch)
-  {
-  int i;
-  for(i = 0; i < ch->num_filters; i++)
-    {
-    if(ch->filters[i].plugin->reset)
-      ch->filters[i].plugin->reset(ch->filters[i].handle->priv);
-    bg_video_converter_reset(ch->filters[i].cnv);
-    }
-  bg_video_converter_reset(ch->cnv_out);
-  }

gmerlin-1.2.0.tar.gz/lib/gtk/Makefile.in Deleted

@@ -1,743 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib/gtk
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libgmerlin_gtk_la_DEPENDENCIES = $(top_builddir)/lib/libgmerlin.la
-am_libgmerlin_gtk_la_OBJECTS = aboutwindow.lo albumentry.lo \
-	albumwidget.lo albumwindow.lo auth.lo button.lo cfg_button.lo \
-	cfg_checkbutton.lo cfg_color.lo cfg_device.lo cfg_dialog.lo \
-	cfg_file.lo cfg_font.lo cfg_multi_list.lo cfg_multi_menu.lo \
-	cfg_position.lo cfg_slider.lo cfg_spinbutton.lo cfg_string.lo \
-	cfg_stringlist.lo cfg_time.lo chapterdialog.lo display.lo \
-	driveselect.lo fileselect.lo fileentry.lo gtkutils.lo \
-	infowindow.lo logwindow.lo message.lo multiinfo.lo \
-	plugininfo.lo plugin_multi.lo plugin_single.lo pluginmenu.lo \
-	presetmenu.lo question.lo slider.lo scrolltext.lo textview.lo \
-	textwindow.lo treewidget.lo treewindow.lo urllink.lo \
-	urlselect.lo vumeter.lo
-libgmerlin_gtk_la_OBJECTS = $(am_libgmerlin_gtk_la_OBJECTS)
-libgmerlin_gtk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgmerlin_gtk_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libgmerlin_gtk_la_SOURCES)
-DIST_SOURCES = $(libgmerlin_gtk_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@GTK_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@FONTCONFIG_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-libgmerlin_gtk_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@
-lib_LTLIBRARIES = libgmerlin_gtk.la
-noinst_HEADERS = gtk_dialog.h
-libgmerlin_gtk_la_SOURCES = \
-aboutwindow.c \
-albumentry.c \
-albumwidget.c \
-albumwindow.c \
-auth.c \
-button.c \
-cfg_button.c \
-cfg_checkbutton.c \
-cfg_color.c \
-cfg_device.c \
-cfg_dialog.c \
-cfg_file.c \
-cfg_font.c \
-cfg_multi_list.c \
-cfg_multi_menu.c \
-cfg_position.c \
-cfg_slider.c \
-cfg_spinbutton.c \
-cfg_string.c \
-cfg_stringlist.c \
-cfg_time.c \
-chapterdialog.c \
-display.c \
-driveselect.c \
-fileselect.c \
-fileentry.c \
-gtkutils.c \
-infowindow.c \
-logwindow.c \
-message.c \
-multiinfo.c \
-plugininfo.c \
-plugin_multi.c \
-plugin_single.c \
-pluginmenu.c \
-presetmenu.c \
-question.c \
-slider.c \
-scrolltext.c \
-textview.c \
-textwindow.c \
-treewidget.c \
-treewindow.c \
-urllink.c \
-urlselect.c \
-vumeter.c
-
-libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la @XML2_LIBS@ @LIBM@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gtk/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/gtk/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libgmerlin_gtk.la: $(libgmerlin_gtk_la_OBJECTS) $(libgmerlin_gtk_la_DEPENDENCIES) 
-	$(libgmerlin_gtk_la_LINK) -rpath $(libdir) $(libgmerlin_gtk_la_OBJECTS) $(libgmerlin_gtk_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutwindow.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/albumentry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/albumwidget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/albumwindow.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/button.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_button.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_checkbutton.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_dialog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_font.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_multi_list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_multi_menu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_position.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_slider.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_spinbutton.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_string.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_stringlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_time.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chapterdialog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/driveselect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileentry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileselect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infowindow.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logwindow.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_multi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_single.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugininfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pluginmenu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/presetmenu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/question.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrolltext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slider.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textview.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textwindow.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treewidget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treewindow.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urllink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlselect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vumeter.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/lib/x11/Makefile.in Deleted

@@ -1,627 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib/x11
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libx11_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am__libx11_la_SOURCES_DIST = grab.c icon.c shm.c x11_event.c x11_gl.c \
-	x11_video.c x11_window.c overlay.c screensaver.c ximage.c \
-	glvideo.c xvideo.c
-@HAVE_GLX_TRUE@am__objects_1 = glvideo.lo
-@HAVE_XV_TRUE@am__objects_2 = xvideo.lo
-am_libx11_la_OBJECTS = grab.lo icon.lo shm.lo x11_event.lo x11_gl.lo \
-	x11_video.lo x11_window.lo overlay.lo screensaver.lo ximage.lo \
-	$(am__objects_1) $(am__objects_2)
-libx11_la_OBJECTS = $(am_libx11_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libx11_la_SOURCES)
-DIST_SOURCES = $(am__libx11_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@X_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-@HAVE_XV_FALSE@xv_sources = 
-@HAVE_XV_TRUE@xv_sources = xvideo.c
-@HAVE_XV_FALSE@xv_libs = 
-@HAVE_XV_TRUE@xv_libs = @XV_LIBS@
-@HAVE_GLX_FALSE@glx_sources = 
-@HAVE_GLX_TRUE@glx_sources = glvideo.c
-@HAVE_GLX_FALSE@glx_libs = 
-@HAVE_GLX_TRUE@glx_libs = @GL_LIBS@
-@HAVE_XTEST_FALSE@xtest_libs = 
-@HAVE_XTEST_TRUE@xtest_libs = @XTEST_LIBS@
-noinst_LTLIBRARIES = \
-libx11.la
-
-libx11_la_SOURCES = \
-grab.c \
-icon.c \
-shm.c \
-x11_event.c \
-x11_gl.c \
-x11_video.c \
-x11_window.c \
-overlay.c \
-screensaver.c \
-ximage.c \
-$(glx_sources) \
-$(xv_sources)
-
-libx11_la_LIBADD = @GMERLIN_DEP_LIBS@ @XINERAMA_LIBS@ @XFIXES_LIBS@ @XDPMS_LIBS@ $(xv_libs) $(glx_libs) $(xtest_libs) @X_LIBS@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/x11/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libx11.la: $(libx11_la_OBJECTS) $(libx11_la_DEPENDENCIES) 
-	$(LINK)  $(libx11_la_OBJECTS) $(libx11_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glvideo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grab.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/overlay.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screensaver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_event.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_gl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_video.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_window.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ximage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvideo.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/ltmain.sh Deleted

@@ -1,8413 +0,0 @@
-# Generated from ltmain.m4sh.
-
-# ltmain.sh (GNU libtool) 2.2.6b
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
-#
-# MODE must be one of the following:
-#
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
-TIMESTAMP=""
-package_revision=1.3017
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-
-$lt_unset CDPATH
-
-
-
-
-
-: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SED="/bin/sed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-# Generated shell functions inserted here.
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=:
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/$[`"$\\]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$["`\\]$/\\\1/g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\$[^$bs]\$$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname${mode+: }$mode: $*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "X$my_tmpdir" | $Xsed
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/$(C)$[ 0-9,-]*$ [1-9][0-9]*$/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $SED -n '/^# Usage:/,/# -h/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    $ECHO
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-     }' < "$progpath"
-    exit $?
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    func_error "missing argument for $1"
-    exit_cmd=exit
-}
-
-exit_cmd=:
-
-
-
-
-
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    $ECHO "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
-    else
-      $ECHO "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
-    else
-      $ECHO "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
-    esac
-  done
-
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
-
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
-
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-
-
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
-
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
-
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-	    done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      removelist="$removelist $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$mode'"
-        ;;
-    esac
-
-    $ECHO
-    $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
-}
-
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
-
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-}
-
-test "$mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-
-# func_emit_wrapper_part1 [arg=no]
-#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$ECHO "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat <<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-# define setmode _setmode
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
-#else
-# define LTWRAPPER_DEBUGPRINTF(args)
-#endif
-
-const char *program_name = NULL;
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/$[\\"]$/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-	    cat <<EOF
-
-static const char *script_text_part2 =
-EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/$[\\"]$/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-
-	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
-
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-
-  /* very simple arg parsing; don't want to rely on getopt */
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
-	  return 0;
-	}
-    }
-
-  newargz = XMALLOC (char *, argc + 1);
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-  for (i = 0; i < newargc; i++)
-    {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  weak_libs="$weak_libs $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  case $lib in
-	  *.la)	func_source "$lib" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	      else
-		$ECHO
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework $[^ $]*$/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-		esac
-	      fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $ECHO
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  $ECHO
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $ECHO
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $ECHO
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $ECHO
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-	    done
-	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      delfiles="$delfiles $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
-		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$mode" = link || test "$mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-

gmerlin-1.2.0.tar.gz/m4/Makefile.in Deleted

@@ -1,458 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 lqt_opt_cflags.m4 check_funcs.m4 gavl_simd.m4 gl.m4
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu m4/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/missing Deleted

@@ -1,376 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
-sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* $[^ ]*$ *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

gmerlin-1.2.0.tar.gz/osd/Makefile.in Deleted

@@ -1,533 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = osd
-DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
-DATA = $(dist_pkgdata_DATA) $(pkgdata_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/gmerlin/osd
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-fonts = \
-GmerlinOSD.afm \
-GmerlinOSD.pfb
-
-pkgdata_DATA = $(fonts)
-dist_pkgdata_DATA = $(fonts)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu osd/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu osd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-dist_pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_pkgdataDATA install-pkgdataDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_pkgdataDATA uninstall-pkgdataDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_pkgdataDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pkgdataDATA \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_pkgdataDATA uninstall-pkgdataDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/Makefile.in Deleted

@@ -1,712 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = audiofilters edl gavl videofilters visualization alsa \
-	jack lqt jpeg esd v4l v4l2 oss png tiff x11 cdaudio pulseaudio \
-	mikmod wavwrite image postprocessors subwriters
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$[^/]*$/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/$[^/]*$$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_X11_FALSE@x11_subdirs = 
-@HAVE_X11_TRUE@x11_subdirs = x11
-@HAVE_OSS_FALSE@oss_subdirs = 
-@HAVE_OSS_TRUE@oss_subdirs = oss
-@HAVE_LIBPNG_FALSE@png_subdirs = 
-@HAVE_LIBPNG_TRUE@png_subdirs = png
-@HAVE_LIBTIFF_FALSE@tiff_subdirs = 
-@HAVE_LIBTIFF_TRUE@tiff_subdirs = tiff
-@HAVE_V4L2_FALSE@v4l2_subdirs = 
-@HAVE_V4L2_TRUE@v4l2_subdirs = v4l2
-@HAVE_V4L_FALSE@v4l_subdirs = 
-@HAVE_V4L_TRUE@v4l_subdirs = v4l
-@HAVE_ESD_FALSE@esd_subdirs = 
-@HAVE_ESD_TRUE@esd_subdirs = esd
-@HAVE_LIBJPEG_FALSE@jpeg_subdirs = 
-@HAVE_LIBJPEG_TRUE@jpeg_subdirs = jpeg
-@HAVE_LQT_FALSE@lqt_subdirs = 
-@HAVE_LQT_TRUE@lqt_subdirs = lqt
-@HAVE_ALSA_FALSE@alsa_subdirs = 
-@HAVE_ALSA_TRUE@alsa_subdirs = alsa
-@HAVE_JACK_FALSE@jack_subdirs = 
-@HAVE_JACK_TRUE@jack_subdirs = jack
-@HAVE_PULSEAUDIO_FALSE@pulseaudio_subdirs = 
-@HAVE_PULSEAUDIO_TRUE@pulseaudio_subdirs = pulseaudio
-@HAVE_CDIO_FALSE@cdio_subdirs = 
-@HAVE_CDIO_TRUE@cdio_subdirs = cdaudio
-SUBDIRS = \
-audiofilters \
-edl \
-gavl \
-videofilters \
-visualization \
-$(alsa_subdirs) \
-$(jack_subdirs) \
-$(lqt_subdirs) \
-$(jpeg_subdirs) \
-$(esd_subdirs) \
-$(v4l_subdirs) \
-$(v4l2_subdirs) \
-$(oss_subdirs) \
-$(png_subdirs) \
-$(tiff_subdirs) \
-$(x11_subdirs) \
-$(cdio_subdirs) \
-$(pulseaudio_subdirs) \
-mikmod \
-wavwrite \
-image \
-postprocessors \
-subwriters
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/alsa/Makefile.in Deleted

@@ -1,644 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/alsa
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_alsa_la_DEPENDENCIES =
-am_i_alsa_la_OBJECTS = i_alsa.lo alsa_common.lo
-i_alsa_la_OBJECTS = $(am_i_alsa_la_OBJECTS)
-oa_alsa_la_DEPENDENCIES =
-am_oa_alsa_la_OBJECTS = oa_alsa.lo alsa_common.lo
-oa_alsa_la_OBJECTS = $(am_oa_alsa_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_alsa_la_SOURCES) $(oa_alsa_la_SOURCES)
-DIST_SOURCES = $(i_alsa_la_SOURCES) $(oa_alsa_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@ALSA_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-plugin_LTLIBRARIES = oa_alsa.la i_alsa.la
-oa_alsa_la_SOURCES = oa_alsa.c alsa_common.c
-i_alsa_la_SOURCES = i_alsa.c alsa_common.c
-oa_alsa_la_LIBADD = @GMERLIN_DEP_LIBS@ @ALSA_LIBS@ @MODULE_LIBADD@
-i_alsa_la_LIBADD = @GMERLIN_DEP_LIBS@ @ALSA_LIBS@ @MODULE_LIBADD@
-noinst_HEADERS = alsa_common.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/alsa/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/alsa/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_alsa.la: $(i_alsa_la_OBJECTS) $(i_alsa_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_alsa_la_OBJECTS) $(i_alsa_la_LIBADD) $(LIBS)
-oa_alsa.la: $(oa_alsa_la_OBJECTS) $(oa_alsa_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(oa_alsa_la_OBJECTS) $(oa_alsa_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsa_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_alsa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oa_alsa.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/audiofilters/Makefile.in Deleted

@@ -1,638 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/audiofilters
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-fa_sampleformat_la_DEPENDENCIES =
-am_fa_sampleformat_la_OBJECTS = fa_sampleformat.lo
-fa_sampleformat_la_OBJECTS = $(am_fa_sampleformat_la_OBJECTS)
-fa_volume_la_DEPENDENCIES =
-am_fa_volume_la_OBJECTS = fa_volume.lo
-fa_volume_la_OBJECTS = $(am_fa_volume_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(fa_sampleformat_la_SOURCES) $(fa_volume_la_SOURCES)
-DIST_SOURCES = $(fa_sampleformat_la_SOURCES) $(fa_volume_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = fa_volume.la fa_sampleformat.la
-fa_volume_la_SOURCES = fa_volume.c 
-fa_volume_la_LIBADD = @MODULE_LIBADD@
-fa_sampleformat_la_SOURCES = fa_sampleformat.c
-fa_sampleformat_la_LIBADD = @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/audiofilters/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/audiofilters/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-fa_sampleformat.la: $(fa_sampleformat_la_OBJECTS) $(fa_sampleformat_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fa_sampleformat_la_OBJECTS) $(fa_sampleformat_la_LIBADD) $(LIBS)
-fa_volume.la: $(fa_volume_la_OBJECTS) $(fa_volume_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fa_volume_la_OBJECTS) $(fa_volume_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fa_sampleformat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fa_volume.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/cdaudio/Makefile.in Deleted

@@ -1,683 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/cdaudio
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-i_cdaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am__i_cdaudio_la_SOURCES_DIST = i_cdaudio.c cdaudio.c cdaudio_xml.c \
-	sha1.c cdparanoia.c cdtext.c musicbrainz.c cddb.c
-@HAVE_MUSICBRAINZ_TRUE@am__objects_1 = musicbrainz.lo
-@HAVE_LIBCDDB_TRUE@am__objects_2 = cddb.lo
-am_i_cdaudio_la_OBJECTS = i_cdaudio.lo cdaudio.lo cdaudio_xml.lo \
-	sha1.lo cdparanoia.lo cdtext.lo $(am__objects_1) \
-	$(am__objects_2)
-i_cdaudio_la_OBJECTS = $(am_i_cdaudio_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_cdaudio_la_SOURCES)
-DIST_SOURCES = $(am__i_cdaudio_la_SOURCES_DIST)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-@HAVE_MUSICBRAINZ_FALSE@musicbrainz_sources = 
-@HAVE_MUSICBRAINZ_TRUE@musicbrainz_sources = musicbrainz.c
-@HAVE_MUSICBRAINZ_FALSE@musicbrainz_libs = 
-@HAVE_MUSICBRAINZ_TRUE@musicbrainz_libs = @MUSICBRAINZ_LIBS@
-@HAVE_MUSICBRAINZ_FALSE@musicbrainz_cflags = 
-@HAVE_MUSICBRAINZ_TRUE@musicbrainz_cflags = @MUSICBRAINZ_CFLAGS@
-@HAVE_LIBCDDB_FALSE@cddb_sources = 
-@HAVE_LIBCDDB_TRUE@cddb_sources = cddb.c
-@HAVE_LIBCDDB_FALSE@cddb_libs = 
-@HAVE_LIBCDDB_TRUE@cddb_libs = @CDDB_LIBS@
-@HAVE_LIBCDDB_FALSE@cddb_cflags = 
-@HAVE_LIBCDDB_TRUE@cddb_cflags = @CDDB_CFLAGS@
-AM_CFLAGS = \
-$(cddb_cflags) \
-$(musicbrainz_cflags) \
-@CDIO_CFLAGS@ \
-@CDIO_CDDA_CFLAGS@ \
-@CDIO_PARANOIA_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = i_cdaudio.la
-i_cdaudio_la_SOURCES = \
-i_cdaudio.c \
-cdaudio.c \
-cdaudio_xml.c \
-sha1.c	\
-cdparanoia.c \
-cdtext.c \
-$(musicbrainz_sources) \
-$(cddb_sources)
-
-i_cdaudio_la_LIBADD = \
-@GMERLIN_DEP_LIBS@ \
-$(musicbrainz_libs) \
-$(cddb_libs) \
-@CDIO_LIBS@ \
-@CDIO_CDDA_LIBS@ \
-@CDIO_PARANOIA_LIBS@ \
-@MODULE_LIBADD@
-
-noinst_HEADERS = cdaudio.h sha1.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/cdaudio/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/cdaudio/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_cdaudio.la: $(i_cdaudio_la_OBJECTS) $(i_cdaudio_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_cdaudio_la_OBJECTS) $(i_cdaudio_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdaudio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdaudio_xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdparanoia.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdtext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_cdaudio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/musicbrainz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/edl/Makefile.in Deleted

@@ -1,630 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/edl
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_edl_la_DEPENDENCIES =
-am_i_edl_la_OBJECTS = i_edl.lo
-i_edl_la_OBJECTS = $(am_i_edl_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_edl_la_SOURCES)
-DIST_SOURCES = $(i_edl_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = i_edl.la 
-i_edl_la_SOURCES = i_edl.c 
-i_edl_la_LIBADD = @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/edl/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/edl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_edl.la: $(i_edl_la_OBJECTS) $(i_edl_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_edl_la_OBJECTS) $(i_edl_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_edl.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/esd/Makefile.in Deleted

@@ -1,639 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/esd
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_esd_la_DEPENDENCIES =
-am_i_esd_la_OBJECTS = i_esd.lo
-i_esd_la_OBJECTS = $(am_i_esd_la_OBJECTS)
-oa_esd_la_DEPENDENCIES =
-am_oa_esd_la_OBJECTS = oa_esd.lo
-oa_esd_la_OBJECTS = $(am_oa_esd_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_esd_la_SOURCES) $(oa_esd_la_SOURCES)
-DIST_SOURCES = $(i_esd_la_SOURCES) $(oa_esd_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
-@ESD_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = oa_esd.la i_esd.la
-oa_esd_la_SOURCES = oa_esd.c
-i_esd_la_SOURCES = i_esd.c
-oa_esd_la_LIBADD = @GMERLIN_DEP_LIBS@ @ESD_LIBS@ @MODULE_LIBADD@
-i_esd_la_LIBADD = @GMERLIN_DEP_LIBS@ @ESD_LIBS@ @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/esd/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/esd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_esd.la: $(i_esd_la_OBJECTS) $(i_esd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_esd_la_OBJECTS) $(i_esd_la_LIBADD) $(LIBS)
-oa_esd.la: $(oa_esd_la_OBJECTS) $(oa_esd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(oa_esd_la_OBJECTS) $(oa_esd_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_esd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oa_esd.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/gavl/Makefile.in Deleted

@@ -1,638 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/gavl
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-ir_gavl_la_DEPENDENCIES =
-am_ir_gavl_la_OBJECTS = ir_gavl.lo
-ir_gavl_la_OBJECTS = $(am_ir_gavl_la_OBJECTS)
-iw_gavl_la_DEPENDENCIES =
-am_iw_gavl_la_OBJECTS = iw_gavl.lo
-iw_gavl_la_OBJECTS = $(am_iw_gavl_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(ir_gavl_la_SOURCES) $(iw_gavl_la_SOURCES)
-DIST_SOURCES = $(ir_gavl_la_SOURCES) $(iw_gavl_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = ir_gavl.la iw_gavl.la
-ir_gavl_la_SOURCES = ir_gavl.c
-ir_gavl_la_LIBADD = @GMERLIN_DEP_LIBS@ @MODULE_LIBADD@
-iw_gavl_la_SOURCES = iw_gavl.c
-iw_gavl_la_LIBADD = @GMERLIN_DEP_LIBS@ @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/gavl/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/gavl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-ir_gavl.la: $(ir_gavl_la_OBJECTS) $(ir_gavl_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_gavl_la_OBJECTS) $(ir_gavl_la_LIBADD) $(LIBS)
-iw_gavl.la: $(iw_gavl_la_OBJECTS) $(iw_gavl_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_gavl_la_OBJECTS) $(iw_gavl_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_gavl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_gavl.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/image/Makefile.in Deleted

@@ -1,679 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/image
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-ir_bmp_la_DEPENDENCIES =
-am_ir_bmp_la_OBJECTS = ir_bmp.lo
-ir_bmp_la_OBJECTS = $(am_ir_bmp_la_OBJECTS)
-ir_pnm_la_DEPENDENCIES =
-am_ir_pnm_la_OBJECTS = ir_pnm.lo
-ir_pnm_la_OBJECTS = $(am_ir_pnm_la_OBJECTS)
-ir_tga_la_DEPENDENCIES =
-am_ir_tga_la_OBJECTS = ir_tga.lo targa.lo
-ir_tga_la_OBJECTS = $(am_ir_tga_la_OBJECTS)
-iw_bmp_la_DEPENDENCIES =
-am_iw_bmp_la_OBJECTS = iw_bmp.lo
-iw_bmp_la_OBJECTS = $(am_iw_bmp_la_OBJECTS)
-iw_pnm_la_DEPENDENCIES =
-am_iw_pnm_la_OBJECTS = iw_pnm.lo
-iw_pnm_la_OBJECTS = $(am_iw_pnm_la_OBJECTS)
-iw_tga_la_DEPENDENCIES =
-am_iw_tga_la_OBJECTS = iw_tga.lo targa.lo
-iw_tga_la_OBJECTS = $(am_iw_tga_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(ir_bmp_la_SOURCES) $(ir_pnm_la_SOURCES) \
-	$(ir_tga_la_SOURCES) $(iw_bmp_la_SOURCES) $(iw_pnm_la_SOURCES) \
-	$(iw_tga_la_SOURCES)
-DIST_SOURCES = $(ir_bmp_la_SOURCES) $(ir_pnm_la_SOURCES) \
-	$(ir_tga_la_SOURCES) $(iw_bmp_la_SOURCES) $(iw_pnm_la_SOURCES) \
-	$(iw_tga_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = ir_tga.la iw_tga.la ir_bmp.la iw_bmp.la ir_pnm.la iw_pnm.la
-ir_tga_la_SOURCES = ir_tga.c targa.c
-ir_tga_la_LIBADD = @MODULE_LIBADD@
-iw_tga_la_SOURCES = iw_tga.c targa.c
-iw_tga_la_LIBADD = @MODULE_LIBADD@
-ir_bmp_la_SOURCES = ir_bmp.c
-ir_bmp_la_LIBADD = @MODULE_LIBADD@
-iw_bmp_la_SOURCES = iw_bmp.c
-iw_bmp_la_LIBADD = @MODULE_LIBADD@
-ir_pnm_la_SOURCES = ir_pnm.c
-ir_pnm_la_LIBADD = @MODULE_LIBADD@
-iw_pnm_la_SOURCES = iw_pnm.c
-iw_pnm_la_LIBADD = @MODULE_LIBADD@
-noinst_HEADERS = targa.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/image/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/image/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-ir_bmp.la: $(ir_bmp_la_OBJECTS) $(ir_bmp_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_bmp_la_OBJECTS) $(ir_bmp_la_LIBADD) $(LIBS)
-ir_pnm.la: $(ir_pnm_la_OBJECTS) $(ir_pnm_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_pnm_la_OBJECTS) $(ir_pnm_la_LIBADD) $(LIBS)
-ir_tga.la: $(ir_tga_la_OBJECTS) $(ir_tga_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_tga_la_OBJECTS) $(ir_tga_la_LIBADD) $(LIBS)
-iw_bmp.la: $(iw_bmp_la_OBJECTS) $(iw_bmp_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_bmp_la_OBJECTS) $(iw_bmp_la_LIBADD) $(LIBS)
-iw_pnm.la: $(iw_pnm_la_OBJECTS) $(iw_pnm_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_pnm_la_OBJECTS) $(iw_pnm_la_LIBADD) $(LIBS)
-iw_tga.la: $(iw_tga_la_OBJECTS) $(iw_tga_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_tga_la_OBJECTS) $(iw_tga_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_bmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_pnm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_tga.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_bmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_pnm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_tga.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/targa.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/jack/Makefile.in Deleted

@@ -1,643 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/jack
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_jack_la_DEPENDENCIES =
-am_i_jack_la_OBJECTS = i_jack.lo jack_common.lo
-i_jack_la_OBJECTS = $(am_i_jack_la_OBJECTS)
-oa_jack_la_DEPENDENCIES =
-am_oa_jack_la_OBJECTS = oa_jack.lo jack_common.lo
-oa_jack_la_OBJECTS = $(am_oa_jack_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_jack_la_SOURCES) $(oa_jack_la_SOURCES)
-DIST_SOURCES = $(i_jack_la_SOURCES) $(oa_jack_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = @JACK_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)/plugins\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-plugin_LTLIBRARIES = oa_jack.la i_jack.la
-oa_jack_la_SOURCES = oa_jack.c jack_common.c
-i_jack_la_SOURCES = i_jack.c  jack_common.c
-oa_jack_la_LIBADD = @GMERLIN_DEP_LIBS@ @JACK_LIBS@ @MODULE_LIBADD@
-i_jack_la_LIBADD = @GMERLIN_DEP_LIBS@ @JACK_LIBS@ @MODULE_LIBADD@
-noinst_HEADERS = jack_common.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/jack/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/jack/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_jack.la: $(i_jack_la_OBJECTS) $(i_jack_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_jack_la_OBJECTS) $(i_jack_la_LIBADD) $(LIBS)
-oa_jack.la: $(oa_jack_la_OBJECTS) $(oa_jack_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(oa_jack_la_OBJECTS) $(oa_jack_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_jack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jack_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oa_jack.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/jpeg/Makefile.in Deleted

@@ -1,653 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/jpeg
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-ir_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__ir_jpeg_la_SOURCES_DIST = ir_jpeg.c exif.c
-@HAVE_LIBEXIF_TRUE@am__objects_1 = exif.lo
-am_ir_jpeg_la_OBJECTS = ir_jpeg.lo $(am__objects_1)
-ir_jpeg_la_OBJECTS = $(am_ir_jpeg_la_OBJECTS)
-iw_jpeg_la_DEPENDENCIES =
-am_iw_jpeg_la_OBJECTS = iw_jpeg.lo
-iw_jpeg_la_OBJECTS = $(am_iw_jpeg_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(ir_jpeg_la_SOURCES) $(iw_jpeg_la_SOURCES)
-DIST_SOURCES = $(am__ir_jpeg_la_SOURCES_DIST) $(iw_jpeg_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
-@JPEG_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-@HAVE_LIBEXIF_FALSE@exif_sources = 
-@HAVE_LIBEXIF_TRUE@exif_sources = exif.c
-@HAVE_LIBEXIF_FALSE@exif_libs = 
-@HAVE_LIBEXIF_TRUE@exif_libs = @LIBEXIF_LIBS@
-@HAVE_LIBEXIF_FALSE@exif_cflags = 
-@HAVE_LIBEXIF_TRUE@exif_cflags = @LIBEXIF_CFLAGS@
-plugin_LTLIBRARIES = ir_jpeg.la iw_jpeg.la
-noinst_HEADERS = exif.h
-ir_jpeg_la_SOURCES = ir_jpeg.c $(exif_sources)
-ir_jpeg_la_LIBADD = @GMERLIN_DEP_LIBS@ @JPEG_LIBS@ @MODULE_LIBADD@ $(exif_libs)
-iw_jpeg_la_SOURCES = iw_jpeg.c
-iw_jpeg_la_LIBADD = @GMERLIN_DEP_LIBS@ @JPEG_LIBS@ @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/jpeg/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/jpeg/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-ir_jpeg.la: $(ir_jpeg_la_OBJECTS) $(ir_jpeg_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_jpeg_la_OBJECTS) $(ir_jpeg_la_LIBADD) $(LIBS)
-iw_jpeg.la: $(iw_jpeg_la_OBJECTS) $(iw_jpeg_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_jpeg_la_OBJECTS) $(iw_jpeg_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_jpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_jpeg.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/lqt/Makefile.in Deleted

@@ -1,645 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/lqt
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-e_lqt_la_DEPENDENCIES =
-am_e_lqt_la_OBJECTS = e_lqt.lo lqt_common.lo lqtgavl.lo
-e_lqt_la_OBJECTS = $(am_e_lqt_la_OBJECTS)
-i_lqt_la_DEPENDENCIES =
-am_i_lqt_la_OBJECTS = i_lqt.lo lqt_common.lo lqtgavl.lo
-i_lqt_la_OBJECTS = $(am_i_lqt_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(e_lqt_la_SOURCES) $(i_lqt_la_SOURCES)
-DIST_SOURCES = $(e_lqt_la_SOURCES) $(i_lqt_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
-@LQT_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = e_lqt.la i_lqt.la
-e_lqt_la_SOURCES = e_lqt.c lqt_common.c lqtgavl.c
-i_lqt_la_SOURCES = i_lqt.c lqt_common.c lqtgavl.c
-e_lqt_la_LIBADD = @GMERLIN_DEP_LIBS@ @LQT_LIBS@ @MODULE_LIBADD@
-i_lqt_la_LIBADD = @GMERLIN_DEP_LIBS@ @LQT_LIBS@ @MODULE_LIBADD@
-noinst_HEADERS = lqt_common.h lqtgavl.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/lqt/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/lqt/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-e_lqt.la: $(e_lqt_la_OBJECTS) $(e_lqt_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(e_lqt_la_OBJECTS) $(e_lqt_la_LIBADD) $(LIBS)
-i_lqt.la: $(i_lqt_la_OBJECTS) $(i_lqt_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_lqt_la_OBJECTS) $(i_lqt_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e_lqt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_lqt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lqt_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lqtgavl.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/mikmod/Makefile.in Deleted

@@ -1,630 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/mikmod
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_mikmod_la_DEPENDENCIES =
-am_i_mikmod_la_OBJECTS = i_mikmod.lo
-i_mikmod_la_OBJECTS = $(am_i_mikmod_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_mikmod_la_SOURCES)
-DIST_SOURCES = $(i_mikmod_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\"  \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = i_mikmod.la
-i_mikmod_la_SOURCES = i_mikmod.c 
-i_mikmod_la_LIBADD = @GMERLIN_DEP_LIBS@ @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mikmod/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/mikmod/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_mikmod.la: $(i_mikmod_la_OBJECTS) $(i_mikmod_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_mikmod_la_OBJECTS) $(i_mikmod_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_mikmod.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/oss/Makefile.in Deleted

@@ -1,643 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/oss
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_oss_la_DEPENDENCIES =
-am_i_oss_la_OBJECTS = i_oss.lo oss_common.lo
-i_oss_la_OBJECTS = $(am_i_oss_la_OBJECTS)
-oa_oss_la_DEPENDENCIES =
-am_oa_oss_la_OBJECTS = oa_oss.lo oss_common.lo
-oa_oss_la_OBJECTS = $(am_oa_oss_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_oss_la_SOURCES) $(oa_oss_la_SOURCES)
-DIST_SOURCES = $(i_oss_la_SOURCES) $(oa_oss_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = oa_oss.la i_oss.la
-oa_oss_la_SOURCES = oa_oss.c oss_common.c
-oa_oss_la_LIBADD = @MODULE_LIBADD@
-i_oss_la_SOURCES = i_oss.c oss_common.c
-i_oss_la_LIBADD = @MODULE_LIBADD@
-noinst_HEADERS = oss_common.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/oss/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/oss/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_oss.la: $(i_oss_la_OBJECTS) $(i_oss_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_oss_la_OBJECTS) $(i_oss_la_LIBADD) $(LIBS)
-oa_oss.la: $(oa_oss_la_OBJECTS) $(oa_oss_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(oa_oss_la_OBJECTS) $(oa_oss_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_oss.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oa_oss.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oss_common.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/png/Makefile.in Deleted

@@ -1,654 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/png
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-e_spumux_la_DEPENDENCIES =
-am_e_spumux_la_OBJECTS = e_spumux.lo pngwriter.lo
-e_spumux_la_OBJECTS = $(am_e_spumux_la_OBJECTS)
-ir_png_la_DEPENDENCIES =
-am_ir_png_la_OBJECTS = ir_png.lo
-ir_png_la_OBJECTS = $(am_ir_png_la_OBJECTS)
-iw_png_la_DEPENDENCIES =
-am_iw_png_la_OBJECTS = iw_png.lo pngwriter.lo
-iw_png_la_OBJECTS = $(am_iw_png_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(e_spumux_la_SOURCES) $(ir_png_la_SOURCES) \
-	$(iw_png_la_SOURCES)
-DIST_SOURCES = $(e_spumux_la_SOURCES) $(ir_png_la_SOURCES) \
-	$(iw_png_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
-@PNG_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = ir_png.la iw_png.la e_spumux.la
-ir_png_la_SOURCES = ir_png.c
-ir_png_la_LIBADD = @GMERLIN_DEP_LIBS@ @PNG_LIBS@ @MODULE_LIBADD@
-iw_png_la_SOURCES = iw_png.c pngwriter.c
-iw_png_la_LIBADD = @GMERLIN_DEP_LIBS@ @PNG_LIBS@ @MODULE_LIBADD@
-e_spumux_la_SOURCES = e_spumux.c pngwriter.c
-e_spumux_la_LIBADD = @GMERLIN_DEP_LIBS@ @PNG_LIBS@ @MODULE_LIBADD@
-noinst_HEADERS = pngwriter.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/png/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/png/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-e_spumux.la: $(e_spumux_la_OBJECTS) $(e_spumux_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(e_spumux_la_OBJECTS) $(e_spumux_la_LIBADD) $(LIBS)
-ir_png.la: $(ir_png_la_OBJECTS) $(ir_png_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_png_la_OBJECTS) $(ir_png_la_LIBADD) $(LIBS)
-iw_png.la: $(iw_png_la_OBJECTS) $(iw_png_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_png_la_OBJECTS) $(iw_png_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e_spumux.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_png.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_png.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngwriter.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/postprocessors/Makefile.in Deleted

@@ -1,647 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/postprocessors
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-e_pp_cdrdao_la_DEPENDENCIES =
-am_e_pp_cdrdao_la_OBJECTS = e_pp_cdrdao.lo cdrdao_common.lo
-e_pp_cdrdao_la_OBJECTS = $(am_e_pp_cdrdao_la_OBJECTS)
-e_pp_cdrdao_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(e_pp_cdrdao_la_LDFLAGS) $(LDFLAGS) -o $@
-e_pp_vcdimager_la_DEPENDENCIES =
-am_e_pp_vcdimager_la_OBJECTS = e_pp_vcdimager.lo cdrdao_common.lo
-e_pp_vcdimager_la_OBJECTS = $(am_e_pp_vcdimager_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(e_pp_cdrdao_la_SOURCES) $(e_pp_vcdimager_la_SOURCES)
-DIST_SOURCES = $(e_pp_cdrdao_la_SOURCES) $(e_pp_vcdimager_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = e_pp_vcdimager.la e_pp_cdrdao.la
-e_pp_vcdimager_la_SOURCES = e_pp_vcdimager.c cdrdao_common.c
-e_pp_vcdimager_la_LIBADD = @MODULE_LIBADD@
-e_pp_cdrdao_la_SOURCES = e_pp_cdrdao.c cdrdao_common.c
-e_pp_cdrdao_la_LDFLAGS = -avoid-version -module
-e_pp_cdrdao_la_LIBADD = @MODULE_LIBADD@
-noinst_HEADERS = cdrdao_common.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/postprocessors/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/postprocessors/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-e_pp_cdrdao.la: $(e_pp_cdrdao_la_OBJECTS) $(e_pp_cdrdao_la_DEPENDENCIES) 
-	$(e_pp_cdrdao_la_LINK) -rpath $(plugindir) $(e_pp_cdrdao_la_OBJECTS) $(e_pp_cdrdao_la_LIBADD) $(LIBS)
-e_pp_vcdimager.la: $(e_pp_vcdimager_la_OBJECTS) $(e_pp_vcdimager_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(e_pp_vcdimager_la_OBJECTS) $(e_pp_vcdimager_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdrdao_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e_pp_cdrdao.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e_pp_vcdimager.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/pulseaudio/Makefile.in Deleted

@@ -1,647 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/pulseaudio
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_pulse_la_DEPENDENCIES =
-am_i_pulse_la_OBJECTS = i_pulse.lo pulseaudio_common.lo
-i_pulse_la_OBJECTS = $(am_i_pulse_la_OBJECTS)
-oa_pulse_la_DEPENDENCIES =
-am_oa_pulse_la_OBJECTS = oa_pulse.lo pulseaudio_common.lo
-oa_pulse_la_OBJECTS = $(am_oa_pulse_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_pulse_la_SOURCES) $(oa_pulse_la_SOURCES)
-DIST_SOURCES = $(i_pulse_la_SOURCES) $(oa_pulse_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
-@PULSEAUDIO_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = \
-oa_pulse.la \
-i_pulse.la
-
-oa_pulse_la_SOURCES = oa_pulse.c pulseaudio_common.c
-oa_pulse_la_LIBADD = @GMERLIN_DEP_LIBS@ @PULSEAUDIO_LIBS@ @MODULE_LIBADD@
-i_pulse_la_SOURCES = i_pulse.c pulseaudio_common.c
-i_pulse_la_LIBADD = @GMERLIN_DEP_LIBS@ @PULSEAUDIO_LIBS@ @MODULE_LIBADD@
-noinst_HEADERS = pulseaudio_common.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/pulseaudio/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/pulseaudio/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_pulse.la: $(i_pulse_la_OBJECTS) $(i_pulse_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_pulse_la_OBJECTS) $(i_pulse_la_LIBADD) $(LIBS)
-oa_pulse.la: $(oa_pulse_la_OBJECTS) $(oa_pulse_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(oa_pulse_la_OBJECTS) $(oa_pulse_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_pulse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oa_pulse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pulseaudio_common.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/subwriters/Makefile.in Deleted

@@ -1,630 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/subwriters
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-e_subtext_la_DEPENDENCIES =
-am_e_subtext_la_OBJECTS = e_subtext.lo
-e_subtext_la_OBJECTS = $(am_e_subtext_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(e_subtext_la_SOURCES)
-DIST_SOURCES = $(e_subtext_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = e_subtext.la
-e_subtext_la_SOURCES = e_subtext.c
-e_subtext_la_LIBADD = @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/subwriters/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/subwriters/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-e_subtext.la: $(e_subtext_la_OBJECTS) $(e_subtext_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(e_subtext_la_OBJECTS) $(e_subtext_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e_subtext.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/tiff/Makefile.in Deleted

@@ -1,639 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/tiff
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-ir_tiff_la_DEPENDENCIES =
-am_ir_tiff_la_OBJECTS = ir_tiff.lo
-ir_tiff_la_OBJECTS = $(am_ir_tiff_la_OBJECTS)
-iw_tiff_la_DEPENDENCIES =
-am_iw_tiff_la_OBJECTS = iw_tiff.lo
-iw_tiff_la_OBJECTS = $(am_iw_tiff_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(ir_tiff_la_SOURCES) $(iw_tiff_la_SOURCES)
-DIST_SOURCES = $(ir_tiff_la_SOURCES) $(iw_tiff_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
-@TIFF_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = ir_tiff.la iw_tiff.la
-ir_tiff_la_SOURCES = ir_tiff.c
-ir_tiff_la_LIBADD = @GMERLIN_DEP_LIBS@ @TIFF_LIBS@ @MODULE_LIBADD@
-iw_tiff_la_SOURCES = iw_tiff.c
-iw_tiff_la_LIBADD = @GMERLIN_DEP_LIBS@ @TIFF_LIBS@ @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/tiff/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/tiff/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-ir_tiff.la: $(ir_tiff_la_OBJECTS) $(ir_tiff_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ir_tiff_la_OBJECTS) $(ir_tiff_la_LIBADD) $(LIBS)
-iw_tiff.la: $(iw_tiff_la_OBJECTS) $(iw_tiff_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(iw_tiff_la_OBJECTS) $(iw_tiff_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ir_tiff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iw_tiff.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/v4l Deleted

gmerlin-1.2.0.tar.gz/plugins/v4l/Makefile.am Deleted

gmerlin-1.2.0.tar.gz/plugins/v4l/Makefile.in Deleted

@@ -1,635 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/v4l
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_v4l_la_DEPENDENCIES =
-am_i_v4l_la_OBJECTS = i_v4l.lo pwc.lo
-i_v4l_la_OBJECTS = $(am_i_v4l_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_v4l_la_SOURCES)
-DIST_SOURCES = $(i_v4l_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = i_v4l.la
-i_v4l_la_SOURCES = i_v4l.c pwc.c
-i_v4l_la_LIBADD = @MODULE_LIBADD@
-noinst_HEADERS = pwc-ioctl.h pwc.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/v4l/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/v4l/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_v4l.la: $(i_v4l_la_OBJECTS) $(i_v4l_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_v4l_la_OBJECTS) $(i_v4l_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_v4l.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwc.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/v4l/i_v4l.c Deleted

@@ -1,717 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <config.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/plugin.h>
-
-#include <linux/videodev.h>
-
-#include <unistd.h>
-#include <gmerlin/utils.h>
-
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "i_v4l"
-
-#include "pwc.h"
-
-/* Debugging stuff */
-#if 0
-
-const struct
-  {
-  int id;
-  char const * const name;
-  }
-palette_names[] =
-  {
-    { VIDEO_PALETTE_GREY,    "Linear greyscale" },
-    { VIDEO_PALETTE_HI240,   "High 240 cube (BT848)" },
-    { VIDEO_PALETTE_RGB565,  "565 16 bit RGB" },
-    { VIDEO_PALETTE_RGB24,   "24bit RGB" },
-    { VIDEO_PALETTE_RGB32,   "32bit RGB" },
-    { VIDEO_PALETTE_RGB555,  "555 15bit RGB" },
-    { VIDEO_PALETTE_YUV422,  "YUV422 capture" },
-    { VIDEO_PALETTE_YUYV,    "YUYV" },
-    { VIDEO_PALETTE_UYVY,    "UYVY" },
-    { VIDEO_PALETTE_YUV420,  "YUV 420" },
-    { VIDEO_PALETTE_YUV411,  "YUV 411" },
-    { VIDEO_PALETTE_RAW,     "RAW capture (BT848)" },
-    { VIDEO_PALETTE_YUV422P, "YUV 4:2:2 Planar" },
-    { VIDEO_PALETTE_YUV411P, "YUV 4:1:1 Planar" },
-    { VIDEO_PALETTE_YUV420P, "YUV 4:2:0 Planar" },
-    { VIDEO_PALETTE_YUV410P, "YUV 4:1:0 Planar" },
-  };
-
-static void dump_palette(int palette)
-  {
-  int i;
-  FILE * out = stderr;
-  for(i = 0; i < sizeof(palette_names)/sizeof(palette_names[0]); i++)
-    {
-    if(palette == palette_names[i].id)
-      {
-      fprintf(out, "%s", palette_names[i].name);
-      break;
-      }
-    }
-  }
-
-static void dump_video_picture(struct video_picture * p)
-  {
-  FILE * out = stderr;
-  fprintf(out , "Video picture:\n");
-  fprintf(out , "  Brightness: %d\n", p->brightness);
-  fprintf(out , "  Hue:        %d\n", p->hue);
-  fprintf(out , "  Colour:     %d\n", p->colour);
-  fprintf(out , "  Contrast:   %d\n", p->contrast);
-  fprintf(out , "  Whiteness:  %d\n", p->whiteness);
-  fprintf(out , "  Depth:      %d\n", p->depth);
-  fprintf(out , "  Palette:    ");
-  dump_palette(p->palette);
-  fprintf(out , "\n");
-  }
-#endif
-
-/* Colorspace translation stuff */
-
-static const struct
-  {
-  int               v4l;
-  gavl_pixelformat_t gavl;
-  int depth;
-  }
-pixelformats[] =
-  {
-    { VIDEO_PALETTE_GREY, GAVL_GRAY_8, 8 }, /* Linear greyscale */
-    // VIDEO_PALETTE_HI240     2       /* High 240 cube (BT848) */
-    { VIDEO_PALETTE_RGB565, GAVL_RGB_16, 16 },       /* 565 16 bit RGB */
-    { VIDEO_PALETTE_RGB24,  GAVL_BGR_24, 24 },       /* 24bit RGB */
-    { VIDEO_PALETTE_RGB32,  GAVL_RGB_32, 32 },       /* 32bit RGB */
-    { VIDEO_PALETTE_RGB555, GAVL_RGB_15, 15 },       /* 555 15bit RGB */
-    { VIDEO_PALETTE_YUV422, GAVL_YUY2,   24 },  /* YUV422 capture */
-    { VIDEO_PALETTE_YUYV,   GAVL_YUY2,   24 },
-    { VIDEO_PALETTE_UYVY,   GAVL_UYVY,   24 },  /* The great thing about standards is ... */
-    // VIDEO_PALETTE_YUV420    10
-    // VIDEO_PALETTE_YUV411    11      /* YUV411 capture */
-    // VIDEO_PALETTE_RAW       12      /* RAW capture (BT848) */
-    { VIDEO_PALETTE_YUV422P, GAVL_YUV_422_P, 24 },  /* YUV 4:2:2 Planar */
-    { VIDEO_PALETTE_YUV411P,  GAVL_YUV_411_P, 24 },  /* YUV 4:1:1 Planar */
-    //    { VIDEO_PALETTE_YUV420P, GAVL_YUV_420_P, 12 },  /* YUV 4:2:0 Planar */
-    { VIDEO_PALETTE_YUV420P, GAVL_YUV_420_P, 24 },  /* YUV 4:2:0 Planar */
-
-    // VIDEO_PALETTE_YUV410P   16      /* YUV 4:1:0 Planar */
-
-  };
-
-static const int
-num_pixelformats = sizeof(pixelformats)/sizeof(pixelformats[0]);
-
-static gavl_pixelformat_t get_gavl_pixelformat(int csp)
-  {
-  int i;
-  for(i = 0; i < num_pixelformats; i++)
-    {
-    if(pixelformats[i].v4l == csp)
-      return pixelformats[i].gavl;
-    }
-  return GAVL_PIXELFORMAT_NONE;
-  }
-
-static int get_v4l_pixelformat(gavl_pixelformat_t csp)
-  {
-  int i;
-  for(i = 0; i < num_pixelformats; i++)
-    {
-    if(pixelformats[i].gavl == csp)
-      return pixelformats[i].v4l;
-    }
-  return -1;
-  }
-
-/* Input module */
-
-typedef struct
-  {
-  bg_parameter_info_t * parameters;
-
-  int have_pwc;            /* True is we have a Phillips webcam */
-  int have_pwc_parameters; /* True is we have created parameters for
-                              a Phillips webcam */
-
-  gavl_video_format_t format;
-  
-  void * pwc_priv;
-  
-  int fd;
-
-  struct video_picture pic, cfg_pic;
-  struct video_window  win, cfg_win;
-
-  int user_width;
-  int user_height;
-  int user_resolution;
-
-  struct video_mbuf mbuf;
-
-  struct video_mmap mmap_struct;
-
-  int frame_index;
-  uint8_t * mmap_buf;
-
-  gavl_video_frame_t * frame;
-  char * device;
-  } v4l_t;
-
-static int open_v4l(void * priv,
-                    gavl_audio_format_t * audio_format,
-                    gavl_video_format_t * format)
-  {
-  v4l_t * v4l;
-  v4l = priv;
-
-  /* Open device */
-
-  if((v4l->fd = open(v4l->device, O_RDWR, 0)) < 0)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open device %s: %s",
-                 v4l->device, strerror(errno));
-    goto fail;
-    }
-  /* Check if we have a Phillips webcam */
-
-  v4l->have_pwc = bg_pwc_probe(v4l->fd);
-
-  if(v4l->have_pwc)
-    bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Phillips webcam detected");
-  
-  /* Set Picture */
-  
-  if(ioctl(v4l->fd, VIDIOCGPICT, &v4l->pic))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCGPICT failed: %s",
-           strerror(errno));
-    goto fail;
-    }
-  format->pixelformat = get_gavl_pixelformat(v4l->pic.palette);
-  /* If we have a nonsupported pixelformat we try YUV420 */
-
-  if(format->pixelformat == GAVL_PIXELFORMAT_NONE)
-    v4l->pic.palette = get_v4l_pixelformat(GAVL_YUV_420_P);
-  
-  /* Transfer values */
-
-#if 1
-  v4l->pic.brightness = v4l->cfg_pic.brightness;
-  v4l->pic.hue        = v4l->cfg_pic.hue;
-  v4l->pic.colour     = v4l->cfg_pic.colour;
-  v4l->pic.contrast   = v4l->cfg_pic.contrast;
-  v4l->pic.whiteness  = v4l->cfg_pic.whiteness;      /* Black and white only */
-#endif
-
-  //  dump_video_picture(&v4l->pic);
-  
-  if(ioctl(v4l->fd, VIDIOCSPICT, &v4l->pic))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCSPICT failed: %s",
-                                    strerror(errno));
-    goto fail;
-    }
-  format->pixelformat = get_gavl_pixelformat(v4l->pic.palette);
-  
-  /* Set window */
-
-  if(ioctl(v4l->fd, VIDIOCGWIN, &v4l->win))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCGWIN failed: %s",
-           strerror(errno));
-    goto fail;
-    }
-  v4l->win.x = 0;
-  v4l->win.y = 0;
-
-  v4l->win.width  = v4l->cfg_win.width;
-  v4l->win.height = v4l->cfg_win.height;
-  v4l->win.flags = 0;
-  
-  if(ioctl(v4l->fd, VIDIOCSWIN, &v4l->win))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCSWIN failed: %s (invalaid picture dimensions?)",
-           strerror(errno));
-    goto fail;
-    }
-  /* Setup format */
-      
-  format->image_width  = v4l->win.width;
-  format->image_height = v4l->win.height;
-
-  format->frame_width  = v4l->win.width;
-  format->frame_height = v4l->win.height;
-
-  format->pixel_width  = 1;
-  format->pixel_height = 1;
-
-  format->framerate_mode = GAVL_FRAMERATE_VARIABLE;
-  format->frame_duration = 0;
-  format->timescale = 1;
-
-  gavl_video_format_copy(&v4l->format, format);
-  
-  
-  /* Setup frame */
-
-  gavl_video_frame_set_strides(v4l->frame, format);
-  
-  /* Setup mmap */
-  
-  if(ioctl(v4l->fd, VIDIOCGMBUF, &v4l->mbuf))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCGMBUF failed: %s",
-           strerror(errno));
-    goto fail;
-    }  
-  v4l->mmap_buf = (uint8_t*)(mmap(0, v4l->mbuf.size, PROT_READ|PROT_WRITE,
-                                  MAP_SHARED,v4l->fd,0));
-  if((unsigned char*)-1 == v4l->mmap_buf)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "mmap failed: %s", strerror(errno));
-    goto fail;
-    }
-  v4l->mmap_struct.width = format->image_width;
-  v4l->mmap_struct.height = format->image_height;
-  v4l->mmap_struct.format = v4l->pic.palette;
-
-  v4l->frame_index = 0;
-
-  gavl_video_format_copy(&v4l->format, format);
-  
-  return 1;
-  fail:
-  if(v4l->fd >= 0)
-    {
-    close(v4l->fd);
-    v4l->fd = -1;
-    }
-  return 0;
-  
-  }
-
-static void close_v4l(void * priv)
-  {
-  v4l_t * v4l;
-  v4l = priv;
-
-  if(v4l->fd >= 0)
-    {
-    close(v4l->fd);
-    if(v4l->mmap_buf)
-      munmap(v4l->mmap_buf, v4l->mbuf.size);
-    }
-  v4l->fd = -1;
-  }
-
-static int read_frame_v4l(void * priv, gavl_video_frame_t * frame, int stream)
-  {
-  v4l_t * v4l;
-  v4l = priv;
-
-  v4l->mmap_struct.frame = v4l->frame_index;
-  
-  if(ioctl(v4l->fd, VIDIOCMCAPTURE, &v4l->mmap_struct))
-    return 0;
-
-  if(ioctl(v4l->fd,VIDIOCSYNC, &v4l->frame_index))
-    return 0;
-
-  gavl_video_frame_set_planes(v4l->frame,
-                              &v4l->format,
-                              &v4l->mmap_buf[v4l->mbuf.offsets[v4l->frame_index]]);
-  
-  gavl_video_frame_copy(&v4l->format, frame, v4l->frame);
-  //  if(ioctl(v4l->fd,VIDIOCSYNC, &v4l->mmap[v4l->frame_index]))
-  
-  v4l->frame_index++;
-  if(v4l->frame_index >= v4l->mbuf.frames)
-    v4l->frame_index = 0;
-  
-  return 1;
-  }
-
-static void * create_v4l()
-  {
-  v4l_t * v4l;
-
-  v4l = calloc(1, sizeof(*v4l));
-
-  v4l->frame = gavl_video_frame_create(NULL);
-  v4l->fd = -1;
-  return v4l;
-  }
-
-static void  destroy_v4l(void * priv)
-  {
-  v4l_t * v4l;
-  v4l = priv;
-  gavl_video_frame_null(v4l->frame);
-  gavl_video_frame_destroy(v4l->frame);
-  close_v4l(priv);
-
-  if(v4l->parameters)
-    bg_parameter_info_destroy_array(v4l->parameters);
-  
-  if(v4l->pwc_priv)
-    {
-    bg_pwc_destroy(v4l->pwc_priv);
-    v4l->pwc_priv = NULL;
-    }
-    free(v4l);
-  
-  }
-
-/* Configuration stuff */
-
-static const bg_parameter_info_t parameters[] =
-  {
-    {
-      .name =        "device_section",
-      .long_name =   TRS("Device"),
-      .type =        BG_PARAMETER_SECTION
-    },
-    {
-      .name =        "device",
-      .long_name =   TRS("V4L Device"),
-      .type =        BG_PARAMETER_DEVICE,
-      .val_default = { .val_str = "/dev/video0" },
-    },
-    {
-      .name =        "res",
-      .long_name =   TRS("Resolution"),
-      .type =        BG_PARAMETER_SECTION,
-    },
-    {
-      .name =      "resolution",
-      .long_name = TRS("Resolution"),
-      .type =      BG_PARAMETER_STRINGLIST,
-      .val_default = { .val_str = "QVGA (320x240)" },
-      .multi_names =     (char const *[]){ "QSIF (160x112)",
-                              "QCIF (176x144)", 
-                              "QVGA (320x240)", 
-                              "SIF(352x240)", 
-                              "CIF (352x288)", 
-                              "VGA (640x480)", 
-                              "User defined",
-                              NULL },
-      .multi_labels =     (char const *[]){ TRS("QSIF (160x112)"),
-                                   TRS("QCIF (176x144)"), 
-                                   TRS("QVGA (320x240)"), 
-                                   TRS("SIF(352x240)"), 
-                                   TRS("CIF (352x288)"), 
-                                   TRS("VGA (640x480)"), 
-                                   TRS("User defined"),
-                                   NULL },
-    },
-    {
-      .name =        "user_width",
-      .long_name =   TRS("User defined width"),
-      .type =        BG_PARAMETER_INT,
-      .val_default = { .val_i = 720 },
-      .val_min =     { .val_i = 160 },
-      .val_max =     { .val_i = 1024 },
-    },
-    {
-      .name =        "user_height",
-      .long_name =   TRS("User defined height"),
-      .type =        BG_PARAMETER_INT,
-      .val_default = { .val_i = 576 },
-      .val_min =     { .val_i = 112 },
-      .val_max =     { .val_i = 768 },
-    },
-    {
-      .name =        "settings",
-      .long_name =   TRS("Settings"),
-      .type =        BG_PARAMETER_SECTION,
-    },
-    {
-      .name =        "brightness",
-      .long_name =   TRS("Brightness"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 40000 },
-    },
-    {
-      .name =        "hue",
-      .long_name =   TRS("Hue"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 65535 },
-    },
-    {
-      .name =        "colour",
-      .long_name =   TRS("Colour"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 30000 },
-    },
-    {
-      .name =        "contrast",
-      .long_name =   TRS("Contrast"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 30000 },
-    },
-    {
-      .name =        "whiteness",
-      .long_name =   TRS("Whiteness"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 30000 },
-    },
-    { /* End of parameters */ }
-  };
-
-static void create_parameters(v4l_t * v4l)
-  {
-  if(v4l->parameters)
-    bg_parameter_info_destroy_array(v4l->parameters);
-  v4l->parameters = bg_parameter_info_copy_array(parameters);
-
-#if 0  
-  if((v4l->fd < 0) &&
-     ((v4l->fd = open(v4l->device, O_RDWR, 0)) >= 0))
-    {
-    v4l->have_pwc = bg_pwc_probe(v4l->fd);
-    close(v4l->fd);
-    v4l->fd = -1;
-    }
-#endif
-  
-  if(v4l->have_pwc)
-    {
-    v4l->pwc_priv = bg_pwc_get_parameters(v4l->fd, &v4l->parameters);
-    v4l->have_pwc_parameters = 1;
-    }
-  }
-
-static const bg_parameter_info_t * get_parameters_v4l(void * priv)
-  {
-  v4l_t * v4l;
-  v4l = priv;
-
-  if(!v4l->parameters ||
-     (v4l->have_pwc != v4l->have_pwc_parameters))
-    {
-    create_parameters(v4l);
-    }
-  
-  return v4l->parameters;
-  }
-
-static void set_parameter_v4l(void * priv, const char * name,
-                              const bg_parameter_value_t * val)
-  {
-  char * pos;
-  v4l_t * v4l;
-  v4l = priv;
-
-  if(!name)
-    {
-    if(v4l->user_resolution)
-      {
-      v4l->cfg_win.width  = v4l->user_width;
-      v4l->cfg_win.height = v4l->user_height;
-      }
-    bg_pwc_set_parameter(v4l->fd, v4l->pwc_priv, NULL, val);
-    return;
-    }
-  
-  if(!strncmp(name, "pwc_", 4))
-    {
-    bg_pwc_set_parameter(v4l->fd, v4l->pwc_priv, name, val);
-    }
-  else if(!strcmp(name, "resolution"))
-    {
-    if(!strcmp(val->val_str, "QSIF (160x112)"))
-      {
-      v4l->cfg_win.width  = 160;
-      v4l->cfg_win.height = 112;
-      v4l->user_resolution = 0;
-      }
-    else if(!strcmp(val->val_str, "QCIF (176x144)"))
-      {
-      v4l->cfg_win.width  = 176;
-      v4l->cfg_win.height = 144;
-      v4l->user_resolution = 0;
-      }
-    else if(!strcmp(val->val_str, "QVGA (320x240)"))
-      {
-      v4l->cfg_win.width  = 320;
-      v4l->cfg_win.height = 240;
-      v4l->user_resolution = 0;
-      }
-    else if(!strcmp(val->val_str, "SIF(352x240)"))
-      {
-      v4l->cfg_win.width  = 352;
-      v4l->cfg_win.height = 240;
-      v4l->user_resolution = 0;
-      }
-    else if(!strcmp(val->val_str, "CIF (352x288)"))
-      {
-      v4l->cfg_win.width  = 352;
-      v4l->cfg_win.height = 288;
-      v4l->user_resolution = 0;
-      }
-    else if(!strcmp(val->val_str, "VGA (640x480)"))
-      {
-      v4l->cfg_win.width  = 640;
-      v4l->cfg_win.height = 480;
-      v4l->user_resolution = 0;
-      }
-    else if(!strcmp(val->val_str, "User defined"))
-      {
-      v4l->user_resolution = 1;
-      }
-    }
-  else if(!strcmp(name, "device"))
-    {
-    v4l->device = bg_strdup(v4l->device, val->val_str);
-    pos = strchr(v4l->device, ' '); if(pos) *pos = '\0';
-    }
-  else if(!strcmp(name, "user_width"))
-    {
-    v4l->user_width = val->val_i;
-    }
-  else if(!strcmp(name, "user_height"))
-    {
-    v4l->user_height = val->val_i;
-    }
-  else if(!strcmp(name, "brightness"))
-    {
-    v4l->cfg_pic.brightness = val->val_i;
-
-    if(v4l->fd > 0)
-      {
-      if(ioctl(v4l->fd, VIDIOCGPICT, &v4l->pic))
-        return;
-      v4l->pic.brightness = val->val_i;
-      if(ioctl(v4l->fd, VIDIOCSPICT, &v4l->pic))
-        return;
-      }
-    }
-  else if(!strcmp(name, "hue"))
-    {
-    v4l->cfg_pic.hue = val->val_i;
-    if(v4l->fd > 0)
-      {
-      if(ioctl(v4l->fd, VIDIOCGPICT, &v4l->pic))
-        return;
-      v4l->pic.hue = val->val_i;
-      if(ioctl(v4l->fd, VIDIOCSPICT, &v4l->pic))
-        return;
-      }
-    }
-  else if(!strcmp(name, "colour"))
-    {
-    v4l->cfg_pic.colour = val->val_i;
-    if(v4l->fd > 0)
-      {
-      if(ioctl(v4l->fd, VIDIOCGPICT, &v4l->pic))
-        return;
-      v4l->pic.colour = val->val_i;
-      if(ioctl(v4l->fd, VIDIOCSPICT, &v4l->pic))
-        return;
-      }
-    }
-  else if(!strcmp(name, "contrast"))
-    {
-    v4l->cfg_pic.contrast = val->val_i;
-    if(v4l->fd > 0)
-      {
-      if(ioctl(v4l->fd, VIDIOCGPICT, &v4l->pic))
-        return;
-      v4l->pic.contrast = val->val_i;
-      if(ioctl(v4l->fd, VIDIOCSPICT, &v4l->pic))
-        return;
-      }
-
-    }
-  else if(!strcmp(name, "whiteness"))
-    {
-    v4l->cfg_pic.whiteness = val->val_i;
-    if(v4l->fd > 0)
-      {
-      if(ioctl(v4l->fd, VIDIOCGPICT, &v4l->pic))
-        return;
-      v4l->pic.whiteness = val->val_i;
-      if(ioctl(v4l->fd, VIDIOCSPICT, &v4l->pic))
-        return;
-      }
-    }
-  }
-
-
-const bg_recorder_plugin_t the_plugin =
-  {
-    .common =
-    {
-      BG_LOCALE,
-      .name =          "i_v4l",
-      .long_name =     TRS("V4L"),
-      .description =   TRS("video4linux recording plugin. Supports only video and no tuner decives."),
-      .type =          BG_PLUGIN_RECORDER_VIDEO,
-      .flags =         BG_PLUGIN_RECORDER,
-      .priority =      BG_PLUGIN_PRIORITY_MAX,
-      .create =        create_v4l,
-      .destroy =       destroy_v4l,
-
-      .get_parameters = get_parameters_v4l,
-      .set_parameter =  set_parameter_v4l,
-    },
-    
-    .open =       open_v4l,
-    .close =      close_v4l,
-    .read_video = read_frame_v4l,
-    
-  };
-
-/* Include this into all plugin modules exactly once
-   to let the plugin loader obtain the API version */
-BG_GET_PLUGIN_API_VERSION;

gmerlin-1.2.0.tar.gz/plugins/v4l/pwc-ioctl.h Deleted

@@ -1,292 +0,0 @@
-#ifndef PWC_IOCTL_H
-#define PWC_IOCTL_H
-
-/* (C) 2001-2004 Nemosoft Unv.
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/* This is pwc-ioctl.h belonging to PWC 8.12.1
-   It contains structures and defines to communicate from user space
-   directly to the driver.
- */
-
-/*
-   Changes
-   2001/08/03  Alvarado   Added ioctl constants to access methods for
-                          changing white balance and red/blue gains
-   2002/12/15  G. H. Fernandez-Toribio   VIDIOCGREALSIZE
-   2003/12/13  Nemosft Unv. Some modifications to make interfacing to
-               PWCX easier
- */
-
-/* These are private ioctl() commands, specific for the Philips webcams.
-   They contain functions not found in other webcams, and settings not
-   specified in the Video4Linux API.
-
-   The #define names are built up like follows:
-   VIDIOC		VIDeo IOCtl prefix
-         PWC		Philps WebCam
-            G           optional: Get
-            S           optional: Set
-             ... 	the function
- */
-
-
- /* Enumeration of image sizes */
-#define PSZ_SQCIF	0x00
-#define PSZ_QSIF	0x01
-#define PSZ_QCIF	0x02
-#define PSZ_SIF		0x03
-#define PSZ_CIF		0x04
-#define PSZ_VGA		0x05
-#define PSZ_MAX		6
-
-
-/* The frame rate is encoded in the video_window.flags parameter using
-   the upper 16 bits, since some flags are defined nowadays. The following
-   defines provide a mask and shift to filter out this value.
-
-   In 'Snapshot' mode the camera freezes its automatic exposure and colour
-   balance controls.
- */
-#define PWC_FPS_SHIFT		16
-#define PWC_FPS_MASK		0x00FF0000
-#define PWC_FPS_FRMASK		0x003F0000
-#define PWC_FPS_SNAPSHOT	0x00400000
-
-
-/* structure for transferring x & y coordinates */
-struct pwc_coord
-{
-	int x, y;		/* guess what */
-	int size;		/* size, or offset */
-};
-
-
-/* Used with VIDIOCPWCPROBE */
-struct pwc_probe
-{
-	char name[32];
-	int type;
-};
-
-struct pwc_serial
-{
-	char serial[30];	/* String with serial number. Contains terminating 0 */
-};
-	
-/* pwc_whitebalance.mode values */
-#define PWC_WB_INDOOR		0
-#define PWC_WB_OUTDOOR		1
-#define PWC_WB_FL		2
-#define PWC_WB_MANUAL		3
-#define PWC_WB_AUTO		4
-
-/* Used with VIDIOCPWC[SG]AWB (Auto White Balance). 
-   Set mode to one of the PWC_WB_* values above.
-   *red and *blue are the respective gains of these colour components inside 
-   the camera; range 0..65535
-   When 'mode' == PWC_WB_MANUAL, 'manual_red' and 'manual_blue' are set or read; 
-   otherwise undefined.
-   'read_red' and 'read_blue' are read-only.
-*/   
-struct pwc_whitebalance
-{
-	int mode;
-	int manual_red, manual_blue;	/* R/W */
-	int read_red, read_blue;	/* R/O */
-};
-
-/* 
-   'control_speed' and 'control_delay' are used in automatic whitebalance mode,
-   and tell the camera how fast it should react to changes in lighting, and 
-   with how much delay. Valid values are 0..65535.
-*/
-struct pwc_wb_speed
-{
-	int control_speed;
-	int control_delay;
-
-};
-
-/* Used with VIDIOCPWC[SG]LED */
-struct pwc_leds
-{
-	int led_on;			/* Led on-time; range = 0..25000 */
-	int led_off;			/* Led off-time; range = 0..25000  */
-};
-
-/* Image size (used with GREALSIZE) */
-struct pwc_imagesize
-{
-	int width;
-	int height;
-};
-
-/* Defines and structures for Motorized Pan & Tilt */
-#define PWC_MPT_PAN		0x01
-#define PWC_MPT_TILT		0x02
-#define PWC_MPT_TIMEOUT		0x04 /* for status */
-
-/* Set angles; when absolute != 0, the angle is absolute and the 
-   driver calculates the relative offset for you. This can only
-   be used with VIDIOCPWCSANGLE; VIDIOCPWCGANGLE always returns
-   absolute angles.
- */   
-struct pwc_mpt_angles
-{
-	int absolute;		/* write-only */
-	int pan;		/* degrees * 100 */
-	int tilt;		/* degress * 100 */
-};
-
-/* Range of angles of the camera, both horizontally and vertically.
- */
-struct pwc_mpt_range
-{
-	int pan_min, pan_max;		/* degrees * 100 */
-	int tilt_min, tilt_max;
-};
-
-struct pwc_mpt_status
-{
-	int status;
-	int time_pan;
-	int time_tilt;
-};
-
-
-/* This is used for out-of-kernel decompression. With it, you can get
-   all the necessary information to initialize and use the decompressor
-   routines in standalone applications.
- */   
-struct pwc_video_command
-{
-	int type;		/* camera type (645, 675, 730, etc.) */
-	int release;		/* release number */
-
-        int size;		/* one of PSZ_* */
-        int alternate;
-	int command_len;	/* length of USB video command */
-	unsigned char command_buf[13];	/* Actual USB video command */
-	int bandlength;		/* >0 = compressed */
-	int frame_size;		/* Size of one (un)compressed frame */
-};
-
-/* Flags for PWCX subroutines. Not all modules honour all flags. */
-#define PWCX_FLAG_PLANAR	0x0001
-#define PWCX_FLAG_BAYER		0x0008
-
-
-/* IOCTL definitions */
-
- /* Restore user settings */
-#define VIDIOCPWCRUSER		_IO('v', 192)
- /* Save user settings */
-#define VIDIOCPWCSUSER		_IO('v', 193)
- /* Restore factory settings */
-#define VIDIOCPWCFACTORY	_IO('v', 194)
-
- /* You can manipulate the compression factor. A compression preference of 0
-    means use uncompressed modes when available; 1 is low compression, 2 is
-    medium and 3 is high compression preferred. Of course, the higher the
-    compression, the lower the bandwidth used but more chance of artefacts
-    in the image. The driver automatically chooses a higher compression when
-    the preferred mode is not available.
-  */
- /* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */
-#define VIDIOCPWCSCQUAL		_IOW('v', 195, int)
- /* Get preferred compression quality */
-#define VIDIOCPWCGCQUAL		_IOR('v', 195, int)
-
-
-/* Retrieve serial number of camera */
-#define VIDIOCPWCGSERIAL	_IOR('v', 198, struct pwc_serial)
-
- /* This is a probe function; since so many devices are supported, it
-    becomes difficult to include all the names in programs that want to
-    check for the enhanced Philips stuff. So in stead, try this PROBE;
-    it returns a structure with the original name, and the corresponding
-    Philips type.
-    To use, fill the structure with zeroes, call PROBE and if that succeeds,
-    compare the name with that returned from VIDIOCGCAP; they should be the
-    same. If so, you can be assured it is a Philips (OEM) cam and the type
-    is valid.
- */
-#define VIDIOCPWCPROBE		_IOR('v', 199, struct pwc_probe)
-
- /* Set AGC (Automatic Gain Control); int < 0 = auto, 0..65535 = fixed */
-#define VIDIOCPWCSAGC		_IOW('v', 200, int)
- /* Get AGC; int < 0 = auto; >= 0 = fixed, range 0..65535 */
-#define VIDIOCPWCGAGC		_IOR('v', 200, int)
- /* Set shutter speed; int < 0 = auto; >= 0 = fixed, range 0..65535 */
-#define VIDIOCPWCSSHUTTER	_IOW('v', 201, int)
-
- /* Color compensation (Auto White Balance) */
-#define VIDIOCPWCSAWB           _IOW('v', 202, struct pwc_whitebalance)
-#define VIDIOCPWCGAWB           _IOR('v', 202, struct pwc_whitebalance)
-
- /* Auto WB speed */
-#define VIDIOCPWCSAWBSPEED	_IOW('v', 203, struct pwc_wb_speed)
-#define VIDIOCPWCGAWBSPEED	_IOR('v', 203, struct pwc_wb_speed)
-
- /* LEDs on/off/blink; int range 0..65535 */
-#define VIDIOCPWCSLED           _IOW('v', 205, struct pwc_leds)
-#define VIDIOCPWCGLED           _IOR('v', 205, struct pwc_leds)
-
-  /* Contour (sharpness); int < 0 = auto, 0..65536 = fixed */
-#define VIDIOCPWCSCONTOUR	_IOW('v', 206, int)
-#define VIDIOCPWCGCONTOUR	_IOR('v', 206, int)
-
-  /* Backlight compensation; 0 = off, otherwise on */
-#define VIDIOCPWCSBACKLIGHT	_IOW('v', 207, int)
-#define VIDIOCPWCGBACKLIGHT	_IOR('v', 207, int)
-
-  /* Flickerless mode; = 0 off, otherwise on */
-#define VIDIOCPWCSFLICKER	_IOW('v', 208, int)
-#define VIDIOCPWCGFLICKER	_IOR('v', 208, int)  
-
-  /* Dynamic noise reduction; 0 off, 3 = high noise reduction */
-#define VIDIOCPWCSDYNNOISE	_IOW('v', 209, int)
-#define VIDIOCPWCGDYNNOISE	_IOR('v', 209, int)
-
- /* Real image size as used by the camera; tells you whether or not there's a gray border around the image */
-#define VIDIOCPWCGREALSIZE	_IOR('v', 210, struct pwc_imagesize)
-
- /* Motorized pan & tilt functions */ 
-#define VIDIOCPWCMPTRESET	_IOW('v', 211, int)
-#define VIDIOCPWCMPTGRANGE	_IOR('v', 211, struct pwc_mpt_range)
-#define VIDIOCPWCMPTSANGLE	_IOW('v', 212, struct pwc_mpt_angles)
-#define VIDIOCPWCMPTGANGLE	_IOR('v', 212, struct pwc_mpt_angles)
-#define VIDIOCPWCMPTSTATUS	_IOR('v', 213, struct pwc_mpt_status)
-
- /* Get the USB set-video command; needed for initializing libpwcx */
-#define VIDIOCPWCGVIDCMD	_IOR('v', 215, struct pwc_video_command)
-struct pwc_table_init_buffer {
-   int len;
-   char *buffer;
-
-};
-#define VIDIOCPWCGVIDTABLE	_IOR('v', 216, struct pwc_table_init_buffer)
-
-#endif

gmerlin-1.2.0.tar.gz/plugins/v4l/pwc.c Deleted

@@ -1,391 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <config.h>
-#include <gmerlin/translation.h>
-#include <gmerlin/plugin.h>
-#include <gmerlin/utils.h>
-
-
-#include <linux/videodev.h>
-#include "pwc-ioctl.h"
-#include "pwc.h"
-
-typedef struct
-  {
-  struct pwc_leds led;
-  } pwc_priv_t;
-
-/* Special stuff for Phillips webcams */
-
-int bg_pwc_probe(int fd)
-  {
-  struct pwc_probe p;
-  struct video_capability c;
-  
-  memset(&p, 0, sizeof(p));
-  memset(&c, 0, sizeof(c));
-
-  if(ioctl(fd, VIDIOCPWCPROBE, &p) < 0)
-    return 0;
-  
-  if(ioctl(fd, VIDIOCGCAP, &c) < 0)
-    return 0;
-
-  
-  if(!strcmp(p.name, c.name))
-    return 1;
-  return 0;
-  }
-
-static const bg_parameter_info_t pwc_parameters[] =
-  {
-    {
-      .name =        "pwc_general",
-      .long_name =   TRS("PWC General"),
-      .type =        BG_PARAMETER_SECTION,
-    },
-    {
-      .name =        "pwc_framerate",
-      .long_name =   TRS("Framerate"),
-      .type =        BG_PARAMETER_INT,
-      .val_min =     { .val_i = 4 },
-      .val_max =     { .val_i = 30 },
-      .val_default = { .val_i = 10 },
-    },
-    {
-      .name =        "pwc_compression",
-      .long_name =   TRS("Compression"),
-      .type =        BG_PARAMETER_STRINGLIST,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_str = "Medium" },
-      .multi_labels = (char const *[]){ TRS("None"),
-                              TRS("Low"),
-                              TRS("Medium"),
-                              TRS("High"),
-                              NULL },
-      .multi_names =     (char const *[]){ "None",
-                              "Low",
-                              "Medium",
-                              "High",
-                              NULL },
-    },
-    {
-      .name =        "pwc_gain",
-      .long_name =   TRS("Gain control (-1 = Auto)"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_i = -1 },
-      .val_min =     { .val_i = -1 },
-      .val_max =     { .val_i = 65535 },
-    },
-    {
-      .name =        "pwc_shutterspeed",
-      .long_name =   TRS("Shutter speed (-1 = Auto)"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_i = -1 },
-      .val_min =     { .val_i = -1 },
-      .val_max =     { .val_i = 65535 },
-    },
-    {
-      .name =        "pwc_sharpness",
-      .long_name =   TRS("Sharpness (-1 = Auto)"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_i = -1 },
-      .val_min =     { .val_i = -1 },
-      .val_max =     { .val_i = 65535 },
-    },
-    {
-      .name =        "pwc_backlight",
-      .long_name =   TRS("Backlight compensation"),
-      .type =        BG_PARAMETER_CHECKBUTTON,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_i = 1 },
-    },
-    {
-      .name =        "pwc_flicker",
-      .long_name =   TRS("Flicker compensation"),
-      .type =        BG_PARAMETER_CHECKBUTTON,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_i = 0 },
-    },
-    {
-      .name =        "pwc_whitebalance_section",
-      .long_name =   TRS("PWC Whitebalance"),
-      .type =        BG_PARAMETER_SECTION,
-    },
-    {
-      .name =        "pwc_whitebalance",
-      .long_name =   TRS("White balance"),
-      .type =        BG_PARAMETER_STRINGLIST,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_default = { .val_str = "Auto" },
-      .multi_names =     (char const *[]){ "Indoor",
-                                  "Outdoor",
-                                  "Fluorescent lighting",
-                                  "Manual",
-                                  "Auto",
-                                  NULL },
-      .multi_labels =     (char const *[]){ TRS("Indoor"),
-                                   TRS("Outdoor"),
-                                   TRS("Fluorescent lighting"),
-                                   TRS("Manual"),
-                                   TRS("Auto"),
-                                   NULL },
-    },
-    {
-      .name =        "pwc_manual_red",
-      .long_name =   TRS("Manual red gain"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 32000 },
-    },
-    {
-      .name =        "pwc_manual_blue",
-      .long_name =   TRS("Manual blue gain"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 32000 },
-    },
-    {
-      .name =        "pwc_control_speed",
-      .long_name =   TRS("Auto speed"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 32000 },
-    },
-    {
-      .name =        "pwc_control_delay",
-      .long_name =   TRS("Auto delay"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .flags =       BG_PARAMETER_SYNC,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 65535 },
-      .val_default = { .val_i = 32000 },
-    },
-    {
-      .name =        "pwc_led_section",
-      .long_name =   TRS("PWC LED"),
-      .type =        BG_PARAMETER_SECTION,
-    },
-    {
-      .name =        "pwc_led_on",
-      .long_name =   TRS("LED on time (secs)"),
-      .type =        BG_PARAMETER_FLOAT,
-      .val_min =     { .val_f = 0.0 },
-      .val_max =     { .val_f = 255.0 },
-      .val_default = { .val_f = 1.0 },
-      .num_digits =  1,
-    },
-    {
-      .name =        "pwc_led_off",
-      .long_name =   TRS("LED off time (secs)"),
-      .type =        BG_PARAMETER_FLOAT,
-      .val_min =     { .val_f = 0.0 },
-      .val_max =     { .val_f = 255.0 },
-      .val_default = { .val_f = 0.0 },
-      .num_digits =  1,
-    },
-    { /* End of parameters */ }
-    
-  };
-
-/* Reallocate parameter array */
-
-void * bg_pwc_get_parameters(int fd, bg_parameter_info_t ** parameters)
-  {
-  int i;
-  bg_parameter_info_t * p;
-  int num_generic_parameters;
-  int num_pwc_parameters;
-  pwc_priv_t * ret;
-
-  
-  p = *parameters;
-  
-  num_generic_parameters = 0;
-  while(p[num_generic_parameters].name)
-    {
-    /* Exchange the "whiteness" parameter by Gamma */
-
-    if(!strcmp(p[num_generic_parameters].name, "whiteness"))
-      {
-      p[num_generic_parameters].long_name =
-        bg_strdup(p[num_generic_parameters].long_name,
-                  "Gamma");
-      }
-    num_generic_parameters++;
-    }
-
-  num_pwc_parameters = 0;
-  while(pwc_parameters[num_pwc_parameters].name)
-    num_pwc_parameters++;
-
-  p = realloc(p, (num_generic_parameters+num_pwc_parameters+1)*sizeof(*p));
-
-  memset(p + num_generic_parameters, 0, (num_pwc_parameters+1)*sizeof(*p));
-
-  for(i = 0; i < num_pwc_parameters; i++)
-    {
-    bg_parameter_info_copy(p + (num_generic_parameters + i),
-                           &pwc_parameters[i]);
-    }
-  *parameters = p;
-
-  ret = calloc(1, sizeof(*ret));
-  return ret;
-  }
-
-void bg_pwc_destroy(void*p)
-  {
-  free(p);
-  }
-
-
-/* Handle parameters beginning with "pwc_" */
-
-void bg_pwc_set_parameter(int fd, void * priv,
-                          const char * name, const bg_parameter_value_t * val)
-  {
-  pwc_priv_t * p;
-  int compression;
-  struct video_window win;
-  struct pwc_whitebalance whitebalance;
-  struct pwc_wb_speed wb_speed;
-
-  p = priv;
-    
-  if(!name)
-    {
-    ioctl(fd, VIDIOCPWCSLED, &p->led);
-    return;
-    }
-  else if(!strcmp(name, "pwc_framerate"))
-    {
-    if(ioctl(fd, VIDIOCGWIN, &win) < 0)
-      return;
-    
-    win.flags &= ~PWC_FPS_FRMASK;
-    win.flags |= (val->val_i << PWC_FPS_SHIFT);
-    ioctl(fd, VIDIOCSWIN, &win);
-    }
-  else if(!strcmp(name, "pwc_compression"))
-    {
-    compression = 0;
-    if(!strcmp(val->val_str, "None"))
-      compression = 0;
-    else if(!strcmp(val->val_str, "Low"))
-      compression = 1;
-    else if(!strcmp(val->val_str, "Medium"))
-      compression = 2;
-    else if(!strcmp(val->val_str, "High"))
-      compression = 3;
-    ioctl(fd, VIDIOCPWCSCQUAL, &compression);
-    }
-  else if(!strcmp(name, "pwc_gain"))
-    {
-    ioctl(fd, VIDIOCPWCSAGC, &val->val_i);
-    }
-  else if(!strcmp(name, "pwc_shutterspeed"))
-    {
-    ioctl(fd, VIDIOCPWCSSHUTTER, &val->val_i);
-    }
-  else if(!strcmp(name, "pwc_sharpness"))
-    {
-    ioctl(fd, VIDIOCPWCSCONTOUR, &val->val_i);
-    }
-  else if(!strcmp(name, "pwc_backlight"))
-    {
-    ioctl(fd, VIDIOCPWCSBACKLIGHT, &val->val_i);
-    }
-  else if(!strcmp(name, "pwc_flicker"))
-    {
-    ioctl(fd, VIDIOCPWCSFLICKER, &val->val_i);
-    }
-  else if(!strcmp(name, "pwc_whitebalance"))
-    {
-    if(ioctl(fd, VIDIOCPWCGAWB, &whitebalance) < 0)
-      return;
-    if(!strcmp(val->val_str, "Indoor"))
-      whitebalance.mode = PWC_WB_INDOOR;
-    else if(!strcmp(val->val_str, "Outdoor"))
-      whitebalance.mode = PWC_WB_OUTDOOR;
-    else if(!strcmp(val->val_str, "Fluorescent lighting"))
-      whitebalance.mode = PWC_WB_FL;
-    else if(!strcmp(val->val_str, "Manual"))
-      whitebalance.mode = PWC_WB_MANUAL;
-    else if(!strcmp(val->val_str, "Auto"))
-      whitebalance.mode = PWC_WB_AUTO;
-    ioctl(fd, VIDIOCPWCSAWB, &whitebalance);
-    }
-  else if(!strcmp(name, "pwc_manual_red"))
-    {
-    if(ioctl(fd, VIDIOCPWCGAWB, &whitebalance) < 0)
-      return;
-    whitebalance.manual_red = val->val_i;
-    ioctl(fd, VIDIOCPWCSAWB, &whitebalance);
-    }
-  else if(!strcmp(name, "pwc_manual_blue"))
-    {
-    if(ioctl(fd, VIDIOCPWCGAWB, &whitebalance) < 0)
-      return;
-    whitebalance.manual_blue = val->val_i;
-    ioctl(fd, VIDIOCPWCSAWB, &whitebalance);
-    }
-  else if(!strcmp(name, "pwc_control_speed"))
-    {
-    if(ioctl(fd, VIDIOCPWCGAWBSPEED, &wb_speed) < 0)
-      return;
-    wb_speed.control_speed = val->val_i;
-    ioctl(fd, VIDIOCPWCSAWBSPEED, &wb_speed);
-    }
-  else if(!strcmp(name, "pwc_control_delay"))
-    {
-    if(ioctl(fd, VIDIOCPWCGAWBSPEED, &wb_speed) < 0)
-      return;
-    wb_speed.control_delay = val->val_i;
-    ioctl(fd, VIDIOCPWCSAWBSPEED, &wb_speed);
-    }
-  else if(!strcmp(name, "pwc_led_on"))
-    {
-    p->led.led_on = (int)(val->val_f * 1000.0 + 0.5);
-    }
-  else if(!strcmp(name, "pwc_led_off"))
-    {
-    p->led.led_off = (int)(val->val_f * 1000.0 + 0.5);
-    }
-  
-  }

gmerlin-1.2.0.tar.gz/plugins/v4l/pwc.h Deleted

@@ -1,30 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-int bg_pwc_probe(int fd);
-
-void * bg_pwc_get_parameters(int fd,
-                                    bg_parameter_info_t ** parameters);
-
-void bg_pwc_destroy(void*);
-
-void bg_pwc_set_parameter(int fd, void * priv, const char * name,
-                          const bg_parameter_value_t * val);

gmerlin-1.2.0.tar.gz/plugins/v4l2/Makefile.in Deleted

@@ -1,653 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/v4l2
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-i_v4l2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__i_v4l2_la_SOURCES_DIST = i_v4l2.c v4l2_common.c convert.c
-@HAVE_V4LVCONVERT_TRUE@am__objects_1 = convert.lo
-am_i_v4l2_la_OBJECTS = i_v4l2.lo v4l2_common.lo $(am__objects_1)
-i_v4l2_la_OBJECTS = $(am_i_v4l2_la_OBJECTS)
-ov_v4l2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__ov_v4l2_la_SOURCES_DIST = ov_v4l2.c v4l2_common.c convert.c
-am_ov_v4l2_la_OBJECTS = ov_v4l2.lo v4l2_common.lo $(am__objects_1)
-ov_v4l2_la_OBJECTS = $(am_ov_v4l2_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_v4l2_la_SOURCES) $(ov_v4l2_la_SOURCES)
-DIST_SOURCES = $(am__i_v4l2_la_SOURCES_DIST) \
-	$(am__ov_v4l2_la_SOURCES_DIST)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = i_v4l2.la ov_v4l2.la
-@HAVE_V4LVCONVERT_FALSE@convert_sources = 
-@HAVE_V4LVCONVERT_TRUE@convert_sources = convert.c
-@HAVE_V4LVCONVERT_FALSE@convert_libs = 
-@HAVE_V4LVCONVERT_TRUE@convert_libs = @V4LCONVERT_LIBS@
-i_v4l2_la_SOURCES = i_v4l2.c v4l2_common.c $(convert_sources)
-i_v4l2_la_LIBADD = @MODULE_LIBADD@ $(convert_libs)
-ov_v4l2_la_SOURCES = ov_v4l2.c v4l2_common.c $(convert_sources)
-ov_v4l2_la_LIBADD = @MODULE_LIBADD@ $(convert_libs)
-noinst_HEADERS = v4l2_common.h convert.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/v4l2/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/v4l2/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_v4l2.la: $(i_v4l2_la_OBJECTS) $(i_v4l2_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_v4l2_la_OBJECTS) $(i_v4l2_la_LIBADD) $(LIBS)
-ov_v4l2.la: $(ov_v4l2_la_OBJECTS) $(ov_v4l2_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ov_v4l2_la_OBJECTS) $(ov_v4l2_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_v4l2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ov_v4l2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v4l2_common.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/videofilters/Makefile.in Deleted

@@ -1,885 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/videofilters
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-fv_bitshift_la_LIBADD =
-fv_bitshift_la_SOURCES = fv_bitshift.c
-fv_bitshift_la_OBJECTS = fv_bitshift.lo
-fv_blur_la_DEPENDENCIES =
-am_fv_blur_la_OBJECTS = fv_blur.lo
-fv_blur_la_OBJECTS = $(am_fv_blur_la_OBJECTS)
-fv_colorbalance_la_DEPENDENCIES =
-am_fv_colorbalance_la_OBJECTS = fv_colorbalance.lo colormatrix.lo
-fv_colorbalance_la_OBJECTS = $(am_fv_colorbalance_la_OBJECTS)
-fv_colormatrix_rgb_la_DEPENDENCIES =
-am_fv_colormatrix_rgb_la_OBJECTS = fv_colormatrix_rgb.lo \
-	colormatrix.lo
-fv_colormatrix_rgb_la_OBJECTS = $(am_fv_colormatrix_rgb_la_OBJECTS)
-fv_colormatrix_yuv_la_DEPENDENCIES =
-am_fv_colormatrix_yuv_la_OBJECTS = fv_colormatrix_yuv.lo \
-	colormatrix.lo
-fv_colormatrix_yuv_la_OBJECTS = $(am_fv_colormatrix_yuv_la_OBJECTS)
-fv_cropscale_la_DEPENDENCIES =
-am_fv_cropscale_la_OBJECTS = fv_cropscale.lo
-fv_cropscale_la_OBJECTS = $(am_fv_cropscale_la_OBJECTS)
-fv_decimate_la_DEPENDENCIES =
-am_fv_decimate_la_OBJECTS = fv_decimate.lo
-fv_decimate_la_OBJECTS = $(am_fv_decimate_la_OBJECTS)
-fv_deinterlace_la_DEPENDENCIES =
-am_fv_deinterlace_la_OBJECTS = fv_deinterlace_la-fv_deinterlace.lo \
-	fv_deinterlace_la-bgyadif.lo
-fv_deinterlace_la_OBJECTS = $(am_fv_deinterlace_la_OBJECTS)
-fv_deinterlace_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(fv_deinterlace_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-fv_equalizer_la_DEPENDENCIES =
-am_fv_equalizer_la_OBJECTS = fv_equalizer.lo colormatrix.lo
-fv_equalizer_la_OBJECTS = $(am_fv_equalizer_la_OBJECTS)
-fv_flip_la_DEPENDENCIES =
-am_fv_flip_la_OBJECTS = fv_flip.lo
-fv_flip_la_OBJECTS = $(am_fv_flip_la_OBJECTS)
-fv_framerate_la_DEPENDENCIES =
-am_fv_framerate_la_OBJECTS = fv_framerate.lo
-fv_framerate_la_OBJECTS = $(am_fv_framerate_la_OBJECTS)
-fv_interlace_la_LIBADD =
-fv_interlace_la_SOURCES = fv_interlace.c
-fv_interlace_la_OBJECTS = fv_interlace.lo
-fv_invert_rgb_la_DEPENDENCIES =
-am_fv_invert_rgb_la_OBJECTS = fv_invert_rgb.lo colormatrix.lo
-fv_invert_rgb_la_OBJECTS = $(am_fv_invert_rgb_la_OBJECTS)
-fv_oldcolor_la_DEPENDENCIES =
-am_fv_oldcolor_la_OBJECTS = fv_oldcolor.lo colormatrix.lo
-fv_oldcolor_la_OBJECTS = $(am_fv_oldcolor_la_OBJECTS)
-fv_pixelformat_la_DEPENDENCIES =
-am_fv_pixelformat_la_OBJECTS = fv_pixelformat.lo
-fv_pixelformat_la_OBJECTS = $(am_fv_pixelformat_la_OBJECTS)
-fv_swapfields_la_LIBADD =
-fv_swapfields_la_SOURCES = fv_swapfields.c
-fv_swapfields_la_OBJECTS = fv_swapfields.lo
-fv_tcdisplay_la_DEPENDENCIES =
-am_fv_tcdisplay_la_OBJECTS = fv_tcdisplay_la-fv_tcdisplay.lo
-fv_tcdisplay_la_OBJECTS = $(am_fv_tcdisplay_la_OBJECTS)
-fv_tcdisplay_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(fv_tcdisplay_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-fv_tctweak_la_DEPENDENCIES =
-am_fv_tctweak_la_OBJECTS = fv_tctweak.lo
-fv_tctweak_la_OBJECTS = $(am_fv_tctweak_la_OBJECTS)
-fv_textlogo_la_DEPENDENCIES =
-am_fv_textlogo_la_OBJECTS = fv_textlogo_la-fv_textlogo.lo
-fv_textlogo_la_OBJECTS = $(am_fv_textlogo_la_OBJECTS)
-fv_textlogo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(fv_textlogo_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-fv_tlp_la_DEPENDENCIES =
-am_fv_tlp_la_OBJECTS = fv_tlp.lo
-fv_tlp_la_OBJECTS = $(am_fv_tlp_la_OBJECTS)
-fv_transform_la_DEPENDENCIES =
-am_fv_transform_la_OBJECTS = fv_transform.lo
-fv_transform_la_OBJECTS = $(am_fv_transform_la_OBJECTS)
-fv_zoom_la_DEPENDENCIES =
-am_fv_zoom_la_OBJECTS = fv_zoom.lo
-fv_zoom_la_OBJECTS = $(am_fv_zoom_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = fv_bitshift.c $(fv_blur_la_SOURCES) \
-	$(fv_colorbalance_la_SOURCES) $(fv_colormatrix_rgb_la_SOURCES) \
-	$(fv_colormatrix_yuv_la_SOURCES) $(fv_cropscale_la_SOURCES) \
-	$(fv_decimate_la_SOURCES) $(fv_deinterlace_la_SOURCES) \
-	$(fv_equalizer_la_SOURCES) $(fv_flip_la_SOURCES) \
-	$(fv_framerate_la_SOURCES) fv_interlace.c \
-	$(fv_invert_rgb_la_SOURCES) $(fv_oldcolor_la_SOURCES) \
-	$(fv_pixelformat_la_SOURCES) fv_swapfields.c \
-	$(fv_tcdisplay_la_SOURCES) $(fv_tctweak_la_SOURCES) \
-	$(fv_textlogo_la_SOURCES) $(fv_tlp_la_SOURCES) \
-	$(fv_transform_la_SOURCES) $(fv_zoom_la_SOURCES)
-DIST_SOURCES = fv_bitshift.c $(fv_blur_la_SOURCES) \
-	$(fv_colorbalance_la_SOURCES) $(fv_colormatrix_rgb_la_SOURCES) \
-	$(fv_colormatrix_yuv_la_SOURCES) $(fv_cropscale_la_SOURCES) \
-	$(fv_decimate_la_SOURCES) $(fv_deinterlace_la_SOURCES) \
-	$(fv_equalizer_la_SOURCES) $(fv_flip_la_SOURCES) \
-	$(fv_framerate_la_SOURCES) fv_interlace.c \
-	$(fv_invert_rgb_la_SOURCES) $(fv_oldcolor_la_SOURCES) \
-	$(fv_pixelformat_la_SOURCES) fv_swapfields.c \
-	$(fv_tcdisplay_la_SOURCES) $(fv_tctweak_la_SOURCES) \
-	$(fv_textlogo_la_SOURCES) $(fv_tlp_la_SOURCES) \
-	$(fv_transform_la_SOURCES) $(fv_zoom_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = \
-fv_bitshift.la \
-fv_blur.la \
-fv_cropscale.la \
-fv_colorbalance.la \
-fv_colormatrix_rgb.la \
-fv_colormatrix_yuv.la \
-fv_decimate.la \
-fv_deinterlace.la \
-fv_equalizer.la \
-fv_flip.la \
-fv_framerate.la \
-fv_interlace.la \
-fv_invert_rgb.la \
-fv_oldcolor.la \
-fv_pixelformat.la \
-fv_swapfields.la \
-fv_tcdisplay.la \
-fv_tctweak.la \
-fv_textlogo.la \
-fv_tlp.la \
-fv_transform.la \
-fv_zoom.la
-
-fv_blur_la_SOURCES = fv_blur.c
-fv_blur_la_LIBADD = @MODULE_LIBADD@
-fv_colormatrix_rgb_la_SOURCES = fv_colormatrix_rgb.c colormatrix.c
-fv_colormatrix_rgb_la_LIBADD = @MODULE_LIBADD@
-fv_colormatrix_yuv_la_SOURCES = fv_colormatrix_yuv.c colormatrix.c
-fv_colormatrix_yuv_la_LIBADD = @MODULE_LIBADD@
-fv_invert_rgb_la_SOURCES = fv_invert_rgb.c colormatrix.c
-fv_invert_rgb_la_LIBADD = @MODULE_LIBADD@
-fv_colorbalance_la_SOURCES = fv_colorbalance.c colormatrix.c
-fv_colorbalance_la_LIBADD = @MODULE_LIBADD@
-fv_oldcolor_la_SOURCES = fv_oldcolor.c colormatrix.c
-fv_oldcolor_la_LIBADD = @MODULE_LIBADD@
-fv_pixelformat_la_SOURCES = fv_pixelformat.c
-fv_pixelformat_la_LIBADD = @MODULE_LIBADD@
-fv_tlp_la_SOURCES = fv_tlp.c
-fv_tlp_la_LIBADD = @MODULE_LIBADD@
-fv_tcdisplay_la_SOURCES = fv_tcdisplay.c
-fv_tcdisplay_la_CFLAGS = @FREETYPE_CFLAGS@ -DLOCALE_DIR=\"$(localedir)\"
-fv_tcdisplay_la_LIBADD = @MODULE_LIBADD@
-fv_textlogo_la_SOURCES = fv_textlogo.c
-fv_textlogo_la_CFLAGS = @FREETYPE_CFLAGS@ -DLOCALE_DIR=\"$(localedir)\"
-fv_textlogo_la_LIBADD = @MODULE_LIBADD@
-fv_tctweak_la_SOURCES = fv_tctweak.c
-fv_tctweak_la_LIBADD = @MODULE_LIBADD@
-fv_transform_la_SOURCES = fv_transform.c
-fv_transform_la_LIBADD = @MODULE_LIBADD@
-fv_cropscale_la_SOURCES = fv_cropscale.c
-fv_cropscale_la_LIBADD = @MODULE_LIBADD@
-fv_framerate_la_SOURCES = fv_framerate.c
-fv_framerate_la_LIBADD = @MODULE_LIBADD@
-fv_flip_la_SOURCES = fv_flip.c
-fv_flip_la_LIBADD = @MODULE_LIBADD@
-fv_decimate_la_SOURCES = fv_decimate.c
-fv_decimate_la_LIBADD = @MODULE_LIBADD@
-fv_deinterlace_la_CFLAGS = -DLOCALE_DIR=\"$(localedir)\"
-fv_deinterlace_la_LIBADD = @MODULE_LIBADD@
-fv_deinterlace_la_SOURCES = fv_deinterlace.c bgyadif.c
-fv_equalizer_la_SOURCES = fv_equalizer.c colormatrix.c
-fv_equalizer_la_LIBADD = @MODULE_LIBADD@
-fv_zoom_la_SOURCES = fv_zoom.c
-fv_zoom_la_LIBADD = @MODULE_LIBADD@
-noinst_HEADERS = bgyadif.h colormatrix.h deinterlace.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/videofilters/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/videofilters/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-fv_bitshift.la: $(fv_bitshift_la_OBJECTS) $(fv_bitshift_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_bitshift_la_OBJECTS) $(fv_bitshift_la_LIBADD) $(LIBS)
-fv_blur.la: $(fv_blur_la_OBJECTS) $(fv_blur_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_blur_la_OBJECTS) $(fv_blur_la_LIBADD) $(LIBS)
-fv_colorbalance.la: $(fv_colorbalance_la_OBJECTS) $(fv_colorbalance_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_colorbalance_la_OBJECTS) $(fv_colorbalance_la_LIBADD) $(LIBS)
-fv_colormatrix_rgb.la: $(fv_colormatrix_rgb_la_OBJECTS) $(fv_colormatrix_rgb_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_colormatrix_rgb_la_OBJECTS) $(fv_colormatrix_rgb_la_LIBADD) $(LIBS)
-fv_colormatrix_yuv.la: $(fv_colormatrix_yuv_la_OBJECTS) $(fv_colormatrix_yuv_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_colormatrix_yuv_la_OBJECTS) $(fv_colormatrix_yuv_la_LIBADD) $(LIBS)
-fv_cropscale.la: $(fv_cropscale_la_OBJECTS) $(fv_cropscale_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_cropscale_la_OBJECTS) $(fv_cropscale_la_LIBADD) $(LIBS)
-fv_decimate.la: $(fv_decimate_la_OBJECTS) $(fv_decimate_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_decimate_la_OBJECTS) $(fv_decimate_la_LIBADD) $(LIBS)
-fv_deinterlace.la: $(fv_deinterlace_la_OBJECTS) $(fv_deinterlace_la_DEPENDENCIES) 
-	$(fv_deinterlace_la_LINK) -rpath $(plugindir) $(fv_deinterlace_la_OBJECTS) $(fv_deinterlace_la_LIBADD) $(LIBS)
-fv_equalizer.la: $(fv_equalizer_la_OBJECTS) $(fv_equalizer_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_equalizer_la_OBJECTS) $(fv_equalizer_la_LIBADD) $(LIBS)
-fv_flip.la: $(fv_flip_la_OBJECTS) $(fv_flip_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_flip_la_OBJECTS) $(fv_flip_la_LIBADD) $(LIBS)
-fv_framerate.la: $(fv_framerate_la_OBJECTS) $(fv_framerate_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_framerate_la_OBJECTS) $(fv_framerate_la_LIBADD) $(LIBS)
-fv_interlace.la: $(fv_interlace_la_OBJECTS) $(fv_interlace_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_interlace_la_OBJECTS) $(fv_interlace_la_LIBADD) $(LIBS)
-fv_invert_rgb.la: $(fv_invert_rgb_la_OBJECTS) $(fv_invert_rgb_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_invert_rgb_la_OBJECTS) $(fv_invert_rgb_la_LIBADD) $(LIBS)
-fv_oldcolor.la: $(fv_oldcolor_la_OBJECTS) $(fv_oldcolor_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_oldcolor_la_OBJECTS) $(fv_oldcolor_la_LIBADD) $(LIBS)
-fv_pixelformat.la: $(fv_pixelformat_la_OBJECTS) $(fv_pixelformat_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_pixelformat_la_OBJECTS) $(fv_pixelformat_la_LIBADD) $(LIBS)
-fv_swapfields.la: $(fv_swapfields_la_OBJECTS) $(fv_swapfields_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_swapfields_la_OBJECTS) $(fv_swapfields_la_LIBADD) $(LIBS)
-fv_tcdisplay.la: $(fv_tcdisplay_la_OBJECTS) $(fv_tcdisplay_la_DEPENDENCIES) 
-	$(fv_tcdisplay_la_LINK) -rpath $(plugindir) $(fv_tcdisplay_la_OBJECTS) $(fv_tcdisplay_la_LIBADD) $(LIBS)
-fv_tctweak.la: $(fv_tctweak_la_OBJECTS) $(fv_tctweak_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_tctweak_la_OBJECTS) $(fv_tctweak_la_LIBADD) $(LIBS)
-fv_textlogo.la: $(fv_textlogo_la_OBJECTS) $(fv_textlogo_la_DEPENDENCIES) 
-	$(fv_textlogo_la_LINK) -rpath $(plugindir) $(fv_textlogo_la_OBJECTS) $(fv_textlogo_la_LIBADD) $(LIBS)
-fv_tlp.la: $(fv_tlp_la_OBJECTS) $(fv_tlp_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_tlp_la_OBJECTS) $(fv_tlp_la_LIBADD) $(LIBS)
-fv_transform.la: $(fv_transform_la_OBJECTS) $(fv_transform_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_transform_la_OBJECTS) $(fv_transform_la_LIBADD) $(LIBS)
-fv_zoom.la: $(fv_zoom_la_OBJECTS) $(fv_zoom_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(fv_zoom_la_OBJECTS) $(fv_zoom_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormatrix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_bitshift.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_blur.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_colorbalance.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_colormatrix_rgb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_colormatrix_yuv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_cropscale.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_decimate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_deinterlace_la-bgyadif.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_deinterlace_la-fv_deinterlace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_equalizer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_flip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_framerate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_interlace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_invert_rgb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_oldcolor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_pixelformat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_swapfields.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_tcdisplay_la-fv_tcdisplay.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_tctweak.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_textlogo_la-fv_textlogo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_tlp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_transform.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fv_zoom.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-fv_deinterlace_la-fv_deinterlace.lo: fv_deinterlace.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_deinterlace_la_CFLAGS) $(CFLAGS) -MT fv_deinterlace_la-fv_deinterlace.lo -MD -MP -MF $(DEPDIR)/fv_deinterlace_la-fv_deinterlace.Tpo -c -o fv_deinterlace_la-fv_deinterlace.lo `test -f 'fv_deinterlace.c' || echo '$(srcdir)/'`fv_deinterlace.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fv_deinterlace_la-fv_deinterlace.Tpo $(DEPDIR)/fv_deinterlace_la-fv_deinterlace.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fv_deinterlace.c' object='fv_deinterlace_la-fv_deinterlace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_deinterlace_la_CFLAGS) $(CFLAGS) -c -o fv_deinterlace_la-fv_deinterlace.lo `test -f 'fv_deinterlace.c' || echo '$(srcdir)/'`fv_deinterlace.c
-
-fv_deinterlace_la-bgyadif.lo: bgyadif.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_deinterlace_la_CFLAGS) $(CFLAGS) -MT fv_deinterlace_la-bgyadif.lo -MD -MP -MF $(DEPDIR)/fv_deinterlace_la-bgyadif.Tpo -c -o fv_deinterlace_la-bgyadif.lo `test -f 'bgyadif.c' || echo '$(srcdir)/'`bgyadif.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fv_deinterlace_la-bgyadif.Tpo $(DEPDIR)/fv_deinterlace_la-bgyadif.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bgyadif.c' object='fv_deinterlace_la-bgyadif.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_deinterlace_la_CFLAGS) $(CFLAGS) -c -o fv_deinterlace_la-bgyadif.lo `test -f 'bgyadif.c' || echo '$(srcdir)/'`bgyadif.c
-
-fv_tcdisplay_la-fv_tcdisplay.lo: fv_tcdisplay.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_tcdisplay_la_CFLAGS) $(CFLAGS) -MT fv_tcdisplay_la-fv_tcdisplay.lo -MD -MP -MF $(DEPDIR)/fv_tcdisplay_la-fv_tcdisplay.Tpo -c -o fv_tcdisplay_la-fv_tcdisplay.lo `test -f 'fv_tcdisplay.c' || echo '$(srcdir)/'`fv_tcdisplay.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fv_tcdisplay_la-fv_tcdisplay.Tpo $(DEPDIR)/fv_tcdisplay_la-fv_tcdisplay.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fv_tcdisplay.c' object='fv_tcdisplay_la-fv_tcdisplay.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_tcdisplay_la_CFLAGS) $(CFLAGS) -c -o fv_tcdisplay_la-fv_tcdisplay.lo `test -f 'fv_tcdisplay.c' || echo '$(srcdir)/'`fv_tcdisplay.c
-
-fv_textlogo_la-fv_textlogo.lo: fv_textlogo.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_textlogo_la_CFLAGS) $(CFLAGS) -MT fv_textlogo_la-fv_textlogo.lo -MD -MP -MF $(DEPDIR)/fv_textlogo_la-fv_textlogo.Tpo -c -o fv_textlogo_la-fv_textlogo.lo `test -f 'fv_textlogo.c' || echo '$(srcdir)/'`fv_textlogo.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fv_textlogo_la-fv_textlogo.Tpo $(DEPDIR)/fv_textlogo_la-fv_textlogo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fv_textlogo.c' object='fv_textlogo_la-fv_textlogo.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fv_textlogo_la_CFLAGS) $(CFLAGS) -c -o fv_textlogo_la-fv_textlogo.lo `test -f 'fv_textlogo.c' || echo '$(srcdir)/'`fv_textlogo.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/videofilters/colormatrix.c Deleted

@@ -1,1467 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <config.h>
-
-#include <gavl/gavl.h>
-#include "colormatrix.h"
-#include <gmerlin/translation.h>
-
-#include <gmerlin/log.h>
-#define LOG_DOMAIN "colormatrix"
-
-#define CLAMP_FLOAT(val) (val > 1.0) ? 1.0 : ((val < 0.0) ? 0.0 : val)
-#define CLAMP_FLOAT_UV(val) (val > 0.5) ? 0.5 : ((val < -0.5) ? -0.5 : val)
-
-typedef struct
-  {
-  float coeffs_f[4][5];
-  int   coeffs_i[4][5];
-  } matrix_t;
-
-#if 0
-static void dump_matrix(float coeffs_f[4][5])
-  {
-  int i;
-  fprintf(stderr, "Matrix\n");
-  for(i = 0; i < 4; i++)
-    {
-    fprintf(stderr, "%f %f %f %f %f\n",
-            coeffs_f[i][0],
-            coeffs_f[i][1],
-            coeffs_f[i][2],
-            coeffs_f[i][3],
-            coeffs_f[i][4]);
-    }
-  }
-#endif
-
-struct bg_colormatrix_s
-  {
-  matrix_t rgba;
-  matrix_t yuva;
-  
-  void (*func)(void * priv, int start, int end);
-  gavl_video_format_t format;
-
-  /* Multithreading stuff */
-
-  gavl_video_run_func run_func;
-  void * run_data;
-  gavl_video_stop_func stop_func;
-  void * stop_data;
-  int num_threads;
-
-  gavl_video_frame_t * frame;
-  };
-
-static void matrixmult_cn(const float coeffs1[4][5],
-                          float coeffs2[4][5],
-                          float result[4][5])
-  {
-  int i, j;
-
-  for(i = 0; i < 4; i++)
-    {
-    for(j = 0; j < 5; j++)
-      {
-      result[i][j] = 
-        coeffs1[i][0] * coeffs2[0][j] +
-        coeffs1[i][1] * coeffs2[1][j] +
-        coeffs1[i][2] * coeffs2[2][j] +
-        coeffs1[i][3] * coeffs2[3][j];
-      }
-    result[i][4] += coeffs1[i][4];
-    }
-  }
-
-static void matrixmult_nc(float coeffs1[4][5],
-                          const float coeffs2[4][5],
-                          float result[4][5])
-  {
-  int i, j;
-
-  for(i = 0; i < 4; i++)
-    {
-    for(j = 0; j < 5; j++)
-      {
-      result[i][j] = 
-        coeffs1[i][0] * coeffs2[0][j] +
-        coeffs1[i][1] * coeffs2[1][j] +
-        coeffs1[i][2] * coeffs2[2][j] +
-        coeffs1[i][3] * coeffs2[3][j];
-      }
-    result[i][4] += coeffs1[i][4];
-    }
-  }
-
-static const float rgba_2_yuva[4][5] =
-  {
-    /*       ry         gy         by   ay   oy */
-    {  0.299000,  0.587000,  0.114000, 0.0, 0.0 },
-    /*       ru         gu         bu   au   ou */
-    { -0.168736, -0.331264,  0.500000, 0.0, 0.0 },
-    /*       rv         gv         bv   av   ov */
-    {  0.500000, -0.418688, -0.081312, 0.0, 0.0 },
-    /*       ra         ga         ba   aa   oa */
-    {       0.0,       0.0,       0.0, 1.0, 0.0 },
-  };
-
-
-static const float yuva_2_rgba[4][5] =
-  {
-    /* yr         ur         vr   ar   or */
-    { 1.0,  0.000000,  1.402000, 0.0, 0.0 },
-    /* yg         ug         vg   ag   og */
-    { 1.0, -0.344136, -0.714136, 0.0, 0.0},
-    /* yb         ub         vb   ab   ob */
-    { 1.0,  1.772000,  0.000000, 0.0, 0.0},
-    /* ya         ua         va   aa   oa */
-    { 0.0,  0.000000,  0.000000, 1.0, 0.0 },
-  };
-
-static void colormatrix_rgb2yuv(float coeffs_in[4][5],
-                                float coeffs_out[4][5])
-  {
-  float coeffs_tmp[4][5];
-  matrixmult_cn(rgba_2_yuva, coeffs_in, coeffs_tmp);
-  matrixmult_nc(coeffs_tmp, yuva_2_rgba, coeffs_out);
-  }
-
-static void colormatrix_yuv2rgb(float coeffs_in[4][5],
-                                float coeffs_out[4][5])
-  {
-  float coeffs_tmp[4][5];
-  matrixmult_cn(yuva_2_rgba,  coeffs_in, coeffs_tmp);
-  matrixmult_nc(coeffs_tmp, rgba_2_yuva, coeffs_out);
-  }
-
-static void colormatrix_set_4(float coeffs_in[4][5],
-                              float coeffs_out[4][5])
-  {
-  int i, j;
-  for(i = 0; i < 4; i++)
-    {
-    for(j = 0; j < 5; j++)
-      coeffs_out[i][j] = coeffs_in[i][j];
-    }
-  }
-
-static void colormatrix_set_3(float coeffs_in[3][4],
-                              float coeffs_out[4][5])
-  {
-  int i, j;
-  for(i = 0; i < 3; i++)
-    {
-    for(j = 0; j < 3; j++)
-      coeffs_out[i][j] = coeffs_in[i][j];
-    
-    coeffs_out[i][3] = 0.0;
-    coeffs_out[i][4] = coeffs_in[i][3];
-    }
-  coeffs_out[3][0] = 0.0;
-  coeffs_out[3][1] = 0.0;
-  coeffs_out[3][2] = 0.0;
-  coeffs_out[3][3] = 1.0;
-  }
-
-bg_colormatrix_t * bg_colormatrix_create()
-  {
-  bg_colormatrix_t * ret;
-  ret = calloc(1, sizeof(*ret));
-  
-  return ret;
-  }
-
-void bg_colormatrix_destroy(bg_colormatrix_t * m)
-  {
-  free(m);
-  }
-
-/* */
-
-/* Gray */
-
-static void process_gray_8(void * priv, int start, int end)
-  {
-  int g;
-  int i, j;
-  uint8_t * src;
-
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      g =
-        ((m->yuva.coeffs_i[0][0] * src[0]) >> 8) +
-        m->yuva.coeffs_i[0][4];
-      
-      src[0] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src++;
-      }
-    }
-  
-  }
-
-
-static void process_graya_16(void * priv, int start, int end)
-  {
-  int g, a;
-  int i, j;
-  uint8_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      g =
-        ((m->yuva.coeffs_i[0][0] * (src[0]) +
-          m->yuva.coeffs_i[0][3] * src[1]) >> 8) +
-        m->yuva.coeffs_i[0][4];
-      
-      a =
-        ((m->yuva.coeffs_i[3][0] * (src[0]) +
-          m->yuva.coeffs_i[3][3] * src[1]) >> 8) +
-        m->yuva.coeffs_i[3][4];
-
-      src[0] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src[1] = (uint8_t)((a & ~0xFF)?((-a) >> 31) : a);
-      
-      src += 2;
-      }
-    }
-  
-  }
-
-/* */
-
-static void process_gray_16(void * priv, int start, int end)
-  {
-  int64_t g;
-  int i, j;
-  uint16_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      g =
-        (((int64_t)m->yuva.coeffs_i[0][0] * src[0]) >> 16) +
-        m->yuva.coeffs_i[0][4];
-      
-      src[0] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
-      src++;
-      }
-    }
-  
-  }
-
-
-static void process_graya_32(void * priv, int start, int end)
-  {
-  int64_t g, a;
-  int i, j;
-  uint16_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      g =
-        (((int64_t)m->yuva.coeffs_i[0][0] * (src[0]) +
-          m->yuva.coeffs_i[0][3] * src[1]) >> 16) +
-        m->yuva.coeffs_i[0][4];
-      
-      a =
-        (((int64_t)m->yuva.coeffs_i[3][0] * (src[0]) +
-          m->yuva.coeffs_i[3][3] * src[1]) >> 16) +
-        m->yuva.coeffs_i[3][4];
-      
-      src[0] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
-      src[1] = (uint16_t)((a & ~0xFFFF)?((-a) >> 63) : a);
-      
-      src += 2;
-      }
-    }
-  
-  }
-
-
-static void process_gray_float(void * priv, int start, int end)
-  {
-  float g;
-  int i, j;
-  float * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (float*)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      g =
-        (m->yuva.coeffs_f[0][0] * src[0]) + m->yuva.coeffs_f[0][4];
-      
-      src[0] = CLAMP_FLOAT(g);
-      src++;
-      }
-    }
-  
-  }
-
-
-static void process_graya_float(void * priv, int start, int end)
-  {
-  float g, a;
-  int i, j;
-  float * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (float*)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      g =
-        ((m->yuva.coeffs_f[0][0] * (src[0]) +
-          m->yuva.coeffs_f[0][3] * src[1])) +
-        m->yuva.coeffs_f[0][4];
-      
-      a =
-        ((m->yuva.coeffs_f[3][0] * (src[0]) +
-          m->yuva.coeffs_f[3][3] * src[1])) +
-        m->yuva.coeffs_f[3][4];
-      
-      src[0] = CLAMP_FLOAT(g);
-      src[1] = CLAMP_FLOAT(a);
-      
-      src += 2;
-      }
-    }
-  
-  }
-
-
-
-
-
-/* RGB(A) 8 bit */
-
-
-static void process_bgr_24(void * priv, int start, int end)
-  {
-  int i, j;
-  int r, g, b;
-  uint8_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        ((m->rgba.coeffs_i[0][0] * src[2] +
-          m->rgba.coeffs_i[0][1] * src[1] + 
-          m->rgba.coeffs_i[0][2] * src[0]) >> 8) +
-        m->rgba.coeffs_i[0][4];
-      
-      g =
-        ((m->rgba.coeffs_i[1][0] * src[2] +
-          m->rgba.coeffs_i[1][1] * src[1] + 
-          m->rgba.coeffs_i[1][2] * src[0]) >> 8) +
-        m->rgba.coeffs_i[1][4];
-      
-      b =
-        ((m->rgba.coeffs_i[2][0] * src[2] +
-          m->rgba.coeffs_i[2][1] * src[1] + 
-          m->rgba.coeffs_i[2][2] * src[0]) >> 8) +
-        m->rgba.coeffs_i[2][4];
-      
-      src[2] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
-      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src[0] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
-      
-      src += 3;
-      }
-    }
-  }
-
-static void process_rgb_24(void * priv, int start, int end)
-  {
-  int i, j;
-  int r, g, b;
-  uint8_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        ((m->rgba.coeffs_i[0][0] * src[0] +
-          m->rgba.coeffs_i[0][1] * src[1] + 
-          m->rgba.coeffs_i[0][2] * src[2]) >> 8) +
-        m->rgba.coeffs_i[0][4];
-      
-      g =
-        ((m->rgba.coeffs_i[1][0] * src[0] +
-          m->rgba.coeffs_i[1][1] * src[1] + 
-          m->rgba.coeffs_i[1][2] * src[2]) >> 8) +
-        m->rgba.coeffs_i[1][4];
-      
-      b =
-        ((m->rgba.coeffs_i[2][0] * src[0] +
-          m->rgba.coeffs_i[2][1] * src[1] + 
-          m->rgba.coeffs_i[2][2] * src[2]) >> 8) +
-        m->rgba.coeffs_i[2][4];
-      
-      src[0] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
-      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src[2] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
-      
-      src += 3;
-      }
-    }
-  }
-
-
-static void process_bgr_32(void * priv, int start, int end)
-  {
-  int i, j;
-  int r, g, b;
-  uint8_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        ((m->rgba.coeffs_i[0][0] * src[2] +
-          m->rgba.coeffs_i[0][1] * src[1] + 
-          m->rgba.coeffs_i[0][2] * src[0]) >> 8) +
-        m->rgba.coeffs_i[0][4];
-      
-      g =
-        ((m->rgba.coeffs_i[1][0] * src[2] +
-          m->rgba.coeffs_i[1][1] * src[1] + 
-          m->rgba.coeffs_i[1][2] * src[0]) >> 8) +
-        m->rgba.coeffs_i[1][4];
-      
-      b =
-        ((m->rgba.coeffs_i[2][0] * src[2] +
-          m->rgba.coeffs_i[2][1] * src[1] + 
-          m->rgba.coeffs_i[2][2] * src[0]) >> 8) +
-        m->rgba.coeffs_i[2][4];
-      
-      src[2] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
-      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src[0] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
-      
-      src += 4;
-      }
-    }
-  }
-
-static void process_rgb_32(void * priv, int start, int end)
-  {
-  int i, j;
-  int r, g, b;
-  uint8_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        ((m->rgba.coeffs_i[0][0] * src[0] +
-          m->rgba.coeffs_i[0][1] * src[1] + 
-          m->rgba.coeffs_i[0][2] * src[2]) >> 8) +
-        m->rgba.coeffs_i[0][4];
-      
-      g =
-        ((m->rgba.coeffs_i[1][0] * src[0] +
-          m->rgba.coeffs_i[1][1] * src[1] + 
-          m->rgba.coeffs_i[1][2] * src[2]) >> 8) +
-        m->rgba.coeffs_i[1][4];
-      
-      b =
-        ((m->rgba.coeffs_i[2][0] * src[0] +
-          m->rgba.coeffs_i[2][1] * src[1] + 
-          m->rgba.coeffs_i[2][2] * src[2]) >> 8) +
-        m->rgba.coeffs_i[2][4];
-      
-      src[0] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
-      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src[2] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
-      
-      src += 4;
-      }
-    }
-  }
-
-static void process_rgba_32(void * priv, int start, int end)
-  {
-  int i, j;
-  uint8_t * src;
-  int r, g, b, a;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        ((m->rgba.coeffs_i[0][0] * src[0] +
-          m->rgba.coeffs_i[0][1] * src[1] + 
-          m->rgba.coeffs_i[0][2] * src[2] + 
-          m->rgba.coeffs_i[0][3] * src[3]) >> 8) +
-        m->rgba.coeffs_i[0][4];
-      
-      g =
-        ((m->rgba.coeffs_i[1][0] * src[0] +
-          m->rgba.coeffs_i[1][1] * src[1] + 
-          m->rgba.coeffs_i[1][2] * src[2] + 
-          m->rgba.coeffs_i[1][3] * src[3]) >> 8) +
-        m->rgba.coeffs_i[1][4];
-      
-      b =
-        ((m->rgba.coeffs_i[2][0] * src[0] +
-          m->rgba.coeffs_i[2][1] * src[1] + 
-          m->rgba.coeffs_i[2][2] * src[2] + 
-          m->rgba.coeffs_i[2][3] * src[3]) >> 8) +
-        m->rgba.coeffs_i[2][4];
-
-      a =
-        ((m->rgba.coeffs_i[3][0] * src[0] +
-          m->rgba.coeffs_i[3][1] * src[1] + 
-          m->rgba.coeffs_i[3][2] * src[2] + 
-          m->rgba.coeffs_i[3][3] * src[3]) >> 8) +
-        m->rgba.coeffs_i[3][4];
-
-      src[0] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
-      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
-      src[2] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
-      src[3] = (uint8_t)((a & ~0xFF)?((-a) >> 31) : a);
-      
-      src += 4;
-      }
-    }
-  
-  }
-
-/* RGB(A) 16 bit */
-
-static void process_rgb_48(void * priv, int start, int end)
-  {
-  int64_t r, g, b;
-  int i, j;
-  uint16_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-
-  for(i = start; i < end; i++)
-    {
-    src = (uint16_t *)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        (((int64_t)m->rgba.coeffs_i[0][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[0][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[0][2] * (int64_t)src[2]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[0][4];
-      
-      g =
-        (((int64_t)m->rgba.coeffs_i[1][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[1][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[1][2] * (int64_t)src[2]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[1][4];
-      
-      b =
-        (((int64_t)m->rgba.coeffs_i[2][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[2][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[2][2] * (int64_t)src[2]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[2][4];
-
-      src[0] = (uint16_t)((r & ~0xFFFF)?((-r) >> 63) : r);
-      src[1] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
-      src[2] = (uint16_t)((b & ~0xFFFF)?((-b) >> 63) : b);
-      
-      src += 3;
-      }
-    }
-  }
-
-static void process_rgba_64(void * priv, int start, int end)
-  {
-  int64_t r, g, b, a;
-  int i, j;
-  uint16_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-
-  for(i = start; i < end; i++)
-    {
-    src = (uint16_t *)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        (((int64_t)m->rgba.coeffs_i[0][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[0][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[0][2] * (int64_t)src[2] + 
-          (int64_t)m->rgba.coeffs_i[0][3] * (int64_t)src[3]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[0][4];
-      
-      g =
-        (((int64_t)m->rgba.coeffs_i[1][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[1][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[1][2] * (int64_t)src[2] + 
-          (int64_t)m->rgba.coeffs_i[1][3] * (int64_t)src[3]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[1][4];
-      
-      b =
-        (((int64_t)m->rgba.coeffs_i[2][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[2][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[2][2] * (int64_t)src[2] + 
-          (int64_t)m->rgba.coeffs_i[2][3] * (int64_t)src[3]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[2][4];
-
-      a =
-        (((int64_t)m->rgba.coeffs_i[3][0] * (int64_t)src[0] +
-          (int64_t)m->rgba.coeffs_i[3][1] * (int64_t)src[1] + 
-          (int64_t)m->rgba.coeffs_i[3][2] * (int64_t)src[2] + 
-          (int64_t)m->rgba.coeffs_i[3][3] * (int64_t)src[3]) >> 16) +
-        (int64_t)m->rgba.coeffs_i[3][4];
-
-      src[0] = (uint16_t)((r & ~0xFFFF)?((-r) >> 63) : r);
-      src[1] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
-      src[2] = (uint16_t)((b & ~0xFFff)?((-b) >> 63) : b);
-      src[3] = (uint16_t)((a & ~0xFFFF)?((-a) >> 63) : a);
-      
-      src += 4;
-      }
-    }
-  
-  }
-
-
-/* Float */
-
-static void process_rgb_float(void * priv, int start, int end)
-  {
-  int i, j;
-  float * src;
-  float r, g, b;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-
-  for(i = start; i < end; i++)
-    {
-    src = (float *)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        m->rgba.coeffs_f[0][0] * src[0] +
-        m->rgba.coeffs_f[0][1] * src[1] + 
-        m->rgba.coeffs_f[0][2] * src[2] +
-        m->rgba.coeffs_f[0][4];
-      g =
-        m->rgba.coeffs_f[1][0] * src[0] +
-        m->rgba.coeffs_f[1][1] * src[1] + 
-        m->rgba.coeffs_f[1][2] * src[2] +
-        m->rgba.coeffs_f[1][4];
-      b =
-        m->rgba.coeffs_f[2][0] * src[0] +
-        m->rgba.coeffs_f[2][1] * src[1] + 
-        m->rgba.coeffs_f[2][2] * src[2] +
-        m->rgba.coeffs_f[2][4];
-      src[0] = CLAMP_FLOAT(r);
-      src[1] = CLAMP_FLOAT(g);
-      src[2] = CLAMP_FLOAT(b);
-      src += 3;
-      }
-    }
-  }
-
-
-static void process_rgba_float(void * priv, int start, int end)
-  {
-  int i, j;
-  float * src;
-  float r, g, b, a;
-
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-
-  for(i = start; i < end; i++)
-    {
-    src = (float *)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      r =
-        m->rgba.coeffs_f[0][0] * src[0] +
-        m->rgba.coeffs_f[0][1] * src[1] + 
-        m->rgba.coeffs_f[0][2] * src[2] +
-        m->rgba.coeffs_f[0][3] * src[3] +
-        m->rgba.coeffs_f[0][4];
-      g =
-        m->rgba.coeffs_f[1][0] * src[0] +
-        m->rgba.coeffs_f[1][1] * src[1] + 
-        m->rgba.coeffs_f[1][2] * src[2] +
-        m->rgba.coeffs_f[1][3] * src[3] +
-        m->rgba.coeffs_f[1][4];
-      b =
-        m->rgba.coeffs_f[2][0] * src[0] +
-        m->rgba.coeffs_f[2][1] * src[1] + 
-        m->rgba.coeffs_f[2][2] * src[2] +
-        m->rgba.coeffs_f[2][3] * src[3] +
-        m->rgba.coeffs_f[2][4];
-      a =
-        m->rgba.coeffs_f[3][0] * src[0] +
-        m->rgba.coeffs_f[3][1] * src[1] + 
-        m->rgba.coeffs_f[3][2] * src[2] +
-        m->rgba.coeffs_f[3][3] * src[3] +
-        m->rgba.coeffs_f[3][4];
-      src[0] = CLAMP_FLOAT(r);
-      src[1] = CLAMP_FLOAT(g);
-      src[2] = CLAMP_FLOAT(b);
-      src[3] = CLAMP_FLOAT(a);
-      
-      src += 4;
-      }
-    }
-  }
-
-static void process_yuv_float(void * priv, int start, int end)
-  {
-  int i, j;
-  float * src;
-  float y, u, v;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (float *)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        m->yuva.coeffs_f[0][0] * src[0] +
-        m->yuva.coeffs_f[0][1] * src[1] + 
-        m->yuva.coeffs_f[0][2] * src[2] +
-        m->yuva.coeffs_f[0][4];
-      u =
-        m->yuva.coeffs_f[1][0] * src[0] +
-        m->yuva.coeffs_f[1][1] * src[1] + 
-        m->yuva.coeffs_f[1][2] * src[2] +
-        m->yuva.coeffs_f[1][4];
-      v =
-        m->yuva.coeffs_f[2][0] * src[0] +
-        m->yuva.coeffs_f[2][1] * src[1] + 
-        m->yuva.coeffs_f[2][2] * src[2] +
-        m->yuva.coeffs_f[2][4];
-      src[0] = CLAMP_FLOAT(y);
-      src[1] = CLAMP_FLOAT_UV(u);
-      src[2] = CLAMP_FLOAT_UV(v);
-      src += 3;
-      }
-    }
-  }
-
-
-static void process_yuva_float(void * priv, int start, int end)
-  {
-  int i, j;
-  float * src;
-  float y, u, v, a;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (float *)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        m->yuva.coeffs_f[0][0] * src[0] +
-        m->yuva.coeffs_f[0][1] * src[1] + 
-        m->yuva.coeffs_f[0][2] * src[2] +
-        m->yuva.coeffs_f[0][3] * src[3] +
-        m->yuva.coeffs_f[0][4];
-      u =
-        m->yuva.coeffs_f[1][0] * src[0] +
-        m->yuva.coeffs_f[1][1] * src[1] + 
-        m->yuva.coeffs_f[1][2] * src[2] +
-        m->yuva.coeffs_f[1][3] * src[3] +
-        m->yuva.coeffs_f[1][4];
-      v =
-        m->yuva.coeffs_f[2][0] * src[0] +
-        m->yuva.coeffs_f[2][1] * src[1] + 
-        m->yuva.coeffs_f[2][2] * src[2] +
-        m->yuva.coeffs_f[2][3] * src[3] +
-        m->yuva.coeffs_f[2][4];
-      a =
-        m->yuva.coeffs_f[3][0] * src[0] +
-        m->yuva.coeffs_f[3][1] * src[1] + 
-        m->yuva.coeffs_f[3][2] * src[2] +
-        m->yuva.coeffs_f[3][3] * src[3] +
-        m->yuva.coeffs_f[3][4];
-      src[0] = CLAMP_FLOAT(y);
-      src[1] = CLAMP_FLOAT_UV(u);
-      src[2] = CLAMP_FLOAT_UV(v);
-      src[3] = CLAMP_FLOAT(a);
-      
-      src += 4;
-      }
-    }
-  }
-
-static void process_yuva_32(void * priv, int start, int end)
-  {
-  int y, u, v, a;
-  int i, j;
-  uint8_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = in->planes[0]  + i * in->strides[0];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        ((m->yuva.coeffs_i[0][0] * (src[0] - 0x10) +
-          m->yuva.coeffs_i[0][1] * (src[1] - 0x80) + 
-          m->yuva.coeffs_i[0][2] * (src[2] - 0x80) + 
-          m->yuva.coeffs_i[0][3] * src[3]) >> 8) +
-        m->yuva.coeffs_i[0][4];
-      y += 0x10;
-      
-      u =
-        ((m->yuva.coeffs_i[1][0] * (src[0] - 0x10) +
-          m->yuva.coeffs_i[1][1] * (src[1] - 0x80) + 
-          m->yuva.coeffs_i[1][2] * (src[2] - 0x80) + 
-          m->yuva.coeffs_i[1][3] * src[3]) >> 8) +
-        m->yuva.coeffs_i[1][4];
-      u += 0x80;
-      
-      v =
-        ((m->yuva.coeffs_i[2][0] * (src[0] - 0x10) +
-          m->yuva.coeffs_i[2][1] * (src[1] - 0x80) + 
-          m->yuva.coeffs_i[2][2] * (src[2] - 0x80) + 
-          m->yuva.coeffs_i[2][3] * src[3]) >> 8) +
-        m->yuva.coeffs_i[2][4];
-      v += 0x80;
-
-      a =
-        ((m->yuva.coeffs_i[3][0] * (src[0] - 0x10) +
-          m->yuva.coeffs_i[3][1] * (src[1] - 0x80) + 
-          m->yuva.coeffs_i[3][2] * (src[2] - 0x80) + 
-          m->yuva.coeffs_i[3][3] * src[3]) >> 8) +
-        m->yuva.coeffs_i[3][4];
-
-      src[0] = (uint8_t)((y & ~0xFF)?((-y) >> 31) : y);
-      src[1] = (uint8_t)((u & ~0xFF)?((-u) >> 31) : u);
-      src[2] = (uint8_t)((v & ~0xFF)?((-v) >> 31) : v);
-      src[3] = (uint8_t)((a & ~0xFF)?((-a) >> 31) : a);
-      
-      src += 4;
-      }
-    }
-  
-  }
-
-static void process_yuva_64(void * priv, int start, int end)
-  {
-  int64_t y, u, v, a;
-  int i, j;
-  uint16_t * src;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  for(i = start; i < end; i++)
-    {
-    src = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        (((int64_t)m->yuva.coeffs_i[0][0] * (src[0] - 0x1000) +
-          m->yuva.coeffs_i[0][1] * (src[1] - 0x8000) + 
-          m->yuva.coeffs_i[0][2] * (src[2] - 0x8000) + 
-          m->yuva.coeffs_i[0][3] * src[3]) >> 16) +
-        m->yuva.coeffs_i[0][4];
-      y += 0x1000;
-      
-      u =
-        (((int64_t)m->yuva.coeffs_i[1][0] * (src[0] - 0x1000) +
-          m->yuva.coeffs_i[1][1] * (src[1] - 0x8000) + 
-          m->yuva.coeffs_i[1][2] * (src[2] - 0x8000) + 
-          m->yuva.coeffs_i[1][3] * src[3]) >> 16) +
-        m->yuva.coeffs_i[1][4];
-      u += 0x8000;
-      
-      v =
-        (((int64_t)m->yuva.coeffs_i[2][0] * (src[0] - 0x1000) +
-          m->yuva.coeffs_i[2][1] * (src[1] - 0x8000) + 
-          m->yuva.coeffs_i[2][2] * (src[2] - 0x8000) + 
-          m->yuva.coeffs_i[2][3] * src[3]) >> 16) +
-        m->yuva.coeffs_i[2][4];
-      v += 0x8000;
-
-      a =
-        (((int64_t)m->yuva.coeffs_i[3][0] * (src[0] - 0x1000) +
-          m->yuva.coeffs_i[3][1] * (src[1] - 0x8000) + 
-          m->yuva.coeffs_i[3][2] * (src[2] - 0x8000) + 
-          m->yuva.coeffs_i[3][3] * src[3]) >> 16) +
-        m->yuva.coeffs_i[3][4];
-
-      src[0] = (uint16_t)((y & ~0xFFFF)?((-y) >> 63) : y);
-      src[1] = (uint16_t)((u & ~0xFFFF)?((-u) >> 63) : u);
-      src[2] = (uint16_t)((v & ~0xFFFF)?((-v) >> 63) : v);
-      src[3] = (uint16_t)((a & ~0xFFFF)?((-a) >> 63) : a);
-      
-      src += 4;
-      }
-    }
-  
-  }
-
-
-
-static void process_444j(void * priv, int start, int end)
-  {
-  int y, u, v;
-  int i, j;
-  uint8_t * src_y, * src_u, *src_v;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  
-  for(i = start; i < end; i++)
-    {
-    src_y = in->planes[0]  + i * in->strides[0];
-    src_u = in->planes[1]  + i * in->strides[1];
-    src_v = in->planes[2]  + i * in->strides[2];
-
-
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        ((m->yuva.coeffs_i[0][0] * *src_y +
-          m->yuva.coeffs_i[0][1] * (*src_u-0x80) + 
-          m->yuva.coeffs_i[0][2] * (*src_v-0x80)) >> 8) +
-        m->yuva.coeffs_i[0][4];
-
-      u =
-        ((m->yuva.coeffs_i[1][0] * *src_y +
-          m->yuva.coeffs_i[1][1] * (*src_u-0x80) + 
-          m->yuva.coeffs_i[1][2] * (*src_v-0x80)) >> 8) +
-        m->yuva.coeffs_i[1][4];
-      u += 0x80;
-      
-      v =
-        ((m->yuva.coeffs_i[2][0] * *src_y +
-          m->yuva.coeffs_i[2][1] * (*src_u-0x80) + 
-          m->yuva.coeffs_i[2][2] * (*src_v-0x80)) >> 8) +
-        m->yuva.coeffs_i[2][4];
-      v += 0x80;
-
-      *src_y = (uint8_t)((y & ~0xFF)?((-y) >> 31) : y);
-      *src_u = (uint8_t)((u & ~0xFF)?((-u) >> 31) : u);
-      *src_v = (uint8_t)((v & ~0xFF)?((-v) >> 31) : v);
-      
-      src_y++;
-      src_u++;
-      src_v++;
-
-      }
-    }
-  }
-
-static void process_444(void * priv, int start, int end)
-  {
-  int y, u, v;
-  int i, j;
-  uint8_t * src_y, * src_u, *src_v;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  
-  for(i = start; i < end; i++)
-    {
-    src_y = in->planes[0]  + i * in->strides[0];
-    src_u = in->planes[1]  + i * in->strides[1];
-    src_v = in->planes[2]  + i * in->strides[2];
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        ((m->yuva.coeffs_i[0][0] * (*src_y-0x10) +
-          m->yuva.coeffs_i[0][1] * (*src_u-0x80) + 
-          m->yuva.coeffs_i[0][2] * (*src_v-0x80)) >> 8) +
-        m->yuva.coeffs_i[0][4];
-      y += 0x10;
-
-      u =
-        ((m->yuva.coeffs_i[1][0] * (*src_y-0x10) +
-          m->yuva.coeffs_i[1][1] * (*src_u-0x80) + 
-          m->yuva.coeffs_i[1][2] * (*src_v-0x80)) >> 8) +
-        m->yuva.coeffs_i[1][4];
-      u += 0x80;
-      
-      v =
-        ((m->yuva.coeffs_i[2][0] * (*src_y-0x10) +
-          m->yuva.coeffs_i[2][1] * (*src_u-0x80) + 
-          m->yuva.coeffs_i[2][2] * (*src_v-0x80)) >> 8) +
-        m->yuva.coeffs_i[2][4];
-      v += 0x80;
-
-      *src_y = (uint8_t)((y & ~0xFF)?((-y) >> 31) : y);
-      *src_u = (uint8_t)((u & ~0xFF)?((-u) >> 31) : u);
-      *src_v = (uint8_t)((v & ~0xFF)?((-v) >> 31) : v);
-      
-      src_y++;
-      src_u++;
-      src_v++;
-      
-      }
-    }
-  }
-
-static void process_444_16(void * priv, int start, int end)
-  {
-  int64_t y, u, v;
-  int i, j;
-  uint16_t * src_y, * src_u, *src_v;
-  bg_colormatrix_t * m = priv;
-  gavl_video_frame_t * in = m->frame;
-  
-  for(i = start; i < end; i++)
-    {
-    src_y = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
-    src_u = (uint16_t*)(in->planes[1]  + i * in->strides[1]);
-    src_v = (uint16_t*)(in->planes[2]  + i * in->strides[2]);
-    
-    for(j = 0; j < m->format.image_width; j++)
-      {
-      y =
-        (((int64_t)m->yuva.coeffs_i[0][0] * (*src_y-0x1000) +
-          m->yuva.coeffs_i[0][1] * (*src_u-0x8000) + 
-          m->yuva.coeffs_i[0][2] * (*src_v-0x8000)) >> 16) +
-        m->yuva.coeffs_i[0][4];
-      y += 0x1000;
-      
-      
-      u =
-        (((int64_t)m->yuva.coeffs_i[1][0] * (*src_y-0x1000) +
-          m->yuva.coeffs_i[1][1] * (*src_u-0x8000) + 
-          m->yuva.coeffs_i[1][2] * (*src_v-0x8000)) >> 16) +
-        m->yuva.coeffs_i[1][4];
-      u += 0x8000;
-
-      
-      v =
-        (((int64_t)m->yuva.coeffs_i[2][0] * (*src_y-0x1000) +
-          m->yuva.coeffs_i[2][1] * (*src_u-0x8000) + 
-          m->yuva.coeffs_i[2][2] * (*src_v-0x8000)) >> 16) +
-        m->yuva.coeffs_i[2][4];
-      v += 0x8000;
-
-      *src_y = (uint16_t)((y & ~0xFFFF)?((-y) >> 63) : y);
-      *src_u = (uint16_t)((u & ~0xFFFF)?((-u) >> 63) : u);
-      *src_v = (uint16_t)((v & ~0xFFFF)?((-v) >> 63) : v);
-      
-      src_y++;
-      src_u++;
-      src_v++;
-      }
-    }
-  }
-
-
-
-static void matrix_f_to_8(matrix_t * mat)
-  {
-  int i, j;
-  for(i = 0; i < 4; i++)
-    {
-    for(j = 0; j < 5; j++)
-      mat->coeffs_i[i][j] = (int)(mat->coeffs_f[i][j] * 256.0 + 0.5);
-    }
-  }
-
-static void matrix_f_to_16(matrix_t * mat)
-  {
-  int i, j;
-  for(i = 0; i < 4; i++)
-    {
-    for(j = 0; j < 5; j++)
-      mat->coeffs_i[i][j] = (int)(mat->coeffs_f[i][j] * 65536.0 + 0.5);
-    }
-  }
-
-#define SCALE_Y    219.0
-#define SCALE_UV   224.0
-#define SCALE_A    255.0
-#define SCALE_OFF  255.0
-
-static void matrix_f_to_8_yuv(matrix_t * mat)
-  {
-
-  /* y -> y */
-  mat->coeffs_i[0][0] = (int)(mat->coeffs_f[0][0] * 256.0 + 0.5);
-  /* u -> y */
-  mat->coeffs_i[0][1] = (int)(mat->coeffs_f[0][1] * 256.0 * SCALE_Y / SCALE_UV + 0.5);
-  /* v -> y */
-  mat->coeffs_i[0][2] = (int)(mat->coeffs_f[0][2] * 256.0 * SCALE_Y / SCALE_UV + 0.5);
-  /* a -> y */
-  mat->coeffs_i[0][3] = (int)(mat->coeffs_f[0][3] * 256.0 * SCALE_Y / SCALE_A + 0.5);
-  /* y off */
-  mat->coeffs_i[0][4] = (int)(mat->coeffs_f[0][4] * 256.0 * SCALE_Y / SCALE_OFF + 0.5);
-  
-  /* y -> u */
-  mat->coeffs_i[1][0] = (int)(mat->coeffs_f[1][0] * 256.0 * SCALE_UV / SCALE_Y + 0.5);
-  /* u -> u */
-  mat->coeffs_i[1][1] = (int)(mat->coeffs_f[1][1] * 256.0 + 0.5);
-  /* v -> u */
-  mat->coeffs_i[1][2] = (int)(mat->coeffs_f[1][2] * 256.0 + 0.5);
-  /* a -> u */
-  mat->coeffs_i[1][3] = (int)(mat->coeffs_f[1][3] * 256.0 * SCALE_UV / SCALE_A + 0.5);
-  /* u off */
-  mat->coeffs_i[1][4] = (int)(mat->coeffs_f[1][4] * 256.0 * SCALE_UV / SCALE_OFF + 0.5);
-
-  /* y -> v */
-  mat->coeffs_i[2][0] = (int)(mat->coeffs_f[2][0] * 256.0 * SCALE_UV / SCALE_Y + 0.5);
-  /* u -> v */
-  mat->coeffs_i[2][1] = (int)(mat->coeffs_f[2][1] * 256.0 + 0.5);
-  /* v -> v */
-  mat->coeffs_i[2][2] = (int)(mat->coeffs_f[2][2] * 256.0 + 0.5);
-  /* a -> v */
-  mat->coeffs_i[2][3] = (int)(mat->coeffs_f[2][3] * 256.0 * SCALE_UV / SCALE_A + 0.5);
-  /* v off */
-  mat->coeffs_i[2][4] = (int)(mat->coeffs_f[2][4] * 256.0 * SCALE_UV / SCALE_OFF + 0.5);
-
-  /* y -> a */
-  mat->coeffs_i[3][0] = (int)(mat->coeffs_f[3][0] * 256.0 * SCALE_A / SCALE_Y + 0.5);
-  /* u -> a */
-  mat->coeffs_i[3][1] = (int)(mat->coeffs_f[3][1] * 256.0 * SCALE_A / SCALE_UV + 0.5);
-  /* v -> a */
-  mat->coeffs_i[3][2] = (int)(mat->coeffs_f[3][2] * 256.0 * SCALE_A / SCALE_UV + 0.5);
-  /* a -> a */
-  mat->coeffs_i[3][3] = (int)(mat->coeffs_f[3][3] * 256.0 + 0.5);
-  /* a off */
-  mat->coeffs_i[3][4] = (int)(mat->coeffs_f[3][4] * 256.0 * SCALE_A / SCALE_OFF + 0.5);
-  }
-
-static void matrix_f_to_16_yuv(matrix_t * mat)
-  {
-
-  /* y -> y */
-  mat->coeffs_i[0][0] = (int)(mat->coeffs_f[0][0] * 65536.0 + 0.5);
-  /* u -> y */
-  mat->coeffs_i[0][1] = (int)(mat->coeffs_f[0][1] * 65536.0 * SCALE_Y / SCALE_UV + 0.5);
-  /* v -> y */
-  mat->coeffs_i[0][2] = (int)(mat->coeffs_f[0][2] * 65536.0 * SCALE_Y / SCALE_UV + 0.5);
-  /* a -> y */
-  mat->coeffs_i[0][3] = (int)(mat->coeffs_f[0][3] * 65536.0 * SCALE_Y / SCALE_A + 0.5);
-  /* y off */
-  mat->coeffs_i[0][4] = (int)(mat->coeffs_f[0][4] * 65536.0 * SCALE_Y / SCALE_OFF + 0.5);
-  
-  /* y -> u */
-  mat->coeffs_i[1][0] = (int)(mat->coeffs_f[1][0] * 65536.0 * SCALE_UV / SCALE_Y + 0.5);
-  /* u -> u */
-  mat->coeffs_i[1][1] = (int)(mat->coeffs_f[1][1] * 65536.0 + 0.5);
-  /* v -> u */
-  mat->coeffs_i[1][2] = (int)(mat->coeffs_f[1][2] * 65536.0 + 0.5);
-  /* a -> u */
-  mat->coeffs_i[1][3] = (int)(mat->coeffs_f[1][3] * 65536.0 * SCALE_UV / SCALE_A + 0.5);
-  /* u off */
-  mat->coeffs_i[1][4] = (int)(mat->coeffs_f[1][4] * 65536.0 * SCALE_UV / SCALE_OFF + 0.5);
-
-  /* y -> v */
-  mat->coeffs_i[2][0] = (int)(mat->coeffs_f[2][0] * 65536.0 * SCALE_UV / SCALE_Y + 0.5);
-  /* u -> v */
-  mat->coeffs_i[2][1] = (int)(mat->coeffs_f[2][1] * 65536.0 + 0.5);
-  /* v -> v */
-  mat->coeffs_i[2][2] = (int)(mat->coeffs_f[2][2] * 65536.0 + 0.5);
-  /* a -> v */
-  mat->coeffs_i[2][3] = (int)(mat->coeffs_f[2][3] * 65536.0 * SCALE_UV / SCALE_A + 0.5);
-  /* v off */
-  mat->coeffs_i[2][4] = (int)(mat->coeffs_f[2][4] * 65536.0 * SCALE_UV / SCALE_OFF + 0.5);
-
-  /* y -> a */
-  mat->coeffs_i[3][0] = (int)(mat->coeffs_f[3][0] * 65536.0 * SCALE_A / SCALE_Y + 0.5);
-  /* u -> a */
-  mat->coeffs_i[3][1] = (int)(mat->coeffs_f[3][1] * 65536.0 * SCALE_A / SCALE_UV + 0.5);
-  /* v -> a */
-  mat->coeffs_i[3][2] = (int)(mat->coeffs_f[3][2] * 65536.0 * SCALE_A / SCALE_UV + 0.5);
-  /* a -> a */
-  mat->coeffs_i[3][3] = (int)(mat->coeffs_f[3][3] * 65536.0 + 0.5);
-  /* a off */
-  mat->coeffs_i[3][4] = (int)(mat->coeffs_f[3][4] * 65536.0 * SCALE_A / SCALE_OFF + 0.5);
-  }
-
-
-static void init_internal(bg_colormatrix_t*m)
-  {
-  switch(m->format.pixelformat)
-    {
-    case GAVL_RGB_24:
-      m->func = process_rgb_24;
-      matrix_f_to_8(&m->rgba);
-      break;
-    case GAVL_RGB_48:
-      m->func = process_rgb_48;
-      matrix_f_to_16(&m->rgba);
-      break;
-    case GAVL_RGB_FLOAT:
-      m->func = process_rgb_float;
-      break;
-    case GAVL_RGB_32:
-      m->func = process_rgb_32;
-      matrix_f_to_8(&m->rgba);
-      break;
-    case GAVL_BGR_24:
-      m->func = process_bgr_24;
-      matrix_f_to_8(&m->rgba);
-      break;
-    case GAVL_BGR_32:
-      m->func = process_bgr_32;
-      matrix_f_to_8(&m->rgba);
-      break;
-    case GAVL_RGBA_32:
-      m->func = process_rgba_32;
-      matrix_f_to_8(&m->rgba);
-      break;
-    case GAVL_RGBA_64:
-      m->func = process_rgba_64;
-      matrix_f_to_16(&m->rgba);
-      break;
-    case GAVL_RGBA_FLOAT:
-      m->func = process_rgba_float;
-      break;
-    case GAVL_YUVJ_444_P:
-      m->func = process_444j;
-      matrix_f_to_8(&m->yuva);
-      break;
-    case GAVL_YUV_444_P:
-      m->func = process_444;
-      matrix_f_to_8_yuv(&m->yuva);
-      break;
-    case GAVL_YUVA_32:
-      m->func = process_yuva_32;
-      matrix_f_to_8_yuv(&m->yuva);
-      break;
-    case GAVL_YUV_444_P_16:
-      m->func = process_444_16;
-      matrix_f_to_16_yuv(&m->yuva);
-      break;
-      /* */
-    case GAVL_GRAY_8:
-      matrix_f_to_8(&m->yuva);
-      m->func = process_gray_8;
-      break;
-    case GAVL_GRAY_16:
-      matrix_f_to_16(&m->yuva);
-      m->func = process_gray_16;
-      break;
-    case GAVL_GRAY_FLOAT:
-      m->func = process_gray_float;
-      break;
-    case GAVL_GRAYA_16:
-      matrix_f_to_8(&m->yuva);
-      m->func = process_graya_16;
-      break;
-    case GAVL_GRAYA_32:
-      matrix_f_to_16(&m->yuva);
-      m->func = process_graya_32;
-      break;
-    case GAVL_GRAYA_FLOAT:
-      m->func = process_graya_float;
-      break;
-    case GAVL_YUV_FLOAT:
-      m->func = process_yuv_float;
-      break;
-    case GAVL_YUVA_FLOAT:
-      m->func = process_yuva_float;
-      break;
-    case GAVL_YUVA_64:
-      m->func = process_yuva_64;
-      matrix_f_to_16_yuv(&m->yuva);
-      break;
-    default:
-      break;
-    }
-  }
-
-
-void bg_colormatrix_set_rgba(bg_colormatrix_t * m, float coeffs[4][5])
-  {
-  colormatrix_set_4(coeffs, m->rgba.coeffs_f);
-  colormatrix_rgb2yuv(m->rgba.coeffs_f, m->yuva.coeffs_f);
-  init_internal(m);
-  }
-
-void bg_colormatrix_set_yuva(bg_colormatrix_t * m, float coeffs[4][5])
-  {
-  colormatrix_set_4(coeffs, m->yuva.coeffs_f);
-  colormatrix_rgb2yuv(m->yuva.coeffs_f, m->rgba.coeffs_f);
-  init_internal(m);
-  }
-
-void bg_colormatrix_set_rgb(bg_colormatrix_t * m, float coeffs[3][4])
-  {
-  colormatrix_set_3(coeffs, m->rgba.coeffs_f);
-  colormatrix_rgb2yuv(m->rgba.coeffs_f, m->yuva.coeffs_f);
-  init_internal(m);
-  //  dump_matrix(m->rgba.coeffs_f);
-  //  dump_matrix(m->yuva.coeffs_f);
-  }
-
-void bg_colormatrix_set_yuv(bg_colormatrix_t * m, float coeffs[3][4])
-  {
-  colormatrix_set_3(coeffs, m->yuva.coeffs_f);
-  colormatrix_yuv2rgb(m->yuva.coeffs_f, m->rgba.coeffs_f);
-  init_internal(m);
-  }
-
-static const gavl_pixelformat_t pixelformats[] =
-  {
-    GAVL_RGB_24,
-    GAVL_RGB_48,
-    GAVL_RGB_32,
-    GAVL_BGR_24,
-    GAVL_BGR_32,
-    GAVL_RGBA_32,
-    GAVL_RGBA_64,
-    GAVL_RGB_FLOAT,
-    GAVL_RGBA_FLOAT,
-    GAVL_YUVJ_444_P,
-    GAVL_YUV_444_P,
-    GAVL_YUV_444_P_16,
-    GAVL_YUVA_32,
-    GAVL_GRAY_8,
-    GAVL_GRAY_16,
-    GAVL_GRAY_FLOAT,
-    GAVL_GRAYA_16,
-    GAVL_GRAYA_32,
-    GAVL_GRAYA_FLOAT,
-    GAVL_YUV_FLOAT,
-    GAVL_YUVA_FLOAT,
-    GAVL_YUVA_64,
-    GAVL_PIXELFORMAT_NONE,
-  };
-
-static const gavl_pixelformat_t pixelformats_alpha[] =
-  {
-    GAVL_RGBA_32,
-    GAVL_RGBA_64,
-    GAVL_YUVA_32,
-    GAVL_YUVA_FLOAT,
-    GAVL_RGBA_FLOAT,
-    GAVL_PIXELFORMAT_NONE,
-  };
-
-
-void bg_colormatrix_init(bg_colormatrix_t * m,
-                         gavl_video_format_t * format, int flags,
-                         gavl_video_options_t * opt)
-  {
-  m->run_func  = gavl_video_options_get_run_func(opt, &m->run_data);
-  m->stop_func = gavl_video_options_get_stop_func(opt, &m->stop_data);
-  m->num_threads = gavl_video_options_get_num_threads(opt);
-  
-  if(flags & BG_COLORMATRIX_FORCE_ALPHA)
-    format->pixelformat = gavl_pixelformat_get_best(format->pixelformat,
-                                                    pixelformats_alpha,
-                                                    NULL);
-  else
-    format->pixelformat = gavl_pixelformat_get_best(format->pixelformat,
-                                                    pixelformats,
-                                                    NULL);
-  
-  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Pixelformat: %s",
-         TRD(gavl_pixelformat_to_string(format->pixelformat), NULL));
-  
-  gavl_video_format_copy(&m->format, format);
-  init_internal(m);
-  
-  }
-
-void bg_colormatrix_process(bg_colormatrix_t * m,
-                            gavl_video_frame_t * in_frame)
-  {
-  int j, nt, scanline, delta;
-
-  m->frame = in_frame;
-  
-  nt = m->num_threads;
-  if(nt > m->format.image_height)
-    nt = m->format.image_height;
-
-  delta = m->format.image_height / nt;
-  scanline = 0;
-
-  for(j = 0; j < nt - 1; j++)
-    {
-    m->run_func(m->func, m, scanline, scanline+delta, m->run_data, j);
-    scanline += delta;
-    }
-  m->run_func(m->func, m, scanline, m->format.image_height,
-              m->run_data, nt - 1);
-  
-  for(j = 0; j < nt; j++)
-    m->stop_func(m->stop_data, j);
-  }
-

gmerlin-1.2.0.tar.gz/plugins/videofilters/colormatrix.h Deleted

@@ -1,43 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-typedef struct bg_colormatrix_s bg_colormatrix_t;
-
-bg_colormatrix_t * bg_colormatrix_create();
-
-void bg_colormatrix_destroy(bg_colormatrix_t *);
-
-void bg_colormatrix_set_rgba(bg_colormatrix_t *, float coeffs[4][5]);
-void bg_colormatrix_set_yuva(bg_colormatrix_t *, float coeffs[4][5]);
-
-void bg_colormatrix_set_rgb(bg_colormatrix_t *, float coeffs[3][4]);
-void bg_colormatrix_set_yuv(bg_colormatrix_t *, float coeffs[3][4]);
-
-/* Constants for flags */
-#define BG_COLORMATRIX_FORCE_ALPHA (1<<0)
-
-void bg_colormatrix_init(bg_colormatrix_t *,
-                         gavl_video_format_t * format, int flags,
-                         gavl_video_options_t * opt);
-
-void bg_colormatrix_process(bg_colormatrix_t *,
-                            gavl_video_frame_t * frame);
-

gmerlin-1.2.0.tar.gz/plugins/visualization/Makefile.in Deleted

@@ -1,640 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/visualization
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-vis_scope_la_DEPENDENCIES =
-am_vis_scope_la_OBJECTS = vis_scope.lo colormatrix.lo
-vis_scope_la_OBJECTS = $(am_vis_scope_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(vis_scope_la_SOURCES)
-DIST_SOURCES = $(vis_scope_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-vis_scope_la_LIBADD = @MODULE_LIBADD@ -lm
-plugin_LTLIBRARIES = \
-vis_scope.la
-
-vis_scope_la_SOURCES = vis_scope.c ../videofilters/colormatrix.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/visualization/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/visualization/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-vis_scope.la: $(vis_scope_la_OBJECTS) $(vis_scope_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(vis_scope_la_OBJECTS) $(vis_scope_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormatrix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vis_scope.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-colormatrix.lo: ../videofilters/colormatrix.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT colormatrix.lo -MD -MP -MF $(DEPDIR)/colormatrix.Tpo -c -o colormatrix.lo `test -f '../videofilters/colormatrix.c' || echo '$(srcdir)/'`../videofilters/colormatrix.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/colormatrix.Tpo $(DEPDIR)/colormatrix.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../videofilters/colormatrix.c' object='colormatrix.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o colormatrix.lo `test -f '../videofilters/colormatrix.c' || echo '$(srcdir)/'`../videofilters/colormatrix.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/wavwrite/Makefile.in Deleted

@@ -1,630 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/wavwrite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-e_wav_la_DEPENDENCIES =
-am_e_wav_la_OBJECTS = e_wav.lo
-e_wav_la_OBJECTS = $(am_e_wav_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(e_wav_la_SOURCES)
-DIST_SOURCES = $(e_wav_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-AM_CFLAGS = \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-plugin_LTLIBRARIES = e_wav.la
-e_wav_la_SOURCES = e_wav.c
-e_wav_la_LIBADD = @MODULE_LIBADD@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/wavwrite/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/wavwrite/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-e_wav.la: $(e_wav_la_OBJECTS) $(e_wav_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(e_wav_la_OBJECTS) $(e_wav_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e_wav.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/plugins/x11/Makefile.in Deleted

@@ -1,645 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/x11
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-i_x11_la_DEPENDENCIES =
-am_i_x11_la_OBJECTS = i_x11.lo
-i_x11_la_OBJECTS = $(am_i_x11_la_OBJECTS)
-ov_x11_la_DEPENDENCIES =
-am_ov_x11_la_OBJECTS = ov_x11.lo
-ov_x11_la_OBJECTS = $(am_ov_x11_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(i_x11_la_SOURCES) $(ov_x11_la_SOURCES)
-DIST_SOURCES = $(i_x11_la_SOURCES) $(ov_x11_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = @X_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
-plugin_LTLIBRARIES = \
-i_x11.la \
-ov_x11.la 
-
-ov_x11_la_SOURCES = ov_x11.c
-ov_x11_la_LIBADD = @GMERLIN_DEP_LIBS@ @X_LIBS@ @XINERAMA_LIBS@ @XV_LIBS@ @MODULE_LIBADD@
-i_x11_la_SOURCES = i_x11.c
-i_x11_la_LIBADD = @GMERLIN_DEP_LIBS@ @X_LIBS@ @XINERAMA_LIBS@ @XV_LIBS@ @MODULE_LIBADD@
-noinst_HEADERS = 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/x11/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-i_x11.la: $(i_x11_la_OBJECTS) $(i_x11_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(i_x11_la_OBJECTS) $(i_x11_la_LIBADD) $(LIBS)
-ov_x11.la: $(ov_x11_la_OBJECTS) $(ov_x11_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ov_x11_la_OBJECTS) $(ov_x11_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_x11.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ov_x11.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/po/POTFILES.in Deleted

@@ -1,432 +0,0 @@
-utils/cpuinfo.c
-plugins/jack/oa_jack.c
-plugins/jack/i_jack.c
-plugins/jack/jack_common.c
-plugins/jack/jack_common.h
-plugins/pulseaudio/oa_pulse.c
-plugins/pulseaudio/pulseaudio_common.c
-plugins/pulseaudio/i_pulse.c
-plugins/pulseaudio/pulseaudio_common.h
-plugins/subwriters/e_subtext.c
-plugins/esd/i_esd.c
-plugins/esd/oa_esd.c
-plugins/v4l/pwc.c
-plugins/v4l/pwc.h
-plugins/v4l/i_v4l.c
-plugins/v4l/pwc-ioctl.h
-plugins/image/targa.h
-plugins/image/ir_tga.c
-plugins/image/ir_bmp.c
-plugins/image/iw_tga.c
-plugins/image/ir_pnm.c
-plugins/image/iw_bmp.c
-plugins/image/targa.c
-plugins/image/iw_pnm.c
-plugins/x11/ov_x11.c
-plugins/x11/i_x11.c
-plugins/oss/oss_common.h
-plugins/oss/i_oss.c
-plugins/oss/oa_oss.c
-plugins/oss/oss_common.c
-plugins/visualization/vis_scope.c
-plugins/audiofilters/fa_sampleformat.c
-plugins/audiofilters/fa_volume.c
-plugins/alsa/i_alsa.c
-plugins/alsa/oa_alsa.c
-plugins/alsa/alsa_common.c
-plugins/alsa/alsa_common.h
-plugins/postprocessors/cdrdao_common.c
-plugins/postprocessors/cdrdao_common.h
-plugins/postprocessors/e_pp_cdrdao.c
-plugins/postprocessors/e_pp_vcdimager.c
-plugins/videofilters/fv_colormatrix_yuv.c
-plugins/videofilters/fv_deinterlace.c
-plugins/videofilters/fv_transform.c
-plugins/videofilters/fv_swapfields.c
-plugins/videofilters/fv_textlogo.c
-plugins/videofilters/colormatrix.c
-plugins/videofilters/fv_cropscale.c
-plugins/videofilters/bgyadif.c
-plugins/videofilters/bgyadif.h
-plugins/videofilters/fv_pixelformat.c
-plugins/videofilters/fv_tcdisplay.c
-plugins/videofilters/fv_zoom.c
-plugins/videofilters/deinterlace.h
-plugins/videofilters/fv_tlp.c
-plugins/videofilters/fv_tctweak.c
-plugins/videofilters/fv_interlace.c
-plugins/videofilters/fv_colorbalance.c
-plugins/videofilters/fv_flip.c
-plugins/videofilters/fv_framerate.c
-plugins/videofilters/fv_oldcolor.c
-plugins/videofilters/fv_colormatrix_rgb.c
-plugins/videofilters/fv_decimate.c
-plugins/videofilters/fv_blur.c
-plugins/videofilters/colormatrix.h
-plugins/videofilters/fv_invert_rgb.c
-plugins/videofilters/fv_bitshift.c
-plugins/videofilters/fv_equalizer.c
-plugins/gavl/ir_gavl.c
-plugins/gavl/iw_gavl.c
-plugins/mikmod/i_mikmod.c
-plugins/cdaudio/sha1.h
-plugins/cdaudio/cddb.c
-plugins/cdaudio/cdaudio_xml.c
-plugins/cdaudio/cdparanoia.c
-plugins/cdaudio/sha1.c
-plugins/cdaudio/cdtext.c
-plugins/cdaudio/cdaudio.c
-plugins/cdaudio/cdaudio.h
-plugins/cdaudio/i_cdaudio.c
-plugins/cdaudio/musicbrainz.c
-plugins/png/e_spumux.c
-plugins/png/ir_png.c
-plugins/png/pngwriter.h
-plugins/png/iw_png.c
-plugins/png/pngwriter.c
-plugins/v4l2/i_v4l2.c
-plugins/v4l2/convert.c
-plugins/v4l2/ov_v4l2.c
-plugins/v4l2/v4l2_common.h
-plugins/v4l2/convert.h
-plugins/v4l2/v4l2_common.c
-plugins/lqt/i_lqt.c
-plugins/lqt/lqt_common.h
-plugins/lqt/lqt_common.c
-plugins/lqt/lqtgavl.c
-plugins/lqt/lqtgavl.h
-plugins/lqt/e_lqt.c
-plugins/tiff/iw_tiff.c
-plugins/tiff/ir_tiff.c
-plugins/jpeg/iw_jpeg.c
-plugins/jpeg/ir_jpeg.c
-plugins/jpeg/exif.h
-plugins/jpeg/exif.c
-plugins/wavwrite/e_wav.c
-plugins/edl/i_edl.c
-include/ladspa.h
-include/registry_priv.h
-include/visualize_priv.h
-include/ovl2text.h
-include/playerprivate.h
-include/player_thread.h
-include/recorder_private.h
-include/gui_gtk/message.h
-include/gui_gtk/question.h
-include/gui_gtk/textview.h
-include/gui_gtk/chapterdialog.h
-include/gui_gtk/fileentry.h
-include/gui_gtk/urllink.h
-include/gui_gtk/logwindow.h
-include/gui_gtk/gtkutils.h
-include/gui_gtk/urlselect.h
-include/gui_gtk/auth.h
-include/gui_gtk/tree.h
-include/gui_gtk/plugin.h
-include/gui_gtk/driveselect.h
-include/gui_gtk/infowindow.h
-include/gui_gtk/display.h
-include/gui_gtk/multiinfo.h
-include/gui_gtk/presetmenu.h
-include/gui_gtk/fileselect.h
-include/gui_gtk/button.h
-include/gui_gtk/aboutwindow.h
-include/gui_gtk/albumentry.h
-include/gui_gtk/audio.h
-include/gui_gtk/slider.h
-include/gui_gtk/scrolltext.h
-include/treeprivate.h
-include/x11/x11.h
-include/x11/x11_window_private.h
-include/bglv.h
-include/frei0r.h
-include/pluginreg_priv.h
-include/gmerlin/cmdline.h
-include/gmerlin/msgqueue.h
-include/gmerlin/ov.h
-include/gmerlin/transcoder_track.h
-include/gmerlin/transcoder.h
-include/gmerlin/visualize.h
-include/gmerlin/pluginregistry.h
-include/gmerlin/ocr.h
-include/gmerlin/bggavl.h
-include/gmerlin/transcodermsg.h
-include/gmerlin/mediafiledevice.h
-include/gmerlin/player.h
-include/gmerlin/accelerator.h
-include/gmerlin/log.h
-include/gmerlin/playermsg.h
-include/gmerlin/osd.h
-include/gmerlin/parameter.h
-include/gmerlin/singlepic.h
-include/gmerlin/tree.h
-include/gmerlin/plugin.h
-include/gmerlin/textrenderer.h
-include/gmerlin/encoder.h
-include/gmerlin/filters.h
-include/gmerlin/cfg_dialog.h
-include/gmerlin/lcdproc.h
-include/gmerlin/keycodes.h
-include/gmerlin/charset.h
-include/gmerlin/bgsocket.h
-include/gmerlin/cfg_registry.h
-include/gmerlin/bg_sem.h
-include/gmerlin/subprocess.h
-include/gmerlin/utils.h
-include/gmerlin/remote.h
-include/gmerlin/serialize.h
-include/gmerlin/preset.h
-include/gmerlin/pluginfuncs.h
-include/gmerlin/converters.h
-include/gmerlin/xmlutils.h
-include/gmerlin/fileformat.h
-include/gmerlin/translation.h
-include/gmerlin/recorder.h
-include/gmerlin/edl.h
-include/gmerlin/streaminfo.h
-include/bgfrei0r.h
-include/language_table.h
-include/bgfreetype.h
-include/float_cast.h
-include/bgladspa.h
-include/md5.h
-apps/player/gmerlin.h
-apps/player/skinbrowser.c
-apps/player/gmerlin.c
-apps/player/player_remote.h
-apps/player/skin.c
-apps/player/main.c
-apps/player/remote.c
-apps/player/cfgdialog.c
-apps/player/display.h
-apps/player/mainmenu.c
-apps/player/playerwindow.c
-apps/player/display.c
-apps/player/playerwindow.h
-apps/player/gmerlin_remote.c
-apps/plugincfg/gmerlin_plugincfg.c
-apps/cmdlinerecorder/gmerlin-record.c
-apps/camelot/vloopback.h
-apps/camelot/webcam.c
-apps/camelot/vloopback.c
-apps/camelot/webcam_priv.h
-apps/camelot/webcam.h
-apps/camelot/main.c
-apps/camelot/webcam_window.c
-apps/camelot/webcam_window.h
-apps/transcoder/tracklist.h
-apps/transcoder/trackdialog.h
-apps/transcoder/transcoder_window.h
-apps/transcoder/transcoder_window.c
-apps/transcoder/main.c
-apps/transcoder/ppwidget.c
-apps/transcoder/gmerlin_transcoder_remote.c
-apps/transcoder/transcoder_remote.h
-apps/transcoder/tracklist.c
-apps/transcoder/ppwidget.h
-apps/transcoder/trackdialog.c
-apps/visualizer/gmerlin_visualizer.c
-apps/cmdlineplayer/gmerlin_play.c
-apps/kbd/kbd_daemon.c
-apps/kbd/keys_xml.c
-apps/kbd/kbd_config.c
-apps/kbd/kbd.h
-apps/kbd/kbd_remote.h
-apps/kbd/kbd_remote.c
-apps/kbd/keys.c
-apps/kbd/kbd.c
-apps/alsamixer/mixer.c
-apps/alsamixer/g_card.c
-apps/alsamixer/g_mixer.c
-apps/alsamixer/main.c
-apps/alsamixer/card.c
-apps/alsamixer/alsamixer.h
-apps/alsamixer/g_control.c
-apps/alsamixer/gui.h
-apps/nmjedit/file.c
-apps/nmjedit/bgalbum.c
-apps/nmjedit/nmjedit.h
-apps/nmjedit/nmjedit.c
-apps/nmjedit/dir.c
-apps/nmjedit/create.c
-apps/nmjedit/song.c
-apps/nmjedit/album.c
-apps/nmjedit/gmerlin-nmjedit.c
-apps/recorder/gmerlin_recorder.c
-apps/recorder/recorder_window.c
-apps/recorder/recorder_window.h
-apps/thumbnailer/gmerlin-video-thumbnailer.c
-tests/gmerlin_vpsnr.c
-tests/scrolltext.c
-tests/vumeter.c
-tests/question.c
-tests/album2pls.c
-tests/v4ltest.c
-tests/thumbnail.c
-tests/ladspa.c
-tests/imgconvert.c
-tests/album2m3u.c
-tests/chapter.c
-tests/insertchannel.c
-tests/playtree.c
-tests/gmerlin_vanalyze.c
-tests/server.c
-tests/textrenderer.c
-tests/ocrtest.c
-tests/fvtest.c
-tests/v4ldump.c
-tests/dump_plugins.c
-tests/client.c
-tests/cfgtest.c
-tests/extractchannel.c
-tests/msgtest.c
-tests/gmerlin_imgdiff.c
-tests/audioplayer1.c
-tests/auth.c
-tests/visualization.c
-tests/gmerlin_psnr.c
-tests/gmerlin_ssim.c
-tests/message.c
-tests/videoplayer1.c
-tests/gmerlin_visualize.c
-lib/pluginreg_xml.c
-lib/md5.c
-lib/recorder_video.c
-lib/utf8.c
-lib/transcoder_track_xml.c
-lib/bggavl.c
-lib/player_subtitle.c
-lib/transcoder_pp.c
-lib/cfg_registry.c
-lib/player_video.c
-lib/serialize.c
-lib/preset.c
-lib/bgladspa.c
-lib/searchpath.c
-lib/parameter_xml.c
-lib/pluginregistry.c
-lib/visualize_slave.c
-lib/visualize.c
-lib/thumbnail.c
-lib/formats.c
-lib/log.c
-lib/cmdline.c
-lib/ov.c
-lib/converters.c
-lib/mediafiledevice.c
-lib/lcdproc.c
-lib/player_thread.c
-lib/language_table.c
-lib/fileformat.c
-lib/player_loop.c
-lib/charset.c
-lib/transcoder.c
-lib/preset_xml.c
-lib/player_time.c
-lib/x11/xvideo.c
-lib/x11/overlay.c
-lib/x11/x11_video.c
-lib/x11/ximage.c
-lib/x11/x11_window.c
-lib/x11/glvideo.c
-lib/x11/icon.c
-lib/x11/x11_gl.c
-lib/x11/grab.c
-lib/x11/screensaver.c
-lib/x11/x11_event.c
-lib/x11/shm.c
-lib/textrenderer.c
-lib/streaminfo.c
-lib/cfg_xml.c
-lib/tree.c
-lib/chapterlist_xml.c
-lib/singlepic.c
-lib/hexdump.c
-lib/cfg_item.c
-lib/metadata.c
-lib/edl.c
-lib/uthread_sem.c
-lib/bgxml.c
-lib/accelerator.c
-lib/player_audio.c
-lib/transcoder_track.c
-lib/osd.c
-lib/msgqueue.c
-lib/remote.c
-lib/player_input.c
-lib/player_ov.c
-lib/parameter.c
-lib/device.c
-lib/chapterlist.c
-lib/stringutils.c
-lib/ocr.c
-lib/metadata_xml.c
-lib/pluginfuncs.c
-lib/urilist.c
-lib/socket.c
-lib/player_oa.c
-lib/album_xml.c
-lib/encoder.c
-lib/gtk/cfg_multi_menu.c
-lib/gtk/infowindow.c
-lib/gtk/gtkutils.c
-lib/gtk/urllink.c
-lib/gtk/albumwindow.c
-lib/gtk/scrolltext.c
-lib/gtk/treewidget.c
-lib/gtk/vumeter.c
-lib/gtk/logwindow.c
-lib/gtk/question.c
-lib/gtk/cfg_file.c
-lib/gtk/cfg_checkbutton.c
-lib/gtk/cfg_color.c
-lib/gtk/plugin_multi.c
-lib/gtk/fileselect.c
-lib/gtk/chapterdialog.c
-lib/gtk/slider.c
-lib/gtk/button.c
-lib/gtk/cfg_time.c
-lib/gtk/fileentry.c
-lib/gtk/textview.c
-lib/gtk/cfg_stringlist.c
-lib/gtk/pluginmenu.c
-lib/gtk/presetmenu.c
-lib/gtk/cfg_spinbutton.c
-lib/gtk/urlselect.c
-lib/gtk/cfg_font.c
-lib/gtk/albumwidget.c
-lib/gtk/aboutwindow.c
-lib/gtk/cfg_slider.c
-lib/gtk/treewindow.c
-lib/gtk/cfg_multi_list.c
-lib/gtk/multiinfo.c
-lib/gtk/textwindow.c
-lib/gtk/driveselect.c
-lib/gtk/display.c
-lib/gtk/cfg_button.c
-lib/gtk/cfg_dialog.c
-lib/gtk/albumentry.c
-lib/gtk/plugin_single.c
-lib/gtk/cfg_position.c
-lib/gtk/plugininfo.c
-lib/gtk/auth.c
-lib/gtk/gtk_dialog.h
-lib/gtk/cfg_device.c
-lib/gtk/message.c
-lib/gtk/cfg_string.c
-lib/threadpool.c
-lib/edl_xml.c
-lib/recorder.c
-lib/cfg_section.c
-lib/subprocess.c
-lib/player.c
-lib/recorder_audio.c
-lib/bgfrei0r.c
-lib/album.c
-lib/ovl2text.c
-lib/edldec.c
-lib/playercmd.c
-lib/tree_xml.c
-lib/filters.c
-lib/translation.c
-lib/bglv.c

gmerlin-1.2.0.tar.gz/po/de.gmo Deleted

gmerlin-1.2.0.tar.gz/po/stamp-po Deleted

gmerlin-1.2.0.tar.gz/skins/Default/Makefile.in Deleted

@@ -1,543 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = skins/Default
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/@PACKAGE@/skins/Default
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-skin_data = \
-close_button_cl.png \
-close_button_hl.png \
-close_button.png \
-mainwin_hl.png \
-mainwin.png \
-menu_button_cl.png \
-menu_button_hl.png \
-menu_button.png \
-next_button_cl.png \
-next_button_hl.png \
-next_button.png \
-pause_button_cl.png \
-pause_button_hl.png \
-pause_button.png \
-play_button_cl.png \
-play_button_hl.png \
-play_button.png \
-previous_button_cl.png \
-previous_button_hl.png \
-previous_button.png \
-seek_bg.png \
-seek_slider_cl.png \
-seek_slider_hl.png \
-seek_slider_in.png \
-seek_slider.png \
-stop_button_cl.png \
-stop_button_hl.png \
-stop_button.png \
-volume_bg.png \
-volume_slider_cl.png \
-volume_slider_hl.png \
-volume_slider_in.png \
-volume_slider.png \
-skin.xml
-
-pkgdata_DATA = $(skin_data)
-EXTRA_DIST = $(skin_data)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu skins/Default/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu skins/Default/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgdataDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgdataDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-pkgdataDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/skins/Makefile.in Deleted

@@ -1,660 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = skins
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$[^/]*$/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/$[^/]*$$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = Default
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu skins/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu skins/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/tests/Makefile.in Deleted

@@ -1,985 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-noinst_PROGRAMS = audioplayer1$(EXEEXT) videoplayer1$(EXEEXT) \
-	fvtest$(EXEEXT) msgtest$(EXEEXT) server$(EXEEXT) \
-	client$(EXEEXT) dump_plugins$(EXEEXT) extractchannel$(EXEEXT) \
-	insertchannel$(EXEEXT) ocrtest$(EXEEXT) textrenderer$(EXEEXT) \
-	ladspa$(EXEEXT) thumbnail$(EXEEXT) visualization$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2)
-bin_PROGRAMS = gmerlin_imgconvert$(EXEEXT) album2m3u$(EXEEXT) \
-	album2pls$(EXEEXT) gmerlin_imgdiff$(EXEEXT) \
-	gmerlin_psnr$(EXEEXT) gmerlin_ssim$(EXEEXT) \
-	gmerlin_vanalyze$(EXEEXT) gmerlin_vpsnr$(EXEEXT) \
-	gmerlin_visualize$(EXEEXT)
-subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-@HAVE_V4L_TRUE@am__EXEEXT_1 = v4ltest$(EXEEXT) v4ldump$(EXEEXT)
-@HAVE_GTK_TRUE@am__EXEEXT_2 = cfgtest$(EXEEXT) playtree$(EXEEXT) \
-@HAVE_GTK_TRUE@	question$(EXEEXT) message$(EXEEXT) \
-@HAVE_GTK_TRUE@	scrolltext$(EXEEXT) auth$(EXEEXT) \
-@HAVE_GTK_TRUE@	chapter$(EXEEXT) vumeter$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_album2m3u_OBJECTS = album2m3u.$(OBJEXT)
-album2m3u_OBJECTS = $(am_album2m3u_OBJECTS)
-album2m3u_DEPENDENCIES = ../lib/libgmerlin.la
-am_album2pls_OBJECTS = album2pls.$(OBJEXT)
-album2pls_OBJECTS = $(am_album2pls_OBJECTS)
-album2pls_DEPENDENCIES = ../lib/libgmerlin.la
-am_audioplayer1_OBJECTS = audioplayer1.$(OBJEXT)
-audioplayer1_OBJECTS = $(am_audioplayer1_OBJECTS)
-audioplayer1_DEPENDENCIES = ../lib/libgmerlin.la
-am_auth_OBJECTS = auth.$(OBJEXT)
-auth_OBJECTS = $(am_auth_OBJECTS)
-auth_DEPENDENCIES = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-am_cfgtest_OBJECTS = cfgtest.$(OBJEXT)
-cfgtest_OBJECTS = $(am_cfgtest_OBJECTS)
-cfgtest_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-am_chapter_OBJECTS = chapter.$(OBJEXT)
-chapter_OBJECTS = $(am_chapter_OBJECTS)
-chapter_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-am_client_OBJECTS = client.$(OBJEXT)
-client_OBJECTS = $(am_client_OBJECTS)
-client_DEPENDENCIES = ../lib/libgmerlin.la
-am_dump_plugins_OBJECTS = dump_plugins.$(OBJEXT)
-dump_plugins_OBJECTS = $(am_dump_plugins_OBJECTS)
-dump_plugins_DEPENDENCIES = ../lib/libgmerlin.la
-am_extractchannel_OBJECTS = extractchannel.$(OBJEXT)
-extractchannel_OBJECTS = $(am_extractchannel_OBJECTS)
-extractchannel_DEPENDENCIES = ../lib/libgmerlin.la
-am_fvtest_OBJECTS = fvtest.$(OBJEXT)
-fvtest_OBJECTS = $(am_fvtest_OBJECTS)
-fvtest_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_imgconvert_OBJECTS = imgconvert.$(OBJEXT)
-gmerlin_imgconvert_OBJECTS = $(am_gmerlin_imgconvert_OBJECTS)
-gmerlin_imgconvert_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_imgdiff_OBJECTS = gmerlin_imgdiff.$(OBJEXT)
-gmerlin_imgdiff_OBJECTS = $(am_gmerlin_imgdiff_OBJECTS)
-gmerlin_imgdiff_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_psnr_OBJECTS = gmerlin_psnr.$(OBJEXT)
-gmerlin_psnr_OBJECTS = $(am_gmerlin_psnr_OBJECTS)
-gmerlin_psnr_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_ssim_OBJECTS = gmerlin_ssim.$(OBJEXT)
-gmerlin_ssim_OBJECTS = $(am_gmerlin_ssim_OBJECTS)
-gmerlin_ssim_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_vanalyze_OBJECTS = gmerlin_vanalyze.$(OBJEXT)
-gmerlin_vanalyze_OBJECTS = $(am_gmerlin_vanalyze_OBJECTS)
-gmerlin_vanalyze_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_visualize_OBJECTS = gmerlin_visualize.$(OBJEXT)
-gmerlin_visualize_OBJECTS = $(am_gmerlin_visualize_OBJECTS)
-gmerlin_visualize_DEPENDENCIES = ../lib/libgmerlin.la
-am_gmerlin_vpsnr_OBJECTS = gmerlin_vpsnr.$(OBJEXT)
-gmerlin_vpsnr_OBJECTS = $(am_gmerlin_vpsnr_OBJECTS)
-gmerlin_vpsnr_DEPENDENCIES = ../lib/libgmerlin.la
-am_insertchannel_OBJECTS = insertchannel.$(OBJEXT)
-insertchannel_OBJECTS = $(am_insertchannel_OBJECTS)
-insertchannel_DEPENDENCIES = ../lib/libgmerlin.la
-am_ladspa_OBJECTS = ladspa.$(OBJEXT)
-ladspa_OBJECTS = $(am_ladspa_OBJECTS)
-ladspa_DEPENDENCIES =
-am_message_OBJECTS = message.$(OBJEXT)
-message_OBJECTS = $(am_message_OBJECTS)
-message_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-am_msgtest_OBJECTS = msgtest.$(OBJEXT)
-msgtest_OBJECTS = $(am_msgtest_OBJECTS)
-msgtest_DEPENDENCIES = ../lib/libgmerlin.la
-am_ocrtest_OBJECTS = ocrtest.$(OBJEXT)
-ocrtest_OBJECTS = $(am_ocrtest_OBJECTS)
-ocrtest_DEPENDENCIES = ../lib/libgmerlin.la
-am_playtree_OBJECTS = playtree.$(OBJEXT)
-playtree_OBJECTS = $(am_playtree_OBJECTS)
-playtree_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-am_question_OBJECTS = question.$(OBJEXT)
-question_OBJECTS = $(am_question_OBJECTS)
-question_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-am_scrolltext_OBJECTS = scrolltext.$(OBJEXT)
-scrolltext_OBJECTS = $(am_scrolltext_OBJECTS)
-scrolltext_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-am_server_OBJECTS = server.$(OBJEXT)
-server_OBJECTS = $(am_server_OBJECTS)
-server_DEPENDENCIES = ../lib/libgmerlin.la
-am_textrenderer_OBJECTS = textrenderer.$(OBJEXT)
-textrenderer_OBJECTS = $(am_textrenderer_OBJECTS)
-textrenderer_DEPENDENCIES = ../lib/libgmerlin.la
-am_thumbnail_OBJECTS = thumbnail.$(OBJEXT)
-thumbnail_OBJECTS = $(am_thumbnail_OBJECTS)
-thumbnail_DEPENDENCIES = ../lib/libgmerlin.la
-am_v4ldump_OBJECTS = v4ldump.$(OBJEXT)
-v4ldump_OBJECTS = $(am_v4ldump_OBJECTS)
-v4ldump_DEPENDENCIES = ../lib/libgmerlin.la
-am_v4ltest_OBJECTS = v4ltest.$(OBJEXT)
-v4ltest_OBJECTS = $(am_v4ltest_OBJECTS)
-v4ltest_DEPENDENCIES = ../lib/libgmerlin.la
-am_videoplayer1_OBJECTS = videoplayer1.$(OBJEXT)
-videoplayer1_OBJECTS = $(am_videoplayer1_OBJECTS)
-videoplayer1_DEPENDENCIES = ../lib/libgmerlin.la
-am_visualization_OBJECTS = visualization.$(OBJEXT)
-visualization_OBJECTS = $(am_visualization_OBJECTS)
-visualization_DEPENDENCIES = ../lib/libgmerlin.la
-am_vumeter_OBJECTS = vumeter.$(OBJEXT)
-vumeter_OBJECTS = $(am_vumeter_OBJECTS)
-vumeter_DEPENDENCIES = ../lib/libgmerlin.la \
-	../lib/gtk/libgmerlin_gtk.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(album2m3u_SOURCES) $(album2pls_SOURCES) \
-	$(audioplayer1_SOURCES) $(auth_SOURCES) $(cfgtest_SOURCES) \
-	$(chapter_SOURCES) $(client_SOURCES) $(dump_plugins_SOURCES) \
-	$(extractchannel_SOURCES) $(fvtest_SOURCES) \
-	$(gmerlin_imgconvert_SOURCES) $(gmerlin_imgdiff_SOURCES) \
-	$(gmerlin_psnr_SOURCES) $(gmerlin_ssim_SOURCES) \
-	$(gmerlin_vanalyze_SOURCES) $(gmerlin_visualize_SOURCES) \
-	$(gmerlin_vpsnr_SOURCES) $(insertchannel_SOURCES) \
-	$(ladspa_SOURCES) $(message_SOURCES) $(msgtest_SOURCES) \
-	$(ocrtest_SOURCES) $(playtree_SOURCES) $(question_SOURCES) \
-	$(scrolltext_SOURCES) $(server_SOURCES) \
-	$(textrenderer_SOURCES) $(thumbnail_SOURCES) \
-	$(v4ldump_SOURCES) $(v4ltest_SOURCES) $(videoplayer1_SOURCES) \
-	$(visualization_SOURCES) $(vumeter_SOURCES)
-DIST_SOURCES = $(album2m3u_SOURCES) $(album2pls_SOURCES) \
-	$(audioplayer1_SOURCES) $(auth_SOURCES) $(cfgtest_SOURCES) \
-	$(chapter_SOURCES) $(client_SOURCES) $(dump_plugins_SOURCES) \
-	$(extractchannel_SOURCES) $(fvtest_SOURCES) \
-	$(gmerlin_imgconvert_SOURCES) $(gmerlin_imgdiff_SOURCES) \
-	$(gmerlin_psnr_SOURCES) $(gmerlin_ssim_SOURCES) \
-	$(gmerlin_vanalyze_SOURCES) $(gmerlin_visualize_SOURCES) \
-	$(gmerlin_vpsnr_SOURCES) $(insertchannel_SOURCES) \
-	$(ladspa_SOURCES) $(message_SOURCES) $(msgtest_SOURCES) \
-	$(ocrtest_SOURCES) $(playtree_SOURCES) $(question_SOURCES) \
-	$(scrolltext_SOURCES) $(server_SOURCES) \
-	$(textrenderer_SOURCES) $(thumbnail_SOURCES) \
-	$(v4ldump_SOURCES) $(v4ltest_SOURCES) $(videoplayer1_SOURCES) \
-	$(visualization_SOURCES) $(vumeter_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = -I$(top_srcdir)/include
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(pkglibdir)/plugins
-AM_CFLAGS = \
-@GTK_CFLAGS@ \
-@XML2_CFLAGS@ \
--DLOCALE_DIR=\"$(localedir)\" \
--DPLUGIN_DIR=\"$(plugindir)\" \
--DDOC_DIR=\"$(docdir)\" \
--DDATA_DIR=\"$(pkgdatadir)\"
-
-@HAVE_GTK_FALSE@gtk_programs = 
-@HAVE_GTK_TRUE@gtk_programs = \
-@HAVE_GTK_TRUE@cfgtest \
-@HAVE_GTK_TRUE@playtree \
-@HAVE_GTK_TRUE@question \
-@HAVE_GTK_TRUE@message \
-@HAVE_GTK_TRUE@scrolltext \
-@HAVE_GTK_TRUE@auth \
-@HAVE_GTK_TRUE@chapter \
-@HAVE_GTK_TRUE@vumeter
-
-@HAVE_V4L_FALSE@v4l_programs = 
-@HAVE_V4L_TRUE@v4l_programs = v4ltest \
-@HAVE_V4L_TRUE@v4ldump
-
-
-# noinst_HEADERS = player1.h
-audioplayer1_SOURCES = audioplayer1.c
-audioplayer1_LDADD = ../lib/libgmerlin.la -ldl
-album2m3u_SOURCES = album2m3u.c
-album2m3u_LDADD = ../lib/libgmerlin.la -ldl
-album2pls_SOURCES = album2pls.c
-album2pls_LDADD = ../lib/libgmerlin.la -ldl
-ocrtest_SOURCES = ocrtest.c
-ocrtest_LDADD = ../lib/libgmerlin.la -ldl
-extractchannel_SOURCES = extractchannel.c
-extractchannel_LDADD = ../lib/libgmerlin.la -ldl
-insertchannel_SOURCES = insertchannel.c
-insertchannel_LDADD = ../lib/libgmerlin.la -ldl
-dump_plugins_SOURCES = dump_plugins.c
-dump_plugins_LDADD = ../lib/libgmerlin.la -ldl
-ladspa_SOURCES = ladspa.c
-ladspa_LDADD = -ldl
-thumbnail_SOURCES = thumbnail.c
-thumbnail_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_imgconvert_SOURCES = imgconvert.c
-gmerlin_imgconvert_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_psnr_SOURCES = gmerlin_psnr.c
-gmerlin_psnr_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_ssim_SOURCES = gmerlin_ssim.c
-gmerlin_ssim_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_vpsnr_SOURCES = gmerlin_vpsnr.c
-gmerlin_vpsnr_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_vanalyze_SOURCES = gmerlin_vanalyze.c
-gmerlin_vanalyze_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_visualize_SOURCES = gmerlin_visualize.c
-gmerlin_visualize_LDADD = ../lib/libgmerlin.la -ldl
-gmerlin_imgdiff_SOURCES = gmerlin_imgdiff.c
-gmerlin_imgdiff_LDADD = ../lib/libgmerlin.la -ldl
-msgtest_SOURCES = msgtest.c
-msgtest_LDADD = ../lib/libgmerlin.la -ldl
-textrenderer_SOURCES = textrenderer.c
-textrenderer_LDADD = ../lib/libgmerlin.la -ldl
-videoplayer1_SOURCES = videoplayer1.c
-videoplayer1_LDADD = ../lib/libgmerlin.la -ldl
-fvtest_SOURCES = fvtest.c
-fvtest_LDADD = ../lib/libgmerlin.la -ldl
-cfgtest_SOURCES = cfgtest.c
-cfgtest_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-chapter_SOURCES = chapter.c
-chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-vumeter_SOURCES = vumeter.c
-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-v4ltest_SOURCES = v4ltest.c
-v4ltest_LDADD = ../lib/libgmerlin.la
-v4ldump_SOURCES = v4ldump.c
-v4ldump_LDADD = ../lib/libgmerlin.la
-visualization_SOURCES = visualization.c
-visualization_LDADD = ../lib/libgmerlin.la
-scrolltext_SOURCES = scrolltext.c
-scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-question_SOURCES = question.c
-question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-auth_SOURCES = auth.c
-auth_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-message_SOURCES = message.c
-message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-playtree_SOURCES = playtree.c
-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-server_SOURCES = server.c
-server_LDADD = ../lib/libgmerlin.la
-client_SOURCES = client.c
-client_LDADD = ../lib/libgmerlin.la
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-album2m3u$(EXEEXT): $(album2m3u_OBJECTS) $(album2m3u_DEPENDENCIES) 
-	@rm -f album2m3u$(EXEEXT)
-	$(LINK) $(album2m3u_OBJECTS) $(album2m3u_LDADD) $(LIBS)
-album2pls$(EXEEXT): $(album2pls_OBJECTS) $(album2pls_DEPENDENCIES) 
-	@rm -f album2pls$(EXEEXT)
-	$(LINK) $(album2pls_OBJECTS) $(album2pls_LDADD) $(LIBS)
-audioplayer1$(EXEEXT): $(audioplayer1_OBJECTS) $(audioplayer1_DEPENDENCIES) 
-	@rm -f audioplayer1$(EXEEXT)
-	$(LINK) $(audioplayer1_OBJECTS) $(audioplayer1_LDADD) $(LIBS)
-auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES) 
-	@rm -f auth$(EXEEXT)
-	$(LINK) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
-cfgtest$(EXEEXT): $(cfgtest_OBJECTS) $(cfgtest_DEPENDENCIES) 
-	@rm -f cfgtest$(EXEEXT)
-	$(LINK) $(cfgtest_OBJECTS) $(cfgtest_LDADD) $(LIBS)
-chapter$(EXEEXT): $(chapter_OBJECTS) $(chapter_DEPENDENCIES) 
-	@rm -f chapter$(EXEEXT)
-	$(LINK) $(chapter_OBJECTS) $(chapter_LDADD) $(LIBS)
-client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) 
-	@rm -f client$(EXEEXT)
-	$(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS)
-dump_plugins$(EXEEXT): $(dump_plugins_OBJECTS) $(dump_plugins_DEPENDENCIES) 
-	@rm -f dump_plugins$(EXEEXT)
-	$(LINK) $(dump_plugins_OBJECTS) $(dump_plugins_LDADD) $(LIBS)
-extractchannel$(EXEEXT): $(extractchannel_OBJECTS) $(extractchannel_DEPENDENCIES) 
-	@rm -f extractchannel$(EXEEXT)
-	$(LINK) $(extractchannel_OBJECTS) $(extractchannel_LDADD) $(LIBS)
-fvtest$(EXEEXT): $(fvtest_OBJECTS) $(fvtest_DEPENDENCIES) 
-	@rm -f fvtest$(EXEEXT)
-	$(LINK) $(fvtest_OBJECTS) $(fvtest_LDADD) $(LIBS)
-gmerlin_imgconvert$(EXEEXT): $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_DEPENDENCIES) 
-	@rm -f gmerlin_imgconvert$(EXEEXT)
-	$(LINK) $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_LDADD) $(LIBS)
-gmerlin_imgdiff$(EXEEXT): $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_DEPENDENCIES) 
-	@rm -f gmerlin_imgdiff$(EXEEXT)
-	$(LINK) $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_LDADD) $(LIBS)
-gmerlin_psnr$(EXEEXT): $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_DEPENDENCIES) 
-	@rm -f gmerlin_psnr$(EXEEXT)
-	$(LINK) $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_LDADD) $(LIBS)
-gmerlin_ssim$(EXEEXT): $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_DEPENDENCIES) 
-	@rm -f gmerlin_ssim$(EXEEXT)
-	$(LINK) $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_LDADD) $(LIBS)
-gmerlin_vanalyze$(EXEEXT): $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_DEPENDENCIES) 
-	@rm -f gmerlin_vanalyze$(EXEEXT)
-	$(LINK) $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_LDADD) $(LIBS)
-gmerlin_visualize$(EXEEXT): $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_DEPENDENCIES) 
-	@rm -f gmerlin_visualize$(EXEEXT)
-	$(LINK) $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_LDADD) $(LIBS)
-gmerlin_vpsnr$(EXEEXT): $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_DEPENDENCIES) 
-	@rm -f gmerlin_vpsnr$(EXEEXT)
-	$(LINK) $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_LDADD) $(LIBS)
-insertchannel$(EXEEXT): $(insertchannel_OBJECTS) $(insertchannel_DEPENDENCIES) 
-	@rm -f insertchannel$(EXEEXT)
-	$(LINK) $(insertchannel_OBJECTS) $(insertchannel_LDADD) $(LIBS)
-ladspa$(EXEEXT): $(ladspa_OBJECTS) $(ladspa_DEPENDENCIES) 
-	@rm -f ladspa$(EXEEXT)
-	$(LINK) $(ladspa_OBJECTS) $(ladspa_LDADD) $(LIBS)
-message$(EXEEXT): $(message_OBJECTS) $(message_DEPENDENCIES) 
-	@rm -f message$(EXEEXT)
-	$(LINK) $(message_OBJECTS) $(message_LDADD) $(LIBS)
-msgtest$(EXEEXT): $(msgtest_OBJECTS) $(msgtest_DEPENDENCIES) 
-	@rm -f msgtest$(EXEEXT)
-	$(LINK) $(msgtest_OBJECTS) $(msgtest_LDADD) $(LIBS)
-ocrtest$(EXEEXT): $(ocrtest_OBJECTS) $(ocrtest_DEPENDENCIES) 
-	@rm -f ocrtest$(EXEEXT)
-	$(LINK) $(ocrtest_OBJECTS) $(ocrtest_LDADD) $(LIBS)
-playtree$(EXEEXT): $(playtree_OBJECTS) $(playtree_DEPENDENCIES) 
-	@rm -f playtree$(EXEEXT)
-	$(LINK) $(playtree_OBJECTS) $(playtree_LDADD) $(LIBS)
-question$(EXEEXT): $(question_OBJECTS) $(question_DEPENDENCIES) 
-	@rm -f question$(EXEEXT)
-	$(LINK) $(question_OBJECTS) $(question_LDADD) $(LIBS)
-scrolltext$(EXEEXT): $(scrolltext_OBJECTS) $(scrolltext_DEPENDENCIES) 
-	@rm -f scrolltext$(EXEEXT)
-	$(LINK) $(scrolltext_OBJECTS) $(scrolltext_LDADD) $(LIBS)
-server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES) 
-	@rm -f server$(EXEEXT)
-	$(LINK) $(server_OBJECTS) $(server_LDADD) $(LIBS)
-textrenderer$(EXEEXT): $(textrenderer_OBJECTS) $(textrenderer_DEPENDENCIES) 
-	@rm -f textrenderer$(EXEEXT)
-	$(LINK) $(textrenderer_OBJECTS) $(textrenderer_LDADD) $(LIBS)
-thumbnail$(EXEEXT): $(thumbnail_OBJECTS) $(thumbnail_DEPENDENCIES) 
-	@rm -f thumbnail$(EXEEXT)
-	$(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS)
-v4ldump$(EXEEXT): $(v4ldump_OBJECTS) $(v4ldump_DEPENDENCIES) 
-	@rm -f v4ldump$(EXEEXT)
-	$(LINK) $(v4ldump_OBJECTS) $(v4ldump_LDADD) $(LIBS)
-v4ltest$(EXEEXT): $(v4ltest_OBJECTS) $(v4ltest_DEPENDENCIES) 
-	@rm -f v4ltest$(EXEEXT)
-	$(LINK) $(v4ltest_OBJECTS) $(v4ltest_LDADD) $(LIBS)
-videoplayer1$(EXEEXT): $(videoplayer1_OBJECTS) $(videoplayer1_DEPENDENCIES) 
-	@rm -f videoplayer1$(EXEEXT)
-	$(LINK) $(videoplayer1_OBJECTS) $(videoplayer1_LDADD) $(LIBS)
-visualization$(EXEEXT): $(visualization_OBJECTS) $(visualization_DEPENDENCIES) 
-	@rm -f visualization$(EXEEXT)
-	$(LINK) $(visualization_OBJECTS) $(visualization_LDADD) $(LIBS)
-vumeter$(EXEEXT): $(vumeter_OBJECTS) $(vumeter_DEPENDENCIES) 
-	@rm -f vumeter$(EXEEXT)
-	$(LINK) $(vumeter_OBJECTS) $(vumeter_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/album2m3u.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/album2pls.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audioplayer1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chapter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_plugins.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extractchannel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fvtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_imgdiff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_psnr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_ssim.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_vanalyze.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_visualize.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmerlin_vpsnr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imgconvert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertchannel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ladspa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msgtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocrtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playtree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/question.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrolltext.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textrenderer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnail.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v4ldump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v4ltest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/videoplayer1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/visualization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vumeter.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/tests/v4ldump.c Deleted

@@ -1,173 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-#include <linux/videodev.h>
-#include <unistd.h>
-#include <stdio.h>
-
-static void dump_video_capability(struct video_capability * c)
-  {
-  fprintf(stderr, "Video Capability:\n");
-  fprintf(stderr, "  Name: %s\n", c->name);
-  fprintf(stderr, "  Type: ");
-
-  if(c->type & VID_TYPE_CAPTURE)       /* Can capture */
-    fprintf(stderr, "CAPTURE ");
-  if(c->type & VID_TYPE_TUNER)         /* Can tune */
-    fprintf(stderr, "TUNER ");
-  if(c->type & VID_TYPE_TELETEXT)      /* Does teletext */
-    fprintf(stderr, "TELETEXT ");
-  if(c->type & VID_TYPE_OVERLAY)       /* Overlay onto frame buffer */
-    fprintf(stderr, "OVERLAY ");
-  if(c->type & VID_TYPE_CHROMAKEY)     /* Overlay by chromakey */
-    fprintf(stderr, "CHROMAKEY ");
-  if(c->type & VID_TYPE_CLIPPING)      /* Can clip */
-    fprintf(stderr, "CLIPPING ");
-  if(c->type & VID_TYPE_FRAMERAM)      /* Uses the frame buffer memory */
-    fprintf(stderr, "FRAMERAM ");
-  if(c->type & VID_TYPE_SCALES)        /* Scalable */
-    fprintf(stderr, "SCALES ");
-  if(c->type & VID_TYPE_MONOCHROME)    /* Monochrome only */
-    fprintf(stderr, "MONOCHROME ");
-  if(c->type & VID_TYPE_SUBCAPTURE)    /* Can capture subareas of the image */
-    fprintf(stderr, "SUBCAPTURE ");
-  if(c->type & VID_TYPE_MPEG_DECODER)  /* Can decode MPEG streams */
-    fprintf(stderr, "MPEG_DECODER ");
-  if(c->type & VID_TYPE_MPEG_ENCODER)  /* Can encode MPEG streams */
-    fprintf(stderr, "MPEG_ENCODER ");
-  if(c->type & VID_TYPE_MJPEG_DECODER) /* Can decode MJPEG streams */
-    fprintf(stderr, "MJPEG_DECODER ");
-  if(c->type & VID_TYPE_MJPEG_ENCODER) /* Can encode MJPEG streams */
-    fprintf(stderr, "MJPEG_ENCODER ");
-  fprintf(stderr, "\n");
-  fprintf(stderr, "  Channels: %d\n", c->channels);
-  fprintf(stderr, "  Audios:   %d\n", c->audios);
-  fprintf(stderr, "  Min size: %d x %d\n", c->minwidth, c->minheight);
-  fprintf(stderr, "  Max size: %d x %d\n", c->maxwidth, c->maxheight);
-  }
-
-struct
-  {
-  int id;
-  char * name;
-  }
-palette_names[] =
-  {
-    { VIDEO_PALETTE_GREY,    "Linear greyscale" },
-    { VIDEO_PALETTE_HI240,   "High 240 cube (BT848)" },
-    { VIDEO_PALETTE_RGB565,  "565 16 bit RGB" },
-    { VIDEO_PALETTE_RGB24,   "24bit RGB" },
-    { VIDEO_PALETTE_RGB32,   "32bit RGB" },
-    { VIDEO_PALETTE_RGB555,  "555 15bit RGB" },
-    { VIDEO_PALETTE_YUV422,  "YUV422 capture" },
-    { VIDEO_PALETTE_YUYV,    "YUYV" },
-    { VIDEO_PALETTE_UYVY,    "UYVY" },
-    { VIDEO_PALETTE_YUV420,  "YUV 420" },
-    { VIDEO_PALETTE_YUV411,  "YUV 411" },
-    { VIDEO_PALETTE_RAW,     "RAW capture (BT848)" },
-    { VIDEO_PALETTE_YUV422P, "YUV 4:2:2 Planar" },
-    { VIDEO_PALETTE_YUV411P, "YUV 4:1:1 Planar" },
-    { VIDEO_PALETTE_YUV420P, "YUV 4:2:0 Planar" },
-    { VIDEO_PALETTE_YUV410P, "YUV 4:1:0 Planar" },
-  };
-
-static void dump_palette(int palette)
-  {
-  int i;
-  for(i = 0; i < sizeof(palette_names)/sizeof(palette_names[0]); i++)
-    {
-    if(palette == palette_names[i].id)
-      {
-      fprintf(stderr, "%s", palette_names[i].name);
-      break;
-      }
-    }
-  }
-
-static void dump_video_picture(struct video_picture * p)
-  {
-  fprintf(stderr , "Video picture:\n");
-  fprintf(stderr , "  Brightness: %d\n", p->brightness);
-  fprintf(stderr , "  Hue:        %d\n", p->hue);
-  fprintf(stderr , "  Colour:     %d\n", p->colour);
-  fprintf(stderr , "  Contrast:   %d\n", p->contrast);
-  fprintf(stderr , "  Whiteness:  %d\n", p->whiteness);
-  fprintf(stderr , "  Depth:      %d\n", p->depth);
-  fprintf(stderr , "  Palette:    ");
-  dump_palette(p->palette);
-  fprintf(stderr , "\n");
-  }
-
-static void dump_video_window(struct video_window * win)
-  {
-  fprintf(stderr, "Video window:\n");
-  fprintf(stderr, "  x:         %d\n", win->x);
-  fprintf(stderr, "  y:         %d\n", win->y);
-  fprintf(stderr, "  width:     %d\n", win->width);
-  fprintf(stderr, "  height:    %d\n", win->height);
-  fprintf(stderr, "  chromakey: %d\n", win->chromakey);
-  fprintf(stderr, "  flags:     %d\n", win->flags);
-  }
-
-int main(int argc, char ** argv)
-  {
-  struct video_capability capability;
-  struct video_picture    picture;
-  struct video_window     win;
-  
-  int fd;
-  fd = open("/dev/video0", O_RDONLY  | O_NONBLOCK);
-
-  if(fd < 0)
-    {
-    fprintf(stderr, "Cannot open device\n");
-    return -1;
-    }
-
-  if(ioctl(fd, VIDIOCGCAP, &capability) < 0)
-    {
-    fprintf(stderr, "Cannot get capabilities\n");
-    return -1;
-    }
-  dump_video_capability(&capability);
-
-  if(ioctl(fd, VIDIOCGPICT, &picture) < 0)
-    {
-    fprintf(stderr, "Cannot get picture\n");
-    return -1;
-    }
-  dump_video_picture(&picture);
-
-  if(ioctl(fd, VIDIOCGWIN, &win) < 0)
-    {
-    fprintf(stderr, "Cannot get window\n");
-    return -1;
-    }
-  dump_video_window(&win);
-  
-  close(fd);
-  return 0;
-  }

gmerlin-1.2.0.tar.gz/tests/v4ltest.c Deleted

@@ -1,171 +0,0 @@
-/*****************************************************************
- * gmerlin - a general purpose multimedia framework and applications
- *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
- * gmerlin-general@lists.sourceforge.net
- * http://gmerlin.sourceforge.net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * *****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <gmerlin/utils.h>
-#include <gmerlin/plugin.h>
-#include <gmerlin/pluginregistry.h>
-
-int keep_going = 1;
-
-
-
-int main(int argc, char ** argv)
-  {
-  char * tmp_path;
-  bg_cfg_section_t     * section;
-  bg_cfg_registry_t    * cfg_reg;
-  bg_plugin_registry_t * plugin_reg;
-  gavl_video_converter_t * cnv;
-  
-  int do_convert;
-
-  gavl_video_format_t input_format;
-  gavl_video_format_t output_format;
-  
-  bg_plugin_handle_t * input_handle;
-  bg_plugin_handle_t * output_handle;
-
-  bg_recorder_plugin_t     * input;
-  bg_ov_plugin_t     * output;
-  
-  const bg_plugin_info_t * info;
-  gavl_video_frame_t * frame = NULL;
-  gavl_video_frame_t * input_frame = NULL;
-
-  /* Create config registry */
-  
-  cfg_reg = bg_cfg_registry_create();
-  tmp_path =  bg_search_file_read("generic", "config.xml");
-  bg_cfg_registry_load(cfg_reg, tmp_path);
-  if(tmp_path)
-    free(tmp_path);
-
-  /* Create plugin registry */
-
-  section = bg_cfg_registry_find_section(cfg_reg, "plugins");
-  plugin_reg = bg_plugin_registry_create(section);
-
-  /* Load v4l plugin */
-
-  info = bg_plugin_find_by_name(plugin_reg, "i_v4l");
-
-  if(!info)
-    {
-    fprintf(stderr, "Video4linux plugin not installed\n");
-    return -1;
-    }
-
-  input_handle = bg_plugin_load(plugin_reg, info);
-
-  if(!input_handle)
-    {
-    fprintf(stderr, "Video4linux plugin could not be loaded\n");
-    return -1;
-    }
-
-  input = (bg_recorder_plugin_t*)input_handle->plugin;
-
-  /* Load output plugin */
-  
-  info = bg_plugin_registry_get_default(plugin_reg,
-                                        BG_PLUGIN_OUTPUT_VIDEO, BG_PLUGIN_PLAYBACK);
-  
-  if(!info)
-    {
-    fprintf(stderr, "No video output plugin found\n");
-    return -1;
-    }
-  
-  output_handle = bg_plugin_load(plugin_reg, info);
-
-  if(!output_handle)
-    {
-    fprintf(stderr, "Video output plugin could not be loaded\n");
-    return -1;
-    }
-
-  output = (bg_ov_plugin_t*)output_handle->plugin;
-
-  /* Open input */
-
-  if(!input->open(input_handle->priv, NULL, &input_format))
-    {
-    fprintf(stderr, "Opening video device fauled\n");
-    return -1;
-    }
-
-  fprintf(stderr, "Opened input device, format:\n");
-  gavl_video_format_dump(&input_format);
-  
-  gavl_video_format_copy(&output_format, &input_format);
-    
-  /* Open output */
-
-  if(!output->open(output_handle->priv, &output_format, 1))
-    {
-    fprintf(stderr, "Opening video device fauled\n");
-    return -1;
-    }
-
-  output->set_window_title(output_handle->priv, "Webcam");
-  
-  if(output->show_window)
-    output->show_window(output_handle->priv, 1);
-  
-  fprintf(stderr, "Opened output plugin, format:\n");
-  gavl_video_format_dump(&output_format);
-  
-  /* Fire up video converter */
-
-  cnv = gavl_video_converter_create();
-
-  do_convert = gavl_video_converter_init(cnv, &input_format, &output_format);
-
-  /* Allocate video image */
-  
-  if(do_convert)
-    input_frame = gavl_video_frame_create(&input_format);
-  
-  while(keep_going)
-    {
-    frame = output->get_frame(output_handle->priv);
-    if(do_convert)
-      {
-      if(!input->read_video(input_handle->priv, input_frame, 0))
-        {
-        fprintf(stderr, "read_frame failed\n");
-        return -1;
-        }
-      gavl_video_convert(cnv, input_frame, frame);
-      }
-    else
-      {
-      //      fprintf(stderr, "Get frame\n");
-      input->read_video(input_handle->priv, frame, 0);
-      }
-    //    fprintf(stderr, "done\nPut frame...");
-    output->put_video(output_handle->priv, frame);
-    //    fprintf(stderr, "done\n");
-    }
-  return 0;
-  }

gmerlin-1.2.0.tar.gz/utils/Makefile.in Deleted

@@ -1,458 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = utils
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/check_funcs.m4 \
-	$(top_srcdir)/m4/gavl_simd.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/lqt_opt_cflags.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-ALSA_REQUIRED = @ALSA_REQUIRED@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_VERSION = @BG_VERSION@
-BG_VERSION_MAJOR = @BG_VERSION_MAJOR@
-BG_VERSION_MICRO = @BG_VERSION_MICRO@
-BG_VERSION_MINOR = @BG_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDDB_CFLAGS = @CDDB_CFLAGS@
-CDDB_LIBS = @CDDB_LIBS@
-CDIO_CDDA_CFLAGS = @CDIO_CDDA_CFLAGS@
-CDIO_CDDA_LIBS = @CDIO_CDDA_LIBS@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CDIO_PARANOIA_CFLAGS = @CDIO_PARANOIA_CFLAGS@
-CDIO_PARANOIA_LIBS = @CDIO_PARANOIA_LIBS@
-CDIO_REQUIRED = @CDIO_REQUIRED@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-ESD_REQUIRED = @ESD_REQUIRED@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GAVL_CFLAGS = @GAVL_CFLAGS@
-GAVL_LIBS = @GAVL_LIBS@
-GAVL_REQUIRED = @GAVL_REQUIRED@
-GLX_CFLAGS = @GLX_CFLAGS@
-GLX_LIBS = @GLX_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GMERLIN_DEP_LIBS = @GMERLIN_DEP_LIBS@
-GMERLIN_PLUGIN_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-ICONV_LIBS = @ICONV_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JACK_CFLAGS = @JACK_CFLAGS@
-JACK_LIBS = @JACK_LIBS@
-JACK_REQUIRED = @JACK_REQUIRED@
-JPEG_CFLAGS = @JPEG_CFLAGS@
-JPEG_LIBS = @JPEG_LIBS@
-JPEG_REQUIRED = @JPEG_REQUIRED@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDDB_REQUIRED = @LIBCDDB_REQUIRED@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LQT_CFLAGS = @LQT_CFLAGS@
-LQT_LIBS = @LQT_LIBS@
-LQT_REQUIRED = @LQT_REQUIRED@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTVERSION_AGE = @LTVERSION_AGE@
-LTVERSION_CURRENT = @LTVERSION_CURRENT@
-LTVERSION_REVISION = @LTVERSION_REVISION@
-LV_CFLAGS = @LV_CFLAGS@
-LV_LIBS = @LV_LIBS@
-LV_REQUIRED = @LV_REQUIRED@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_LIBADD = @MODULE_LIBADD@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
-MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
-MUSICBRAINZ_REQUIRED = @MUSICBRAINZ_REQUIRED@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRED = @PNG_REQUIRED@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PULSEAUDIO_REQUIRED = @PULSEAUDIO_REQUIRED@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TEXINFO = @TEXINFO@
-TIFF_CFLAGS = @TIFF_CFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-TIFF_REQUIRED = @TIFF_REQUIRED@
-TOP_SRCDIR = @TOP_SRCDIR@
-USE_NLS = @USE_NLS@
-V4LCONVERT_CFLAGS = @V4LCONVERT_CFLAGS@
-V4LCONVERT_LIBS = @V4LCONVERT_LIBS@
-V4LCONVERT_REQUIRED = @V4LCONVERT_REQUIRED@
-VERSION = @VERSION@
-XDPMS_LIBS = @XDPMS_LIBS@
-XFIXES_LIBS = @XFIXES_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-XMKMF = @XMKMF@
-XML2_CFLAGS = @XML2_CFLAGS@
-XML2_LIBS = @XML2_LIBS@
-XML2_REQUIRED = @XML2_REQUIRED@
-XTEST_LIBS = @XTEST_LIBS@
-XV_LIBS = @XV_LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = cpuinfo.c
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu utils/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

gmerlin-1.2.0.tar.gz/ABOUT-NLS -> gmerlin-4256.tar.gz/ABOUT-NLS Changed

@@ -18,35 +18,7 @@
 available translations.  They tell how people wanting to contribute and
 work on translations can contact the appropriate team.
 
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-1.1 Quick configuration advice
-==============================
-
-If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation.  Future versions of GNU `gettext' will
-very likely convey even more functionality.  So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
-   So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-1.2 INSTALL Matters
+1.1 INSTALL Matters
 ===================
 
 Some packages are "localizable" when properly installed; the programs
@@ -56,36 +28,19 @@
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the included GNU
-`gettext' library will be used.  This library is wholly contained
-within this package, usually in the `intl/' subdirectory, so prior
-installation of the GNU `gettext' package is _not_ required.
-Installers may use special options at configuration time for changing
-the default behaviour.  The commands:
+provides the GNU `gettext' functions.  Installers may use special
+options at configuration time for changing the default behaviour.  The
+command:
 
-     ./configure --with-included-gettext
      ./configure --disable-nls
 
-will, respectively, bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
+will _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might not be desirable.  You should use
-the more recent version of the GNU `gettext' library.  I.e. if the file
-`intl/VERSION' shows that the library which comes with this package is
-more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   The configuration process will not test for the `catgets' function
-and therefore it will not be used.  The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
+probably detect the previously built and installed `libintl' library
+and will decide to use it.  If not, you may have to to use the
+`--with-libintl-prefix' option to tell `configure' where to look for it.
 
    Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
@@ -96,13 +51,16 @@
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-1.3 Using This Package
+1.2 Using This Package
 ======================
 
 As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
-and `CC' is an ISO 3166 two-letter country code.  For example, let's
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
 suppose that you speak German and live in Germany.  At the shell
 prompt, merely execute `setenv LANG de_DE' (in `csh'),
 `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
@@ -145,7 +103,7 @@
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-1.4 Translating Teams
+1.3 Translating Teams
 =====================
 
 For the Free Translation Project to be a success, we need interested
@@ -153,8 +111,7 @@
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
 teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
+`http://translationproject.org/', in the "Teams" area.
 
    If you'd like to volunteer to _work_ at translating messages, you
 should become a member of the translating team for your own language.
@@ -168,911 +125,1125 @@
 _actively_ in translations, or at solving translational difficulties,
 rather than merely lurking around.  If your team does not exist yet and
 you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
+get started, please write to `coordinator@translationproject.org' to
+reach the coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
 
-1.5 Available Packages
+1.4 Available Packages
 ======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of July
-2006.  The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of June
+2010.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
-                        +----------------------------------------------------+
-     GNUnet             |                                  []                |
-     a2ps               |             []                [] [] []     []      |
-     aegis              |                                  ()                |
-     ant-phone          |                                  ()                |
-     anubis             |                                  []                |
-     ap-utils           |                                                    |
-     aspell             |                         []    [] []        []      |
-     bash               |                      []          []             [] |
-     batchelor          |                                  []                |
-     bfd                |                                                    |
-     bibshelf           |                                  []                |
-     binutils           |                               []                   |
-     bison              |                               [] []                |
-     bison-runtime      |                                  []                |
-     bluez-pin          | []                      []       [] []          [] |
-     cflow              |                               []                   |
-     clisp              |                                  []    []          |
-     console-tools      |                         []       []                |
-     coreutils          |                []    []       [] []                |
-     cpio               |                                                    |
-     cpplib             |                      []       [] []                |
-     cryptonit          |                                  []                |
-     darkstat           |                []             () []                |
-     dialog             |                      [] [] [] [] [] []             |
-     diffutils          |                      [] []    [] [] []          [] |
-     doodle             |                                  []                |
-     e2fsprogs          |                         []       []                |
-     enscript           |                      []       [] []        []      |
-     error              |                      []       [] []        []      |
-     fetchmail          |                      []       [] () []             |
-     fileutils          |                               [] []                |
-     findutils          |                []    []       []                   |
-     flex               |                      []       [] []                |
-     fslint             |                                  []                |
-     gas                |                                                    |
-     gawk               |                      []       [] []                |
-     gbiff              |                                  []                |
-     gcal               |                      []                            |
-     gcc                |                                  []                |
-     gettext-examples   | []                   []          [] []          [] |
-     gettext-runtime    |             []       []       [] []             [] |
-     gettext-tools      |                      []          []                |
-     gimp-print         |                         []    [] []        []      |
-     gip                |                []                                  |
-     gliv               |                                  []                |
-     glunarclock        |                []                                  |
-     gmult              | []                               []                |
-     gnubiff            |                                  ()                |
-     gnucash            |                                  () ()     []      |
-     gnucash-glossary   |                               [] ()                |
-     gnuedu             |                                                    |
-     gnulib             | []          [] []    []       [] []                |
-     gnunet-gtk         |                                                    |
-     gnutls             |                                                    |
-     gpe-aerial         |                         []       []                |
-     gpe-beam           |                         []       []                |
-     gpe-calendar       |                         []       []                |
-     gpe-clock          |                         []       []                |
-     gpe-conf           |                         []       []                |
-     gpe-contacts       |                                                    |
-     gpe-edit           |                         []                         |
-     gpe-filemanager    |                                                    |
-     gpe-go             |                         []                         |
-     gpe-login          |                         []       []                |
-     gpe-ownerinfo      |                         []       []                |
-     gpe-package        |                                                    |
-     gpe-sketchbook     |                         []       []                |
-     gpe-su             |                         []       []                |
-     gpe-taskmanager    |                         []       []                |
-     gpe-timesheet      |                         []                         |
-     gpe-today          |                         []       []                |
-     gpe-todo           |                                                    |
-     gphoto2            |                         []    [] []        []      |
-     gprof              |                               [] []                |
-     gpsdrive           |                                  ()    ()          |
-     gramadoir          | []                               []                |
-     grep               | []          [] []    []          [] []             |
-     gretl              |                                                    |
-     gsasl              |                                                    |
-     gss                |                                                    |
-     gst-plugins        | []                   [] []    []                   |
-     gst-plugins-base   |                []    []       []                   |
-     gst-plugins-good   | []       []    []    [] []    []           []      |
-     gstreamer          | []             []    [] []    [] []        []      |
-     gtick              | []                               ()                |
-     gtkam              |                         []    [] []                |
-     gtkorphan          |                []                []                |
-     gtkspell           |             []                   [] []          [] |
-     gutenprint         |                               []                   |
-     hello              |                      []       [] [] []          [] |
-     id-utils           |                               [] []                |
-     impost             |                                                    |
-     indent             |                      []          []             [] |
-     iso_3166           |                                  []             [] |
-     iso_3166_1         |                      [] []    [] [] []             |
-     iso_3166_2         |                                                    |
-     iso_3166_3         |                                  []                |
-     iso_4217           |                                  []                |
-     iso_639            |                                  []             [] |
-     jpilot             |                         []                         |
-     jtag               |                                                    |
-     jwhois             |                                                    |
-     kbd                |                         []    [] [] []             |
-     keytouch           |                                                    |
-     keytouch-editor    |                                                    |
-     keytouch-keyboa... |                                                    |
-     latrine            |                                  ()                |
-     ld                 |                               []                   |
-     leafpad            |                []    [] []       [] []             |
-     libc               |                      [] []    [] [] []             |
-     libexif            |                                  []                |
-     libextractor       |                                  []                |
-     libgpewidget       |                         []    [] []                |
-     libgpg-error       |                                  []                |
-     libgphoto2         |                               [] []                |
-     libgphoto2_port    |                               [] []                |
-     libgsasl           |                                                    |
-     libiconv           |                                  []             [] |
-     libidn             |                               []                [] |
-     lifelines          |                               [] ()                |
-     lilypond           |                                  []                |
-     lingoteach         |                                                    |
-     lynx               |                      [] []    [] []                |
-     m4                 |                         []    [] [] []             |
-     mailutils          |                      []                            |
-     make               |                               [] []                |
-     man-db             |                      [] ()    [] []                |
-     minicom            |                         []    [] []                |
-     mysecretdiary      |                               [] []                |
-     nano               |                []    [] ()       []                |
-     nano_1_0           |                      [] ()    [] []                |
-     opcodes            |                                  []                |
-     parted             |                                                    |
-     pilot-qof          |                                            []      |
-     psmisc             |                []                                  |
-     pwdutils           |                                                    |
-     python             |                                                    |
-     qof                |                                                    |
-     radius             |                      []                            |
-     recode             |             []       []       [] [] []          [] |
-     rpm                |                         []    []                   |
-     screem             |                                                    |
-     scrollkeeper       |          [] []       [] [] [] [] []        []      |
-     sed                |                      []          []             [] |
-     sh-utils           |                               [] []                |
-     shared-mime-info   |                []       []                      [] |
-     sharutils          |                []    [] []    [] [] []             |
-     shishi             |                                                    |
-     silky              |                                                    |
-     skencil            |                               [] ()                |
-     sketch             |                               [] ()                |
-     solfege            |                                                    |
-     soundtracker       |                               [] []                |
-     sp                 |                                  []                |
-     stardict           |                         []                         |
-     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
-     tar                |                []                                  |
-     texinfo            |                               [] []             [] |
-     textutils          |                      []       [] []                |
-     tin                |                                  ()        ()      |
-     tp-robot           |                                  []                |
-     tuxpaint           | []             []             [] []        []      |
-     unicode-han-tra... |                                                    |
-     unicode-transla... |                                                    |
-     util-linux         |                      [] []    [] []                |
-     vorbis-tools       |             []          []    []           []      |
-     wastesedge         |                                  ()                |
-     wdiff              |                      []       [] []        []      |
-     wget               |                      []          []                |
-     xchat              |                []    []          [] []     []      |
-     xkeyboard-config   |                                                    |
-     xpad               |                []             []                   |
-                        +----------------------------------------------------+
-                          af am ar az be bg bs ca cs cy da de el en en_GB eo
-                          11  0  1  2  8 21  1 42 43  2 62 99 18  1  16   16
-
-                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+     Ready PO files       af am an ar as ast az be be@latin bg bn_IN bs ca
                         +--------------------------------------------------+
-     GNUnet             |                                                  |
-     a2ps               |    []       [] []                             () |
+     a2ps               |                       []                      [] |
      aegis              |                                                  |
-     ant-phone          |                []                                |
-     anubis             |                []                                |
-     ap-utils           |             [] []                                |
-     aspell             |                []  []                         [] |
-     bash               | []             []                    []          |
-     batchelor          |                []  []                            |
-     bfd                | []                                               |
-     bibshelf           | []                 []                         [] |
-     binutils           | []          [] []                                |
-     bison              | [] []          []  []                   []    [] |
-     bison-runtime      |    []          []  []                   []    [] |
-     bluez-pin          |             [] []  []                [] []       |
-     cflow              |                                                  |
-     clisp              | []             []                                |
-     console-tools      |                                                  |
-     coreutils          | [] []       [] []  []                []          |
-     cpio               | []             []  []                            |
-     cpplib             | []             []                                |
-     cryptonit          |                []                                |
-     darkstat           | []             ()  []                [] []       |
-     dialog             | [] [] []    [] []  []                []       [] |
-     diffutils          | []          [] []  [] []    []       [] []    [] |
-     doodle             |                    []                         [] |
-     e2fsprogs          | []             []                             [] |
-     enscript           |                []  []             []             |
-     error              | []          [] []  []                []          |
-     fetchmail          | []                                               |
-     fileutils          | [] []          []  []                []       [] |
-     findutils          |    []          []  []                []          |
-     flex               | []             []  []                            |
-     fslint             |                []                                |
-     gas                | []             []                                |
-     gawk               | []             []  []       []                   |
-     gbiff              |                []                                |
-     gcal               | []             []                                |
-     gcc                | []                                               |
-     gettext-examples   | []             []  []                []       [] |
-     gettext-runtime    | []          [] []  []                   []    [] |
-     gettext-tools      | []             []                             [] |
-     gimp-print         | []             []                                |
-     gip                | []    []       []                                |
-     gliv               |                ()                                |
-     glunarclock        |             []     []                []          |
-     gmult              |       []       []                             [] |
-     gnubiff            |                ()                             () |
-     gnucash            | ()             ()                    ()          |
-     gnucash-glossary   | []                                            [] |
-     gnuedu             | []                                               |
-     gnulib             | [] [] []    [] []  [] []             []          |
-     gnunet-gtk         |                                                  |
-     gnutls             |                                                  |
-     gpe-aerial         | []             []                                |
-     gpe-beam           | []             []                                |
-     gpe-calendar       | []             []                    [] []       |
-     gpe-clock          | []          [] []                    []          |
-     gpe-conf           |                []                                |
-     gpe-contacts       | []             []                                |
-     gpe-edit           | []             []                    [] []       |
-     gpe-filemanager    | []                                               |
-     gpe-go             | []             []                    []          |
-     gpe-login          | []             []                    []          |
-     gpe-ownerinfo      | []          [] []                    [] []       |
-     gpe-package        | []                                               |
-     gpe-sketchbook     | []             []                                |
-     gpe-su             | []          [] []                    []          |
-     gpe-taskmanager    | []          [] []                                |
-     gpe-timesheet      | []             []  []                   []       |
-     gpe-today          | []          [] []  []                            |
-     gpe-todo           | []                                               |
-     gphoto2            | []          [] []                    []       [] |
-     gprof              | []             []  []                   []       |
-     gpsdrive           | ()             ()                    []       () |
-     gramadoir          |                []  []                            |
-     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
-     gretl              | []             []                             [] |
-     gsasl              |                    []                            |
-     gss                |                []                                |
-     gst-plugins        |                []                    []       [] |
-     gst-plugins-base   |                                      []       [] |
-     gst-plugins-good   |       []                             []       [] |
-     gstreamer          |             []                       []       [] |
-     gtick              |       []    [] []  []                         [] |
-     gtkam              | []             []                    []       [] |
-     gtkorphan          |                []                             [] |
-     gtkspell           | []    []    [] []  []                         [] |
-     gutenprint         |                                      []          |
-     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
-     id-utils           |                []  []                [] []    [] |
-     impost             |                []  []                            |
-     indent             | [] [] []    [] []  [] []             [] []    [] |
-     iso_3166           |             [] []                    []          |
-     iso_3166_1         | []    []    [] []  []                [] []       |
-     iso_3166_2         |                []                                |
-     iso_3166_3         |                []                                |
-     iso_4217           |    []       []        []             []          |
-     iso_639            |          [] [] []  []                []          |
-     jpilot             | []             []                                |
-     jtag               |                []                                |
-     jwhois             | []             []                    [] []    [] |
-     kbd                | []             []                                |
-     keytouch           |                    []                            |
-     keytouch-editor    |                    []                            |
-     keytouch-keyboa... |                    []                            |
-     latrine            |                []  []                         [] |
-     ld                 | []             []                                |
-     leafpad            | []             []  []       []       []       [] |
-     libc               | []          [] []     []             []          |
-     libexif            | []                                               |
-     libextractor       |                    []                            |
-     libgpewidget       | []             []  []                [] []       |
-     libgpg-error       |                                                  |
-     libgphoto2         | []             []                             [] |
-     libgphoto2_port    |                []                             [] |
-     libgsasl           |                []  []                            |
-     libiconv           |                    []                            |
-     libidn             |                []                             [] |
-     lifelines          |                ()                                |
-     lilypond           |                []                                |
-     lingoteach         |                []                       []    [] |
-     lynx               |    []                                []       [] |
-     m4                 |                []  [] []                []       |
-     mailutils          | []             []                                |
-     make               | []          [] []  [] []    []    []    []       |
-     man-db             | ()                                               |
-     minicom            | []          [] []                    []          |
-     mysecretdiary      | []             []                       []       |
-     nano               |       []    () []  []                []       [] |
-     nano_1_0           | []             []     []                []    [] |
-     opcodes            | []          [] []  []                            |
-     parted             | []             []                       []    [] |
-     pilot-qof          |                                                  |
-     psmisc             |       []                             []       [] |
-     pwdutils           |                                                  |
-     python             |                                                  |
-     qof                |                                                  |
-     radius             | []             []                                |
-     recode             | []             []  [] []    []       [] []    [] |
-     rpm                |                []                       []       |
-     screem             |                                                  |
-     scrollkeeper       | []          []                       []          |
-     sed                | [] []          []  []                []          |
-     sh-utils           | [] []       [] []  []                []       [] |
-     shared-mime-info   | []    []    [] []                    []       [] |
-     sharutils          | [] []       [] []  [] []             []       [] |
-     shishi             |                                                  |
-     silky              |                []                                |
-     skencil            | []             []                                |
-     sketch             | []             []                                |
-     solfege            |                                               [] |
-     soundtracker       | []             []                             [] |
-     sp                 |                []                                |
-     stardict           |                                      []          |
-     system-tools-ba... | []    []    [] []                 [] [] []    [] |
-     tar                | [] []          []  []                []       [] |
-     texinfo            |                []           []                   |
-     textutils          | []             []  [] []             []          |
-     tin                |    []          ()                                |
-     tp-robot           |             [] []  []                []          |
-     tuxpaint           |                    []                []          |
-     unicode-han-tra... |                                                  |
-     unicode-transla... |                []  []                            |
-     util-linux         | [] []       [] []                    [] []    [] |
-     vorbis-tools       | []             []                                |
-     wastesedge         |                ()                                |
-     wdiff              | [] []          []  [] []             [] []    [] |
-     wget               |    []       [] []  []             [] [] []    [] |
-     xchat              | []    []    [] []        []    []    []       [] |
-     xkeyboard-config   |             [] []                    []       [] |
-     xpad               | []                 []                []          |
-                        +--------------------------------------------------+
-                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
-                          89 21 16  2 41 119 61 14  1  8  1  6 61 30  0 53
-
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl  nn no
-                        +--------------------------------------------------+
-     GNUnet             |                                                  |
-     a2ps               |    ()                      []          []     () |
-     aegis              |                                        ()        |
-     ant-phone          |                                        []        |
-     anubis             |                            []    []    []        |
-     ap-utils           |                            []                    |
-     aspell             |                         []             []        |
-     bash               |                                        []        |
-     batchelor          |                            []          []        |
+     ant-phone          |                                                  |
+     anubis             |                                                  |
+     aspell             |                []                             [] |
+     bash               |                                                  |
      bfd                |                                                  |
-     bibshelf           |                            []                    |
+     bibshelf           |                []                                |
      binutils           |                                                  |
-     bison              |                            []    []    []        |
-     bison-runtime      |                            []    []    []        |
-     bluez-pin          |       []                   []          []        |
+     bison              |                                                  |
+     bison-runtime      |                []                                |
+     bluez-pin          | []             []                                |
+     bombono-dvd        |                                                  |
+     buzztard           |                                                  |
      cflow              |                                                  |
-     clisp              |                                        []        |
-     console-tools      |                                                  |
-     coreutils          |                                        []        |
+     clisp              |                                                  |
+     coreutils          |                                   []          [] |
      cpio               |                                                  |
-     cpplib             |                                        []        |
-     cryptonit          |                                        []        |
-     darkstat           |                            []          []        |
-     dialog             |                            []          []        |
-     diffutils          | []                         []          []        |
+     cppi               |                                                  |
+     cpplib             |                                               [] |
+     cryptsetup         |                                                  |
+     dfarc              |                                                  |
+     dialog             |                             []                [] |
+     dico               |                                                  |
+     diffutils          |                                               [] |
+     dink               |                                                  |
      doodle             |                                                  |
-     e2fsprogs          |                                        []        |
-     enscript           |                                        []        |
-     error              |                                        []        |
-     fetchmail          | []                                     []        |
-     fileutils          | []          []                                   |
-     findutils          |                                        []        |
-     flex               |    []                                  []        |
-     fslint             |                            []          []        |
+     e2fsprogs          |                                               [] |
+     enscript           |                                               [] |
+     exif               |                                                  |
+     fetchmail          |                                               [] |
+     findutils          |                                   []             |
+     flex               |                                               [] |
+     freedink           |                                                  |
      gas                |                                                  |
-     gawk               | []                                     []        |
-     gbiff              |                                        []        |
-     gcal               |                                                  |
+     gawk               |                []                             [] |
+     gcal               |                                               [] |
      gcc                |                                                  |
-     gettext-examples   | []                                     []        |
-     gettext-runtime    | [] []                                  []        |
-     gettext-tools      | [] []                                            |
-     gimp-print         | []                                     []        |
-     gip                |                            []          []        |
-     gliv               |                                        []        |
-     glunarclock        |                            []          []        |
-     gmult              | []                         []                    |
+     gettext-examples   | []             []                 []          [] |
+     gettext-runtime    |                                   []          [] |
+     gettext-tools      |                                   []          [] |
+     gip                |                                   []             |
+     gjay               |                                                  |
+     gliv               |                                   []             |
+     glunarclock        |                []                 []             |
      gnubiff            |                                                  |
-     gnucash            | ()                               ()              |
-     gnucash-glossary   |                                        []        |
+     gnucash            |                                               [] |
      gnuedu             |                                                  |
-     gnulib             | [] []                      []          []        |
+     gnulib             |                                                  |
+     gnunet             |                                                  |
      gnunet-gtk         |                                                  |
      gnutls             |                                                  |
-     gpe-aerial         |                                        []        |
-     gpe-beam           |                                        []        |
-     gpe-calendar       |                                        []        |
-     gpe-clock          |    []                                  []        |
-     gpe-conf           |    []                                  []        |
-     gpe-contacts       |    []                                            |
-     gpe-edit           |    []                                  []        |
-     gpe-filemanager    |    []                                            |
-     gpe-go             |    []                                  []        |
-     gpe-login          |    []                                  []        |
-     gpe-ownerinfo      |                                        []        |
-     gpe-package        |    []                                            |
-     gpe-sketchbook     |    []                                  []        |
-     gpe-su             |    []                                  []        |
-     gpe-taskmanager    |    [] []                               []        |
-     gpe-timesheet      |                                        []        |
-     gpe-today          |                                        []        |
+     gold               |                                                  |
+     gpe-aerial         |                                                  |
+     gpe-beam           |                                                  |
+     gpe-bluetooth      |                                                  |
+     gpe-calendar       |                                                  |
+     gpe-clock          |                []                                |
+     gpe-conf           |                                                  |
+     gpe-contacts       |                                                  |
+     gpe-edit           |                                                  |
+     gpe-filemanager    |                                                  |
+     gpe-go             |                                                  |
+     gpe-login          |                                                  |
+     gpe-ownerinfo      |                []                                |
+     gpe-package        |                                                  |
+     gpe-sketchbook     |                                                  |
+     gpe-su             |                []                                |
+     gpe-taskmanager    |                []                                |
+     gpe-timesheet      |                []                                |
+     gpe-today          |                []                                |
      gpe-todo           |                                                  |
-     gphoto2            | []                                     []        |
-     gprof              |                                                  |
-     gpsdrive           | ()                                     ()     () |
-     gramadoir          |                                        ()        |
-     grep               | []                               []    []        |
-     gretl              |                                                  |
-     gsasl              |                                        []        |
+     gphoto2            |                                                  |
+     gprof              |                                   []             |
+     gpsdrive           |                                                  |
+     gramadoir          |                                                  |
+     grep               |                                                  |
+     grub               |                []                             [] |
+     gsasl              |                                                  |
      gss                |                                                  |
-     gst-plugins        |                                        []        |
-     gst-plugins-base   |                                                  |
-     gst-plugins-good   |                                        []        |
-     gstreamer          |                                        []        |
-     gtick              |                                        []        |
-     gtkam              | []                                               |
-     gtkorphan          |                                        []        |
-     gtkspell           |                         []             []        |
+     gst-plugins-bad    |                                   []             |
+     gst-plugins-base   |                                   []             |
+     gst-plugins-good   |                                   []             |
+     gst-plugins-ugly   |                                   []             |
+     gstreamer          | []                                []          [] |
+     gtick              |                                                  |
+     gtkam              |                       []                         |
+     gtkorphan          |                                   []             |
+     gtkspell           | []             []     []                         |
      gutenprint         |                                                  |
-     hello              | [] []             []       []    []    []  [] [] |
-     id-utils           |                                        []        |
-     impost             |                                                  |
-     indent             | []                                     []        |
-     iso_3166           |                                        []        |
-     iso_3166_1         |                                        []     [] |
-     iso_3166_2         |                                        []        |
-     iso_3166_3         |                                        []        |
-     iso_4217           | []                      []             []        |
-     iso_639            | []                                     []        |
-     jpilot             | ()                                     ()     () |
-     jtag               |                                                  |
-     jwhois             |                                        []        |
-     kbd                |                                        []        |
-     keytouch           |                                        []        |
+     hello              |                                   []             |
+     help2man           |                                                  |
+     hylafax            |                                                  |
+     idutils            |                                                  |
+     indent             |                                   []          [] |
+     iso_15924          |                                                  |
+     iso_3166           | []          []        []          []  []   [] [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |                                                  |
+     iso_639            |             [] []     []              []         |
+     iso_639_3          |                                                  |
+     jwhois             |                                                  |
+     kbd                |                                                  |
+     keytouch           |                                               [] |
      keytouch-editor    |                                                  |
-     keytouch-keyboa... |                                                  |
-     latrine            |                                        []        |
-     ld                 |                                                  |
-     leafpad            | []             []                                |
-     libc               | [] []                            []    []     [] |
-     libexif            |                                                  |
+     keytouch-keyboa... |                                               [] |
+     klavaro            |          []                                      |
+     latrine            |                                                  |
+     ld                 |                                   []             |
+     leafpad            |                                   []          [] |
+     libc               |                                   []          [] |
+     libexif            |                       ()                         |
      libextractor       |                                                  |
-     libgpewidget       |                                        []        |
+     libgnutls          |                                                  |
+     libgpewidget       |                                                  |
      libgpg-error       |                                                  |
-     libgphoto2         | []                                               |
-     libgphoto2_port    | []                                               |
-     libgsasl           |                                        []        |
-     libiconv           |                                                  |
-     libidn             | []                                     []        |
-     lifelines          |                                        []        |
+     libgphoto2         |                                                  |
+     libgphoto2_port    |                                                  |
+     libgsasl           |                                                  |
+     libiconv           |                                   []             |
+     libidn             |                                                  |
+     lifelines          |                                                  |
+     liferea            |                             []                [] |
      lilypond           |                                                  |
-     lingoteach         |                                        []        |
-     lynx               | []                                     []        |
-     m4                 | []                                     []        |
+     linkdr             |          []                                      |
+     lordsawar          |                                                  |
+     lprng              |                                                  |
+     lynx               |                                               [] |
+     m4                 |                                                  |
+     mailfromd          |                                                  |
      mailutils          |                                                  |
-     make               | [] []                                  []        |
-     man-db             | ()                                               |
-     minicom            | []                                               |
-     mysecretdiary      |                                        []        |
-     nano               |                            []    []    []        |
-     nano_1_0           |                            []    []        []    |
-     opcodes            |                                        []        |
-     parted             | []                                     []        |
-     pilot-qof          |                                                  |
-     psmisc             | []                               []    []        |
+     make               |                                                  |
+     man-db             |                                                  |
+     man-db-manpages    |                                                  |
+     minicom            |                                                  |
+     mkisofs            |                                                  |
+     myserver           |                                                  |
+     nano               |                                   []          [] |
+     opcodes            |                                                  |
+     parted             |                                                  |
+     pies               |                                                  |
+     popt               |                                                  |
+     psmisc             |                                                  |
+     pspp               |                                               [] |
      pwdutils           |                                                  |
-     python             |                                                  |
-     qof                |                                                  |
-     radius             |                                                  |
-     recode             |                                        []        |
-     rpm                | [] []                                            |
-     screem             | []                                               |
-     scrollkeeper       |                                  [] [] []  []    |
-     sed                | []                                     []        |
-     sh-utils           | []                               []              |
-     shared-mime-info   |    []          []                []    []  []    |
-     sharutils          | []                                     []        |
+     radius             |                                               [] |
+     recode             |                       []                      [] |
+     rosegarden         |                                                  |
+     rpm                |                                                  |
+     rush               |                                                  |
+     sarg               |                                                  |
+     screem             |                                                  |
+     scrollkeeper       |                    [] []                      [] |
+     sed                |                []                             [] |
+     sharutils          |                                   []          [] |
      shishi             |                                                  |
-     silky              |                                        []        |
      skencil            |                                                  |
-     sketch             |                                                  |
      solfege            |                                                  |
+     solfege-manual     |                                                  |
      soundtracker       |                                                  |
-     sp                 | ()                                               |
-     stardict           |                      []                []        |
-     system-tools-ba... | [] []          []                      []        |
-     tar                | []       []                            []        |
-     texinfo            | []                               []    []        |
-     textutils          | [] []                            []              |
+     sp                 |                                                  |
+     sysstat            |                                                  |
+     tar                |                                   []             |
+     texinfo            |                                                  |
      tin                |                                                  |
-     tp-robot           |                                        []        |
-     tuxpaint           |                                            []    |
      unicode-han-tra... |                                                  |
      unicode-transla... |                                                  |
-     util-linux         | []                                     []        |
-     vorbis-tools       |                                        []        |
-     wastesedge         |                                        []        |
-     wdiff              |                            []    []              |
-     wget               | []                                     []        |
-     xchat              | [] []                []                []        |
-     xkeyboard-config   |                                        []        |
-     xpad               |    []                      []          []        |
+     util-linux-ng      |                                               [] |
+     vice               |                                                  |
+     vmm                |                                                  |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                                  |
+     wdiff              |                                                  |
+     wget               |                       []                      [] |
+     wyslij-po          |                                                  |
+     xchat              |                []     []          []          [] |
+     xdg-user-dirs      | []    []    [] []     []    []    []  []      [] |
+     xkeyboard-config   |                                   []          [] |
                         +--------------------------------------------------+
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl  nn no
-                          40 24  2  1  1  3  1  2  3 21  0 15  1 101  5  3
+                          af am an ar as ast az be be@latin bg bn_IN bs ca
+                           6  0  1  2  3 19   1 10     3    28   3    1 38
 
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                        +------------------------------------------------------+
-     GNUnet             |                                                      |
-     a2ps               |           ()     []      [] []       []    [] []     |
-     aegis              |                          () ()                       |
-     ant-phone          |                          []                   []     |
-     anubis             |           []             [] []                       |
-     ap-utils           |           ()                                         |
-     aspell             |                          [] []                       |
-     bash               |                  []      [] []                       |
-     batchelor          |                          []                   []     |
-     bfd                |                                                      |
-     bibshelf           |                                               []     |
-     binutils           |                             []                []     |
-     bison              |           []     []      [] []                []     |
-     bison-runtime      |           []             []          []       []     |
-     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
-     cflow              |           []                                         |
-     clisp              |                             []                       |
-     console-tools      |                             []                       |
-     coreutils          |           []                []       []       []     |
-     cpio               |           []                []                []     |
-     cpplib             |                                               []     |
-     cryptonit          |                  []                           []     |
-     darkstat           |           []     []      []       []       [] []     |
-     dialog             |           [] []  []   [] [] [] []          [] []     |
-     diffutils          |           []     []      [] []             [] []     |
-     doodle             |                                         []    []     |
-     e2fsprogs          |           []                                  []     |
-     enscript           |                  []      [] []       []       []     |
-     error              |                  []      []       []          []     |
-     fetchmail          |           []                []          []           |
-     fileutils          |           []             [] []       []       []     |
-     findutils          |           [] []          []       [] []       []     |
-     flex               |           []     []      [] []                []     |
-     fslint             |                  []      []                [] []     |
-     gas                |                                                      |
-     gawk               |           []     []      []                   []     |
-     gbiff              |                          []                          |
-     gcal               |                                               []     |
-     gcc                |                                               []     |
-     gettext-examples   |           [] []          [] []    [] []    [] []     |
-     gettext-runtime    |           [] []          [] []    [] []    [] []     |
-     gettext-tools      |           []             [] []    [] []    [] []     |
-     gimp-print         |                                   []          []     |
-     gip                |                       []          []       [] []     |
-     gliv               |                  []      []       []          []     |
-     glunarclock        |                  []      [] []    []       [] []     |
-     gmult              |                       [] []                [] []     |
-     gnubiff            |                          ()                          |
-     gnucash            |           ()                                  []     |
-     gnucash-glossary   |              []                   []          []     |
-     gnuedu             |                                                      |
-     gnulib             |           []             [] []       []       []     |
-     gnunet-gtk         |                                               []     |
-     gnutls             |           []                                  []     |
-     gpe-aerial         |              []  []      [] []       []    [] []     |
-     gpe-beam           |              []  []      [] []       []    [] []     |
-     gpe-calendar       |              []  []      [] []    [] []    [] []     |
-     gpe-clock          |              []  []      [] []    [] []    [] []     |
-     gpe-conf           |              []  []      [] []    [] []       []     |
-     gpe-contacts       |                          [] []       []    [] []     |
-     gpe-edit           |              []  []      [] []    [] []    [] []     |
-     gpe-filemanager    |                                      []       []     |
-     gpe-go             |                  []      [] []       []    [] []     |
-     gpe-login          |              []  []      [] []    [] []    [] []     |
-     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
-     gpe-package        |                                      []       []     |
-     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
-     gpe-su             |              []  []      [] []    [] []    [] []     |
-     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
-     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
-     gpe-today          |              []  []      [] []    [] []    [] []     |
-     gpe-todo           |                             []       []    [] []     |
-     gphoto2            |           []             []       []       [] []     |
-     gprof              |                  []      []                   []     |
-     gpsdrive           |        []                []                   []     |
-     gramadoir          |                                   []          []     |
-     grep               |           [] []  []      [] []       []    [] []     |
-     gretl              |           []                                         |
-     gsasl              |           []                                  []     |
-     gss                |           []             []                   []     |
-     gst-plugins        |     []                                  [] [] []     |
-     gst-plugins-base   |                                               []     |
-     gst-plugins-good   |     []                                  [] [] []     |
-     gstreamer          |                                         [] [] []     |
-     gtick              |                          [] []                []     |
-     gtkam              |           []     []         []                []     |
-     gtkorphan          |                                               []     |
-     gtkspell           |                  []   [] [] []    [] []    [] []     |
-     gutenprint         |                                               []     |
-     hello              |           []     []      [] []    [] []    [] []     |
-     id-utils           |                  []      [] []                []     |
-     impost             |                                               []     |
-     indent             |                  []      [] []    []       [] []     |
-     iso_3166           |              []                []    [] [] [] []     |
-     iso_3166_1         |                                   [] [] [] []        |
-     iso_3166_2         |                                                      |
-     iso_3166_3         |                          []    []    []    []        |
-     iso_4217           |                                []    []    [] []     |
-     iso_639            |                                []    []    [] []     |
-     jpilot             |                                                      |
-     jtag               |                                   []                 |
-     jwhois             |           []     []      []                   []     |
-     kbd                |           []             []                   []     |
-     keytouch           |                                               []     |
-     keytouch-editor    |                                               []     |
-     keytouch-keyboa... |                                               []     |
-     latrine            |                          []                   []     |
-     ld                 |                                               []     |
-     leafpad            |           [] []             []    []          []  [] |
-     libc               |           []     []         []    []          []     |
-     libexif            |           []                                         |
-     libextractor       |                          []                   []     |
-     libgpewidget       |              []  []      []       [] []    [] []     |
-     libgpg-error       |           []             []                          |
-     libgphoto2         |           []                                         |
-     libgphoto2_port    |           []                []                []     |
-     libgsasl           |           []             []                [] []     |
-     libiconv           |                                                      |
-     libidn             |           []                               [] ()     |
-     lifelines          |           []                                  []     |
-     lilypond           |                                                      |
-     lingoteach         |                  []                                  |
-     lynx               |                  []         []                []     |
-     m4                 |           []     []      [] []                []     |
-     mailutils          |           []             [] []                []     |
-     make               |           []     []         []                []     |
-     man-db             |                          []                   []     |
-     minicom            |           []     []      [] []                []     |
-     mysecretdiary      |                  []      [] []                []     |
-     nano               |                          []                   []     |
-     nano_1_0           |           []             [] []                []     |
-     opcodes            |                          []                   []     |
-     parted             |           []                                         |
-     pilot-qof          |                                               []     |
-     psmisc             |           []                                  []     |
-     pwdutils           |           []                                  []     |
-     python             |                                                      |
-     qof                |                                               []     |
-     radius             |           []                []                       |
-     recode             |           [] []  []      [] []       []       []     |
-     rpm                |           [] []             []                []     |
-     screem             |                                                      |
-     scrollkeeper       |           []             [] []    []    [] [] []     |
-     sed                |           [] []  []      [] []    [] []    [] []     |
-     sh-utils           |                             []       []    []        |
-     shared-mime-info   |              []  []                     [] [] []     |
-     sharutils          |           []                []             [] []     |
-     shishi             |           []                                         |
-     silky              |                                   []                 |
-     skencil            |              []  []                           []     |
-     sketch             |              []  []                           []     |
-     solfege            |                                               []     |
-     soundtracker       |                                   []          []     |
-     sp                 |                                                      |
-     stardict           |                             []    []          []     |
-     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
-     tar                |           []             [] []       []       []     |
-     texinfo            |           []             [] []                []     |
-     textutils          |                             []       []       []     |
-     tin                |                             ()                       |
-     tp-robot           |                             []                       |
-     tuxpaint           |              []                      [] [] [] []     |
-     unicode-han-tra... |                                                      |
-     unicode-transla... |                                                      |
-     util-linux         |                  []         []       []       []     |
-     vorbis-tools       |                          [] []                       |
-     wastesedge         |                                                      |
-     wdiff              |           []     []      [] []    []          []     |
-     wget               |              []             []    []          []     |
-     xchat              |        []                   []    [] [] [] [] []     |
-     xkeyboard-config   |                                      []       []     |
-     xpad               |                                   [] []       []     |
-                        +------------------------------------------------------+
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                           0   2  3 58 31  53    5 76 72  5 42 48 12 51 130  2
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                        +-------------------------------------------------+
+     a2ps               |     [] []  []  []     []            [] []       |
+     aegis              |        []  []                       []          |
+     ant-phone          |        []  ()                                   |
+     anubis             |        []  []                                   |
+     aspell             |     [] []  []         []            []          |
+     bash               |     []                           [] []          |
+     bfd                |                                     []          |
+     bibshelf           |        []  []                       []          |
+     binutils           |                                     []          |
+     bison              |            []  []                               |
+     bison-runtime      |        []  []  []                      []       |
+     bluez-pin          |     [] []  []  []                [] []          |
+     bombono-dvd        |        []                                       |
+     buzztard           |     [] []  []                                   |
+     cflow              |        []  []                                   |
+     clisp              |        []  []     []                []          |
+     coreutils          |     [] []  []                          []       |
+     cpio               |                                                 |
+     cppi               |                                                 |
+     cpplib             |        []  []                       []          |
+     cryptsetup         |            []                                   |
+     dfarc              |        []  []                       []          |
+     dialog             |        []  []                    [] []    []    |
+     dico               |                                                 |
+     diffutils          |     [] []  []  []                [] []          |
+     dink               |        []  []                       []          |
+     doodle             |            []                                   |
+     e2fsprogs          |     []     []                       []          |
+     enscript           |        []  []         []                        |
+     exif               |     () []  []                                   |
+     fetchmail          |     [] []  ()  []     []            []          |
+     findutils          |     [] []  []                                   |
+     flex               |            []                       []          |
+     freedink           |        []  []                       []          |
+     gas                |                                     []          |
+     gawk               |        []  []                       []          |
+     gcal               |                                     []          |
+     gcc                |            []                       []          |
+     gettext-examples   |            []  []                [] []          |
+     gettext-runtime    |        []  []                    [] []          |
+     gettext-tools      |            []                       []    []    |
+     gip                |        []  []                       []    []    |
+     gjay               |            []                                   |
+     gliv               |     [] []  []                                   |
+     glunarclock        |        []  []                                   |
+     gnubiff            |            ()                                   |
+     gnucash            |     []     ()  ()     ()            ()          |
+     gnuedu             |        []                           []          |
+     gnulib             |            []                       []          |
+     gnunet             |                                                 |
+     gnunet-gtk         |        []                                       |
+     gnutls             |     []     []                                   |
+     gold               |                                     []          |
+     gpe-aerial         |     [] []  []                       []          |
+     gpe-beam           |     [] []  []                       []          |
+     gpe-bluetooth      |        []  []                                   |
+     gpe-calendar       |        []                                       |
+     gpe-clock          |     [] []  []                       []          |
+     gpe-conf           |     [] []  []                                   |
+     gpe-contacts       |        []  []                       []          |
+     gpe-edit           |        []  []                                   |
+     gpe-filemanager    |        []  []                       []          |
+     gpe-go             |     [] []  []                       []          |
+     gpe-login          |        []  []                                   |
+     gpe-ownerinfo      |     [] []  []                       []          |
+     gpe-package        |        []  []                       []          |
+     gpe-sketchbook     |     [] []  []                       []          |
+     gpe-su             |     [] []  []                       []          |
+     gpe-taskmanager    |     [] []  []                       []          |
+     gpe-timesheet      |     [] []  []                       []          |
+     gpe-today          |     [] []  []                       []          |
+     gpe-todo           |        []  []                       []          |
+     gphoto2            |     [] []  ()         []            []    []    |
+     gprof              |        []  []                       []          |
+     gpsdrive           |        []                           [] []       |
+     gramadoir          |        []  []                    []             |
+     grep               |     []                                          |
+     grub               |        []  []                                   |
+     gsasl              |            []                                   |
+     gss                |                                                 |
+     gst-plugins-bad    |     [] []  []                       []    []    |
+     gst-plugins-base   |     [] []  []                       []    []    |
+     gst-plugins-good   |     [] []  []  []                   []    []    |
+     gst-plugins-ugly   |     [] []  []  []                   []    []    |
+     gstreamer          |     [] []  []                       []    []    |
+     gtick              |        []  ()                    []             |
+     gtkam              |     [] []  ()                    [] []          |
+     gtkorphan          |     [] []  []                    []             |
+     gtkspell           |     [] []  []  []                [] []    []    |
+     gutenprint         |        []  []         []                        |
+     hello              |        []  []                    [] []          |
+     help2man           |            []                                   |
+     hylafax            |            []                       []          |
+     idutils            |        []  []                                   |
+     indent             |     [] []  []                    [] [] [] []    |
+     iso_15924          |        []      ()                [] []          |
+     iso_3166           | []  [] []  []  ()                [] [] [] ()    |
+     iso_3166_2         |                ()                               |
+     iso_4217           |     [] []  []  ()                   [] []       |
+     iso_639            | []  [] []  []  ()                [] []          |
+     iso_639_3          | []                                              |
+     jwhois             |                                     []          |
+     kbd                |     [] []  []  []                   []          |
+     keytouch           |        []  []                                   |
+     keytouch-editor    |        []  []                                   |
+     keytouch-keyboa... |        []                                       |
+     klavaro            |     [] []  []                    []             |
+     latrine            |        []  ()                                   |
+     ld                 |        []                           []          |
+     leafpad            |     [] []  []  []                   []    []    |
+     libc               |     [] []  []                       []          |
+     libexif            |        []  []         ()                        |
+     libextractor       |                                                 |
+     libgnutls          |     []                                          |
+     libgpewidget       |        []  []                                   |
+     libgpg-error       |     []     []                                   |
+     libgphoto2         |        []  ()                                   |
+     libgphoto2_port    |        []  ()                             []    |
+     libgsasl           |                                                 |
+     libiconv           |     [] []  []                    []    []       |
+     libidn             |     []     []                    []             |
+     lifelines          |        []  ()                                   |
+     liferea            |     []     []  []                   []    []    |
+     lilypond           |     []     []                       []          |
+     linkdr             |        []  []                       []          |
+     lordsawar          |        []                                       |
+     lprng              |                                                 |
+     lynx               |     [] []  []                          []       |
+     m4                 |     [] []  []  []                               |
+     mailfromd          |                                                 |
+     mailutils          |                                     []          |
+     make               |        []  []                       []          |
+     man-db             |                                                 |
+     man-db-manpages    |                                                 |
+     minicom            |     [] []  []                       []          |
+     mkisofs            |                                                 |
+     myserver           |                                                 |
+     nano               |            []                       []    []    |
+     opcodes            |            []                       []          |
+     parted             |     []     []                                   |
+     pies               |                                                 |
+     popt               |     [] []  []                    [] []          |
+     psmisc             |     []     []                             []    |
+     pspp               |                                     []          |
+     pwdutils           |        []                                       |
+     radius             |                                     []          |
+     recode             |     [] []  []  []                [] []          |
+     rosegarden         |     ()     ()                       ()          |
+     rpm                |        []  []                       []          |
+     rush               |                                                 |
+     sarg               |                                                 |
+     screem             |                                                 |
+     scrollkeeper       |     [] []  []         []            []          |
+     sed                |     []     []  []                [] [] []       |
+     sharutils          |        []  []                       [] []       |
+     shishi             |                                                 |
+     skencil            |        []  ()                       []          |
+     solfege            |            []                    []    []       |
+     solfege-manual     |                                  []    []       |
+     soundtracker       |        []  []                       []          |
+     sp                 |            []                                   |
+     sysstat            |        []  []                             []    |
+     tar                |     []     []                          [] []    |
+     texinfo            |            []                    [] []          |
+     tin                |            []                          []       |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux-ng      |     [] []  []                       []          |
+     vice               |        ()  ()                                   |
+     vmm                |            []                                   |
+     vorbis-tools       |     []                           []             |
+     wastesedge         |        []                                       |
+     wdiff              |            []                       []          |
+     wget               |     []     []                          []       |
+     wyslij-po          |                                                 |
+     xchat              |     []     []  []                   [] []       |
+     xdg-user-dirs      | []  [] []  []  []                [] [] [] []    |
+     xkeyboard-config   | []  [] []  []                    [] []          |
+                        +-------------------------------------------------+
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                           5  64 105 117 18  1   8     0   28 89 18 19  0
+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                        +----------------------------------------------------+
+     a2ps               | []  []                          []        []       |
+     aegis              |     []                                 []          |
+     ant-phone          |     []                                 []          |
+     anubis             | []  []                          []     []          |
+     aspell             |     []  []                      []     []          |
+     bash               | []  []                          []        []       |
+     bfd                | []  []                          []                 |
+     bibshelf           | []  []  []                      []     []          |
+     binutils           | []  []                          []                 |
+     bison              | []  []  []                      []                 |
+     bison-runtime      | []  []  []                      []     [] []       |
+     bluez-pin          | []  []  []                [] [] []  []    []       |
+     bombono-dvd        | []                                                 |
+     buzztard           |                                 []                 |
+     cflow              | []      []                      []                 |
+     clisp              |     []                                             |
+     coreutils          |     []  []                []    []     []          |
+     cpio               | []  []  []                      []                 |
+     cppi               | []  []                                             |
+     cpplib             | []  []                          []                 |
+     cryptsetup         |     []                          []     []          |
+     dfarc              | []  []                                 []          |
+     dialog             |     []  [] []                   []  [] [] []       |
+     dico               |                                                    |
+     diffutils          | []  []  [] []    []       []    []     [] []       |
+     dink               |     []                                             |
+     doodle             |         []                             []          |
+     e2fsprogs          |     []                          []                 |
+     enscript           |     []  []             []       []                 |
+     exif               | []  []                          []  [] [] []       |
+     fetchmail          |     []                          []     [] []       |
+     findutils          | []  []  []                []    []     []          |
+     flex               | []  []  []                                         |
+     freedink           | []  []                          []                 |
+     gas                |     []                          []                 |
+     gawk               |     []  []       []             []     () []       |
+     gcal               |     []                                             |
+     gcc                |                                 []                 |
+     gettext-examples   | []  []  []                []    []     [] []       |
+     gettext-runtime    | []  []  []                      []     [] []       |
+     gettext-tools      |     []                          []     [] []       |
+     gip                | []  []  [] []                   []        []       |
+     gjay               | []                                                 |
+     gliv               | []  ()                                             |
+     glunarclock        | []      []                []    []                 |
+     gnubiff            |     ()                          []     ()          |
+     gnucash            | ()  ()           ()       ()           () []       |
+     gnuedu             |     []                                 []          |
+     gnulib             | []  []  []                []           [] []       |
+     gnunet             |                                                    |
+     gnunet-gtk         |     []                                             |
+     gnutls             |     []                                 []          |
+     gold               | []                              []                 |
+     gpe-aerial         | []  []                          []                 |
+     gpe-beam           | []  []                          []        []       |
+     gpe-bluetooth      | []                              []     [] []       |
+     gpe-calendar       | []                                        []       |
+     gpe-clock          | []  []                    []    []        []       |
+     gpe-conf           | []  []                          []        []       |
+     gpe-contacts       | []  []                          []        []       |
+     gpe-edit           | []                              []        []       |
+     gpe-filemanager    | []                        []    []        []       |
+     gpe-go             | []  []                    []    []        []       |
+     gpe-login          | []                              []        []       |
+     gpe-ownerinfo      | []  []                    []    []        []       |
+     gpe-package        | []                              []        []       |
+     gpe-sketchbook     | []  []                          []        []       |
+     gpe-su             | []  []     []             []    []        []       |
+     gpe-taskmanager    | []  []                    []    []        []       |
+     gpe-timesheet      | []  []  []                      []        []       |
+     gpe-today          | []  []  [] []             []    []        []       |
+     gpe-todo           | []                              []        []       |
+     gphoto2            | []  []                    []    []     [] []       |
+     gprof              | []  []  []                      []                 |
+     gpsdrive           |            []                   []     []          |
+     gramadoir          |     []  []                      []                 |
+     grep               | []                                     []          |
+     grub               | []                        []    []     []          |
+     gsasl              | []  []  []                      []     []          |
+     gss                | []  []  []                      []     []          |
+     gst-plugins-bad    | []  []                    []    []     [] []       |
+     gst-plugins-base   | []  []                    []    []     [] []       |
+     gst-plugins-good   | []  []                    []    []     [] []       |
+     gst-plugins-ugly   | []  []                    []    []     [] []       |
+     gstreamer          | []  []                    []    []     []          |
+     gtick              | []  []  []                      []     []          |
+     gtkam              |     []                    []    []     [] []       |
+     gtkorphan          |     []                          []     []          |
+     gtkspell           | []  []  [] []             [] [] []     [] []       |
+     gutenprint         | []  []                    []           []          |
+     hello              | []      []                      []                 |
+     help2man           | []  []                                             |
+     hylafax            |                                 []                 |
+     idutils            | []  []  []                []    []     []          |
+     indent             | []  []  [] []             []    []     [] []       |
+     iso_15924          | []  ()                          []     []          |
+     iso_3166           | []  ()  [] [] [] [] [] [] []    []     [] []       |
+     iso_3166_2         |     ()                    []    []     []          |
+     iso_4217           | []  ()                    []    []     [] []       |
+     iso_639            | []  ()  []    []          []    []     [] []    [] |
+     iso_639_3          |     ()                                 []       [] |
+     jwhois             | []  []                    []    []     []          |
+     kbd                |     []                          []                 |
+     keytouch           | []  []  []                []    []     []          |
+     keytouch-editor    | []      []                []    []     []          |
+     keytouch-keyboa... | []      []                []    []     []          |
+     klavaro            |            []             []                       |
+     latrine            | []                              []     []          |
+     ld                 | []  []  []                      []                 |
+     leafpad            | []  []  []       []       []    []     [] ()       |
+     libc               | []  []     []                   []        []       |
+     libexif            |                                        []          |
+     libextractor       |                                                    |
+     libgnutls          |     []                                 []          |
+     libgpewidget       | []      []                      []        []       |
+     libgpg-error       |     []                                 []          |
+     libgphoto2         |     []                                 [] []       |
+     libgphoto2_port    |     []                                 [] []       |
+     libgsasl           | []  []  []                      []     []          |
+     libiconv           | []  []  []                      []     [] []       |
+     libidn             | []  []                          []     []          |
+     lifelines          |     ()                                             |
+     liferea            |     []                    []           [] []       |
+     lilypond           | []  []                                             |
+     linkdr             | []               []    [] []           []          |
+     lordsawar          |                                                    |
+     lprng              |                                 []                 |
+     lynx               |     []                    []    []     [] []       |
+     m4                 | []  []  [] []                   []        []       |
+     mailfromd          |                                                    |
+     mailutils          |     []                          []                 |
+     make               | []  []  [] []    []    []       []     [] []       |
+     man-db             |                                 []     []          |
+     man-db-manpages    |                                 []                 |
+     minicom            | []  []                    []    []        []       |
+     mkisofs            | []  []                          []     []          |
+     myserver           |                                                    |
+     nano               | []  []  [] []             []           []          |
+     opcodes            | []  []  []                      []                 |
+     parted             |     []                          []     [] []       |
+     pies               |                                                    |
+     popt               | []  []  [] []             []    []  [] [] []       |
+     psmisc             | []  []                          []                 |
+     pspp               |                                                    |
+     pwdutils           |     []                          []                 |
+     radius             |     []                          []                 |
+     recode             | []  []  [] []    []       []    []     []          |
+     rosegarden         | ()  ()                          ()     () ()       |
+     rpm                |                                 []        []       |
+     rush               |                                                    |
+     sarg               |     []                                             |
+     screem             |                                        [] []       |
+     scrollkeeper       | []                        []    []     []          |
+     sed                | []  []  [] []             []    []     [] []       |
+     sharutils          | []  []  []                []    []     [] []       |
+     shishi             |     []                                             |
+     skencil            |     []                                             |
+     solfege            | []  []     []                          []          |
+     solfege-manual     |     []     []                                      |
+     soundtracker       |     []                                 []          |
+     sp                 |     []                                    ()       |
+     sysstat            | []  []                          []     [] []       |
+     tar                | []  []  []                []    []     [] []       |
+     texinfo            |     []                          []     [] []       |
+     tin                |     []                                             |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |     []  []                                         |
+     util-linux-ng      | []  []                    []    []     [] []       |
+     vice               |     ()                    ()           ()          |
+     vmm                |     []                                             |
+     vorbis-tools       |                                 []                 |
+     wastesedge         |     ()                                 ()          |
+     wdiff              | []                                                 |
+     wget               | []  []  []             [] []    []     [] []       |
+     wyslij-po          | []  []                          []                 |
+     xchat              | []  []        []    []    []    []     [] []    [] |
+     xdg-user-dirs      | []  []  [] [] [] [] []    []    []  [] [] []    [] |
+     xkeyboard-config   | []  []                    []    []     []          |
+                        +----------------------------------------------------+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                          105 121 53 20  4  8  3  5 53  2 120  5 84 67  0  4
+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                        +-----------------------------------------------+
+     a2ps               |                               []              |
+     aegis              |                                               |
+     ant-phone          |                                               |
+     anubis             |                               []    []        |
+     aspell             |                         []                    |
+     bash               |                                               |
+     bfd                |                                               |
+     bibshelf           |                []             []              |
+     binutils           |                                               |
+     bison              |                               []              |
+     bison-runtime      |       []    [] []             []    []        |
+     bluez-pin          |    [] []    [] []             []              |
+     bombono-dvd        |                                               |
+     buzztard           |                                               |
+     cflow              |                                               |
+     clisp              |                                               |
+     coreutils          |          []                                   |
+     cpio               |                                               |
+     cppi               |                                               |
+     cpplib             |                                               |
+     cryptsetup         |                                               |
+     dfarc              |                   []                          |
+     dialog             |    []       [] []             []    []        |
+     dico               |                                               |
+     diffutils          |                []             []              |
+     dink               |                                               |
+     doodle             |                                               |
+     e2fsprogs          |                                               |
+     enscript           |                                               |
+     exif               |                []                             |
+     fetchmail          |                                               |
+     findutils          |                                               |
+     flex               |                                               |
+     freedink           |                                     []        |
+     gas                |                                               |
+     gawk               |                                               |
+     gcal               |                                               |
+     gcc                |                                               |
+     gettext-examples   |       []       []             [] []           |
+     gettext-runtime    | []                                            |
+     gettext-tools      | []                                            |
+     gip                |                []             []              |
+     gjay               |                                               |
+     gliv               |                                               |
+     glunarclock        |                []                             |
+     gnubiff            |                                               |
+     gnucash            | ()          ()                      ()     () |
+     gnuedu             |                                               |
+     gnulib             |                                               |
+     gnunet             |                                               |
+     gnunet-gtk         |                                               |
+     gnutls             |                               []              |
+     gold               |                                               |
+     gpe-aerial         |                []                             |
+     gpe-beam           |                []                             |
+     gpe-bluetooth      |                []                []           |
+     gpe-calendar       |                []                             |
+     gpe-clock          | []    []       []             [] []           |
+     gpe-conf           | []             []                             |
+     gpe-contacts       | []             []                             |
+     gpe-edit           |                []                             |
+     gpe-filemanager    | []             []                             |
+     gpe-go             | []             []                []           |
+     gpe-login          |                []                             |
+     gpe-ownerinfo      |                []             []              |
+     gpe-package        | []             []                             |
+     gpe-sketchbook     | []             []                             |
+     gpe-su             | []    []       []             [] [] []        |
+     gpe-taskmanager    | [] [] []       []             [] []           |
+     gpe-timesheet      |                []             []              |
+     gpe-today          |       []       []             [] []           |
+     gpe-todo           |                []                   []        |
+     gphoto2            |                                               |
+     gprof              |                               []              |
+     gpsdrive           |                                               |
+     gramadoir          |                                               |
+     grep               |                                               |
+     grub               |                                               |
+     gsasl              |                                               |
+     gss                |                                               |
+     gst-plugins-bad    |             [] []                [] []        |
+     gst-plugins-base   |             [] []                             |
+     gst-plugins-good   |                []                []           |
+     gst-plugins-ugly   |             [] []             [] [] []        |
+     gstreamer          |                                               |
+     gtick              |                                               |
+     gtkam              |                                     []        |
+     gtkorphan          |                []                      []     |
+     gtkspell           |       []    [] []       []    []    [] []     |
+     gutenprint         |                                               |
+     hello              | []             []             []              |
+     help2man           |                                               |
+     hylafax            |                                               |
+     idutils            |                                               |
+     indent             |                                               |
+     iso_15924          |             [] []                             |
+     iso_3166           | [] []       () [] [] []    []       []        |
+     iso_3166_2         |                                               |
+     iso_4217           |             []                      []        |
+     iso_639            |                      []    []                 |
+     iso_639_3          |                            []                 |
+     jwhois             |                []                             |
+     kbd                |                                               |
+     keytouch           |                []                             |
+     keytouch-editor    |                []                             |
+     keytouch-keyboa... |                []                             |
+     klavaro            |                                     []        |
+     latrine            |                []                             |
+     ld                 |                                               |
+     leafpad            | []          [] []                             |
+     libc               | []                                            |
+     libexif            |                                               |
+     libextractor       |                                               |
+     libgnutls          |                               []              |
+     libgpewidget       |                []             []              |
+     libgpg-error       |                                               |
+     libgphoto2         |                                               |
+     libgphoto2_port    |                                               |
+     libgsasl           |                                               |
+     libiconv           |                                               |
+     libidn             |                                               |
+     lifelines          |                                               |
+     liferea            |                                               |
+     lilypond           |                                               |
+     linkdr             |                                               |
+     lordsawar          |                                               |
+     lprng              |                                               |
+     lynx               |                                               |
+     m4                 |                                               |
+     mailfromd          |                                               |
+     mailutils          |                                               |
+     make               | []                                            |
+     man-db             |                                               |
+     man-db-manpages    |                                               |
+     minicom            |                                     []        |
+     mkisofs            |                                               |
+     myserver           |                                               |
+     nano               |                               []    []        |
+     opcodes            |                                               |
+     parted             |                                               |
+     pies               |                                               |
+     popt               | []             []                   []        |
+     psmisc             |                                               |
+     pspp               |                                               |
+     pwdutils           |                                               |
+     radius             |                                               |
+     recode             |                                               |
+     rosegarden         |                                               |
+     rpm                |                                               |
+     rush               |                                               |
+     sarg               |                                               |
+     screem             |                                               |
+     scrollkeeper       |                                     []     [] |
+     sed                |                                               |
+     sharutils          |                                               |
+     shishi             |                                               |
+     skencil            |                                               |
+     solfege            |                                     []        |
+     solfege-manual     |                                               |
+     soundtracker       |                                               |
+     sp                 |                                               |
+     sysstat            |                []                             |
+     tar                |       []                                      |
+     texinfo            |                                     []        |
+     tin                |                                               |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                                               |
+     util-linux-ng      |                                               |
+     vice               |                                               |
+     vmm                |                                               |
+     vorbis-tools       |                                               |
+     wastesedge         |                                               |
+     wdiff              |                                               |
+     wget               |             []                                |
+     wyslij-po          |                                               |
+     xchat              | []             [] []                          |
+     xdg-user-dirs      | [] []       [] [] []       []       [] []     |
+     xkeyboard-config   | []    []    []                                |
+                        +-----------------------------------------------+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                          20  5 10  1 13 48  4  2  2  4 24 10 20  3   1
+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                        +---------------------------------------------------+
+     a2ps               | []           []     []  []   [] []       []    [] |
+     aegis              | []                      []      []                |
+     ant-phone          |                         []   []                   |
+     anubis             | []           []                 []                |
+     aspell             | []                           [] []    [] []       |
+     bash               | []                                    []          |
+     bfd                |                                 []                |
+     bibshelf           | []  []                                            |
+     binutils           |                                 []    []          |
+     bison              | []           []                 []                |
+     bison-runtime      | []           []     []  []   [] []       []       |
+     bluez-pin          | []           []         []   [] []    [] []    [] |
+     bombono-dvd        |     []                          ()                |
+     buzztard           | []  []                                            |
+     cflow              |              []                                   |
+     clisp              | []                              []                |
+     coreutils          | []           []     []  []      []       []       |
+     cpio               | []           []                 []                |
+     cppi               |              []                                   |
+     cpplib             | []                                                |
+     cryptsetup         | []                                                |
+     dfarc              |              []                                   |
+     dialog             | []           []         []      []                |
+     dico               |              []                                   |
+     diffutils          | []           []         []   [] []             [] |
+     dink               | ()                                                |
+     doodle             | []                                          []    |
+     e2fsprogs          | []           []                                   |
+     enscript           | []                      []   [] []       []       |
+     exif               | []           []              [] ()    []          |
+     fetchmail          | []           []                 []          []    |
+     findutils          | []           []     []          []       []       |
+     flex               | []           []         []   [] []                |
+     freedink           | []           []                                   |
+     gas                |                                                   |
+     gawk               | []           []         []   []                   |
+     gcal               |                                                   |
+     gcc                |                                                [] |
+     gettext-examples   | []           []     []       [] []    [] []    [] |
+     gettext-runtime    | []  []       []     []       [] []    [] []    [] |
+     gettext-tools      |              []              [] []    [] []    [] |
+     gip                | []           []                 []    []       [] |
+     gjay               |                                                   |
+     gliv               | []           []         []   [] []    []          |
+     glunarclock        | []                      []   []       []       [] |
+     gnubiff            | []                           ()                   |
+     gnucash            | []           ()         ()      ()                |
+     gnuedu             | []                                                |
+     gnulib             | []           []                 []       []       |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gnutls             | []           []                                   |
+     gold               |                                                   |
+     gpe-aerial         | []                  []  []   [] []       []    [] |
+     gpe-beam           | []                  []  []   [] []       []    [] |
+     gpe-bluetooth      | []                      []                        |
+     gpe-calendar       |                         []      []       []    [] |
+     gpe-clock          | []                  []  []   [] []    [] []    [] |
+     gpe-conf           | []                  []  []   [] []    [] []       |
+     gpe-contacts       |                         []   [] []       []    [] |
+     gpe-edit           | []           []                          []       |
+     gpe-filemanager    | []                              []       []       |
+     gpe-go             | []           []         []   [] []    [] []    [] |
+     gpe-login          | []                      []                        |
+     gpe-ownerinfo      | []                  []  []   [] []    [] []    [] |
+     gpe-package        | []                                       []       |
+     gpe-sketchbook     | []                  []  []   [] []       []    [] |
+     gpe-su             | []                  []  []   [] []    [] []    [] |
+     gpe-taskmanager    | []                  []  []   [] []    [] []    [] |
+     gpe-timesheet      | []                  []  []   [] []    [] []    [] |
+     gpe-today          | []                  []  []   [] []    [] []    [] |
+     gpe-todo           | []                      []      []       []    [] |
+     gphoto2            | []        [] []         []   [] []    []       [] |
+     gprof              | []                      []   []                   |
+     gpsdrive           | []                              []                |
+     gramadoir          | []                                    []          |
+     grep               | []           []                 []    []          |
+     grub               | []           []                 []                |
+     gsasl              | []           []                       []       [] |
+     gss                |              []              []       []          |
+     gst-plugins-bad    | []           []         []      []    []    []    |
+     gst-plugins-base   | []           []         []      []    []          |
+     gst-plugins-good   | []           []         []      []    []          |
+     gst-plugins-ugly   | []           []         []      []    [] []       |
+     gstreamer          | []           []         []      []    []          |
+     gtick              | []                              []    []          |
+     gtkam              | []        [] []         []      []    []          |
+     gtkorphan          | []                                                |
+     gtkspell           | []           []     []  []   [] []    [] [] [] [] |
+     gutenprint         | []                              []                |
+     hello              | []           []                       [] []       |
+     help2man           |              []                 []                |
+     hylafax            | []                                                |
+     idutils            | []           []         []   [] []                |
+     indent             | []           []         []   [] []    []       [] |
+     iso_15924          | []           []                 []       []       |
+     iso_3166           | []  [] [] [] []     ()  []   [] [] [] [] [] [] [] |
+     iso_3166_2         | []           []                          []       |
+     iso_4217           | []  []       []     []          [] []    []    [] |
+     iso_639            | []     [] [] []                 [] [] [] []    [] |
+     iso_639_3          |        [] []                                      |
+     jwhois             | []           []         []   []                   |
+     kbd                | []           []              []                   |
+     keytouch           | []           []                       []          |
+     keytouch-editor    | []           []                       []          |
+     keytouch-keyboa... | []           []                       []          |
+     klavaro            | []                      []                        |
+     latrine            |              []                 []                |
+     ld                 |                                                   |
+     leafpad            | []  []       []     []  []      []    [] []    [] |
+     libc               | []           []                 []    []          |
+     libexif            | []           []         ()            []          |
+     libextractor       |                                                   |
+     libgnutls          | []           []                                   |
+     libgpewidget       | []           []                          []       |
+     libgpg-error       |              []              []                   |
+     libgphoto2         | []           []                                   |
+     libgphoto2_port    | []           []         []      []    []          |
+     libgsasl           | []           []              []       []       [] |
+     libiconv           | []           []                       [] []    [] |
+     libidn             | []           []                                   |
+     lifelines          | []           []                                   |
+     liferea            | []           []     []  []   [] ()    ()    []    |
+     lilypond           | []                                                |
+     linkdr             | []                  []          []                |
+     lordsawar          |                                                   |
+     lprng              |              []                                   |
+     lynx               | []                      []      []                |
+     m4                 | []           []         []   [] []                |
+     mailfromd          |              []                                   |
+     mailutils          |              []                                   |
+     make               | []           []         []      []                |
+     man-db             | []           []                 []                |
+     man-db-manpages    | []           []                 []                |
+     minicom            |              []         []   [] []                |
+     mkisofs            | []           []                 []                |
+     myserver           |                                                   |
+     nano               | []           []         []      []                |
+     opcodes            | []                           []                   |
+     parted             | []           []                 []    []          |
+     pies               |              []                                   |
+     popt               | []           []     []          []                |
+     psmisc             | []           []                 []                |
+     pspp               | []                      []                        |
+     pwdutils           |              []                                   |
+     radius             | []           []                 []                |
+     recode             | []           []     []  []   [] []    [] []       |
+     rosegarden         |              ()                 ()                |
+     rpm                | []           []     []                            |
+     rush               | []           []                                   |
+     sarg               |                                                   |
+     screem             |                                                   |
+     scrollkeeper       | []  []       []              [] []    []    [] [] |
+     sed                | []           []     []  []   [] []    [] []    [] |
+     sharutils          | []           []                 []             [] |
+     shishi             |              []                                   |
+     skencil            |                     []  []                        |
+     solfege            | []           []         []      []                |
+     solfege-manual     | []           []         []                        |
+     soundtracker       |                                       []          |
+     sp                 |                                                   |
+     sysstat            | []           []         []      []                |
+     tar                | []           []                 []       []       |
+     texinfo            | []           []              [] []                |
+     tin                |                                 []                |
+     unicode-han-tra... |                                                   |
+     unicode-transla... |                                                   |
+     util-linux-ng      | []           []         []      []       []       |
+     vice               | []                                                |
+     vmm                | []                                                |
+     vorbis-tools       | []           []                                   |
+     wastesedge         | []                                                |
+     wdiff              | []           []                                   |
+     wget               | []           []     []  []      []    [] []       |
+     wyslij-po          | []  []       []                                   |
+     xchat              | []        [] []     []          []    [] [] [] [] |
+     xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
+     xkeyboard-config   | []           []                 []                |
+                        +---------------------------------------------------+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                          135 10  4  7 105  1 29  62   47 91  3 54 46  9 37
 
-                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                          sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
                         +---------------------------------------------------+
-     GNUnet             |                    []                             |  2
-     a2ps               |          [] []     []                             | 19
-     aegis              |                                                   |  0
-     ant-phone          |          []        []                             |  6
-     anubis             |          [] []     []                             | 11
-     ap-utils           |             ()     []                             |  4
-     aspell             |             []     []  []                         | 14
-     bash               |                    []                             | 11
-     batchelor          |          []        []                             |  9
-     bfd                |                                                   |  1
-     bibshelf           |                    []                             |  7
-     binutils           |          []        []                     []      |  9
-     bison              |          []        []                     []      | 19
-     bison-runtime      |                    []         []          []      | 16
-     bluez-pin          |          [] []     []  []     []          []      | 28
-     cflow              |             []     []                             |  4
-     clisp              |                                                   |  6
-     console-tools      |          []        []                             |  5
-     coreutils          |          []        []                             | 17
-     cpio               |          [] []     []                             |  9
-     cpplib             |          []        []         []          []      | 11
-     cryptonit          |                                                   |  5
-     darkstat           |                    []         ()          ()      | 15
-     dialog             |          [] []     []         []          []      | 30
-     diffutils          |          []        []         []          []      | 28
-     doodle             |                    []                             |  6
-     e2fsprogs          |          []        []                             | 10
-     enscript           |          [] []     []                             | 16
-     error              |          []        []         []          []      | 18
-     fetchmail          |          []        []                             | 12
-     fileutils          |          []                   []          []      | 18
-     findutils          |          []        []                     []      | 17
-     flex               |          []        []                             | 15
-     fslint             |                    []                             |  9
-     gas                |          []                                       |  3
-     gawk               |          []        []                             | 15
-     gbiff              |                    []                             |  5
-     gcal               |          []                                       |  5
-     gcc                |          []                   []          []      |  6
-     gettext-examples   |          [] []     []         []    []    []      | 26
-     gettext-runtime    |          [] []     []         []    []    []      | 28
-     gettext-tools      |          [] []     []         []          []      | 19
-     gimp-print         |             []     []                             | 12
-     gip                |                    []                     []      | 12
-     gliv               |          []        []                             |  8
-     glunarclock        |                    []  []                 []      | 15
-     gmult              |          []        []         []          []      | 15
-     gnubiff            |                    []                             |  1
-     gnucash            |          ()                                       |  2
-     gnucash-glossary   |                    []                     []      |  9
-     gnuedu             |                    []                             |  2
-     gnulib             |          [] []     []         []          []      | 28
-     gnunet-gtk         |                                                   |  1
-     gnutls             |                                                   |  2
-     gpe-aerial         |                    []         []                  | 14
-     gpe-beam           |                    []         []                  | 14
-     gpe-calendar       |                    []  []     []          []      | 19
-     gpe-clock          |          []        []  []     []                  | 20
-     gpe-conf           |                    []         []                  | 14
-     gpe-contacts       |                    []         []                  | 10
-     gpe-edit           |          []        []  []                 []      | 19
-     gpe-filemanager    |                    []                             |  5
-     gpe-go             |          []        []                             | 14
-     gpe-login          |          []        []  []     []          []      | 20
-     gpe-ownerinfo      |          []        []         []          []      | 20
-     gpe-package        |                    []                             |  5
-     gpe-sketchbook     |          []        []                             | 16
-     gpe-su             |          []        []         []                  | 19
-     gpe-taskmanager    |          []        []         []                  | 19
-     gpe-timesheet      |          []        []         []          []      | 18
-     gpe-today          |          []        []  []     []          []      | 20
-     gpe-todo           |                    []                             |  6
-     gphoto2            |             []     []         []          []      | 20
-     gprof              |          []        []                             | 11
-     gpsdrive           |                                                   |  4
-     gramadoir          |                    []                             |  7
-     grep               |          [] []     []                     []      | 33
-     gretl              |                                                   |  4
-     gsasl              |                    []         []                  |  6
-     gss                |                    []                             |  5
-     gst-plugins        |             []     []                     []      | 15
-     gst-plugins-base   |             []     []         []                  |  9
-     gst-plugins-good   |             []     []         []                  | 18
-     gstreamer          |          [] []     []                             | 17
-     gtick              |                    []                             | 11
-     gtkam              |                    []                             | 13
-     gtkorphan          |                    []                             |  7
-     gtkspell           |             []     []  []     []    []    []      | 26
-     gutenprint         |                                                   |  3
-     hello              |          [] []     []         []          []      | 39
-     id-utils           |          []        []                             | 14
-     impost             |                    []                             |  4
-     indent             |          []        []         []          []      | 25
-     iso_3166           |       [] []        []                             | 15
-     iso_3166_1         |          []            []                         | 20
-     iso_3166_2         |                                                   |  2
-     iso_3166_3         |                        []     []                  |  9
-     iso_4217           |          []        []                             | 14
-     iso_639            |                    []                             | 14
-     jpilot             |          [] []     []         []                  |  7
-     jtag               |                    []                             |  3
-     jwhois             |          []        []                     []      | 13
-     kbd                |          []        []                             | 12
-     keytouch           |                    []                             |  4
-     keytouch-editor    |                                                   |  2
-     keytouch-keyboa... |                                                   |  2
-     latrine            |          []        []                             |  8
-     ld                 |          []        []         []          []      |  8
-     leafpad            |          []        []         []          []      | 23
-     libc               |          []                   []          []      | 23
-     libexif            |                    []                             |  4
-     libextractor       |                    []                             |  5
-     libgpewidget       |                    []  []     []                  | 19
-     libgpg-error       |                    []                             |  4
-     libgphoto2         |             []                                    |  8
-     libgphoto2_port    |             []     []                     []      | 11
-     libgsasl           |                    []                             |  8
-     libiconv           |                    []                             |  4
-     libidn             |                    []         []                  | 10
-     lifelines          |                                                   |  4
-     lilypond           |                                                   |  2
-     lingoteach         |                    []                             |  6
-     lynx               |          [] []     []                             | 15
-     m4                 |                    []         []          []      | 18
-     mailutils          |             []                                    |  8
-     make               |          []        []         []                  | 20
-     man-db             |                    []                             |  6
-     minicom            |                    []                             | 14
-     mysecretdiary      |          []        []                             | 12
-     nano               |                    []                     []      | 15
-     nano_1_0           |          [] []     []                             | 18
-     opcodes            |          []        []                             | 10
-     parted             |          [] []                            []      | 10
-     pilot-qof          |                    []                             |  3
-     psmisc             |                    []                             | 10
-     pwdutils           |                    []                             |  3
-     python             |                                                   |  0
-     qof                |                    []                             |  2
-     radius             |             []                                    |  6
-     recode             |          []        []         []                  | 25
-     rpm                |          [] []     []                     []      | 14
-     screem             |                    []                             |  2
-     scrollkeeper       |          [] []     []                     []      | 26
-     sed                |          []        []                     []      | 22
-     sh-utils           |          []                                       | 15
-     shared-mime-info   |             []     []         []          []      | 23
-     sharutils          |          []        []                     []      | 23
-     shishi             |                                                   |  1
-     silky              |                    []                             |  4
-     skencil            |                    []                             |  7
-     sketch             |                                                   |  6
-     solfege            |                                                   |  2
-     soundtracker       |          []        []                             |  9
-     sp                 |          []                                       |  3
-     stardict           |             []     []         []          []      | 11
-     system-tools-ba... |    []    [] []     []     []  []          []      | 37
-     tar                |          [] []     []                     []      | 19
-     texinfo            |          []        []         []                  | 15
-     textutils          |          []                   []          []      | 17
-     tin                |                                                   |  1
-     tp-robot           |                    []         []          []      | 10
-     tuxpaint           |                    []  []                 []      | 16
+     a2ps               | []              [] [] [] []                       | 27
+     aegis              |                          []                       |  9
+     ant-phone          | []                 []    []      []               |  9
+     anubis             | []                 [] [] []                       | 15
+     aspell             |                       [] []  []                   | 20
+     bash               | []                    [] []                       | 12
+     bfd                |                          []                       |  6
+     bibshelf           | []                       []      []               | 16
+     binutils           |                       [] []                       |  8
+     bison              | []                       []                       | 12
+     bison-runtime      | []              []    [] []      []          []   | 29
+     bluez-pin          | []              [] [] [] []  []  []          []   | 37
+     bombono-dvd        |                          []                       |  4
+     buzztard           |                          []                       |  7
+     cflow              |                       [] []      []               |  9
+     clisp              |                                                   | 10
+     coreutils          | []                    [] []      []               | 22
+     cpio               | []                 [] [] []      []          []   | 13
+     cppi               |                       [] []                       |  5
+     cpplib             | []                 [] [] []      []          []   | 14
+     cryptsetup         | []                       []                       |  7
+     dfarc              |                          []                       |  9
+     dialog             | []  []          []       []  []  []          []   | 30
+     dico               |                       []                          |  2
+     diffutils          | []                 [] [] []      []          []   | 30
+     dink               |                                                   |  4
+     doodle             | []                       []                       |  7
+     e2fsprogs          | []                 []    []                       | 11
+     enscript           | []                 [] [] []                       | 17
+     exif               | []                       []      []               | 16
+     fetchmail          |                    []    []      []               | 17
+     findutils          | []                 [] [] []      []               | 20
+     flex               | []                 []    []                  []   | 15
+     freedink           |                          []                       | 10
+     gas                |                    []                             |  4
+     gawk               | []                 []    []      []               | 18
+     gcal               | []                 []                             |  5
+     gcc                | []                 []            []               |  7
+     gettext-examples   | []                 [] [] []      []    []    []   | 34
+     gettext-runtime    | []                 [] [] []      []    []    []   | 29
+     gettext-tools      | []                 [] [] []      []          []   | 22
+     gip                | []                       []      []          []   | 22
+     gjay               |                          []                       |  3
+     gliv               | []                 []    []                       | 14
+     glunarclock        | []                       []  []  []          []   | 19
+     gnubiff            | []                       []                       |  4
+     gnucash            |                    () [] ()      []          ()   | 10
+     gnuedu             |                          []                  []   |  7
+     gnulib             | []                    [] []      []               | 16
+     gnunet             |                          []                       |  1
+     gnunet-gtk         | []                 []    []                       |  5
+     gnutls             | []                       []      []               | 10
+     gold               |                          []                       |  4
+     gpe-aerial         | []                       []      []               | 18
+     gpe-beam           | []                       []      []               | 19
+     gpe-bluetooth      | []                       []      []               | 13
+     gpe-calendar       | []                       []  []  []               | 12
+     gpe-clock          | []                 []    []  []  []               | 28
+     gpe-conf           | []                       []  []  []               | 20
+     gpe-contacts       | []                       []      []               | 17
+     gpe-edit           | []                       []      []               | 12
+     gpe-filemanager    | []                       []  []  []               | 16
+     gpe-go             | []                 []    []  []  []               | 25
+     gpe-login          | []                       []      []               | 11
+     gpe-ownerinfo      | []                 []    []      []          []   | 25
+     gpe-package        | []                       []      []               | 13
+     gpe-sketchbook     | []                       []      []               | 20
+     gpe-su             | []                 []    []  []  []               | 30
+     gpe-taskmanager    | []                 []    []  []  []               | 29
+     gpe-timesheet      | []                 []    []      []          []   | 25
+     gpe-today          | []                 []    []  []  []          []   | 30
+     gpe-todo           | []                       []  []  []               | 17
+     gphoto2            | []                    [] []      []          []   | 24
+     gprof              | []                 []    []                       | 15
+     gpsdrive           | []                       []      []               | 11
+     gramadoir          | []                       []      []               | 11
+     grep               |                 []       []      []               | 10
+     grub               | []                       []      []               | 14
+     gsasl              | []                       []      []          []   | 14
+     gss                | []                       []      []               | 11
+     gst-plugins-bad    | []                 []    []      []               | 26
+     gst-plugins-base   | []                 [] [] []      []               | 24
+     gst-plugins-good   | []                 []    []      []               | 24
+     gst-plugins-ugly   | []                 [] [] []      []               | 29
+     gstreamer          | []                    [] []      []               | 22
+     gtick              |                       [] []      []               | 13
+     gtkam              | []                       []      []               | 20
+     gtkorphan          | []                       []      []               | 14
+     gtkspell           | []              [] [] [] []  []  []    []    []   | 45
+     gutenprint         | []                                                | 10
+     hello              | []              [] []    []      []          []   | 21
+     help2man           | []                       []                       |  7
+     hylafax            |                          []                       |  5
+     idutils            | []                 []    []      []               | 17
+     indent             | []                 [] [] []      []          []   | 30
+     iso_15924          |                 ()    [] ()      []          []   | 16
+     iso_3166           | []        []    () [] [] ()  []  []    []    ()   | 53
+     iso_3166_2         |                 ()    [] ()      []               |  9
+     iso_4217           | []              () [] [] ()      []    []         | 26
+     iso_639            | []     [] []    ()    [] ()  []  []    []    []   | 38
+     iso_639_3          |        []                ()                       |  8
+     jwhois             | []                 []    []      []          []   | 16
+     kbd                | []                 [] [] []      []               | 15
+     keytouch           | []                       []      []               | 16
+     keytouch-editor    | []                       []      []               | 14
+     keytouch-keyboa... | []                       []      []               | 14
+     klavaro            |                          []                       | 11
+     latrine            |                    []    []      []               | 10
+     ld                 | []                 []    []                  []   | 11
+     leafpad            | []                 [] [] []      []          []   | 33
+     libc               | []                 []    []      []          []   | 21
+     libexif            |                          []      ()               |  7
+     libextractor       |                          []                       |  1
+     libgnutls          | []                       []      []               |  9
+     libgpewidget       | []                       []      []               | 14
+     libgpg-error       | []                       []      []               |  9
+     libgphoto2         |                       [] []                       |  8
+     libgphoto2_port    | []                    [] []                  []   | 14
+     libgsasl           | []                       []      []               | 13
+     libiconv           | []                       []  []  []               | 21
+     libidn             | ()                       []      []               | 11
+     lifelines          | []                                                |  4
+     liferea            | []                 []            []               | 21
+     lilypond           |                          []                       |  7
+     linkdr             | []                 []    []      []          []   | 17
+     lordsawar          |                                                   |  1
+     lprng              |                          []                       |  3
+     lynx               | []                 [] [] []                       | 17
+     m4                 | []                       []      []          []   | 19
+     mailfromd          |                       [] []                       |  3
+     mailutils          |                          []                       |  5
+     make               | []                 []    []      []               | 21
+     man-db             | []                       []      []               |  8
+     man-db-manpages    |                                                   |  4
+     minicom            | []                       []                       | 16
+     mkisofs            |                          []      []               |  9
+     myserver           |                                                   |  0
+     nano               | []                       []      []          []   | 21
+     opcodes            | []                 []    []                       | 11
+     parted             | []                 [] [] []                  []   | 15
+     pies               |                       [] []                       |  3
+     popt               | []              [] []    []      []          []   | 27
+     psmisc             | []                       []                       | 11
+     pspp               |                                                   |  4
+     pwdutils           | []                       []                       |  6
+     radius             |                       [] []                       |  9
+     recode             | []                 []    []      []               | 28
+     rosegarden         | ()                                                |  0
+     rpm                | []                       []                  []   | 11
+     rush               |                       [] []                       |  4
+     sarg               |                                                   |  1
+     screem             |                          []                       |  3
+     scrollkeeper       | []                 [] [] []                  []   | 27
+     sed                | []                 []    []      []          []   | 30
+     sharutils          | []                 []    []      []          []   | 22
+     shishi             |                          []                       |  3
+     skencil            | []                       []                       |  7
+     solfege            | []                 []    []      []               | 16
+     solfege-manual     |                    []                             |  8
+     soundtracker       | []                 []    []                       |  9
+     sp                 |                    []                             |  3
+     sysstat            |                          []      []               | 15
+     tar                | []                 [] [] []      []          []   | 23
+     texinfo            | []                 [] [] []      []               | 17
+     tin                |                                                   |  4
      unicode-han-tra... |                                                   |  0
      unicode-transla... |                                                   |  2
-     util-linux         |          [] []     []                             | 20
-     vorbis-tools       |             []     []                             | 11
-     wastesedge         |                                                   |  1
-     wdiff              |          []        []                             | 22
-     wget               |          []        []                     []      | 19
-     xchat              |             []     []         []          []      | 28
-     xkeyboard-config   |          [] []     []                     []      | 11
-     xpad               |                    []         []          []      | 14
+     util-linux-ng      | []                 [] [] []                       | 20
+     vice               | ()                 ()                             |  1
+     vmm                |                          []                       |  4
+     vorbis-tools       |                          []                       |  6
+     wastesedge         |                                                   |  2
+     wdiff              | []                       []                       |  7
+     wget               | []                 []    []      []          []   | 26
+     wyslij-po          |                       [] []                       |  8
+     xchat              | []              []    [] []      []          []   | 36
+     xdg-user-dirs      | []     [] []    [] [] [] []      []    []    []   | 63
+     xkeyboard-config   | []                    [] []                       | 22
                         +---------------------------------------------------+
-       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
-      172 domains          0  1  1 78 39  0  135 13  1  50     3    54    0  2054
+       85 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+      178 domains         119  1  3  3  0 10 65 51 155 17  98     7    41    2618
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -1085,12 +1256,12 @@
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If July 2006 seems to be old, you may fetch a more recent copy of
+   If June 2010 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+`http://translationproject.org/extra/matrix.html'.
 
-1.6 Using `gettext' in new packages
+1.5 Using `gettext' in new packages
 ===================================
 
 If you are writing a freely available program and want to
@@ -1106,6 +1277,6 @@
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
+`coordinator@translationproject.org' to make the `.pot' files available
+to the translation teams.

gmerlin-1.2.0.tar.gz/ChangeLog -> gmerlin-4256.tar.gz/ChangeLog Changed

gmerlin-1.2.0.tar.gz/Makefile.am -> gmerlin-4256.tar.gz/Makefile.am Changed

gmerlin-4256.tar.gz/README.gavftools Added

@@ -0,0 +1,98 @@
+1. Introduction
+
+In apps/gavftools, there is a bunch of commandline programs I wrote
+for making my everyday multimedia work much easier. They allow to
+build quite complex processing pipelines from the commandline.
+
+The basis is the gavf multimedia format, which can contain audio, video
+as well as text- and graphical subtitles. A/V data can be either
+uncompressed or compressed in a large number of formats. In some cases,
+especially for uncompresed video, the video frames are passed as shared memory
+segments between the processes.
+
+All programs are prefixed by gavf-. All programs can be called with the -help
+argument to show commandline options.
+
+2. Simple examples
+
+Read a media file and convert it to the gavf format:
+
+gavf-decode -i file.avi -o file.gavf
+
+or:
+
+gavf-decode -i file.avi > file.gavf
+
+Play a media file:
+
+gavf-decode -i file.avi | gavf-play
+
+3. I/O variants
+
+Playing a media file can happen in many ways. Instead of
+
+gavf-decode -i file.avi | gavf-play
+
+You can use a unix-domain socket:
+
+gavf-decode -i file.avi -o unixserv://socket &
+gavf-play -i unix://socket
+
+Or a fifo:
+
+mkfifo fifo
+gavf-decode -i file.avi -o fifo &
+gavf-play -i fifo
+
+Or a TCP socket:
+
+gavf-decode -i file.avi -o httpserv://192.128.100.1:8888 &
+gavf-play -i http://192.128.100.1:8888
+
+Naturally in the last example the decode and playback commands can run
+on different machines.
+
+Shared memory segments are always used if the maximum packet size is known
+in advance and the receiver is a process (i.e. not a file) running on the same
+machine.
+
+4. Other commands
+
+Recompress the the audio stream to 320 kbps mp3. This can also be used to recompress
+audio and video simultaneously:
+
+... | gavf-recompress -ac 'codec=c_lame{cbr_bitrate=320}' | ....
+
+Split audio- and video stream into separate files:
+
+... | gavf-demux -oa audio.gavf -ov video.gavf
+
+Multiplex separate streams:
+
+gavf-mux -i audio.gavf -i video.gavf | ....
+
+Display info about the stream (don't do anything else)
+
+... | gavf-info
+
+Split a stream for multiple receivers (can also use more than 2 -o options):
+
+... | gavf-tee -o saved_file.gavf -o "|gavf-play"
+
+Record a stream from your webcam and from your soundcard
+(replace pulseaudio_device with something meaningful):
+
+gavf-record -vid 'plugin=i_v4l2{device=/dev/video0}' -aud 'plugin=i_pulse{dev=pulseaudio_device}' | ...
+
+Convert an audio-only stream to mp3. If the audio compression is mp3 already,
+it is written as it is, else it is encoded with 320 kbps:
+
+... | gavf-encode -enc "a2v=0:ae=e_lame" -ac cbr_bitrate=320 -o file.mp3
+
+Flip video images vertically:
+
+... | gavf-filter -vf 'f={fv_flip{flip_v=1}}' | ....
+
+Can also be used for adding audio filters with the -af option. Filters can also be chained.
+
+

gmerlin-1.2.0.tar.gz/acinclude.m4 -> gmerlin-4256.tar.gz/acinclude.m4 Changed

gmerlin-1.2.0.tar.gz/apps/Makefile.am -> gmerlin-4256.tar.gz/apps/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/Makefile.am -> gmerlin-4256.tar.gz/apps/alsamixer/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/alsamixer.h -> gmerlin-4256.tar.gz/apps/alsamixer/alsamixer.h Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/card.c -> gmerlin-4256.tar.gz/apps/alsamixer/card.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -64,7 +64,7 @@
   c->groups = realloc(c->groups, c->num_groups * sizeof(*(c->groups)));
   memset(c->groups + (c->num_groups-1), 0, sizeof(*(c->groups)));
   c->groups[c->num_groups-1].label =
-    bg_strdup(c->groups[c->num_groups-1].label, label);
+    gavl_strrep(c->groups[c->num_groups-1].label, label);
   return &c->groups[c->num_groups-1];
   }
 
@@ -135,7 +135,7 @@
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "snd_ctl_card_info failed");
     goto fail;
     }
-  card->name = bg_strdup(card->name,
+  card->name = gavl_strrep(card->name,
                          snd_ctl_card_info_get_mixername(card_info));
   
   hctl_elem = snd_hctl_first_elem(card->hctl);
@@ -219,20 +219,20 @@
       label = NULL;
       for(i = 0; i < num_strings; i++)
         {
-        label = bg_strcat(label, strings[i]);
+        label = gavl_strcat(label, strings[i]);
         if(i < num_strings - 1)
           {
-          label = bg_strcat(label, " ");
+          label = gavl_strcat(label, " ");
           }
         }
       }
     else if(is_capture && (is_volume || is_switch))
       {
-      label = bg_strdup(NULL, TR("Capture"));
+      label = gavl_strdup(TR("Capture"));
       }
     else
       {
-      label = bg_strdup(NULL, TR("Unknown"));
+      label = gavl_strdup(TR("Unknown"));
       }
     
     if(elem_index > 0)

gmerlin-1.2.0.tar.gz/apps/alsamixer/g_card.c -> gmerlin-4256.tar.gz/apps/alsamixer/g_card.c Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/g_control.c -> gmerlin-4256.tar.gz/apps/alsamixer/g_control.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -518,8 +518,7 @@
 
         ret->popdown_strings =
           g_list_append(ret->popdown_strings,
-                        bg_strdup(NULL,
-                                  snd_ctl_elem_info_get_item_name(info)));
+                        gavl_strdup(snd_ctl_elem_info_get_item_name(info)));
         }
 #endif
       for(i = 0; i < ret->num; i++)
@@ -860,7 +859,7 @@
 
   row = 0;
   
-  w->label = bg_strdup(w->label, TR("Tone"));
+  w->label = gavl_strrep(w->label, TR("Tone"));
   label = gtk_label_new(w->label);
   gtk_widget_show(label);
   gtk_table_attach(GTK_TABLE(w->w), label, 0, num_cols, row, row+1,
@@ -998,7 +997,7 @@
   
   w->w = gtk_table_new(4, capture_width + playback_width, 0);
 
-  w->label = bg_strdup(w->label, c->label);
+  w->label = gavl_strrep(w->label, c->label);
   label = gtk_label_new(w->label);
   gtk_widget_show(label);
   gtk_table_attach(GTK_TABLE(w->w), label, 0,
@@ -1175,7 +1174,7 @@
   w->w = gtk_table_new(2, w->priv.integer.sliders.num,
                        0);
 
-  w->label = bg_strdup(w->label, c->label);
+  w->label = gavl_strrep(w->label, c->label);
   label = gtk_label_new(w->label);
   
   gtk_widget_show(label);
@@ -1205,7 +1204,7 @@
   w->w = gtk_table_new(w->priv.bool.buttons.num + 1,
                        1, 0);
 
-  w->label = bg_strdup(w->label, c->label);
+  w->label = gavl_strrep(w->label, c->label);
   label = gtk_label_new(w->label);
   gtk_widget_show(label);
   gtk_table_attach(GTK_TABLE(w->w), label, 0, 1, 0, 1,
@@ -1235,7 +1234,7 @@
   w->w = gtk_table_new(w->priv.enumerated.combos.num + 1,
                        1, 0);
 
-  w->label = bg_strdup(w->label, c->label);
+  w->label = gavl_strrep(w->label, c->label);
   label = gtk_label_new(w->label);
   gtk_widget_show(label);
   gtk_table_attach(GTK_TABLE(w->w), label, 0, 1, 0, 1,

gmerlin-1.2.0.tar.gz/apps/alsamixer/g_mixer.c -> gmerlin-4256.tar.gz/apps/alsamixer/g_mixer.c Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/gui.h -> gmerlin-4256.tar.gz/apps/alsamixer/gui.h Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/main.c -> gmerlin-4256.tar.gz/apps/alsamixer/main.c Changed

gmerlin-1.2.0.tar.gz/apps/alsamixer/mixer.c -> gmerlin-4256.tar.gz/apps/alsamixer/mixer.c Changed

gmerlin-4256.tar.gz/apps/camelot Added

gmerlin-4256.tar.gz/apps/camelot/Makefile.am Added

gmerlin-4256.tar.gz/apps/camelot/gmerlin-camelot.desktop Added

gmerlin-4256.tar.gz/apps/camelot/main.c Added

@@ -0,0 +1,88 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gtk/gtk.h>
+#include <gmerlin/utils.h>
+#include <stdlib.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/pluginregistry.h>
+#include <gui_gtk/gtkutils.h>
+
+
+#include "webcam.h"
+#include "webcam_window.h"
+
+int main(int argc, char ** argv)
+  {
+  gmerlin_webcam_t * w;
+  gmerlin_webcam_window_t * ww;
+  bg_cfg_registry_t    * cfg_reg;
+  bg_plugin_registry_t * plugin_reg;
+  char * tmp_path;
+  bg_cfg_section_t     * section;
+  
+  /* Create config registry */
+  
+  cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("camelot", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+  
+  /* Create plugin registry */
+  
+  section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(section);
+  
+  bg_gtk_init(&argc, &argv, WINDOW_ICON, WINDOW_NAME, WINDOW_CLASS);
+  
+  w = gmerlin_webcam_create(plugin_reg);
+
+  section = bg_cfg_registry_find_section(cfg_reg, "general");
+  
+  ww = gmerlin_webcam_window_create(w, plugin_reg, cfg_reg);
+
+  /* Get config values */
+  
+  gmerlin_webcam_run(w);
+  
+  gmerlin_webcam_window_show(ww);
+  gtk_main();
+  
+  gmerlin_webcam_quit(w);
+
+  gmerlin_webcam_window_destroy(ww);
+  gmerlin_webcam_destroy(w);
+
+  tmp_path =  bg_search_file_write("camelot", "config.xml");
+  
+  if(tmp_path)
+    {
+    bg_cfg_registry_save(cfg_reg, tmp_path);
+    free(tmp_path);
+    }
+  bg_plugin_registry_destroy(plugin_reg);
+  bg_cfg_registry_destroy(cfg_reg);
+  
+
+  return 0;
+  }
+

gmerlin-4256.tar.gz/apps/camelot/vloopback.c Added

@@ -0,0 +1,914 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <poll.h>
+#include <errno.h>
+#include <pthread.h>
+#include <sys/signal.h>
+#include <string.h>
+
+#include <gavl/gavl.h>
+#include <linux/videodev.h>
+
+#include <gmerlin/translation.h>
+#include <gmerlin/utils.h>
+
+#include <gmerlin/parameter.h>
+#include "vloopback.h"
+
+#include <gmerlin/log.h>
+
+#define LOG_DOMAIN "vloopback"
+
+#define VIDIOCSINVALID _IO('v',BASE_VIDIOCPRIVATE+1)
+
+#define MAX_WIDTH 640
+#define MAX_HEIGHT 480
+#define MIN_WIDTH 32
+#define MIN_HEIGHT 32
+
+#define MAXIOCTL 1024
+
+#define MAX_FRAMESIZE (MAX_WIDTH*MAX_HEIGHT*4)
+#define NUM_FRAMES 2
+
+#define DUMP_IOCTLS
+
+#define MODE_WRITE 0
+#define MODE_IOCTL 1
+
+static void put_frame_ioctl(bg_vloopback_t * v, gavl_video_frame_t * frame);
+static void put_frame_write(bg_vloopback_t * v, gavl_video_frame_t * frame);
+
+
+struct bg_vloopback_s
+  {
+  int mode;
+  int fd;
+  gavl_video_converter_t * cnv;
+  uint8_t * mmap;
+  int mmap_len;
+
+  gavl_video_format_t input_format;
+  gavl_video_format_t output_format;
+
+  /* write() */
+  gavl_video_format_t write_format;
+  int write_width;
+  int write_height;
+  int write_size_custom;
+  gavl_video_frame_t * write_frame;
+  int write_bytes;
+  
+  int out_palette;
+  
+  sigset_t oldset;
+  int output_open;
+  
+  int out_depth;
+  
+  int do_grab;
+  int grab_frame;
+  
+  int format_changed;
+  gavl_video_frame_t * mmap_frames[NUM_FRAMES];
+
+  int do_convert;
+
+  char * device;
+
+  int changed;
+
+  void (*put_frame)(bg_vloopback_t * v, gavl_video_frame_t * frame);
+  };
+
+
+/* Colorspace translation stuff */
+
+static const struct
+  {
+  int               v4l;
+  gavl_pixelformat_t gavl;
+  int depth;
+  }
+pixelformats[] =
+  {
+    { VIDEO_PALETTE_GREY, GAVL_GRAY_8, 8 }, /* Linear greyscale */
+    // VIDEO_PALETTE_HI240     2       /* High 240 cube (BT848) */
+    { VIDEO_PALETTE_RGB565, GAVL_RGB_16, 16 },       /* 565 16 bit RGB */
+    { VIDEO_PALETTE_RGB24,  GAVL_BGR_24, 24 },       /* 24bit RGB */
+    { VIDEO_PALETTE_RGB32,  GAVL_RGB_32, 32 },       /* 32bit RGB */
+    { VIDEO_PALETTE_RGB555, GAVL_RGB_15, 15 },       /* 555 15bit RGB */
+    { VIDEO_PALETTE_YUV422, GAVL_YUY2,   24 },  /* YUV422 capture */
+    { VIDEO_PALETTE_YUYV,   GAVL_YUY2,   24 },
+    { VIDEO_PALETTE_UYVY,   GAVL_UYVY,   24 },  /* The great thing about standards is ... */
+    // VIDEO_PALETTE_YUV420    10
+    // VIDEO_PALETTE_YUV411    11      /* YUV411 capture */
+    // VIDEO_PALETTE_RAW       12      /* RAW capture (BT848) */
+    { VIDEO_PALETTE_YUV422P, GAVL_YUV_422_P, 24 },  /* YUV 4:2:2 Planar */
+    { VIDEO_PALETTE_YUV411P,  GAVL_YUV_411_P, 24 },  /* YUV 4:1:1 Planar */
+    //    { VIDEO_PALETTE_YUV420P, GAVL_YUV_420_P, 12 },  /* YUV 4:2:0 Planar */
+    { VIDEO_PALETTE_YUV420P, GAVL_YUV_420_P, 24 },  /* YUV 4:2:0 Planar */
+
+    // VIDEO_PALETTE_YUV410P   16      /* YUV 4:1:0 Planar */
+  };
+
+static const int
+num_pixelformats = sizeof(pixelformats)/sizeof(pixelformats[0]);
+
+static gavl_pixelformat_t get_gavl_pixelformat(int csp)
+  {
+  int i;
+  for(i = 0; i < num_pixelformats; i++)
+    {
+    if(pixelformats[i].v4l == csp)
+      return pixelformats[i].gavl;
+    }
+  return GAVL_PIXELFORMAT_NONE;
+  }
+
+static int get_v4l_pixelformat(gavl_pixelformat_t csp, int * depth)
+  {
+  int i;
+  for(i = 0; i < num_pixelformats; i++)
+    {
+    if(pixelformats[i].gavl == csp)
+      {
+      if(depth)
+        *depth = pixelformats[i].depth;
+      return pixelformats[i].v4l;
+      }
+    }
+  return -1;
+  }
+
+/* ioctl handler shamelessly stolen from effectv */
+
+static int v4l_ioctlhandler(bg_vloopback_t * v,
+                            unsigned long int cmd, void *arg)
+  {
+  gavl_pixelformat_t pfmt;
+  switch(cmd)
+    {
+    case VIDIOCGCAP:
+      {
+      struct video_capability *vidcap = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCGCAP");
+#endif
+      snprintf(vidcap->name, 32, "Camelot vloopback output");
+      vidcap->type = VID_TYPE_CAPTURE;
+      vidcap->channels = 1;
+      vidcap->audios = 0;
+      vidcap->maxwidth = MAX_WIDTH;
+      vidcap->maxheight = MAX_HEIGHT;
+      vidcap->minwidth = MIN_WIDTH;
+      vidcap->minheight = MIN_HEIGHT;
+      return 0;
+      }
+    case VIDIOCGCHAN:
+      {
+      struct video_channel *vidchan = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCGCHAN");
+#endif
+      if(vidchan->channel != 0)
+        return EINVAL;
+      vidchan->flags = 0;
+      vidchan->tuners = 0;
+      vidchan->type = VIDEO_TYPE_CAMERA;
+      strncpy(vidchan->name, "Camelot", 32);
+      //      strncpy(vidchan->name, "Webcam", 32);
+      return 0;
+      }
+    case VIDIOCSCHAN:
+      {
+      int *v = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCSCHAN");
+#endif
+      if(v[0] != 0)
+        return EINVAL;
+      return 0;
+      }
+    case VIDIOCCAPTURE:
+      {
+      int * start = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCCAPTURE %d", *start);
+#endif
+      return 0;
+      }
+    case VIDIOCGPICT:
+      {
+      struct video_picture *vidpic = arg;
+      vidpic->colour = 0xffff;
+      vidpic->hue = 0xffff;
+      vidpic->brightness = 0xffff;
+      vidpic->contrast = 0xffff;
+      vidpic->whiteness = 0xffff;
+      //      vidpic->depth = v->out_depth;
+      vidpic->depth = 12;
+      vidpic->palette = v->out_palette;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCGPICT %d %d",
+             vidpic->depth, vidpic->palette);
+#endif
+      return 0;
+      }
+    case VIDIOCSPICT:
+      {
+      struct video_picture *vidpic = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCSPICT");
+#endif
+      if(vidpic->palette != v->out_palette)
+        {
+        pfmt = get_gavl_pixelformat(vidpic->palette);
+        if(pfmt == GAVL_PIXELFORMAT_NONE)
+          {
+          bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+                 "unsupported pixel format (%d) is requested in VIDIOCSPICT",
+                 vidpic->palette);
+          return EINVAL;
+          }
+        v->out_palette = vidpic->palette;
+        v->output_format.pixelformat = pfmt;
+        v->format_changed = 1;
+        }
+      return 0;
+      }
+
+    case VIDIOCGWIN:
+      {
+      struct video_window *vidwin = arg;
+      vidwin->x = 0;
+      vidwin->y = 0;
+      vidwin->width = v->output_format.image_width;
+      vidwin->height = v->output_format.image_height;
+      vidwin->chromakey = 0;
+      vidwin->flags = 655360;
+      //      vidwin->flags = 0;
+      vidwin->clipcount = 0;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCGWIN %dx%d", vidwin->width, vidwin->height);
+#endif
+      return 0;
+      }
+      
+    case VIDIOCSWIN:
+      {
+      struct video_window *vidwin = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCSWIN");
+#endif
+      if(vidwin->width > MAX_WIDTH || vidwin->height > MAX_HEIGHT)
+        {
+        bg_log(BG_LOG_WARNING, LOG_DOMAIN, "width %d out of range", vidwin->width);
+        return EINVAL;
+        }
+      if(vidwin->width < MIN_WIDTH || vidwin->height < MIN_HEIGHT)
+        {
+        bg_log(BG_LOG_WARNING, LOG_DOMAIN, "height %d out of range", vidwin->height);
+        return EINVAL;
+        }
+      if(vidwin->flags)
+        {
+        bg_log(BG_LOG_WARNING, LOG_DOMAIN, "invalid flags %08x in VIDIOCSWIN", vidwin->flags);
+        return EINVAL;
+        }
+      v->output_format.image_width = vidwin->width;
+      v->output_format.image_height = vidwin->height;
+      return 0;
+      }
+
+    case VIDIOCSYNC:
+      {
+      int frame = *(int *)arg;
+      int ret = 0;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCSYNC");
+#endif
+      if(frame < 0 || frame >= NUM_FRAMES)
+        {
+        bg_log(BG_LOG_WARNING, LOG_DOMAIN, "frame %d out of range in VIDIOCSYNC", frame);
+        return EINVAL;
+        }
+      v->do_grab = 0;
+      return ret;
+      }
+
+    case VIDIOCMCAPTURE:
+      {
+      struct video_mmap *vidmmap = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCMCAPTURE");
+#endif
+      if((vidmmap->width  != v->output_format.image_width) ||
+         (vidmmap->height != v->output_format.image_height))
+        {
+        if(vidmmap->width > MAX_WIDTH || vidmmap->height > MAX_HEIGHT)
+          {
+          bg_log(BG_LOG_WARNING, LOG_DOMAIN, "VIDIOCMCAPTURE: requested capture size is too big: %dx%d",
+                 vidmmap->width, vidmmap->height);
+          return EINVAL;
+          }
+        if(vidmmap->width < MIN_WIDTH || vidmmap->height < MIN_HEIGHT)
+          {
+          bg_log(BG_LOG_WARNING, LOG_DOMAIN, "VIDIOCMCAPTURE: requested capture size is too small: %dx%d",
+                 vidmmap->width, vidmmap->height);
+          return EINVAL;
+          }
+#ifdef DUMP_IOCTLS
+        bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCMCAPTURE %dx%d, format: %d",
+               vidmmap->width, vidmmap->height, vidmmap->format);
+#endif
+        v->output_format.image_width = vidmmap->width;
+        v->output_format.image_height = vidmmap->height;
+        v->format_changed = 1;
+        }
+      if(vidmmap->format != v->out_palette)
+        {
+        pfmt = get_gavl_pixelformat(vidmmap->format);
+        if(pfmt == GAVL_PIXELFORMAT_NONE)
+          {
+          bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+                 "unsupported pixel format (%d) is requested in VIDIOCMCAPTURE",
+                 vidmmap->format);
+          return EINVAL;
+          }
+        v->out_palette = vidmmap->format;
+        v->output_format.pixelformat = pfmt;
+        v->format_changed = 1;
+        }
+      if(vidmmap->frame >= NUM_FRAMES || vidmmap->frame < 0)
+        {
+        bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+               "Invalid frame (%d) in VIDIOCMCAPTURE",
+               vidmmap->frame);
+        return EINVAL;
+        }
+      v->do_grab = 1;
+      v->grab_frame = vidmmap->frame;
+      return 0;
+      }
+      
+    case VIDIOCGMBUF:
+      {
+      struct video_mbuf *vidmbuf = arg;
+#ifdef DUMP_IOCTLS
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "VIDIOCGMBUF");
+#endif
+      vidmbuf->size = v->mmap_len;
+      vidmbuf->frames = NUM_FRAMES;
+      vidmbuf->offsets[0] = 0;
+      vidmbuf->offsets[1] = MAX_FRAMESIZE;
+      return 0;
+      }
+
+    default:
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+             "Unknown ioctl %lx", cmd);
+          
+      return EPERM;
+      }
+    }
+  }
+
+static void init(bg_vloopback_t * v)
+  {
+  int i;
+  gavl_rectangle_i_t out_rect;
+  gavl_rectangle_f_t in_rect;
+  
+  v->output_format.frame_width = v->output_format.image_width;
+  v->output_format.frame_height = v->output_format.image_height;
+
+  for(i = 0; i < NUM_FRAMES; i++)
+    {
+    v->mmap_frames[i]->strides[0] = 0;
+    gavl_video_frame_set_planes(v->mmap_frames[i],
+                                &v->output_format, v->mmap + i * MAX_FRAMESIZE);
+    }
+  
+  gavl_rectangle_i_set_all(&out_rect, &v->output_format);
+  gavl_rectangle_f_set_all(&in_rect, &v->input_format);
+
+  gavl_video_options_set_rectangles(gavl_video_converter_get_options(v->cnv),
+                                    &in_rect, &out_rect);
+  
+  v->do_convert = gavl_video_converter_init(v->cnv, &v->input_format,
+                                            &v->output_format);
+
+  //  fprintf(stderr, "Initializing vloopback, in format:\n");
+  //  gavl_video_format_dump(&v->input_format);
+  //  fprintf(stderr, "Out format:\n");
+  //  gavl_video_format_dump(&v->output_format);
+  
+  }
+
+
+bg_vloopback_t * bg_vloopback_create()
+  {
+  int i;
+  sigset_t newset;
+  bg_vloopback_t * ret = calloc(1, sizeof(*ret));
+
+  /* Block SIGIO */
+  sigemptyset(&newset);
+  sigaddset(&newset, SIGIO);
+  pthread_sigmask(SIG_BLOCK, &newset, &ret->oldset);
+  
+  ret->fd = -1;
+  for(i = 0; i < NUM_FRAMES; i++)
+    {
+    ret->mmap_frames[i] = gavl_video_frame_create(NULL);
+    }
+  ret->cnv = gavl_video_converter_create();
+  
+  return ret;
+  }
+
+void bg_vloopback_destroy(bg_vloopback_t * v)
+  {
+  int i;
+  if(v->fd >= 0)
+    bg_vloopback_close(v);
+
+  if(v->device)
+    free(v->device);
+  
+  /* Restore signal mask */
+  //  pthread_sigmask(SIG_SETMASK, &v->oldset, NULL);
+  
+  gavl_video_converter_destroy(v->cnv);
+
+  for(i = 0; i < NUM_FRAMES; i++)
+    {
+    gavl_video_frame_null(v->mmap_frames[i]);
+    gavl_video_frame_destroy(v->mmap_frames[i]);
+    }
+  free(v);
+  }
+
+int bg_vloopback_open(bg_vloopback_t * v)
+  {
+  struct video_capability vid_caps;
+  struct video_window vid_win;
+  struct video_picture vid_pic;
+  
+  //  fprintf(stderr, "vloopback open\n");
+  v->fd = open(v->device, O_RDWR);
+
+  if(v->fd < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Opening %s failed: %s",
+           v->device, strerror(errno));
+    return 0;
+    }
+
+  if(v->write_frame)
+    {
+    gavl_video_frame_destroy(v->write_frame);
+    v->write_frame = NULL;
+    }
+  
+  if(v->mode == MODE_WRITE)
+    {
+    int depth;
+    if(v->write_size_custom)
+      {
+      v->write_format.image_width = v->write_width;
+      v->write_format.image_height = v->write_height;
+      }
+    v->write_format.frame_width  = v->write_format.image_width;
+    v->write_format.frame_height = v->write_format.image_height;
+
+    v->write_format.pixel_width  = 1;
+    v->write_format.pixel_height = 1;
+
+    v->format_changed = 1;
+    
+    gavl_video_format_copy(&v->output_format, 
+                           &v->write_format);
+    
+    v->write_frame = gavl_video_frame_create(&v->write_format);
+
+    v->write_bytes = gavl_video_format_get_image_size(&v->write_format);
+
+    //    fprintf(stderr, "Write format %d bytes:\n", v->write_bytes);
+    //    gavl_video_format_dump(&v->write_format);
+    
+    
+    /* The following is from the vloopback example code */
+    if (ioctl(v->fd, VIDIOCGCAP, &vid_caps) == -1)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCGCAP failed %s",strerror(errno));
+      return 0;
+      }
+  
+    if (ioctl(v->fd, VIDIOCGPICT, &vid_pic) == -1)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCGPICT failed: %s",strerror(errno));
+      return 0;
+      }
+
+    vid_pic.palette = get_v4l_pixelformat(v->write_format.pixelformat,
+                                          &depth);
+    vid_pic.depth = depth;
+    
+    if (ioctl(v->fd, VIDIOCSPICT, &vid_pic) == -1)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOCSPICT failed: %s",strerror(errno));
+      return 0;
+      }
+  
+    if (ioctl(v->fd, VIDIOCGWIN, &vid_win) == -1)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "ioctl VIDIOCGWIN failed");
+      return 0;
+      }
+
+    vid_win.width  = v->write_format.image_width;
+    vid_win.height = v->write_format.image_height;
+  
+    if (ioctl(v->fd, VIDIOCSWIN, &vid_win) == -1)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "ioctl VIDIOCSWIN failed");
+      return (1);
+      } 
+
+    v->put_frame = put_frame_write;
+
+    v->output_open = 1;
+    
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Opened vloopback in write mode");
+    }
+  else
+    {
+    v->mmap_len = MAX_FRAMESIZE * NUM_FRAMES;
+  
+    v->mmap = mmap(NULL, v->mmap_len, PROT_READ | PROT_WRITE /* required */,
+                   MAP_SHARED /* recommended */, v->fd, 0);
+  
+    if(MAP_FAILED == v->mmap)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "vloopback mmap failed: %s",
+             strerror(errno));
+      return 0;
+      }
+
+    v->put_frame = put_frame_ioctl;
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Opened vloopback in ioctl mode");
+    }
+
+  v->changed = 0;
+  
+  /* */
+  
+  return 1;
+  }
+
+void bg_vloopback_close(bg_vloopback_t * v)
+  {
+  if(v->mmap)
+    {
+    munmap(v->mmap, v->mmap_len);
+    v->mmap = NULL;
+    }
+  close(v->fd);
+  v->fd = -1;
+  v->output_open = 0;
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Closed vloopback");
+  
+  }
+
+void bg_vloopback_set_format(bg_vloopback_t * v, const gavl_video_format_t * format)
+  {
+  //  fprintf(stderr, "vloopback set format\n");
+  gavl_video_format_copy(&v->input_format, format);
+  if(!v->output_open)
+    {
+    gavl_video_format_copy(&v->output_format, format);
+    v->out_palette =
+      get_v4l_pixelformat(v->output_format.pixelformat, &v->out_depth);
+    
+    if(v->out_palette == -1)
+      {
+      /* Works for sure */
+      v->out_palette = VIDEO_PALETTE_YUV420P;
+      v->output_format.pixelformat = get_v4l_pixelformat(v->out_palette, &v->out_depth);
+      }
+    
+    }
+  v->format_changed = 1;
+  }
+
+static void put_frame_ioctl(bg_vloopback_t * v, gavl_video_frame_t * frame)
+  {
+  struct pollfd pfd;
+  uint8_t buffer[MAXIOCTL];
+  int len;
+  unsigned long ioctl_nr;
+  uint8_t * arg;
+  int result;
+  
+  if(v->fd < 0)
+    return;
+  
+  pfd.fd = v->fd;
+  pfd.events = POLLIN;
+
+  while(poll(&pfd, 1, 0))
+    {
+    if(!v->output_open)
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Client connected");
+    v->output_open = 1;
+    len = read(v->fd, buffer, MAXIOCTL);
+    if(len < 8)
+      return;
+    
+    v->output_open = 1;
+    
+    memcpy(&ioctl_nr, buffer, sizeof(ioctl_nr));
+    arg = &buffer[sizeof(unsigned long)];
+
+    if(!ioctl_nr)
+      {
+      /* Client disconnected */
+      v->output_open = 0;
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Client disconnected");
+      break;
+      }
+    
+    result = v4l_ioctlhandler(v, ioctl_nr, arg);
+    if(result)
+      {
+      /* new vloopback patch supports a way to return EINVAL to
+       * a client. */
+      memset(arg, 0xff, MAXIOCTL-sizeof(unsigned long int));
+      ioctl(v->fd, VIDIOCSINVALID);
+      }
+    else if(ioctl(v->fd, ioctl_nr, arg))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "ioctl %lx unsuccessfull.", ioctl_nr);
+      //      fprintf(stderr, "vloopback: ioctl %lx unsuccessfull.\n", ioctl_nr);
+      }
+    if(v->do_grab)
+      {
+      if(v->format_changed)
+        {
+        init(v);
+        v->format_changed = 0;
+        }
+
+      if(v->do_convert)
+        gavl_video_convert(v->cnv, frame, v->mmap_frames[v->grab_frame]);
+      else
+        gavl_video_frame_copy(&v->output_format, v->mmap_frames[v->grab_frame], frame);
+      
+      v->do_grab = 0;
+      }
+    }
+  
+  }
+
+static void put_frame_write(bg_vloopback_t * v, gavl_video_frame_t * frame)
+  {
+  if(v->format_changed)
+    {
+    init(v);
+    v->format_changed = 0;
+    }
+  
+  if(v->do_convert)
+    gavl_video_convert(v->cnv, frame, v->write_frame);
+  else
+    gavl_video_frame_copy(&v->write_format, v->write_frame, frame);
+  write(v->fd, v->write_frame->planes[0], v->write_bytes);
+  }
+
+void bg_vloopback_put_frame(bg_vloopback_t * v, gavl_video_frame_t * frame)
+  {
+  v->put_frame(v, frame);
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name        = "device",
+      .long_name   = TRS("Device"),
+      .type        = BG_PARAMETER_FILE,
+      .val_default = { .val_str = "/dev/video1" },
+    },
+    {
+      .name         = "mode",
+      .long_name    = TRS("Mode"),
+      .type         = BG_PARAMETER_STRINGLIST,
+      .val_default  = { .val_str = "ioctl" },
+      .multi_names  = (char const *[]){ "write", "ioctl", NULL },
+      .multi_labels = (char const *[]){ TRS("Write"), TRS("ioctl"),NULL },
+      .help_string = TRS("Set the operating mode. Ioctl is more flexible on the clients side but doesn't work with all applications. Write works with more applications but has a larger overhead"),
+      
+    },
+    {
+      .name =      "resolution",
+      .long_name = TRS("Resolution"),
+      .type =      BG_PARAMETER_STRINGLIST,
+      .val_default = { .val_str = "QVGA (320x240)" },
+      .multi_names =     (char const *[]){ "QSIF (160x112)",
+                              "QCIF (176x144)", 
+                              "QVGA (320x240)", 
+                              "SIF(352x240)", 
+                              "CIF (352x288)", 
+                              "VGA (640x480)", 
+                              "User defined",
+                              NULL },
+      .multi_labels =     (char const *[]){ TRS("QSIF (160x112)"),
+                                   TRS("QCIF (176x144)"), 
+                                   TRS("QVGA (320x240)"), 
+                                   TRS("SIF(352x240)"), 
+                                   TRS("CIF (352x288)"), 
+                                   TRS("VGA (640x480)"), 
+                                   TRS("User defined"),
+                                   NULL },
+      .help_string = TRS("Fixed resolution for write mode"),
+    },
+    {
+      .name =        "user_width",
+      .long_name =   TRS("User defined width"),
+      .type =        BG_PARAMETER_INT,
+      .val_default = { .val_i = 720 },
+      .val_min =     { .val_i = 160 },
+      .val_max =     { .val_i = 1024 },
+      .help_string = TRS("User defined width for write mode"),
+    },
+    {
+      .name =        "user_height",
+      .long_name =   TRS("User defined height"),
+      .type =        BG_PARAMETER_INT,
+      .val_default = { .val_i = 576 },
+      .val_min =     { .val_i = 112 },
+      .val_max =     { .val_i = 768 },
+      .help_string = TRS("User defined height for write mode"),
+    },
+    {
+      .name =      "pixelformat",
+      .long_name = TRS("Pixelformat"),
+      .type =      BG_PARAMETER_STRINGLIST,
+      .val_default = { .val_str = "yuv420p" },
+      .multi_names =     (char const *[]){ "yuv420p", "rgb24",
+                                          NULL },
+      .multi_labels =     (char const *[]){ TRS("Y'CbCr 4:2:0"),
+                                            TRS("RGB (24 bit)"), 
+                                            NULL },
+      .help_string = TRS("Pixelformat for write mode"),
+      
+    },
+    { /* End of parameters */ }
+  };
+
+const bg_parameter_info_t * bg_vloopback_get_parameters(bg_vloopback_t * v)
+  {
+  return parameters;
+  }
+
+void bg_vloopback_set_parameter(void * data, const char * name,
+                                const bg_parameter_value_t * val)
+  {
+  bg_vloopback_t * v = data;
+
+  //  fprintf(stderr, "vloopback_set_parameter %s\n", name); 
+
+  if(!name)
+    return;
+  else if(!strcmp(name, "device"))
+    {
+    if(!v->device || strcmp(val->val_str, v->device))
+      {
+      v->device = bg_strdup(v->device, val->val_str);
+      v->changed = 1;
+      }
+    }
+  else if(!strcmp(name, "mode"))
+    {
+    int new_mode;
+    if(!strcmp(val->val_str, "write"))
+      new_mode = MODE_WRITE;
+    else
+      new_mode = MODE_IOCTL;
+    if(v->mode != new_mode)
+      {
+      v->mode = new_mode;
+      v->changed = 1;
+      }
+    }
+  else if(!strcmp(name, "resolution"))
+    {
+    int width = 0, height = 0, custom = 0;
+    
+    if(!strcmp(val->val_str, "QSIF (160x112)"))
+      {
+      width  = 160;
+      height = 112;
+      }
+    else if(!strcmp(val->val_str, "QCIF (176x144)"))
+      {
+      width  = 176;
+      height = 144;
+      }
+    else if(!strcmp(val->val_str, "QVGA (320x240)"))
+      {
+      width  = 320;
+      height = 240;
+      }
+    else if(!strcmp(val->val_str, "SIF(352x240)"))
+      {
+      width  = 352;
+      height = 240;
+      }
+    else if(!strcmp(val->val_str, "CIF (352x288)"))
+      {
+      width  = 352;
+      height = 288;
+      }
+    else if(!strcmp(val->val_str, "VGA (640x480)"))
+      {
+      width  = 640;
+      height = 480;
+      }
+    else if(!strcmp(val->val_str, "User defined"))
+      {
+      custom = 1;
+      width = v->write_format.image_width;
+      height = v->write_format.image_height;
+      }
+    if((v->write_size_custom != custom) ||
+       (v->write_format.image_width != width) ||
+       (v->write_format.image_height != height))
+      {
+      v->write_size_custom = custom;
+      v->write_format.image_width = width;
+      v->write_format.image_height = height;
+      v->changed = 1;
+      }
+    }
+  else if(!strcmp(name, "user_width"))
+    {
+    if(v->write_width != val->val_i)
+      {
+      v->write_width = val->val_i;
+      v->changed = 1;
+      }
+    }
+  else if(!strcmp(name, "user_height"))
+    {
+    if(v->write_height != val->val_i)
+      {
+      v->write_height = val->val_i;
+      v->changed = 1;
+      }
+    }
+  else if(!strcmp(name, "pixelformat"))
+    {
+    if(!strcmp(val->val_str, "yuv420p"))
+      v->write_format.pixelformat = GAVL_YUV_420_P;
+    else
+      v->write_format.pixelformat = GAVL_RGB_24;
+    }
+  }
+
+int bg_vloopback_changed(bg_vloopback_t * v)
+  {
+  return v->changed;
+  }

gmerlin-4256.tar.gz/apps/camelot/vloopback.h Added

@@ -0,0 +1,37 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct bg_vloopback_s bg_vloopback_t;
+
+bg_vloopback_t * bg_vloopback_create();
+void bg_vloopback_destroy(bg_vloopback_t *);
+
+int bg_vloopback_open(bg_vloopback_t *);
+void bg_vloopback_close(bg_vloopback_t *);
+
+void bg_vloopback_set_format(bg_vloopback_t *, const gavl_video_format_t * format);
+void bg_vloopback_put_frame(bg_vloopback_t *, gavl_video_frame_t * frame);
+
+const bg_parameter_info_t * bg_vloopback_get_parameters(bg_vloopback_t *);
+void bg_vloopback_set_parameter(void * data, const char * name,
+                                const bg_parameter_value_t * val);
+
+int bg_vloopback_changed(bg_vloopback_t *);

gmerlin-4256.tar.gz/apps/camelot/webcam.c Added

@@ -0,0 +1,760 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <pthread.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <time.h>
+#include <stdlib.h>
+
+#include <config.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/filters.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "webcam"
+
+#include "webcam.h"
+#include "webcam_priv.h"
+
+
+#define FRAMERATE_INTERVAL 10
+
+
+static int read_func(void * data, gavl_video_frame_t * f, int stream)
+  {
+  gmerlin_webcam_t * w = data;
+  bg_plugin_lock(w->input_handle);
+  
+  if(!w->input->read_video(w->input_handle->priv, f, 0))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "read_frame failed");
+    }
+  bg_plugin_unlock(w->input_handle);
+  return 1;
+  }
+
+void gmerlin_webcam_get_message_queues(gmerlin_webcam_t * cam,
+                                       bg_msg_queue_t ** cmd_queue,
+                                       bg_msg_queue_t ** msg_queue)
+  {
+  *cmd_queue = cam->cmd_queue;
+  *msg_queue = cam->msg_queue;
+  }
+
+gmerlin_webcam_t * gmerlin_webcam_create(bg_plugin_registry_t * plugin_reg)
+  {
+  gmerlin_webcam_t * ret;
+
+  ret = calloc(1, sizeof(*ret));
+  pthread_mutex_init(&ret->mutex, NULL);
+
+  ret->plugin_reg = plugin_reg;
+
+  bg_gavl_video_options_init(&ret->opt);
+  
+  ret->fc = bg_video_filter_chain_create(&ret->opt, ret->plugin_reg);
+  
+  ret->cmd_queue = bg_msg_queue_create();
+  ret->msg_queue = bg_msg_queue_create();
+  
+  ret->monitor_cnv = gavl_video_converter_create();
+  ret->capture_cnv = gavl_video_converter_create();
+
+  ret->timer = gavl_timer_create();
+
+#ifdef HAVE_V4L
+  ret->vloopback = bg_vloopback_create();
+  pthread_mutex_init(&ret->vloopback_mutex, NULL);
+#endif
+  
+  return ret;
+  }
+
+void gmerlin_webcam_destroy(gmerlin_webcam_t * w)
+  {
+  /* First, we destroy the video frames. This must be done while the
+     plugins aren't unrefed */
+
+  if(w->input_frame)
+    gavl_video_frame_destroy(w->input_frame);
+  if(w->capture_frame)
+    gavl_video_frame_destroy(w->capture_frame);
+
+  if(w->monitor_frame)
+    {
+    if(w->monitor->destroy_frame)
+      w->monitor->destroy_frame(w->monitor_handle->priv, w->monitor_frame);
+    else
+      gavl_video_frame_destroy(w->monitor_frame);
+    }
+
+  if(w->capture_directory)
+    free(w->capture_directory);
+
+  if(w->capture_namebase)
+    free(w->capture_namebase);
+    
+  if(w->input_handle)
+    bg_plugin_unref(w->input_handle);
+  if(w->monitor_handle)
+    bg_plugin_unref(w->monitor_handle);
+  if(w->capture_handle)
+    bg_plugin_unref(w->capture_handle);
+  bg_msg_queue_destroy(w->cmd_queue);
+  bg_msg_queue_destroy(w->msg_queue);
+
+  if(w->fc)
+    bg_video_filter_chain_destroy(w->fc);
+
+  bg_gavl_video_options_free(&w->opt);
+  
+  if(w->capture_cnv)
+    gavl_video_converter_destroy(w->capture_cnv);
+  if(w->monitor_cnv)
+    gavl_video_converter_destroy(w->monitor_cnv);
+  
+  gavl_timer_destroy(w->timer);
+  pthread_mutex_destroy(&w->mutex);
+  
+#ifdef HAVE_V4L
+  bg_vloopback_destroy(w->vloopback);
+  pthread_mutex_destroy(&w->vloopback_mutex);
+#endif  
+  
+  free(w);
+  }
+
+#define BUFFER_SIZE 256
+
+static char * create_filename(gmerlin_webcam_t * cam)
+  {
+  char mask[16];
+  char buf[BUFFER_SIZE];
+  char * pos;
+  char * end;
+  char * filename;
+  int have_time = 0;
+  time_t t;
+  struct tm time_date;
+  
+  filename = bg_sprintf("%s/", cam->capture_directory);
+  
+  pos = cam->capture_namebase;
+  
+  while(1)
+    {
+    end = pos;
+
+    while((*end != '%') && (*end != '\0'))
+      {
+      end++;
+      }
+
+    if(end - pos)
+      filename = bg_strncat(filename, pos, end);
+    
+    if(*end == '\0')
+      break;
+
+    pos = end;
+    
+    /* Insert frame count */
+    if(isdigit(pos[1]) && (pos[2] == 'n'))
+      {
+      mask[0] = '%';
+      mask[1] = '0';
+      mask[2] = pos[1];
+      mask[3] = 'd';
+      mask[4] = '\0';
+      sprintf(buf, mask, cam->capture_frame_counter);
+      filename = gavl_strcat(filename, buf);
+      pos += 3;
+      }
+    /* Insert date */
+    else if(pos[1] == 'd')
+      {
+      if(!have_time)
+        {
+        time(&t);
+        localtime_r(&t, &time_date);
+        have_time = 1;
+        }
+      strftime(buf, BUFFER_SIZE, "%Y-%m-%d", &time_date);
+      filename = gavl_strcat(filename, buf);
+      pos += 2;
+      }
+    /* Insert date */
+    else if(pos[1] == 't')
+      {
+      if(!have_time)
+        {
+        time(&t);
+        localtime_r(&t, &time_date);
+        have_time = 1;
+        }
+      strftime(buf, BUFFER_SIZE, "%H-%M-%S", &time_date);
+      filename = gavl_strcat(filename, buf);
+      pos += 2;
+      }
+    else
+      {
+      filename = gavl_strcat(filename, "%");
+      pos++;
+      }
+    }
+  
+  return filename;
+  }
+
+static void do_capture(gmerlin_webcam_t * cam)
+  {
+  bg_msg_t * msg;
+  char * filename = NULL;
+
+  //   char * capture_directory;
+  //   char * capture_namebase;
+    
+  if(!cam->capture)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "do_capture: No plugin loaded");
+    goto fail;
+    }
+  
+  /* Construct filename */
+
+  filename = create_filename(cam);
+  
+  if(!cam->capture_initialized)
+    {
+    if(cam->capture_frame)
+      gavl_video_frame_destroy(cam->capture_frame);
+    gavl_video_format_copy(&cam->capture_format, &cam->input_format);
+    }
+  
+  if(!cam->capture->write_header(cam->capture_handle->priv,
+                                 filename, &cam->capture_format, NULL))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Saving %s failed", filename);
+    goto fail;
+    }
+
+  if(!cam->capture_initialized)
+    {
+    cam->do_convert_capture =
+      gavl_video_converter_init(cam->capture_cnv,
+                      &cam->input_format, &cam->capture_format);
+    cam->capture_frame = gavl_video_frame_create(&cam->capture_format);
+    }
+
+  if(cam->do_convert_capture)
+    gavl_video_convert(cam->capture_cnv, cam->input_frame, cam->capture_frame);
+  else
+    gavl_video_frame_copy(&cam->input_format,
+                          cam->capture_frame, cam->input_frame);
+
+  cam->capture->write_image(cam->capture_handle->priv, cam->capture_frame);
+
+  /* Update capture frame counter */
+  
+  cam->capture_frame_counter++;
+  msg = bg_msg_queue_lock_write(cam->msg_queue);
+  bg_msg_set_id(msg, MSG_FRAME_COUNT);
+  bg_msg_set_arg_int(msg, 0, cam->capture_frame_counter);
+  bg_msg_queue_unlock_write(cam->msg_queue);
+  cam->capture_initialized = 1;
+  
+  fail:
+  if(filename)
+    free(filename);
+  }
+
+static void open_monitor(gmerlin_webcam_t * cam)
+  {
+  if(!cam->input_open)
+    return;
+  gavl_video_format_copy(&cam->monitor_format, &cam->input_format);
+
+  /* Open monitor */
+  
+  if(!cam->monitor->open(cam->monitor_handle->priv, &cam->monitor_format, 1))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Opening monitor plugin failed");
+    }
+  cam->monitor->set_window_title(cam->monitor_handle->priv,
+                                 "Camelot");
+  
+  if(cam->monitor->show_window)
+    cam->monitor->show_window(cam->monitor_handle->priv, 1);
+  
+  //  gavl_video_format_dump(&cam->monitor_format);
+
+  /* Fire up video converter */
+  
+  cam->do_convert_monitor =
+    gavl_video_converter_init(cam->monitor_cnv, &cam->input_format,
+                    &cam->monitor_format);
+  
+  /* Allocate video image */
+  
+  if(cam->monitor->create_frame)
+    cam->monitor_frame = cam->monitor->create_frame(cam->monitor_handle->priv);
+  else
+    cam->monitor_frame = gavl_video_frame_create(&cam->monitor_format);
+  cam->monitor_open = 1;
+
+  //  fprintf(stderr, "Monitor format:\n");
+  //  gavl_video_format_dump(&cam->monitor_format);
+  
+  }
+
+static void close_monitor(gmerlin_webcam_t * cam)
+  {
+  if(!cam->monitor_open)
+    return;
+
+  if(cam->monitor->destroy_frame)
+    cam->monitor->destroy_frame(cam->monitor_handle->priv, cam->monitor_frame);
+  else
+    gavl_video_frame_destroy(cam->monitor_frame);
+  
+  cam->monitor_frame = NULL;
+  cam->monitor->close(cam->monitor_handle->priv);
+  if(cam->monitor->show_window)
+    cam->monitor->show_window(cam->monitor_handle->priv, 0);
+  cam->monitor_open = 0;
+  }
+
+static void build_pipeline(gmerlin_webcam_t * cam)
+  {
+  cam->read_func = read_func;
+  cam->read_data = cam;
+  cam->read_stream = 0;
+  
+  bg_video_filter_chain_connect_input(cam->fc, cam->read_func,cam->read_data,
+                                      cam->read_stream);
+
+  bg_video_filter_chain_reset(cam->fc);
+  
+  if(bg_video_filter_chain_init(cam->fc, &cam->cam_format, &cam->input_format))
+    {
+    bg_video_filter_chain_set_out_format(cam->fc, &cam->input_format);
+    cam->read_func = bg_video_filter_chain_read;
+    cam->read_data = cam->fc;
+    cam->read_stream = 0;
+    }
+
+  if(cam->input_frame)
+    gavl_video_frame_destroy(cam->input_frame);
+  
+  cam->input_frame = gavl_video_frame_create(&cam->input_format);
+  
+  //  fprintf(stderr, "Cam format:\n");
+  //  gavl_video_format_dump(&cam->cam_format);
+  
+  //  fprintf(stderr, "Input format:\n");
+  //  gavl_video_format_dump(&cam->input_format);
+
+#ifdef HAVE_V4L
+  bg_vloopback_set_format(cam->vloopback, &cam->input_format);
+#endif
+  
+  }
+
+static void open_input(gmerlin_webcam_t * cam)
+  {
+  bg_msg_t * msg;
+  if(!cam->input->open(cam->input_handle->priv, NULL, &cam->cam_format))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Initializing %s failed, check settings",
+           cam->input_handle->info->long_name);
+    msg = bg_msg_queue_lock_write(cam->msg_queue);
+    bg_msg_set_id(msg, MSG_ERROR);
+    bg_msg_queue_unlock_write(cam->msg_queue);
+
+    cam->input_open = 0;
+    return;
+    }
+
+  build_pipeline(cam);
+  cam->input_open = 1;
+  }
+
+static void close_input(gmerlin_webcam_t * cam)
+  {
+  if(!cam->input_open)
+    return;
+  cam->input->close(cam->input_handle->priv);
+  cam->input_open = 0;
+  }
+
+static void handle_cmd(gmerlin_webcam_t * cam, bg_msg_t * msg)
+  {
+  bg_plugin_handle_t * h;
+  int arg_i;
+  float arg_f;
+  
+  switch(bg_msg_get_id(msg))
+    {
+    case CMD_QUIT:
+      cam->do_quit = 1;
+      break;
+    case CMD_SET_MONITOR:               /* ARG0: int */
+      arg_i = bg_msg_get_arg_int(msg, 0);
+      if(arg_i == cam->do_monitor)
+        return;
+      if(arg_i)
+        open_monitor(cam);
+      else
+        close_monitor(cam);
+      cam->do_monitor = arg_i; 
+      break;
+    case CMD_SET_MONITOR_PLUGIN:        /* ARG0: plugin_handle */
+      if(cam->monitor)
+        {
+        close_monitor(cam);
+        bg_plugin_unref(cam->monitor_handle);
+        }
+      h = bg_msg_get_arg_ptr_nocopy(msg, 0);
+
+      cam->monitor_handle = h;
+      bg_plugin_ref(cam->monitor_handle);
+      cam->monitor = (bg_ov_plugin_t*)cam->monitor_handle->plugin;
+
+      if(cam->do_monitor)
+        open_monitor(cam);
+      break;
+    case CMD_SET_INPUT_PLUGIN:          /* ARG0: plugin_handle */
+      if(cam->do_monitor)
+        close_monitor(cam);
+      
+      if(cam->input)
+        {
+        close_input(cam);
+        bg_plugin_unref(cam->input_handle);
+        }
+      h = bg_msg_get_arg_ptr_nocopy(msg, 0);
+      cam->input_handle = h;
+
+      bg_plugin_ref(cam->input_handle);
+
+      cam->input = (bg_recorder_plugin_t*)cam->input_handle->plugin;
+      open_input(cam);
+
+      if(cam->do_monitor)
+        open_monitor(cam);
+      
+      break;
+    case CMD_INPUT_REOPEN:
+      if(cam->do_monitor)
+        close_monitor(cam);
+      close_input(cam);
+      open_input(cam);
+      
+      if(cam->do_monitor)
+        open_monitor(cam);
+
+      cam->capture_initialized = 0;
+
+      break;
+    case CMD_SET_CAPTURE_PLUGIN:
+      if(cam->capture_handle)
+        {
+        bg_plugin_unref(cam->capture_handle);
+        }
+      h = bg_msg_get_arg_ptr_nocopy(msg, 0);
+
+      cam->capture_handle = h;
+      bg_plugin_ref(cam->capture_handle);
+      cam->capture = (bg_image_writer_plugin_t*)cam->capture_handle->plugin;
+
+      cam->capture_initialized = 0;
+      break;
+    case CMD_SET_CAPTURE_AUTO:
+      arg_i = bg_msg_get_arg_int(msg, 0);
+      if(!cam->auto_capture && arg_i)
+        cam->next_capture_time = gavl_timer_get(cam->timer);
+      cam->auto_capture = arg_i;
+      break;
+    case CMD_SET_CAPTURE_INTERVAL:      /* ARG0: float */
+      arg_f = bg_msg_get_arg_float(msg, 0);
+      cam->capture_interval = (gavl_time_t)(GAVL_TIME_SCALE * arg_f);
+      break;
+    case CMD_SET_CAPTURE_DIRECTORY:     /* ARG0: string */
+      if(cam->capture_directory)
+        free(cam->capture_directory);
+      cam->capture_directory = bg_msg_get_arg_string(msg, 0);
+      break;
+    case CMD_SET_CAPTURE_NAMEBASE:      /* ARG0: string */
+      if(cam->capture_namebase)
+        free(cam->capture_namebase);
+      cam->capture_namebase = bg_msg_get_arg_string(msg, 0);
+      break;
+    case CMD_SET_CAPTURE_FRAME_COUNTER: /* ARG0: int */
+      arg_i = bg_msg_get_arg_int(msg, 0);
+      cam->capture_frame_counter = arg_i;
+      break;
+    case CMD_DO_CAPTURE:
+      do_capture(cam);
+      break;
+#ifdef HAVE_V4L
+    case CMD_SET_VLOOPBACK:
+      arg_i = bg_msg_get_arg_int(msg, 0);
+      cam->do_vloopback = 0;
+      if(arg_i)
+        {
+        if(bg_vloopback_open(cam->vloopback))
+          cam->do_vloopback = 1;
+        }
+      else
+        {
+        bg_vloopback_close(cam->vloopback);
+        cam->do_vloopback = 0;
+        }
+      break;
+#endif
+    }
+  }
+
+static void * thread_func(void * data)
+  {
+  bg_msg_t * msg;
+  gavl_time_t frame_time;
+  gavl_time_t last_frame_time;
+  gmerlin_webcam_t * w;
+  float frame_rate;
+  
+  w = (gmerlin_webcam_t *)data;
+
+  last_frame_time = gavl_timer_get(w->timer);
+  w->frame_counter = 0;
+  gavl_timer_start(w->timer);
+  
+  while(1)
+    {
+    /* Get frame from camera */
+    if(w->input_open)
+      {
+      if(!w->read_func(w->read_data, w->input_frame, w->read_stream))
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "read_frame failed");
+      frame_time = gavl_timer_get(w->timer);
+      
+      /* Send to monitor plugin */
+      if(w->do_monitor && w->monitor_open)
+        {
+        if(w->do_convert_monitor)
+          gavl_video_convert(w->monitor_cnv, w->input_frame, w->monitor_frame);
+        else
+          gavl_video_frame_copy(&w->input_format,
+                                w->monitor_frame, w->input_frame);
+        bg_plugin_lock(w->monitor_handle);
+        w->monitor->put_video(w->monitor_handle->priv, w->monitor_frame);
+        if(w->monitor->handle_events)
+          w->monitor->handle_events(w->monitor_handle->priv);
+        bg_plugin_unlock(w->monitor_handle);
+        
+        }
+      /* Check if we have to do auto capture */
+      if(w->capture && w->auto_capture &&
+         (frame_time >= w->next_capture_time))
+        {
+        do_capture(w);
+        w->next_capture_time += w->capture_interval;
+        }
+#ifdef HAVE_V4L
+      pthread_mutex_lock(&w->vloopback_mutex);
+      if(w->do_vloopback)
+        bg_vloopback_put_frame(w->vloopback, w->input_frame);
+      pthread_mutex_unlock(&w->vloopback_mutex);
+#endif      
+      /* Calculate framerate */
+      
+      w->frame_counter++;
+      if(w->frame_counter == FRAMERATE_INTERVAL)
+        w->frame_counter = 0;
+      
+      if(!w->frame_counter)
+        {
+        frame_rate = (double)(FRAMERATE_INTERVAL*GAVL_TIME_SCALE) /
+          (double)(frame_time - last_frame_time);
+        
+        msg = bg_msg_queue_lock_write(w->msg_queue);
+        bg_msg_set_id(msg, MSG_FRAMERATE);
+        bg_msg_set_arg_float(msg, 0, frame_rate);
+        bg_msg_queue_unlock_write(w->msg_queue);
+        last_frame_time = frame_time;
+
+        }
+      }
+    else
+      {
+      gavl_time_t delay_time = GAVL_TIME_SCALE / 100;
+      gavl_time_delay(&delay_time);
+      }
+    
+    /* Check for commands */
+    
+    while((msg = bg_msg_queue_try_lock_read(w->cmd_queue)))
+      {
+      handle_cmd(w, msg);
+      bg_msg_queue_unlock_read(w->cmd_queue);
+      }
+    if(w->do_quit)
+      break;
+    }
+  
+  return NULL;
+  }
+
+void gmerlin_webcam_run(gmerlin_webcam_t * w)
+  {
+  pthread_create(&w->thread, NULL,
+                 thread_func, w);
+  w->running = 1;
+  }
+
+void gmerlin_webcam_quit(gmerlin_webcam_t * w)
+  {
+  bg_msg_t * msg;
+  msg = bg_msg_queue_lock_write(w->cmd_queue);
+  bg_msg_set_id(msg, CMD_QUIT);
+  bg_msg_queue_unlock_write(w->cmd_queue);
+  
+  pthread_join(w->thread, NULL);
+  w->running = 0;
+  w->do_quit = 0;
+  }
+
+
+const bg_parameter_info_t *
+gmerlin_webcam_get_filter_parameters(gmerlin_webcam_t * w)
+  {
+  return bg_video_filter_chain_get_parameters(w->fc);
+  }
+
+void gmerlin_webcam_set_filter_parameter(void * data, const char * name,
+                                         const bg_parameter_value_t * val)
+  {
+  int need_rebuild = 0, need_restart = 0;
+  gmerlin_webcam_t * w = data;
+
+  //  fprintf(stderr, "Set filter parameter %s\n",
+  //          name);
+  
+  //  pthread_mutex_lock(&p->video_stream.config_mutex);
+  //  is_interrupted = p->video_stream.interrupted;
+  //  pthread_mutex_unlock(&p->video_stream.config_mutex);
+  
+  bg_video_filter_chain_lock(w->fc);
+  bg_video_filter_chain_set_parameter(w->fc, name, val);
+  
+  need_rebuild =
+    bg_video_filter_chain_need_rebuild(w->fc);
+  need_restart =
+    bg_video_filter_chain_need_restart(w->fc);
+  
+  bg_video_filter_chain_unlock(w->fc);
+  
+  if(w->running && (need_rebuild || need_restart))
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN,
+           "Restarting playback due to changed video filters");
+    gmerlin_webcam_quit(w);
+    w->interrupted = 1;
+    
+    if(w->do_monitor)
+      close_monitor(w);
+    }
+  if(!name && w->interrupted)
+    {
+    build_pipeline(w);
+    if(w->do_monitor)
+      open_monitor(w);
+    w->interrupted = 0;
+    gmerlin_webcam_run(w);
+    w->capture_initialized = 0;
+    //    fprintf(stderr, "Restarting\n");
+    }
+  }
+
+#ifdef HAVE_V4L
+const bg_parameter_info_t *
+gmerlin_webcam_get_vloopback_parameters(gmerlin_webcam_t * w)
+  {
+  return bg_vloopback_get_parameters(w->vloopback);
+  }
+
+void gmerlin_webcam_set_vloopback_parameter(void * data, const char * name,
+                                            const bg_parameter_value_t * val)
+  {
+  gmerlin_webcam_t * w = data;
+  pthread_mutex_lock(&w->vloopback_mutex);
+  bg_vloopback_set_parameter(w->vloopback, name, val);
+
+  if(bg_vloopback_changed(w->vloopback) && w->do_vloopback)
+    {
+    bg_vloopback_close(w->vloopback);
+    if(!bg_vloopback_open(w->vloopback))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Restarting vloopback failed, close client and try again");
+      w->do_vloopback = 0;
+      }
+    }
+
+  pthread_mutex_unlock(&w->vloopback_mutex);
+  }
+#endif
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name = "video_capture",
+      .long_name = TRS("Video capture"),
+      .type = BG_PARAMETER_SECTION,
+    },
+    {
+      .name      = "max_framerate",
+      .long_name = TRS("Maximum framerate"),
+      .type      = BG_PARAMETER_INT,
+      .val_min       = { .val_i = 1 },
+      .val_max       = { .val_i = 100 },
+      .val_default   = { .val_i = 25 },
+    },
+    { /* End */ }
+  };
+
+const bg_parameter_info_t *
+gmerlin_webcam_get_parameters(gmerlin_webcam_t * w)
+  {
+  return parameters;
+  }
+
+void
+gmerlin_webcam_set_parameter(void * data, const char * name,
+                             const bg_parameter_value_t * val)
+  {
+  
+  }

gmerlin-4256.tar.gz/apps/camelot/webcam.h Added

@@ -0,0 +1,83 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/msgqueue.h>
+
+/* Messages from the webcam */
+
+#define MSG_FRAMERATE   0 /* Current capture rate (float) */
+#define MSG_FRAME_COUNT 1 /* Frame counter (int)          */
+#define MSG_ERROR       2 /* Something went wrong         */
+
+/* Commands to the webcam */
+
+#define CMD_SET_MONITOR                0 /* ARG 0: int */
+#define CMD_SET_MONITOR_PLUGIN         1 /* ARG 0: plugin_handle */
+
+#define CMD_SET_INPUT_PLUGIN           3 /* ARG 0: plugin_handle */
+
+#define CMD_SET_CAPTURE_PLUGIN         4 /* ARG 0: plugin_handle */
+#define CMD_SET_CAPTURE_AUTO           5 /* ARG 0: int   */
+#define CMD_SET_CAPTURE_INTERVAL       6 /* ARG 0: float */
+#define CMD_SET_CAPTURE_DIRECTORY      7 /* ARG 0: string */
+#define CMD_SET_CAPTURE_NAMEBASE       8 /* ARG 0: string */
+
+#define CMD_SET_CAPTURE_FRAME_COUNTER  9 /* ARG 0: int */
+
+#define CMD_DO_CAPTURE                10 /* No args */
+#define CMD_INPUT_REOPEN              11 /* No args */
+
+#define CMD_QUIT                      12 /* No args */
+
+#define CMD_SET_VLOOPBACK             13 /* ARG 0: int */
+                                         /* ARG 1: string */
+
+typedef struct gmerlin_webcam_s gmerlin_webcam_t;
+
+gmerlin_webcam_t * gmerlin_webcam_create(bg_plugin_registry_t * plugin_reg);
+
+void gmerlin_webcam_get_message_queues(gmerlin_webcam_t *,
+                                       bg_msg_queue_t ** cmd_queue,
+                                       bg_msg_queue_t ** msg_queue);
+                 
+
+void gmerlin_webcam_run(gmerlin_webcam_t *);
+void gmerlin_webcam_quit(gmerlin_webcam_t *);
+
+void gmerlin_webcam_destroy(gmerlin_webcam_t *);
+
+const bg_parameter_info_t * gmerlin_webcam_get_filter_parameters(gmerlin_webcam_t *);
+void gmerlin_webcam_set_filter_parameter(void * data, const char * name,
+                                         const bg_parameter_value_t * val);
+
+#ifdef HAVE_V4L
+const bg_parameter_info_t * gmerlin_webcam_get_vloopback_parameters(gmerlin_webcam_t *);
+void gmerlin_webcam_set_vloopback_parameter(void * data, const char * name,
+                                            const bg_parameter_value_t * val);
+#endif
+
+const bg_parameter_info_t *
+gmerlin_webcam_get_parameters(gmerlin_webcam_t * w);
+
+void
+gmerlin_webcam_set_parameter(void * data, const char * name,
+                             const bg_parameter_value_t * val);
+

gmerlin-4256.tar.gz/apps/camelot/webcam_priv.h Added

@@ -0,0 +1,122 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/plugin.h>
+
+#ifdef HAVE_V4L
+#include "vloopback.h"
+#endif
+
+typedef struct video_stream_s
+  {
+  pthread_t thread;
+
+  gavl_video_format_t pipe_format;
+  gavl_video_format_t monitor_format;
+  gavl_video_format_t out_format;
+  
+  bg_plugin_handle_t * input_handle;
+  bg_plugin_handle_t * monitor_handle;
+  bg_plugin_handle_t * output_handle;
+
+  /* For encoding or output */
+  void (*put_frame)(struct video_stream_s * s, gavl_video_frame_t * f);
+  
+  } video_stream_t;
+
+struct gmerlin_webcam_s
+  {
+  gavl_video_frame_t     * monitor_frame;
+  gavl_video_converter_t * monitor_cnv;
+  bg_plugin_handle_t     * monitor_handle;
+  bg_ov_plugin_t         * monitor;
+
+  gavl_video_frame_t       * capture_frame;
+  gavl_video_converter_t   * capture_cnv;
+  bg_plugin_handle_t       * capture_handle;
+  bg_image_writer_plugin_t * capture;
+  
+  int do_convert_monitor;
+  int do_convert_capture;
+  
+  int do_monitor;
+  
+  int monitor_open;
+  int input_open;
+  int capture_open;
+
+  int capture_initialized;
+
+  gavl_timer_t * timer;
+  gavl_time_t next_capture_time;
+  gavl_time_t capture_interval;
+  
+  int auto_capture;
+  
+  uint32_t capture_frame_counter;
+
+  uint32_t frame_counter;
+
+  gavl_video_format_t cam_format;
+  
+  gavl_video_format_t input_format;
+  gavl_video_format_t monitor_format;
+  gavl_video_format_t capture_format;
+  
+  bg_plugin_handle_t * input_handle;
+
+  bg_recorder_plugin_t     * input;
+  
+  gavl_video_frame_t * input_frame;
+
+  pthread_t thread;
+  pthread_mutex_t mutex;
+
+  bg_msg_queue_t * cmd_queue;
+  bg_msg_queue_t * msg_queue;
+
+  char * capture_directory;
+  char * capture_namebase;
+  
+  bg_video_filter_chain_t * fc;
+
+  bg_plugin_registry_t * plugin_reg;
+
+  bg_gavl_video_options_t opt;
+  
+  int do_quit;
+
+  bg_read_video_func_t read_func;
+  void * read_data;
+  int read_stream;
+
+  int running;
+  int interrupted;
+
+#ifdef HAVE_V4L
+  bg_vloopback_t * vloopback;
+  int do_vloopback;
+  pthread_mutex_t vloopback_mutex;
+#endif  
+  };
+
+void * video_thread(void * priv);
+

gmerlin-4256.tar.gz/apps/camelot/webcam_window.c Added

@@ -0,0 +1,996 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <gtk/gtk.h>
+
+#include <config.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/cfg_dialog.h>
+
+#include "webcam.h"
+#include "webcam_window.h"
+
+#include <gui_gtk/plugin.h>
+#include <gui_gtk/fileentry.h>
+#include <gui_gtk/message.h>
+#include <gui_gtk/gtkutils.h>
+#include <gui_gtk/aboutwindow.h>
+#include <gui_gtk/logwindow.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "camelot"
+
+#define DELAY_TIME 100
+
+struct gmerlin_webcam_window_s 
+  {
+  bg_plugin_registry_t * plugin_reg;
+  gmerlin_webcam_t * cam;
+  GtkWidget * win;
+  bg_gtk_plugin_widget_single_t * input_plugin;
+  bg_gtk_plugin_widget_single_t * capture_plugin;
+  bg_gtk_plugin_widget_single_t * monitor_plugin;
+
+  GtkWidget * input_reopen;
+  GtkWidget * capture_button;
+  GtkWidget * auto_capture;
+  GtkWidget * capture_interval;
+  
+  GtkWidget * monitor_button;
+  GtkWidget * output_button;
+  GtkWidget * output_framerate;
+  GtkWidget * capture_framerate;
+  
+  GtkWidget * statusbar;
+  GtkWidget * about_button;
+  GtkWidget * log_button;
+  GtkWidget * config_button;
+  GtkWidget * filter_button;
+
+  bg_msg_queue_t * cmd_queue;
+  bg_msg_queue_t * msg_queue;
+      
+  bg_gtk_file_entry_t * output_dir;
+  GtkWidget * output_filename_base;
+  GtkWidget * output_frame_counter;
+  GtkWidget * output_set_frame_counter;
+
+  guint framerate_context;
+
+  int framerate_set;
+
+  bg_cfg_section_t * general_section;
+  bg_cfg_section_t * filter_section;
+  bg_cfg_section_t * log_section;
+  bg_cfg_section_t * vloopback_section;
+  
+  bg_gtk_log_window_t * logwindow;
+  bg_dialog_t * filter_dialog;
+  bg_dialog_t * cfg_dialog;
+
+  GtkWidget * vloopback_button;
+  
+  };
+
+static void set_input_plugin(const bg_plugin_info_t * info, void * data)
+  {
+  bg_msg_t * msg;
+  gmerlin_webcam_window_t * w;
+  bg_plugin_handle_t * h;
+  w = (gmerlin_webcam_window_t *)data;
+  h = bg_gtk_plugin_widget_single_load_plugin(w->input_plugin);
+  bg_plugin_registry_set_default(w->plugin_reg, BG_PLUGIN_RECORDER_VIDEO, BG_PLUGIN_RECORDER, info->name);
+
+  msg = bg_msg_queue_lock_write(w->cmd_queue);
+  bg_msg_set_id(msg, CMD_SET_INPUT_PLUGIN);
+  bg_msg_set_arg_ptr_nocopy(msg, 0, h);
+  bg_msg_queue_unlock_write(w->cmd_queue);
+  
+  //  gmerlin_webcam_set_input_plugin(w->cam, h);
+  }
+
+static void set_capture_plugin(const bg_plugin_info_t * info, void *  data)
+  {
+  bg_msg_t * msg;
+  gmerlin_webcam_window_t * w;
+  bg_plugin_handle_t * h;
+  w = (gmerlin_webcam_window_t *)data;
+  h = bg_gtk_plugin_widget_single_load_plugin(w->capture_plugin);
+  bg_plugin_registry_set_default(w->plugin_reg, BG_PLUGIN_IMAGE_WRITER, BG_PLUGIN_FILE, info->name);
+  
+  msg = bg_msg_queue_lock_write(w->cmd_queue);
+  bg_msg_set_id(msg, CMD_SET_CAPTURE_PLUGIN);
+  bg_msg_set_arg_ptr_nocopy(msg, 0, h);
+  bg_msg_queue_unlock_write(w->cmd_queue);
+  }
+
+static void set_monitor_plugin(const bg_plugin_info_t * info, void *  data)
+  {
+  bg_msg_t * msg;
+  gmerlin_webcam_window_t * w;
+  bg_plugin_handle_t * h;
+  bg_ov_plugin_t * p;
+
+  w = (gmerlin_webcam_window_t *)data;
+  h = bg_gtk_plugin_widget_single_load_plugin(w->monitor_plugin);
+  bg_plugin_registry_set_default(w->plugin_reg, 
+                                 BG_PLUGIN_OUTPUT_VIDEO, BG_PLUGIN_PLAYBACK,
+                                 info->name);
+  p = (bg_ov_plugin_t*)h->plugin;
+  if(p->set_window_options)
+    {
+    gavl_video_frame_t * icon = NULL;
+    gavl_video_format_t icon_format;
+    char * icon_path;
+
+    memset(&icon_format, 0, sizeof(icon_format));
+    
+    /* Load icon */
+    icon_path = bg_search_file_read("icons", WINDOW_ICON);
+    if(icon_path)       
+      {
+      icon = 
+        bg_plugin_registry_load_image(w->plugin_reg,
+                                      icon_path,
+                                      &icon_format,
+                                      NULL);
+       }
+    p->set_window_options(h->priv, WINDOW_NAME, WINDOW_CLASS, 
+                          icon, &icon_format);
+    if(icon)
+      gavl_video_frame_destroy(icon);
+    if(icon_path)
+      free(icon_path);
+    }
+
+  msg = bg_msg_queue_lock_write(w->cmd_queue);
+  bg_msg_set_id(msg, CMD_SET_MONITOR_PLUGIN);
+  bg_msg_set_arg_ptr_nocopy(msg, 0, h);
+  bg_msg_queue_unlock_write(w->cmd_queue);
+  }
+
+static void about_window_close_callback(bg_gtk_about_window_t * w,
+                                        void * data)
+  {
+  gmerlin_webcam_window_t * win;
+  win = (gmerlin_webcam_window_t *)data;
+  gtk_widget_set_sensitive(win->about_button, 1);
+  }
+
+static void log_window_close_callback(bg_gtk_log_window_t * w,
+                                      void * data)
+  {
+  gmerlin_webcam_window_t * win;
+  win = (gmerlin_webcam_window_t *)data;
+  gtk_widget_set_sensitive(win->log_button, 1);
+  }
+
+static void button_callback(GtkWidget * w, gpointer data)
+  {
+  int i;
+  bg_msg_t * msg;
+  
+  gmerlin_webcam_window_t * win;
+  win = (gmerlin_webcam_window_t *)data;
+  if(w == win->monitor_button)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_MONITOR);
+    bg_msg_set_arg_int(msg, 0, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->monitor_button)));
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->auto_capture)
+    {
+    i = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->auto_capture));
+    if(i)
+      {
+      gtk_widget_set_sensitive(win->capture_button,   0);
+      gtk_widget_set_sensitive(win->capture_interval, 1);
+      }
+    else
+      {
+      gtk_widget_set_sensitive(win->capture_button,   1);
+      gtk_widget_set_sensitive(win->capture_interval, 0);
+      }
+
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_CAPTURE_AUTO);
+    bg_msg_set_arg_int(msg, 0, i);
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->capture_interval)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_CAPTURE_INTERVAL);
+    bg_msg_set_arg_float
+      (msg, 0, gtk_spin_button_get_value(GTK_SPIN_BUTTON(win->capture_interval)));
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->input_reopen)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_INPUT_REOPEN);
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->capture_button)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_DO_CAPTURE);
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->output_filename_base)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_CAPTURE_NAMEBASE);
+    bg_msg_set_arg_string
+      (msg, 0, gtk_entry_get_text(GTK_ENTRY(win->output_filename_base)));
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->output_set_frame_counter)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_CAPTURE_FRAME_COUNTER);
+    bg_msg_set_arg_int
+      (msg, 0, gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(win->output_frame_counter)));
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+  else if(w == win->about_button)
+    {
+    gtk_widget_set_sensitive(win->about_button, 0);
+    bg_gtk_about_window_create("Camelot", VERSION,
+                               "camelot_icon.png", about_window_close_callback,
+                               win);
+    }
+  else if(w == win->log_button)
+    {
+    gtk_widget_set_sensitive(win->log_button, 0);
+    bg_gtk_log_window_show(win->logwindow);
+    }
+  else if(w == win->config_button)
+    {
+    bg_dialog_show(win->cfg_dialog, win->win);
+    }
+  else if(w == win->filter_button)
+    {
+    bg_dialog_show(win->filter_dialog, win->win);
+    }
+#ifdef HAVE_V4L
+  else if(w == win->vloopback_button)
+    {
+    msg = bg_msg_queue_lock_write(win->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_VLOOPBACK);
+    bg_msg_set_arg_int
+      (msg, 0, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->vloopback_button)));
+    bg_msg_queue_unlock_write(win->cmd_queue);
+    }
+#endif
+  }
+
+static gboolean timeout_func(gpointer data)
+  {
+  float arg_f;
+  int arg_i;
+  char * tmp_string;
+  bg_msg_t * msg;
+  
+  gmerlin_webcam_window_t * w;
+  w = (gmerlin_webcam_window_t *)data;
+  
+  msg = bg_msg_queue_try_lock_read(w->msg_queue);
+  if(msg)
+    {
+    switch(bg_msg_get_id(msg))
+      {
+      case MSG_FRAMERATE:
+        arg_f = bg_msg_get_arg_float(msg, 0);
+        tmp_string = bg_sprintf(TR("Framerate: %.2f fps"), arg_f);
+
+        if(w->framerate_set)
+          gtk_statusbar_pop(GTK_STATUSBAR(w->statusbar),
+                            w->framerate_context);
+        else
+          w->framerate_set = 1;
+        
+        gtk_statusbar_push(GTK_STATUSBAR(w->statusbar),
+                           w->framerate_context,
+                           tmp_string);
+        free(tmp_string);
+        break;
+      case MSG_FRAME_COUNT:
+        arg_i = bg_msg_get_arg_int(msg, 0);
+        
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(w->output_frame_counter), (float)arg_i);
+        break;
+      case MSG_ERROR:
+        break;
+      }
+    bg_msg_queue_unlock_read(w->msg_queue);
+    }
+  return TRUE;
+  }
+
+static void filename_changed_callback(bg_gtk_file_entry_t * entry, void * data)
+  {
+  bg_msg_t * msg;
+  gmerlin_webcam_window_t * w;
+  w = (gmerlin_webcam_window_t *)data;
+
+  if(entry == w->output_dir)
+    {
+    msg = bg_msg_queue_lock_write(w->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_CAPTURE_DIRECTORY);
+    bg_msg_set_arg_string(msg, 0, bg_gtk_file_entry_get_filename(w->output_dir));
+    bg_msg_queue_unlock_write(w->cmd_queue);
+    }
+  }
+
+static void delete_callback(GtkWidget * w, GdkEvent * evt, gpointer data)
+  {
+  gmerlin_webcam_window_t * win = (gmerlin_webcam_window_t *)data;
+
+  bg_cfg_section_get(win->general_section,
+                     gmerlin_webcam_window_get_parameters(win),
+                     gmerlin_webcam_window_get_parameter,
+                     win);
+
+  
+  gtk_widget_hide(win->win);
+  gtk_main_quit();
+  }
+
+static GtkWidget * create_pixmap_button(gmerlin_webcam_window_t * w,
+                                        const char * filename,
+                                        const char * tooltip)
+  {
+  GtkWidget * button;
+  GtkWidget * image;
+  char * path;
+  path = bg_search_file_read("icons", filename);
+  if(path)
+    {
+    image = gtk_image_new_from_file(path);
+    free(path);
+    }
+  else
+    image = gtk_image_new();
+
+  gtk_widget_show(image);
+  button = gtk_button_new();
+  gtk_container_add(GTK_CONTAINER(button), image);
+
+  g_signal_connect(G_OBJECT(button), "clicked",
+                   G_CALLBACK(button_callback), w);
+
+  gtk_widget_show(button);
+
+  bg_gtk_tooltips_set_tip(button, tooltip, PACKAGE);
+  
+  return button;
+  }
+
+gmerlin_webcam_window_t *
+gmerlin_webcam_window_create(gmerlin_webcam_t * w,
+                             bg_plugin_registry_t * reg,
+                             bg_cfg_registry_t * cfg_reg)
+  {
+  GtkWidget * notebook;
+  GtkWidget * mainbox;
+  GtkWidget * hbox;
+  GtkWidget * label;
+  GtkWidget * table;
+  GtkWidget * box;
+  GtkWidget * frame;
+  int row, num_columns;
+  
+  gmerlin_webcam_window_t * ret;
+  
+  ret = calloc(1, sizeof(*ret));
+  
+  ret->cam = w;
+  
+  ret->logwindow =
+    bg_gtk_log_window_create(log_window_close_callback,
+                             ret, "Camelot");
+  
+  gmerlin_webcam_get_message_queues(ret->cam,
+                                    &ret->cmd_queue,
+                                    &ret->msg_queue);
+  
+  ret->plugin_reg = reg;
+  
+  ret->win = bg_gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+  gtk_window_set_title(GTK_WINDOW(ret->win), "Camelot-"VERSION);
+  
+  g_signal_connect(G_OBJECT(ret->win), "delete-event", G_CALLBACK(delete_callback),
+                   ret);
+    
+  /* Create input stuff */
+    
+  ret->input_plugin =
+    bg_gtk_plugin_widget_single_create(TR("Plugin"), ret->plugin_reg,
+                                       BG_PLUGIN_RECORDER_VIDEO,
+                                       BG_PLUGIN_RECORDER);
+  bg_gtk_plugin_widget_single_set_change_callback(ret->input_plugin, set_input_plugin, ret);
+  
+  set_input_plugin(bg_gtk_plugin_widget_single_get_plugin(ret->input_plugin),
+                                                          ret);
+  
+  ret->input_reopen = gtk_button_new_with_label(TR("Reopen"));
+  g_signal_connect(G_OBJECT(ret->input_reopen), "clicked",
+                   G_CALLBACK(button_callback), ret);
+  gtk_widget_show(ret->input_reopen);
+
+  /* Create filter stuff */
+  ret->filter_button = gtk_button_new_with_label(TR("Setup filters"));
+  g_signal_connect(G_OBJECT(ret->filter_button), "clicked",
+                   G_CALLBACK(button_callback), ret);
+  gtk_widget_show(ret->filter_button);
+  
+  /* Create capture stuff */
+  
+  ret->capture_plugin =
+    bg_gtk_plugin_widget_single_create(TR("Plugin"), ret->plugin_reg,
+                                       BG_PLUGIN_IMAGE_WRITER,
+                                       BG_PLUGIN_FILE);
+  bg_gtk_plugin_widget_single_set_change_callback(ret->capture_plugin, set_capture_plugin, ret);
+
+  set_capture_plugin(bg_gtk_plugin_widget_single_get_plugin(ret->capture_plugin),
+                                                          ret);
+
+  
+  ret->capture_button = gtk_button_new_with_label(TR("Take picture"));
+  g_signal_connect(G_OBJECT(ret->capture_button), "clicked", G_CALLBACK(button_callback),
+                   ret);
+  gtk_widget_show(ret->capture_button);
+    
+  ret->auto_capture = gtk_check_button_new_with_label(TR("Automatic capture"));
+  g_signal_connect(G_OBJECT(ret->auto_capture), "toggled", G_CALLBACK(button_callback),
+                   ret);
+  gtk_widget_show(ret->auto_capture);
+
+  ret->capture_interval = gtk_spin_button_new_with_range(0.5, 1200.0, 1.0);
+  gtk_spin_button_set_digits(GTK_SPIN_BUTTON(ret->capture_interval), 1);
+  g_signal_connect(G_OBJECT(ret->capture_interval), "value-changed",
+                   G_CALLBACK(button_callback), ret);
+  gtk_widget_show(ret->capture_interval);
+
+  /* Create vloopback stuff */
+#ifdef HAVE_V4L
+  ret->vloopback_button = gtk_check_button_new_with_label(TR("Enable vloopback"));
+  g_signal_connect(G_OBJECT(ret->vloopback_button), "toggled",
+                   G_CALLBACK(button_callback), ret);
+  
+  gtk_widget_show(ret->vloopback_button);
+  
+#endif
+  
+  /* Create monitor stuff */
+  
+  ret->monitor_plugin =
+    bg_gtk_plugin_widget_single_create(TR("Plugin"), ret->plugin_reg,
+                                       BG_PLUGIN_OUTPUT_VIDEO,
+                                       BG_PLUGIN_PLAYBACK);
+  bg_gtk_plugin_widget_single_set_change_callback(ret->monitor_plugin,
+                                                  set_monitor_plugin, ret);
+
+  set_monitor_plugin(bg_gtk_plugin_widget_single_get_plugin(ret->monitor_plugin),
+                                                            ret);
+                     
+  
+  ret->monitor_button = gtk_check_button_new_with_label(TR("Enable Monitor"));
+  g_signal_connect(G_OBJECT(ret->monitor_button), "toggled",
+                   G_CALLBACK(button_callback), ret);
+  
+  gtk_widget_show(ret->monitor_button);
+
+  /* Create output file stuff */
+
+  ret->output_dir = bg_gtk_file_entry_create(1, filename_changed_callback, ret,
+                                             NULL, NULL);
+  ret->output_filename_base = gtk_entry_new();
+  g_signal_connect(ret->output_filename_base, "changed", G_CALLBACK(button_callback),
+                   ret);
+  
+  gtk_widget_show(ret->output_filename_base);
+    
+  ret->output_frame_counter = gtk_spin_button_new_with_range(0.0, 1000000.0, 1.0);
+  //  g_signal_connect(G_OBJECT(ret->output_frame_counter), "value-changed",
+  //                   G_CALLBACK(button_callback), ret);
+  gtk_widget_show(ret->output_frame_counter);
+  
+  gtk_spin_button_set_digits(GTK_SPIN_BUTTON(ret->output_frame_counter), 0);
+  
+  ret->output_set_frame_counter = gtk_button_new_with_label(TR("Set"));
+  g_signal_connect(G_OBJECT(ret->output_set_frame_counter), "clicked",
+                   G_CALLBACK(button_callback), ret);
+  gtk_widget_show(ret->output_set_frame_counter);
+  
+  notebook = gtk_notebook_new();
+
+  /* Pack input stuff */
+
+  frame = gtk_frame_new(TR("Input"));
+
+  box = gtk_vbox_new(0, 5);
+  gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+    
+  table = gtk_table_new(1, 1, 0);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+  gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+
+  row = 0;
+  num_columns = 0;
+
+  bg_gtk_plugin_widget_single_attach(ret->input_plugin,
+                                     table,
+                                     &row, &num_columns);
+
+  gtk_table_resize(GTK_TABLE(table), row+1, num_columns);
+
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->input_reopen, 
+                   0, num_columns, row, row+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  
+  gtk_widget_show(table);
+  
+  gtk_container_add(GTK_CONTAINER(frame), table);
+  gtk_widget_show(frame);
+  bg_gtk_box_pack_start_defaults(GTK_BOX(box), frame);
+
+  /* Pack filter stuff */
+
+  frame = gtk_frame_new(TR("Filters"));
+
+  table = gtk_table_new(1, 1, 0);
+  gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->filter_button, 
+                   0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+
+  gtk_widget_show(table);
+  
+  gtk_container_add(GTK_CONTAINER(frame), table);
+  gtk_widget_show(frame);
+  bg_gtk_box_pack_start_defaults(GTK_BOX(box), frame);
+  
+  /* Pack monitor stuff */
+
+  frame = gtk_frame_new(TR("Monitor"));
+  
+  table = gtk_table_new(1, 1, 0);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+  
+  gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+  row = 0;
+  num_columns = 0;
+
+  bg_gtk_plugin_widget_single_attach(ret->monitor_plugin,
+                                     table,
+                                     &row, &num_columns);
+  gtk_table_resize(GTK_TABLE(table), row+1, num_columns);
+  
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->monitor_button, 
+                   0, num_columns, row, row+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  
+  gtk_widget_show(table);
+
+  gtk_container_add(GTK_CONTAINER(frame), table);
+  gtk_widget_show(frame);
+  bg_gtk_box_pack_start_defaults(GTK_BOX(box), frame);
+
+#ifdef HAVE_V4L
+  bg_gtk_box_pack_start_defaults(GTK_BOX(box),
+                                 ret->vloopback_button);
+#endif
+  
+  gtk_widget_show(box);
+  
+  label = gtk_label_new(TR("Cam"));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook), box, label);
+  
+  /* Pack Capture stuff */
+
+  
+  table = gtk_table_new(1, 1, 0);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+  
+  gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+  row = 0;
+  num_columns = 0;
+
+  bg_gtk_plugin_widget_single_attach(ret->capture_plugin,
+                                     table,
+                                     &row, &num_columns);
+
+  gtk_table_resize(GTK_TABLE(table), row+3, num_columns);
+  
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->auto_capture, 
+                   0, num_columns, row, row+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  
+  label = gtk_label_new(TR("Interval (sec)"));
+  gtk_widget_show(label);
+  gtk_table_attach(GTK_TABLE(table),
+                   label, 
+                   0, 1, row+1, row+2, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->capture_interval, 
+                   1, num_columns, row+1, row+2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->capture_button, 
+                   0, num_columns, row+2, row+3, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  
+  gtk_widget_show(table);
+  
+  label = gtk_label_new(TR("Capture"));
+  gtk_widget_show(label);
+  
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table, label);
+
+  /* Pack output file stuff */
+
+  table = gtk_table_new(3, 3, 0);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+  gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+
+  label = gtk_label_new(TR("Directory"));
+  gtk_widget_show(label);
+  gtk_table_attach(GTK_TABLE(table),
+                   label, 
+                   0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+  gtk_table_attach_defaults(GTK_TABLE(table),
+                            bg_gtk_file_entry_get_entry(ret->output_dir), 
+                            1, 2, 0, 1);
+
+  gtk_table_attach(GTK_TABLE(table),
+                   bg_gtk_file_entry_get_button(ret->output_dir), 
+                   2, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+  box = gtk_vbox_new(0, 5);
+  gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+  
+  label = gtk_label_new(TR("Extension is appended by the plugin\n\
+%t    Inserts time\n\
+%d    Inserts date\n\
+%<i>n Inserts Frame number with <i> digits"));
+  gtk_widget_show(label);
+  
+  bg_gtk_box_pack_start_defaults(GTK_BOX(box), label);
+  bg_gtk_box_pack_start_defaults(GTK_BOX(box), ret->output_filename_base);
+
+  gtk_widget_show(box);
+  
+  frame = gtk_frame_new(TR("Filename base"));
+  gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
+  
+  gtk_container_add(GTK_CONTAINER(frame), box);
+  gtk_widget_show(frame);
+  gtk_table_attach_defaults(GTK_TABLE(table),
+                            frame, 
+                            0, 3, 1, 2);
+
+  label = gtk_label_new(TR("Frame counter"));
+  gtk_widget_show(label);
+
+  gtk_table_attach(GTK_TABLE(table),
+                   label, 
+                   0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+  
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->output_frame_counter, 
+                   1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+  
+  gtk_table_attach(GTK_TABLE(table),
+                   ret->output_set_frame_counter, 
+                   2, 3, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+  
+  gtk_widget_show(table);
+  
+  label = gtk_label_new(TR("Output files"));
+  gtk_widget_show(label);
+  
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table, label);
+  
+  /* Pack rest */
+    
+  gtk_widget_show(notebook);
+
+  ret->statusbar = gtk_statusbar_new();
+  ret->framerate_context =
+    gtk_statusbar_get_context_id(GTK_STATUSBAR(ret->statusbar),
+                                 "framerate");
+  
+  gtk_widget_show(ret->statusbar);
+
+  ret->about_button = create_pixmap_button(ret, "info_16.png", TRS("About"));
+  ret->log_button = create_pixmap_button(ret, "log_16.png", TRS("Log messages"));
+  ret->config_button = create_pixmap_button(ret, "config_16.png", TRS("Preferences"));
+  
+  mainbox = gtk_vbox_new(0, 5);
+  bg_gtk_box_pack_start_defaults(GTK_BOX(mainbox), notebook);
+  
+  hbox = gtk_hbox_new(0, 0);
+  bg_gtk_box_pack_start_defaults(GTK_BOX(hbox), ret->statusbar);
+  gtk_box_pack_start(GTK_BOX(hbox), ret->about_button, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), ret->log_button, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), ret->config_button, FALSE, FALSE, 0);
+  
+  gtk_widget_show(hbox);
+  gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+  
+  gtk_widget_show(mainbox);
+  gtk_container_add(GTK_CONTAINER(ret->win), mainbox);
+  
+  /* Add timeout */
+
+  g_timeout_add(DELAY_TIME, timeout_func, ret);
+
+  ret->general_section = bg_cfg_registry_find_section(cfg_reg, "general");
+  
+  bg_cfg_section_apply(ret->general_section,
+                       gmerlin_webcam_window_get_parameters(ret),
+                       gmerlin_webcam_window_set_parameter,
+                       ret);
+
+  ret->filter_section = bg_cfg_registry_find_section(cfg_reg, "filters");
+  ret->log_section = bg_cfg_registry_find_section(cfg_reg, "log");
+  ret->vloopback_section = bg_cfg_registry_find_section(cfg_reg, "vloopback");
+
+  bg_cfg_section_apply(ret->log_section,
+                       bg_gtk_log_window_get_parameters(ret->logwindow),
+                       bg_gtk_log_window_set_parameter,
+                       ret->logwindow);
+
+  bg_cfg_section_apply(ret->vloopback_section,
+                       gmerlin_webcam_get_vloopback_parameters(ret->cam),
+                       gmerlin_webcam_set_vloopback_parameter,
+                       ret->cam);
+
+  
+  /* Create config dialog */
+  ret->filter_dialog = bg_dialog_create(ret->filter_section,
+                                        gmerlin_webcam_set_filter_parameter,
+                                        NULL,
+                                        ret->cam,
+                                        gmerlin_webcam_get_filter_parameters(ret->cam),
+                                        "Filters");
+
+  ret->cfg_dialog = bg_dialog_create_multi(TR("Camelot confiuration"));
+
+#ifdef HAVE_V4L
+  bg_dialog_add(ret->cfg_dialog,
+                TR("vloopback"),
+                ret->vloopback_section,
+                gmerlin_webcam_set_vloopback_parameter,
+                NULL,
+                (void*)(ret->cam),
+                gmerlin_webcam_get_vloopback_parameters(ret->cam));
+#endif
+  
+  bg_dialog_add(ret->cfg_dialog,
+                TR("Log window"),
+                ret->log_section,
+                bg_gtk_log_window_set_parameter,
+                NULL,
+                (void*)(ret->logwindow),
+                bg_gtk_log_window_get_parameters(ret->logwindow));
+  
+  
+  return ret;
+  }
+
+void
+gmerlin_webcam_window_destroy(gmerlin_webcam_window_t * w)
+  {
+  bg_gtk_plugin_widget_single_destroy(w->input_plugin);
+  bg_gtk_plugin_widget_single_destroy(w->monitor_plugin);
+  bg_gtk_plugin_widget_single_destroy(w->capture_plugin);
+  bg_gtk_file_entry_destroy(w->output_dir);
+  
+  free(w);
+  }
+
+void
+gmerlin_webcam_window_show(gmerlin_webcam_window_t * w)
+  {
+  gtk_widget_show(w->win);
+  
+  }
+
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name =        "do_monitor",
+      .long_name =   TRS("Do monitor"),
+      .type =      BG_PARAMETER_CHECKBUTTON,
+      .val_default = { .val_i = 0 },
+      .help_string = TRS("Enable monitoring of the webcam image")
+    },
+    {
+      .name =        "auto_capture",
+      .long_name =   TRS("Automatic capture"),
+      .type =      BG_PARAMETER_CHECKBUTTON,
+      .val_default = { .val_i = 0 },
+      .help_string = TRS("Automatically capture in the specified capture interval")
+    },
+    {
+      .name =        "capture_interval",
+      .long_name =   TRS("Capture interval"),
+      .type =        BG_PARAMETER_FLOAT,
+      .val_default = { .val_f = 10.0 },
+      .val_min =     { .val_f = 0.5 },
+      .val_max =     { .val_f = 1200.0 },
+      .help_string = TRS("Capture interval (in seconds)"),
+    },
+    {
+      .name =        "output_directory",
+      .long_name =   TRS("Output directory"),
+      .type =        BG_PARAMETER_DIRECTORY,
+      .val_default = { .val_str = "/tmp/" },
+    },
+    {
+      .name =        "output_namebase",
+      .long_name =   TRS("Output namebase"),
+      .type =        BG_PARAMETER_STRING,
+      .val_default = { .val_str = "webcam-shot-%6n" },
+      .help_string = TRS("Template for the output files. A mask \"%<d>n\" inserts the frame number with <n> digits (e.g. webcam-shot-%6n)")
+    },
+    {
+      .name =        "output_frame_counter",
+      .long_name =   TRS("Output framecounter"),
+      .type =        BG_PARAMETER_INT,
+      .val_default = { .val_i = 0 },
+    },
+#ifdef HAVE_V4L
+    {
+      .name =        "vloopback",
+      .long_name =   TRS("vloopback"),
+      .type =        BG_PARAMETER_CHECKBUTTON,
+      .val_default = { .val_i = 1 },
+    },
+    {
+      .name =        "vloopback_dev",
+      .long_name =   TRS("vloopback_dev"),
+      .type =        BG_PARAMETER_FILE,
+      .val_default = { .val_str = "/dev/video1" },
+    },
+#endif
+    { /* End of parameters */  }
+  };
+
+const bg_parameter_info_t *
+gmerlin_webcam_window_get_parameters(gmerlin_webcam_window_t*w)
+  {
+  return parameters;
+  }
+
+void
+gmerlin_webcam_window_set_parameter(void * priv,
+                                    const char * name,
+                                    const bg_parameter_value_t * val)
+  {
+  bg_msg_t * msg;
+  gmerlin_webcam_window_t * w;
+  w = (gmerlin_webcam_window_t *)priv;
+
+  if(!name)
+    return;
+
+  if(!strcmp(name, "do_monitor"))
+    {
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->monitor_button), val->val_i);
+    }
+  else if(!strcmp(name, "auto_capture"))
+    {
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->auto_capture), val->val_i);
+    if(!val->val_i)
+      button_callback(w->auto_capture, w);
+    }
+  else if(!strcmp(name, "capture_interval"))
+    {
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(w->capture_interval), val->val_f);
+    }
+  else if(!strcmp(name, "output_directory"))
+    {
+    bg_gtk_file_entry_set_filename(w->output_dir, val->val_str);
+    }
+  else if(!strcmp(name, "output_namebase"))
+    {
+    gtk_entry_set_text(GTK_ENTRY(w->output_filename_base), val->val_str);
+    }
+  else if(!strcmp(name, "output_frame_counter"))
+    {
+    msg = bg_msg_queue_lock_write(w->cmd_queue);
+    bg_msg_set_id(msg, CMD_SET_CAPTURE_FRAME_COUNTER);
+    bg_msg_set_arg_int(msg, 0, val->val_i);
+    bg_msg_queue_unlock_write(w->cmd_queue);
+    
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(w->output_frame_counter),
+                              val->val_i);
+    }
+#ifdef HAVE_V4L
+  else if(!strcmp(name, "vloopback"))
+    {
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->vloopback_button), val->val_i);
+    }
+#endif
+  }
+
+int
+gmerlin_webcam_window_get_parameter(void * priv,
+                                    const char * name, bg_parameter_value_t * val)
+  {
+  gmerlin_webcam_window_t * w;
+  w = (gmerlin_webcam_window_t *)priv;
+
+  if(!name)
+    return 0;
+
+  if(!strcmp(name, "do_monitor"))
+    {
+    val->val_i = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->monitor_button));
+    }
+  else if(!strcmp(name, "auto_capture"))
+    {
+    val->val_i = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->auto_capture));
+    }
+  else if(!strcmp(name, "capture_interval"))
+    {
+    val->val_f = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w->capture_interval));
+    }
+  else if(!strcmp(name, "output_directory"))
+    {
+    val->val_str = bg_strdup(val->val_str,
+                             bg_gtk_file_entry_get_filename(w->output_dir));
+    }
+  else if(!strcmp(name, "output_namebase"))
+    {
+    val->val_str = bg_strdup(val->val_str,
+                             gtk_entry_get_text(GTK_ENTRY(w->output_filename_base)));
+    }
+  else if(!strcmp(name, "output_frame_counter"))
+    {
+    val->val_i =
+      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(w->output_frame_counter));
+    }
+#ifdef HAVE_V4L
+  else if(!strcmp(name, "vloopback"))
+    {
+    val->val_i = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->vloopback_button));
+    }
+#endif
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/camelot/webcam_window.h Added

@@ -0,0 +1,50 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct gmerlin_webcam_window_s gmerlin_webcam_window_t;
+
+#define WINDOW_NAME  "Camelot"
+#define WINDOW_CLASS "camelot"
+#define WINDOW_ICON "camelot_icon.png"
+
+gmerlin_webcam_window_t *
+gmerlin_webcam_window_create(gmerlin_webcam_t * w,
+                             bg_plugin_registry_t * reg,
+                             bg_cfg_registry_t * cfg_reg);
+void
+gmerlin_webcam_window_destroy(gmerlin_webcam_window_t * w);
+
+void
+gmerlin_webcam_window_show(gmerlin_webcam_window_t * w);
+
+
+const bg_parameter_info_t *
+gmerlin_webcam_window_get_parameters(gmerlin_webcam_window_t * w);
+
+int
+gmerlin_webcam_window_get_parameter(void * priv, const char * name,
+                                    bg_parameter_value_t * val);
+
+void
+gmerlin_webcam_window_set_parameter(void * priv, const char * name,
+                                    const bg_parameter_value_t * val);
+
+

gmerlin-1.2.0.tar.gz/apps/cmdlineplayer/Makefile.am -> gmerlin-4256.tar.gz/apps/cmdlineplayer/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/cmdlineplayer/gmerlin_play.1 -> gmerlin-4256.tar.gz/apps/cmdlineplayer/gmerlin_play.1 Changed

@@ -1,6 +1,6 @@
-.TH GMERLIN_PLAYER 1 "March 2012" Gmerlin "User Manuals"
+.TH GMERLIN_PLAYER 1 "June 2012" Gmerlin "User Manuals"
 .SH NAME
-gmerlin_player
+gmerlin_player \- Commandline media player
 .SH SYNOPSIS
 .B gmerlin_player 
 .I [options]
@@ -11,7 +11,7 @@
 
 .SH OPTIONS
 
-.B -oa
+.B \-oa
 .I <audio_output_options>
 
 .RS 2
@@ -32,7 +32,7 @@
 .RS 2
 .BR card "=<string>"
 .P
-Supported strings: default hw:0,0 hw:0,4
+Supported strings: default hw:0,0 hw:0,1
 .P
 Default: default
 .P
@@ -128,7 +128,7 @@
 .RE
 .RE
 
-.B -ov
+.B \-ov
 .I <video_output_options>
 
 .RS 2
@@ -210,7 +210,7 @@
 .RS 2
 .BR device "=option[{suboptions}]"
 .P
-Supported options: /dev/video0
+Supported options: <None>
 .P
 Default: /dev/video0
 .P
@@ -230,7 +230,7 @@
 .P
 .RE
 
-.B -i
+.B \-i
 .I <input_plugin>
 
 .RS 2
@@ -239,157 +239,12 @@
 .RS 2
 .BR p "=option[{suboptions}]"
 .P
-Supported options: i_cdaudio i_avdec i_vcd i_dvd i_singlepic_stills i_lqt i_edl i_singlepic i_mikmod
+Supported options: i_avdec i_cdaudio i_dvd i_vcd i_singlepic_stills i_lqt i_edl i_singlepic i_mikmod
 .P
-Default: i_cdaudio
+Default: i_avdec
 .P
 input plugin
 .P
-.B Suboptions for p=i_cdaudio
-
-.P
-.RS 2
-.BR trackname_template "=<string> (Default: %p - %t)"
-.P
-Trackname template
-.P
-Template for track name generation from metadata
-%p:    Artist
-%a:    Album
-%g:    Genre
-%t:    Track name
-%<d>n: Track number (d = number of digits, 1-9)
-%y:    Year
-%c:    Comment
-
-.P
-.BR use_cdtext "=[1|0] (default: 1)"
-.P
-Use CD-Text
-.P
-Try to get CD metadata from CD-Text
-
-.P
-.BR use_local "=[1|0] (default: 1)"
-.P
-Use locally saved metadata
-.P
-Whenever we obtain CD metadata from the internet, we save them into
-$HOME/.gmerlin/cdaudio_metadata. If you got wrong metadata for a CD,
-disabling this option will retrieve the metadata again and overwrite the
-saved data.
-
-.P
-.BR use_musicbrainz "=[1|0] (default: 1)"
-.P
-Use Musicbrainz
-.P
-.BR musicbrainz_host "=<string> (Default: mm.musicbrainz.org)"
-.P
-Server
-.P
-.BR musicbrainz_port "=<number> (1..65535, default: 80)"
-.P
-Port
-.P
-.BR musicbrainz_proxy_host "=<string>"
-.P
-Proxy
-.P
-Proxy server (leave empty for direct connection)
-
-.P
-.BR musicbrainz_proxy_port "=<number> (1..65535, default: 80)"
-.P
-Proxy port
-.P
-Proxy port
-
-.P
-.BR use_cddb "=[1|0] (default: 1)"
-.P
-Use Cddb
-.P
-.BR cddb_host "=<string> (Default: freedb.org)"
-.P
-Server
-.P
-.BR cddb_port "=<number> (1..65535, default: 80)"
-.P
-Port
-.P
-.BR cddb_path "=<string> (Default: /~cddb/cddb.cgi)"
-.P
-Path
-.P
-.BR cddb_proxy_host "=<string>"
-.P
-Proxy
-.P
-Proxy server (leave empty for direct connection)
-
-.P
-.BR cddb_proxy_port "=<number> (1..65535, default: 80)"
-.P
-Proxy port
-.P
-Proxy port
-
-.P
-.BR cddb_proxy_user "=<string>"
-.P
-Proxy username
-.P
-User name for proxy (leave empty for poxies, which don't require
-authentication)
-
-.P
-.BR cddb_proxy_pass "=<string>"
-.P
-Proxy password
-.P
-Password for proxy
-
-.P
-.BR cddb_timeout "=<number> (0..1000, default: 10)"
-.P
-Timeout
-.P
-Timeout (in seconds) for connections to the CDDB server
-
-.P
-.BR cdparanoia_speed "=<string>"
-.P
-Supported strings: Auto 4 8 16 32
-.P
-Default: Auto
-.P
-Speed
-.P
-.BR cdparanoia_max_retries "=<number> (0..200, default: 20)"
-.P
-Maximum retries
-.P
-Maximum number of retries, 0 = infinite
-
-.P
-.BR cdparanoia_disable_paranoia "=[1|0] (default: 0)"
-.P
-Disable paranoia
-.P
-Disable all data verification and correction features.
-
-.P
-.BR cdparanoia_disable_extra_paranoia "=[1|0] (default: 0)"
-.P
-Disable extra paranoia
-.P
-Disables intra-read data verification; only overlap checking atread
-boundaries is performed. It can wedge if errors  occur  in the attempted
-overlap area. Not recommended.
-
-.P
-.RE
 .B Suboptions for p=i_avdec
 
 .P
@@ -568,6 +423,151 @@
 Export date and time as timecodes for DV
 .P
 .RE
+.B Suboptions for p=i_cdaudio
+
+.P
+.RS 2
+.BR trackname_template "=<string> (Default: %p - %t)"
+.P
+Trackname template
+.P
+Template for track name generation from metadata
+%p:    Artist
+%a:    Album
+%g:    Genre
+%t:    Track name
+%<d>n: Track number (d = number of digits, 1-9)
+%y:    Year
+%c:    Comment
+
+.P
+.BR use_cdtext "=[1|0] (default: 1)"
+.P
+Use CD-Text
+.P
+Try to get CD metadata from CD-Text
+
+.P
+.BR use_local "=[1|0] (default: 1)"
+.P
+Use locally saved metadata
+.P
+Whenever we obtain CD metadata from the internet, we save them into
+$HOME/.gmerlin/cdaudio_metadata. If you got wrong metadata for a CD,
+disabling this option will retrieve the metadata again and overwrite the
+saved data.
+
+.P
+.BR use_musicbrainz "=[1|0] (default: 1)"
+.P
+Use Musicbrainz
+.P
+.BR musicbrainz_host "=<string> (Default: mm.musicbrainz.org)"
+.P
+Server
+.P
+.BR musicbrainz_port "=<number> (1..65535, default: 80)"
+.P
+Port
+.P
+.BR musicbrainz_proxy_host "=<string>"
+.P
+Proxy
+.P
+Proxy server (leave empty for direct connection)
+
+.P
+.BR musicbrainz_proxy_port "=<number> (1..65535, default: 80)"
+.P
+Proxy port
+.P
+Proxy port
+
+.P
+.BR use_cddb "=[1|0] (default: 1)"
+.P
+Use Cddb
+.P
+.BR cddb_host "=<string> (Default: freedb.org)"
+.P
+Server
+.P
+.BR cddb_port "=<number> (1..65535, default: 80)"
+.P
+Port
+.P
+.BR cddb_path "=<string> (Default: /~cddb/cddb.cgi)"
+.P
+Path
+.P
+.BR cddb_proxy_host "=<string>"
+.P
+Proxy
+.P
+Proxy server (leave empty for direct connection)
+
+.P
+.BR cddb_proxy_port "=<number> (1..65535, default: 80)"
+.P
+Proxy port
+.P
+Proxy port
+
+.P
+.BR cddb_proxy_user "=<string>"
+.P
+Proxy username
+.P
+User name for proxy (leave empty for poxies, which don't require
+authentication)
+
+.P
+.BR cddb_proxy_pass "=<string>"
+.P
+Proxy password
+.P
+Password for proxy
+
+.P
+.BR cddb_timeout "=<number> (0..1000, default: 10)"
+.P
+Timeout
+.P
+Timeout (in seconds) for connections to the CDDB server
+
+.P
+.BR cdparanoia_speed "=<string>"
+.P
+Supported strings: Auto 4 8 16 32
+.P
+Default: Auto
+.P
+Speed
+.P
+.BR cdparanoia_max_retries "=<number> (0..200, default: 20)"
+.P
+Maximum retries
+.P
+Maximum number of retries, 0 = infinite
+
+.P
+.BR cdparanoia_disable_paranoia "=[1|0] (default: 0)"
+.P
+Disable paranoia
+.P
+Disable all data verification and correction features.
+
+.P
+.BR cdparanoia_disable_extra_paranoia "=[1|0] (default: 0)"
+.P
+Disable extra paranoia
+.P
+Disables intra-read data verification; only overlap checking atread
+boundaries is performed. It can wedge if errors  occur  in the attempted
+overlap area. Not recommended.
+
+.P
+.RE
 .B Suboptions for p=i_dvd
 
 .P
@@ -601,8 +601,8 @@
 .BR ac "={option[{suboptions}][:option[{suboptions}]...]}"
 .P
 Supported options: ima4 rawaudio twos ulaw sowt alaw in24 in32 fl32 fl64 
-lpcm vorbis vorbis_qt ffmpeg_mp3 ffmpeg_mp2 ffmpeg_ac3 ffmpeg_qdm2 
-ffmpeg_alac ffmpeg_adpcm_ms ffmpeg_ima_adpcm_wav faad2
+lpcm faad2 ffmpeg_mp3 ffmpeg_mp2 ffmpeg_ac3 ffmpeg_qdm2 ffmpeg_alac 
+ffmpeg_adpcm_ms ffmpeg_ima_adpcm_wav vorbis vorbis_qt
 
 Audio Codecs
 .P
@@ -611,15 +611,14 @@
 .P
 .BR vc "={option[{suboptions}][:option[{suboptions}]...]}"
 .P
-Supported options: raw v308 v408 v410 yuv2 yuv4 yv12 2vuy v210 rtjpeg 
-jpeg mjpa png ffmpeg_mpg1 ffmpeg_mpg4 ffmpeg_msmpeg4v1 
+Supported options: jpeg rtjpeg raw v308 v408 v410 yuv2 yuv4 yv12 2vuy 
+v210 schroedinger png ffmpeg_mpg1 ffmpeg_mpg4 ffmpeg_msmpeg4v1 
 ffmpeg_msmpeg4v2 ffmpeg_msmpeg4v3 ffmpeg_msmpeg4v3_wmp ffmpeg_h263_dec 
 ffmpeg_h263 ffmpeg_h264 ffmpeg_i263 ffmpeg_svq1 ffmpeg_svq3 
 ffmpeg_mjpg ffmpeg_mjpegb ffmpeg_TGA ffmpeg_TIFF ffmpeg_8BPS 
 ffmpeg_indeo ffmpeg_rpza ffmpeg_smc ffmpeg_cinepak ffmpeg_cyuv 
-ffmpeg_rle ffmpeg_wrle ffmpeg_dv ffmpeg_dvcpro ffmpeg_dv50 
-ffmpeg_dvcprohd ffmpeg_ffvhuff ffmpeg_ffv1 ffmpeg_dnxhd ffmpeg_imx 
-schroedinger yuvs
+ffmpeg_rle ffmpeg_wrle ffmpeg_dvcprohd ffmpeg_ffvhuff ffmpeg_ffv1 
+ffmpeg_dnxhd mjpa ffmpeg_imx ffmpeg_dv ffmpeg_dvcpro ffmpeg_dv50 yuvs
 
 Video Codecs
 .P
@@ -770,7 +769,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_dv
+.B Suboptions for ffmpeg_dvcprohd
 
 .P
 .RS 2
@@ -779,7 +778,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_dvcpro
+.B Suboptions for ffmpeg_ffvhuff
 
 .P
 .RS 2
@@ -788,7 +787,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_dv50
+.B Suboptions for ffmpeg_ffv1
 
 .P
 .RS 2
@@ -797,7 +796,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_dvcprohd
+.B Suboptions for ffmpeg_dnxhd
 
 .P
 .RS 2
@@ -806,7 +805,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_ffvhuff
+.B Suboptions for ffmpeg_imx
 
 .P
 .RS 2
@@ -815,7 +814,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_ffv1
+.B Suboptions for ffmpeg_dv
 
 .P
 .RS 2
@@ -824,7 +823,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_dnxhd
+.B Suboptions for ffmpeg_dvcpro
 
 .P
 .RS 2
@@ -833,7 +832,7 @@
 Grayscale mode
 .P
 .RE
-.B Suboptions for ffmpeg_imx
+.B Suboptions for ffmpeg_dv50
 
 .P
 .RS 2
@@ -891,7 +890,7 @@
 .RE
 .RE
 
-.B -aud
+.B \-aud
 .I <audio_options>
 
 .RS 2
@@ -1001,7 +1000,7 @@
 .P
 .RE
 
-.B -vid
+.B \-vid
 .I <video_options>
 
 .RS 2
@@ -1063,7 +1062,7 @@
 .P
 .RE
 
-.B -inopt
+.B \-inopt
 .I <input_options>
 
 .RS 2
@@ -1088,7 +1087,7 @@
 .P
 .RE
 
-.B -osd
+.B \-osd
 .I <osd_options>
 
 .RS 2
@@ -1173,27 +1172,27 @@
 .P
 .RE
 
-.B -nt
+.B \-nt
 
 .RS 2
 Disable time display
 .RE
 
-.B -vol
+.B \-vol
 .I <volume>
 
 .RS 2
 Set volume in dB (max: 0.0)
 .RE
 
-.B -v
+.B \-v
 .I level
 
 .RS 2
 Set verbosity level (0..4)
 .RE
 
-.B -tracks
+.B \-tracks
 .I <track_spec>
 
 .RS 2
@@ -1203,25 +1202,25 @@
 .SH GENERIC OPTIONS
 The following generic options are available for all gmerlin applications
 
-.B -help
+.B \-help
 
 .RS 2
 Print this help message and exit
 .RE
 
-.B -help-man
+.B \-help\-man
 
 .RS 2
 Print this help message as a manual page and exit
 .RE
 
-.B -help-texi
+.B \-help\-texi
 
 .RS 2
 Print this help message in texinfo format and exit
 .RE
 
-.B -version
+.B \-version
 
 .RS 2
 Print version info and exit

gmerlin-1.2.0.tar.gz/apps/cmdlineplayer/gmerlin_play.c -> gmerlin-4256.tar.gz/apps/cmdlineplayer/gmerlin_play.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -31,10 +31,13 @@
 #include <gmerlin/player.h>
 #include <gmerlin/pluginregistry.h>
 #include <gavl/gavl.h>
+#include <gavl/metatags.h>
+
 #include <gmerlin/utils.h>
 #include <gmerlin/cmdline.h>
 #include <gmerlin/log.h>
 #include <gmerlin/translation.h>
+#include <gmerlin/bggavl.h>
 
 #ifdef INFO_WINDOW
 #include <gtk/gtk.h>
@@ -184,7 +187,7 @@
     }
   else if(name && !strcmp(name, "window"))
     {
-    window_id = bg_strdup(window_id, val->val_str);
+    window_id = gavl_strrep(window_id, val->val_str);
     }
 #if 0
   else
@@ -199,7 +202,7 @@
                             const bg_parameter_value_t * val)
   {
   if(name && !strcmp(name, "plugin"))
-    input_plugin_name = bg_strdup(input_plugin_name,
+    input_plugin_name = gavl_strrep(input_plugin_name,
                                   val->val_str);
   }
 
@@ -334,7 +337,7 @@
     fprintf(stderr, "Option -vol requires an argument\n");
     exit(-1);
     }
-  bg_player_set_volume(player, strtod((*_argv[arg]), NULL));
+  bg_player_set_volume(player, strtod((*_argv)[arg], NULL));
   bg_cmdline_remove_arg(argc, _argv, arg);
   }
 
@@ -345,7 +348,7 @@
     fprintf(stderr, "Option -tracks requires an argument\n");
     exit(-1);
     }
-  track_spec = bg_strdup(track_spec, (*_argv)[arg]);
+  track_spec = gavl_strrep(track_spec, (*_argv)[arg]);
   track_spec_ptr = track_spec;
   bg_cmdline_remove_arg(argc, _argv, arg);
   }
@@ -515,10 +518,8 @@
   const bg_plugin_info_t * info = NULL;
   bg_input_plugin_t * plugin;
   bg_track_info_t * track_info;
-
   int result;
-  char * redir_url;
-  char * redir_plugin;
+  const char * var;
   
   if(plugin_name)
     info = bg_plugin_find_by_name(plugin_reg,
@@ -592,10 +593,13 @@
   if(!track_info)
     return 0;
     
-  if(track_info->url)
+  if((var = gavl_metadata_get(&track_info->metadata, GAVL_META_REFURL)))
     {
-    redir_url    = bg_strdup(NULL, track_info->url);
-    redir_plugin = bg_strdup(NULL, input_handle->info->name);
+    char * redir_url;
+    char * redir_plugin;
+    
+    redir_url    = gavl_strdup(var);
+    redir_plugin = gavl_strdup(input_handle->info->name);
 
     bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Got redirector %s (%d/%d)",
             redir_url, current_track+1, num_tracks);
@@ -610,58 +614,26 @@
     return result;
     }
   
-  if(!track_info->name)
-    bg_set_track_name_default(track_info, gml);
-  bg_player_play(player, input_handle, current_track, 0, track_info->name);
+  bg_set_track_name_default(track_info, gml);
+  bg_player_play(player, input_handle, current_track, 0, gavl_metadata_get(&track_info->metadata,
+                                                                           GAVL_META_LABEL));
   
   return 1;
   }
 
-
+#if 1
 static void print_time(gavl_time_t time)
   {
-  char str[GAVL_TIME_STRING_LEN];
-  int i;
-  int len;
-  int total_len;
   if(!display_time)
     return;
-  total_len = 2*GAVL_TIME_STRING_LEN + 7;
-  
-  if(time_active)
-    putc('\r', stderr);
-  
-  gavl_time_prettyprint(time, str);
-
-  fprintf(stderr, "[ ");
-  len = strlen(str);
-
-  for(i = 0; i < GAVL_TIME_STRING_LEN - len - 1; i++)
-    {
-    fprintf(stderr, " ");
-    }
-  fprintf(stderr, "%s ]/", str);
-
-  gavl_time_prettyprint(total_time, str);
-
-  fprintf(stderr, "[ ");
-  len = strlen(str);
-
-  for(i = 0; i < GAVL_TIME_STRING_LEN - len - 1; i++)
-    {
-    fprintf(stderr, " ");
-    }
-  fprintf(stderr, "%s ]", str);
-  
-  time_active = 1;
+  bg_print_time(stderr, time, total_time);
   }
-
+#endif
 
 static int handle_message(bg_player_t * player,
                           bg_msg_t * message)
   {
   int arg_i1;
-  char * arg_str1;
   gavl_time_t t;
   gavl_audio_format_t audio_format;
   gavl_video_format_t video_format;
@@ -679,15 +651,6 @@
     case BG_PLAYER_MSG_TRACK_DURATION:
       total_time = bg_msg_get_arg_time(message, 0);
       break;
-    case BG_PLAYER_MSG_TRACK_NAME:
-      arg_str1 = bg_msg_get_arg_string(message, 0);
-      if(arg_str1)
-        {
-        if(time_active) { putc('\n', stderr); time_active = 0; }
-        bg_log(BG_LOG_INFO, LOG_DOMAIN, "Name: %s", arg_str1);
-        free(arg_str1);
-        }
-      break;
     case BG_PLAYER_MSG_TRACK_NUM_STREAMS:
       arg_i1 = bg_msg_get_arg_int(message, 0);
       if(arg_i1)
@@ -708,10 +671,10 @@
     case BG_PLAYER_MSG_AUDIO_STREAM:
       arg_i1 = bg_msg_get_arg_int(message, 0);
 
-      bg_msg_get_arg_audio_format(message, 1, &audio_format, NULL);
+      bg_msg_get_arg_audio_format(message, 1, &audio_format);
       tmp_string_1 = bg_audio_format_to_string(&audio_format, 0);
 
-      bg_msg_get_arg_audio_format(message, 2, &audio_format, NULL);
+      bg_msg_get_arg_audio_format(message, 2, &audio_format);
       tmp_string_2 = bg_audio_format_to_string(&audio_format, 0);
   
       bg_log(BG_LOG_INFO, LOG_DOMAIN, "Playing audio stream %d\nInput format:\n%s\nOutput format:\n%s",
@@ -723,10 +686,10 @@
     case BG_PLAYER_MSG_VIDEO_STREAM:
       arg_i1 = bg_msg_get_arg_int(message, 0);
 
-      bg_msg_get_arg_video_format(message, 1, &video_format, NULL);
+      bg_msg_get_arg_video_format(message, 1, &video_format);
       tmp_string_1 = bg_video_format_to_string(&video_format, 0);
 
-      bg_msg_get_arg_video_format(message, 2, &video_format, NULL);
+      bg_msg_get_arg_video_format(message, 2, &video_format);
       tmp_string_2 = bg_video_format_to_string(&video_format, 0);
   
       bg_log(BG_LOG_INFO, LOG_DOMAIN, "Playing video stream %d\nInput format:\n%s\nOutput format:\n%s",
@@ -833,13 +796,14 @@
     .package =  PACKAGE,
     .version =  VERSION,
     .name =     "gmerlin_player",
+    .long_name = TRS("Commandline media player"),
     .synopsis = TRS("[options] gml...\n"),
     .help_before = TRS("Commandline Multimedia player\n"),
     .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
                                        {  } },
     .files = (bg_cmdline_ext_doc_t[])
     { { "~/.gmerlin/plugins.xml",
-        TRS("Cache of the plugin registry (shared by all applicatons)") },
+        TRS("Cache of the plugin registry (shared by all applications)") },
       { "~/.gmerlin/generic/config.xml",
         TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
       { /* End */ }

gmerlin-1.2.0.tar.gz/apps/cmdlinerecorder/Makefile.am -> gmerlin-4256.tar.gz/apps/cmdlinerecorder/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/cmdlinerecorder/gmerlin-record.1 -> gmerlin-4256.tar.gz/apps/cmdlinerecorder/gmerlin-record.1 Changed

@@ -1,6 +1,6 @@
-.TH GMERLIN-RECORD 1 "March 2012" Gmerlin "User Manuals"
+.TH GMERLIN-RECORD 1 "June 2012" Gmerlin "User Manuals"
 .SH NAME
-gmerlin-record
+gmerlin-record \- Commandline recorder
 .SH SYNOPSIS
 .B gmerlin-record 
 .I [options]
@@ -10,7 +10,7 @@
 
 .SH OPTIONS
 
-.B -aud
+.B \-aud
 .I <audio_options>
 
 .RS 2
@@ -35,7 +35,7 @@
 .RS 2
 .BR card "=<string>"
 .P
-Supported strings: default hw:0,0 hw:0,1 hw:0,2 hw:0,3
+Supported strings: default hw:0,0 hw:0,2
 .P
 Default: default
 .P
@@ -198,7 +198,7 @@
 .P
 .RE
 
-.B -vid
+.B \-vid
 .I <video_options>
 
 .RS 2
@@ -211,12 +211,48 @@
 .P
 .BR plugin "=option[{suboptions}]"
 .P
-Supported options: i_v4l i_v4l2 i_x11
+Supported options: i_v4l2 i_v4l i_x11
 .P
-Default: i_v4l
+Default: i_v4l2
 .P
 Plugin
 .P
+.B Suboptions for plugin=i_v4l2
+
+.P
+.RS 2
+.BR device "=option[{suboptions}]"
+.P
+Supported options: <None>
+.P
+Default: /dev/video0
+.P
+V4L2 Device
+.P
+.BR force_rw "=[1|0] (default: 1)"
+.P
+Force read
+.P
+Don't use memory mapping
+
+.P
+.BR resolution "=<string>"
+.P
+Supported strings: QSIF (160x112) QCIF (176x144) QVGA (320x240) SIF(352x240) CIF (352x288) VGA (640x480) User defined
+.P
+Default: QVGA (320x240)
+.P
+Resolution
+.P
+.BR user_width "=<number> (160..1024, default: 720)"
+.P
+User defined width
+.P
+.BR user_height "=<number> (112..768, default: 576)"
+.P
+User defined height
+.P
+.RE
 .B Suboptions for plugin=i_v4l
 
 .P
@@ -262,42 +298,6 @@
 Whiteness
 .P
 .RE
-.B Suboptions for plugin=i_v4l2
-
-.P
-.RS 2
-.BR device "=option[{suboptions}]"
-.P
-Supported options: /dev/video0
-.P
-Default: /dev/video0
-.P
-V4L2 Device
-.P
-.BR force_rw "=[1|0] (default: 1)"
-.P
-Force read
-.P
-Don't use memory mapping
-
-.P
-.BR resolution "=<string>"
-.P
-Supported strings: QSIF (160x112) QCIF (176x144) QVGA (320x240) SIF(352x240) CIF (352x288) VGA (640x480) User defined
-.P
-Default: QVGA (320x240)
-.P
-Resolution
-.P
-.BR user_width "=<number> (160..1024, default: 720)"
-.P
-User defined width
-.P
-.BR user_height "=<number> (112..768, default: 576)"
-.P
-User defined height
-.P
-.RE
 .B Suboptions for plugin=i_x11
 
 .P
@@ -344,7 +344,7 @@
 .P
 .RE
 
-.B -af
+.B \-af
 .I <audio filter options>
 
 .RS 2
@@ -353,17 +353,13 @@
 .RS 2
 .BR audio_filters "={option[{suboptions}][:option[{suboptions}]...]}"
 .P
-Supported options: fa_ladspa_lp4pole_fcrcia_oa fa_ladspa_fourByFourPole 
-fa_ladspa_adsr fa_ladspa_amPitchshift fa_ladspa_alias fa_ladspa_allpass_c 
-fa_ladspa_allpass_l fa_ladspa_allpass_n fa_ladspa_amp_gcia_oa 
-fa_ladspa_amp_mono fa_ladspa_amp_stereo fa_ladspa_artificialLatency 
-fa_ladspa_divider fa_ladspa_autoPhaser fa_ladspa_sawtooth_fa_oa 
-fa_ladspa_square_fa_oa fa_ladspa_triangle_fasc_oa 
-fa_ladspa_triangle_fcsa_oa fa_ladspa_pulse_fapc_oa fa_ladspa_pulse_fcpa_oa 
+Supported options: fa_ladspa_fourByFourPole fa_ladspa_amPitchshift 
+fa_ladspa_alias fa_ladspa_allpass_c fa_ladspa_allpass_l 
+fa_ladspa_allpass_n fa_ladspa_amp_mono fa_ladspa_amp_stereo 
+fa_ladspa_artificialLatency fa_ladspa_divider fa_ladspa_autoPhaser 
 fa_ladspa_satanMaximiser fa_ladspa_canyon_delay fa_ladspa_chebstortion 
-fa_ladspa_syncsquare_fcga_oa fa_ladspa_syncpulse_fcpcga_oa fa_ladspa_comb 
-fa_ladspa_comb_c fa_ladspa_comb_l fa_ladspa_comb_n fa_ladspa_const 
-fa_ladspa_crossoverDist fa_ladspa_dcRemove fa_ladspa_dj_eq 
+fa_ladspa_comb fa_ladspa_comb_c fa_ladspa_comb_l fa_ladspa_comb_n 
+fa_ladspa_const fa_ladspa_crossoverDist fa_ladspa_dcRemove fa_ladspa_dj_eq 
 fa_ladspa_dj_eq_mono fa_ladspa_djFlanger fa_ladspa_decimator 
 fa_ladspa_declip fa_ladspa_delayorama fa_ladspa_diode 
 fa_ladspa_disintegrator fa_ladspa_dysonCompress fa_ladspa_delay_0,01s 
@@ -373,31 +369,27 @@
 fa_ladspa_fbdelay_0,01s fa_ladspa_fbdelay_0,1s fa_ladspa_fbdelay_1s 
 fa_ladspa_fbdelay_5s fa_ladspa_fbdelay_60s fa_ladspa_flanger 
 fa_ladspa_foldover fa_sampleformat fa_ladspa_fadDelay fa_ladspa_freeverb3 
-fa_ladspa_freqTracker fa_ladspa_fmod_famc_oa fa_ladspa_fmod_fcma_oa 
-fa_ladspa_butthigh_iir fa_ladspa_buttlow_iir fa_ladspa_gsm fa_ladspa_gate 
-fa_ladspa_giantFlange fa_ladspa_bandpass_a_iir fa_ladspa_bandpass_iir 
-fa_ladspa_highpass_iir fa_ladspa_lowpass_iir fa_ladspa_gongBeater 
-fa_ladspa_gong fa_ladspa_grain_scatter fa_ladspa_hard_gate 
-fa_ladspa_hardLimiter fa_ladspa_harmonicGen fa_ladspa_hermesFilter 
-fa_ladspa_hpf fa_ladspa_pitchScaleHQ fa_ladspa_identity_audio 
-fa_ladspa_imp fa_ladspa_inv fa_ladspa_karaoke fa_ladspa_lcrDelay 
-fa_ladspa_lfoPhaser fa_ladspa_lsFilter fa_ladspa_lofi fa_ladspa_lpf 
-fa_ladspa_notch_iir fa_ladspa_matrixSpatialiser fa_ladspa_matrixMSSt 
-fa_ladspa_matrixStMS fa_ladspa_mbeq fa_ladspa_multivoiceChorus 
-fa_ladspa_pitchScale fa_ladspa_pointerCastDistortion 
-fa_ladspa_random_fasc_oa fa_ladspa_random_fcsa_oa fa_ladspa_rateShifter 
+fa_ladspa_freqTracker fa_ladspa_butthigh_iir fa_ladspa_buttlow_iir 
+fa_ladspa_gsm fa_ladspa_gate fa_ladspa_giantFlange 
+fa_ladspa_bandpass_a_iir fa_ladspa_bandpass_iir fa_ladspa_highpass_iir 
+fa_ladspa_lowpass_iir fa_ladspa_gongBeater fa_ladspa_gong 
+fa_ladspa_grain_scatter fa_ladspa_hard_gate fa_ladspa_hardLimiter 
+fa_ladspa_harmonicGen fa_ladspa_hermesFilter fa_ladspa_hpf 
+fa_ladspa_pitchScaleHQ fa_ladspa_identity_audio fa_ladspa_imp 
+fa_ladspa_inv fa_ladspa_karaoke fa_ladspa_lcrDelay fa_ladspa_lfoPhaser 
+fa_ladspa_lsFilter fa_ladspa_lofi fa_ladspa_lpf fa_ladspa_notch_iir 
+fa_ladspa_matrixSpatialiser fa_ladspa_matrixMSSt fa_ladspa_matrixStMS 
+fa_ladspa_mbeq fa_ladspa_multivoiceChorus fa_ladspa_pitchScale 
+fa_ladspa_pointerCastDistortion fa_ladspa_rateShifter 
 fa_ladspa_retroFlange fa_ladspa_revdelay fa_ladspa_ringmod_1i1o1l 
-fa_ladspa_sc1 fa_ladspa_sc4 fa_ladspa_sc4m fa_ladspa_se4 
-fa_ladspa_difference_iamc_oa fa_ladspa_difference_icma_oa 
-fa_ladspa_product_iaic_oa fa_ladspa_ratio_nadc_oa fa_ladspa_ratio_ncda_oa 
-fa_ladspa_sum_iaic_oa fa_ladspa_sifter fa_ladspa_compress_peak 
-fa_ladspa_compress_rms fa_ladspa_expand_peak fa_ladspa_expand_rms 
-fa_ladspa_limit_peak fa_ladspa_limit_rms fa_ladspa_amp fa_ladspa_delay_c 
-fa_ladspa_delay_l fa_ladspa_delay_n fa_ladspa_sine_faac 
-fa_ladspa_sine_fcaa fa_ladspa_singlePara fa_ladspa_sinusWavewrapper 
-fa_ladspa_smoothDecimate fa_ladspa_svf fa_ladspa_tap_autopan 
-fa_ladspa_tap_chorusflanger fa_ladspa_tap_deesser fa_ladspa_tap_dynamics_m 
-fa_ladspa_tap_dynamics_st fa_ladspa_tap_equalizer 
+fa_ladspa_sc1 fa_ladspa_sc4 fa_ladspa_sc4m fa_ladspa_se4 fa_ladspa_sifter 
+fa_ladspa_compress_peak fa_ladspa_compress_rms fa_ladspa_expand_peak 
+fa_ladspa_expand_rms fa_ladspa_limit_peak fa_ladspa_limit_rms 
+fa_ladspa_amp fa_ladspa_delay_c fa_ladspa_delay_l fa_ladspa_delay_n 
+fa_ladspa_sine_faac fa_ladspa_sine_fcaa fa_ladspa_singlePara 
+fa_ladspa_sinusWavewrapper fa_ladspa_smoothDecimate fa_ladspa_svf 
+fa_ladspa_tap_autopan fa_ladspa_tap_chorusflanger fa_ladspa_tap_deesser 
+fa_ladspa_tap_dynamics_m fa_ladspa_tap_dynamics_st fa_ladspa_tap_equalizer 
 fa_ladspa_tap_equalizer_bw fa_ladspa_tap_doubler fa_ladspa_tap_pinknoise 
 fa_ladspa_tap_pitch fa_ladspa_tap_reflector fa_ladspa_tap_reverb 
 fa_ladspa_tap_rotspeak fa_ladspa_tap_limiter fa_ladspa_tap_sigmoid 
@@ -409,19 +401,6 @@
 
 Audio Filters
 .P
-.B Suboptions for fa_ladspa_lp4pole_fcrcia_oa
-
-.P
-.RS 2
-.BR Cutoff Frequency "=<number> (0.000..0.500, default: 0.500)"
-.P
-Cutoff Frequency
-.P
-.BR Resonanz "=<number> (0.000..4.000, default: 0.000)"
-.P
-Resonanz
-.P
-.RE
 .B Suboptions for fa_ladspa_fourByFourPole
 
 .P
@@ -471,31 +450,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_adsr
-
-.P
-.RS 2
-.BR Trigger Threshold "=<number> (default: 0.000)"
-.P
-Trigger Threshold
-.P
-.BR Einschwingzeit (s) "=<number> (default: 0.000)"
-.P
-Einschwingzeit (s)
-.P
-.BR Abklingzeit (s) "=<number> (default: 0.000)"
-.P
-Abklingzeit (s)
-.P
-.BR Haltewert "=<number> (0.000..1.000, default: 1.000)"
-.P
-Haltewert
-.P
-.BR Ausklingzeit (s) "=<number> (default: 0.000)"
-.P
-Ausklingzeit (s)
-.P
-.RE
 .B Suboptions for fa_ladspa_amPitchshift
 
 .P
@@ -629,15 +583,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_amp_gcia_oa
-
-.P
-.RS 2
-.BR Verstärkung (dB) "=<number> (-96.000..96.000, default: 0.000)"
-.P
-Verstärkung (dB)
-.P
-.RE
 .B Suboptions for fa_ladspa_amp_mono
 
 .P
@@ -735,42 +680,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_triangle_fasc_oa
-
-.P
-.RS 2
-.BR Slope "=<number> (0.000..1.000, default: 0.500)"
-.P
-Slope
-.P
-.RE
-.B Suboptions for fa_ladspa_triangle_fcsa_oa
-
-.P
-.RS 2
-.BR Frequenz "=<number> (0.000..0.500, default: 440.000)"
-.P
-Frequenz
-.P
-.RE
-.B Suboptions for fa_ladspa_pulse_fapc_oa
-
-.P
-.RS 2
-.BR Pulse Width "=<number> (0.000..1.000, default: 0.500)"
-.P
-Pulse Width
-.P
-.RE
-.B Suboptions for fa_ladspa_pulse_fcpa_oa
-
-.P
-.RS 2
-.BR Frequenz "=<number> (0.000..0.500, default: 440.000)"
-.P
-Frequenz
-.P
-.RE
 .B Suboptions for fa_ladspa_satanMaximiser
 
 .P
@@ -842,28 +751,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_syncsquare_fcga_oa
-
-.P
-.RS 2
-.BR Frequency "=<number> (0.000..64.000, default: 16.000)"
-.P
-Frequency
-.P
-.RE
-.B Suboptions for fa_ladspa_syncpulse_fcpcga_oa
-
-.P
-.RS 2
-.BR Frequenz "=<number> (0.000..64.000, default: 16.000)"
-.P
-Frequenz
-.P
-.BR Pulse Width "=<number> (0.000..1.000, default: 0.500)"
-.P
-Pulse Width
-.P
-.RE
 .B Suboptions for fa_ladspa_comb
 
 .P
@@ -1700,24 +1587,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_fmod_famc_oa
-
-.P
-.RS 2
-.BR Modulation (Octaves) "=<number> (default: 0.000)"
-.P
-Modulation (Octaves)
-.P
-.RE
-.B Suboptions for fa_ladspa_fmod_fcma_oa
-
-.P
-.RS 2
-.BR Frequenz (Hz) "=<number> (0.000..0.500, default: 440.000)"
-.P
-Frequenz (Hz)
-.P
-.RE
 .B Suboptions for fa_ladspa_butthigh_iir
 
 .P
@@ -2988,24 +2857,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_random_fasc_oa
-
-.P
-.RS 2
-.BR Wave Smoothness "=<number> (0.000..1.000, default: 1.000)"
-.P
-Wave Smoothness
-.P
-.RE
-.B Suboptions for fa_ladspa_random_fcsa_oa
-
-.P
-.RS 2
-.BR Frequenz (Hz) "=<number> (0.000..0.500, default: 440.000)"
-.P
-Frequenz (Hz)
-.P
-.RE
 .B Suboptions for fa_ladspa_rateShifter
 
 .P
@@ -3306,60 +3157,6 @@
 
 .P
 .RE
-.B Suboptions for fa_ladspa_difference_iamc_oa
-
-.P
-.RS 2
-.BR Input to Subtract "=<number> (default: 0.000)"
-.P
-Input to Subtract
-.P
-.RE
-.B Suboptions for fa_ladspa_difference_icma_oa
-
-.P
-.RS 2
-.BR Input "=<number> (default: 0.000)"
-.P
-Input
-.P
-.RE
-.B Suboptions for fa_ladspa_product_iaic_oa
-
-.P
-.RS 2
-.BR Second Input "=<number> (default: 0.000)"
-.P
-Second Input
-.P
-.RE
-.B Suboptions for fa_ladspa_ratio_nadc_oa
-
-.P
-.RS 2
-.BR Denominator "=<number> (default: 0.000)"
-.P
-Denominator
-.P
-.RE
-.B Suboptions for fa_ladspa_ratio_ncda_oa
-
-.P
-.RS 2
-.BR Numerator "=<number> (default: 0.000)"
-.P
-Numerator
-.P
-.RE
-.B Suboptions for fa_ladspa_sum_iaic_oa
-
-.P
-.RS 2
-.BR Second Input "=<number> (default: 0.000)"
-.P
-Second Input
-.P
-.RE
 .B Suboptions for fa_ladspa_sifter
 
 .P
@@ -4845,7 +4642,7 @@
 .RE
 .RE
 
-.B -vf
+.B \-vf
 .I <video filter options>
 
 .RS 2
@@ -4862,24 +4659,22 @@
 fv_lifetv fv_matrixtv fv_mosaictv fv_halftv fv_nervoustv fv_noisetv 
 fv_oldcolor fv_optv fv_puptv fv_quarktv fv_colormatrix_rgb fv_rdstv 
 fv_revtv fv_rippletv fv_rndmtv fv_shagadelictv fv_shift fv_simuratv 
-fv_slofasttv fv_sparktv fv_spiraltv fv_streaktv fv_tlp fv_timedisttv 
-fv_transform fv_transformtv fv_tctweak fv_vertigotv fv_warholtv fv_warptv 
-fv_colormatrix_yuv fv_zoom bg_f0r_3 point color balance bg_f0r_3dflippo 
-bg_f0r_B bg_f0r_Baltan bg_f0r_Brightness bg_f0r_Cartoon 
-bg_f0r_Color Distance bg_f0r_Contrast0r bg_f0r_Curves bg_f0r_Defish0r 
-bg_f0r_Delaygrab bg_f0r_Distort0r bg_f0r_Edgeglow bg_f0r_Equaliz0r 
-bg_f0r_Flippo bg_f0r_G bg_f0r_Gamma bg_f0r_Glow bg_f0r_Hueshift0r 
-bg_f0r_Invert0r bg_f0r_K-Means Clustering bg_f0r_Lens Correction 
-bg_f0r_LetterB0xed bg_f0r_Levels bg_f0r_Luminance bg_f0r_Mask0Mate 
-bg_f0r_Nervous bg_f0r_Nikon D90 Stairstepping fix bg_f0r_Perspective 
-bg_f0r_R bg_f0r_RGB-Parade bg_f0r_SOP/Sat bg_f0r_Saturat0r 
-bg_f0r_Scale0Tilt bg_f0r_Sobel bg_f0r_Squareblur bg_f0r_TehRoxx0r 
-bg_f0r_Threshold0r bg_f0r_Tint0r bg_f0r_Transparency bg_f0r_Twolay0r 
-bg_f0r_Vectorscope bg_f0r_Vertigo bg_f0r_Water bg_f0r_White Balance 
-bg_f0r_alpha0ps bg_f0r_alphagrad bg_f0r_alphaspot bg_f0r_bluescreen0r 
-bg_f0r_bw0r bg_f0r_c0rners bg_f0r_coloradj_RGB bg_f0r_delay0r 
-bg_f0r_nosync0r bg_f0r_pixeliz0r bg_f0r_pr0be bg_f0r_pr0file 
-bg_f0r_primaries bg_f0r_scanline0r bg_f0r_select0r bg_f0r_threelay0r
+fv_slofasttv fv_sparktv fv_spiraltv fv_streaktv fv_swapfields fv_tlp 
+fv_textlogo fv_timedisttv fv_transform fv_transformtv fv_tctweak 
+fv_vertigotv fv_warholtv fv_warptv fv_colormatrix_yuv fv_zoom 
+bg_f0r_3 point color balance bg_f0r_3dflippo bg_f0r_B bg_f0r_Baltan 
+bg_f0r_Brightness bg_f0r_Cartoon bg_f0r_Color Distance bg_f0r_Contrast0r 
+bg_f0r_Curves bg_f0r_Dealygrab bg_f0r_Distort0r bg_f0r_Edgeglow 
+bg_f0r_Equaliz0r bg_f0r_Flippo bg_f0r_G bg_f0r_Gamma bg_f0r_Glow 
+bg_f0r_Hueshift0r bg_f0r_Invert0r bg_f0r_K-Means Clustering 
+bg_f0r_Lens Correction bg_f0r_LetterB0xed bg_f0r_Levels bg_f0r_Luminance 
+bg_f0r_Mask0Mate bg_f0r_Nervous bg_f0r_Perspective bg_f0r_R 
+bg_f0r_RGB-Parade bg_f0r_Saturat0r bg_f0r_Scale0Tilt bg_f0r_Sobel 
+bg_f0r_Squareblur bg_f0r_TehRoxx0r bg_f0r_Threshold0r bg_f0r_Tint0r 
+bg_f0r_Transparency bg_f0r_Twolay0r bg_f0r_Vectorscope bg_f0r_Vertigo 
+bg_f0r_Water bg_f0r_White Balance bg_f0r_bluescreen0r bg_f0r_bw0r 
+bg_f0r_delay0r bg_f0r_nosync0r bg_f0r_pixeliz0r bg_f0r_primaries 
+bg_f0r_scanline0r bg_f0r_threelay0r
 
 Video Filters
 .P
@@ -5906,6 +5701,82 @@
 Quality
 .P
 .RE
+.B Suboptions for fv_textlogo
+
+.P
+.RS 2
+.BR text "=<string> (Default: Enter text)"
+.P
+Text
+.P
+Text to display
+
+.P
+.BR color "=<r>,<g>,<b>,<a> (default: 1.000,1.000,1.000,1.000)"
+.P
+<r>, <g>, <b> and <a> are in the range 0.0..1.0
+.P
+Text color
+.P
+.BR border_color "=<r>,<g>,<b> (default: 0.000,0.000,0.000)"
+.P
+<r>, <g> and <b> are in the range 0.0..1.0
+.P
+Border color
+.P
+.BR border_width "=<number> (0.00..10.00, default: 2.00)"
+.P
+Border width
+.P
+.BR font "=<string> (Default: Courier-20)"
+.P
+Font
+.P
+.BR justify_h "=<string>"
+.P
+Supported strings: center left right
+.P
+Default: right
+.P
+Horizontal justify
+.P
+.BR justify_v "=<string>"
+.P
+Supported strings: center top bottom
+.P
+Default: top
+.P
+Vertical justify
+.P
+.BR border_left "=<number> (0..65535, default: 10)"
+.P
+Left border
+.P
+Distance from the left text border to the image border
+
+.P
+.BR border_right "=<number> (0..65535, default: 10)"
+.P
+Right border
+.P
+Distance from the right text border to the image border
+
+.P
+.BR border_top "=<number> (0..65535, default: 10)"
+.P
+Top border
+.P
+Distance from the top text border to the image border
+
+.P
+.BR border_bottom "=<number> (0..65535, default: 10)"
+.P
+Bottom border
+.P
+Distance from the bottom text border to the image border
+
+.P
+.RE
 .B Suboptions for fv_transform
 
 .P
@@ -6575,67 +6446,6 @@
 
 .P
 .RE
-.B Suboptions for bg_f0r_Defish0r
-
-.P
-.RS 2
-.BR Amount "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Amount
-.P
-Focal Ratio
-
-.P
-.BR DeFish "=[1|0] (default: 0)"
-.P
-DeFish
-.P
-Fish or Defish
-
-.P
-.BR Type "=<number> (0.0000..1.0000, default: 0.6667)"
-.P
-Type
-.P
-Mapping function
-
-.P
-.BR Scaling "=<number> (0.0000..1.0000, default: 0.6667)"
-.P
-Scaling
-.P
-Scaling method
-
-.P
-.BR Manual Scale "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Manual Scale
-.P
-Manual Scale
-
-.P
-.BR Interpolator "=<number> (0.0000..1.0000, default: 0.1667)"
-.P
-Interpolator
-.P
-Quality of interpolation
-
-.P
-.BR Aspect type "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Aspect type
-.P
-Pixel aspect ratio presets
-
-.P
-.BR Manual Aspect "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Manual Aspect
-.P
-Manual Pixel Aspect ratio
-
-.P
-.RE
 .B Suboptions for bg_f0r_Distort0r
 
 .P
@@ -6736,7 +6546,7 @@
 
 .P
 .RE
-.B Suboptions for bg_f0r_K-Means Clustering
+.B Suboptions for bg_f0r_K\-Means Clustering
 
 .P
 .RS 2
@@ -6918,102 +6728,6 @@
 Bottom Right
 .P
 .RE
-.B Suboptions for bg_f0r_SOP/Sat
-
-.P
-.RS 2
-.BR rSlope "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-rSlope
-.P
-Slope of the red color component
-
-.P
-.BR gSlope "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-gSlope
-.P
-Slope of the green color component
-
-.P
-.BR bSlope "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-bSlope
-.P
-Slope of the blue color component
-
-.P
-.BR aSlope "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-aSlope
-.P
-Slope of the alpha component
-
-.P
-.BR rOffset "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-rOffset
-.P
-Offset of the red color component
-
-.P
-.BR gOffset "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-gOffset
-.P
-Offset of the green color component
-
-.P
-.BR bOffset "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-bOffset
-.P
-Offset of the blue color component
-
-.P
-.BR aOffset "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-aOffset
-.P
-Offset of the alpha component
-
-.P
-.BR rPower "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-rPower
-.P
-Power (Gamma) of the red color component
-
-.P
-.BR gPower "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-gPower
-.P
-Power (Gamma) of the green color component
-
-.P
-.BR bPower "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-bPower
-.P
-Power (Gamma) of the blue color component
-
-.P
-.BR aPower "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-aPower
-.P
-Power (Gamma) of the alpha component
-
-.P
-.BR saturation "=<number> (0.0000..1.0000, default: 200.0000)"
-.P
-saturation
-.P
-Overall saturation
-
-.P
-.RE
 .B Suboptions for bg_f0r_Saturat0r
 
 .P
@@ -7145,6 +6859,13 @@
 
 .P
 .RS 2
+.BR Mode "=<number> (0.0000..1.0000, default: 3.0000)"
+.P
+Mode
+.P
+The effect mode
+
+.P
 .BR PhaseIncrement "=<number> (0.0000..1.0000, default: 0.0200)"
 .P
 PhaseIncrement
@@ -7164,15 +6885,6 @@
 
 .P
 .RS 2
-.BR splash "=<x>,<y> (default: 0.000,0.000)"
-.P
-<r>, <g> and <b> are in the range 0.0..1.0
-.P
-splash
-.P
-make a big splash in the center
-
-.P
 .BR physics "=<number> (0.0000..1.0000, default: 0.0000)"
 .P
 physics
@@ -7244,109 +6956,6 @@
 
 .P
 .RE
-.B Suboptions for bg_f0r_alpha0ps
-
-.P
-.RS 2
-.BR Display "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Display
-.P
-.BR Display input alpha "=[1|0] (default: 0)"
-.P
-Display input alpha
-.P
-.BR Operation "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Operation
-.P
-.BR Threshold "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Threshold
-.P
-.BR Shrink/grow amount "=<number> (0.0000..1.0000, default: 0.3333)"
-.P
-Shrink/grow amount
-.P
-.BR Invert "=[1|0] (default: 0)"
-.P
-Invert
-.P
-.RE
-.B Suboptions for bg_f0r_alphagrad
-
-.P
-.RS 2
-.BR Position "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Position
-.P
-.BR Transition width "=[1|0] (default: 0)"
-.P
-Transition width
-.P
-.BR Tilt "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Tilt
-.P
-.BR Min "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Min
-.P
-.BR Max "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-Max
-.P
-.BR Operation "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Operation
-.P
-.RE
-.B Suboptions for bg_f0r_alphaspot
-
-.P
-.RS 2
-.BR Shape "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Shape
-.P
-.BR Position X "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Position X
-.P
-.BR Position Y "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Position Y
-.P
-.BR Size X "=<number> (0.0000..1.0000, default: 0.1000)"
-.P
-Size X
-.P
-.BR Size Y "=<number> (0.0000..1.0000, default: 0.1000)"
-.P
-Size Y
-.P
-.BR Tilt "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Tilt
-.P
-.BR Transition width "=<number> (0.0000..1.0000, default: 0.2000)"
-.P
-Transition width
-.P
-.BR Min "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Min
-.P
-.BR Max "=<number> (0.0000..1.0000, default: 1.0000)"
-.P
-Max
-.P
-.BR Operation "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Operation
-.P
-.RE
 .B Suboptions for bg_f0r_bluescreen0r
 
 .P
@@ -7368,160 +6977,6 @@
 
 .P
 .RE
-.B Suboptions for bg_f0r_c0rners
-
-.P
-.RS 2
-.BR Corner 1 X "=<number> (0.0000..1.0000, default: 0.3333)"
-.P
-Corner 1 X
-.P
-X coordinate of corner 1
-
-.P
-.BR Corner 1 Y "=<number> (0.0000..1.0000, default: 0.3333)"
-.P
-Corner 1 Y
-.P
-Y coordinate of corner 1
-
-.P
-.BR Corner 2 X "=<number> (0.0000..1.0000, default: 0.6667)"
-.P
-Corner 2 X
-.P
-X coordinate of corner 2
-
-.P
-.BR Corner 2 Y "=<number> (0.0000..1.0000, default: 0.3333)"
-.P
-Corner 2 Y
-.P
-Y coordinate of corner 2
-
-.P
-.BR Corner 3 X "=<number> (0.0000..1.0000, default: 0.6667)"
-.P
-Corner 3 X
-.P
-X coordinate of corner 3
-
-.P
-.BR Corner 3 Y "=<number> (0.0000..1.0000, default: 0.6667)"
-.P
-Corner 3 Y
-.P
-Y coordinate of corner 3
-
-.P
-.BR Corner 4 X "=<number> (0.0000..1.0000, default: 0.3333)"
-.P
-Corner 4 X
-.P
-X coordinate of corner 4
-
-.P
-.BR Corner 4 Y "=<number> (0.0000..1.0000, default: 0.6667)"
-.P
-Corner 4 Y
-.P
-Y coordinate of corner 4
-
-.P
-.BR Enable Stretch "=[1|0] (default: 0)"
-.P
-Enable Stretch
-.P
-Enable stretching
-
-.P
-.BR Stretch X "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Stretch X
-.P
-Amount of stretching in X direction
-
-.P
-.BR Stretch Y "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Stretch Y
-.P
-Amount of stretching in Y direction
-
-.P
-.BR Interpolator "=<number> (0.0000..1.0000, default: 0.1667)"
-.P
-Interpolator
-.P
-Quality of interpolation
-
-.P
-.BR Transparent Background "=[1|0] (default: 0)"
-.P
-Transparent Background
-.P
-Makes background transparent
-
-.P
-.BR Feather Alpha "=<number> (0.0000..1.0000, default: 0.0100)"
-.P
-Feather Alpha
-.P
-Makes smooth transition into transparent
-
-.P
-.RE
-.B Suboptions for bg_f0r_coloradj_RGB
-
-.P
-.RS 2
-.BR R "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-R
-.P
-Amount of red
-
-.P
-.BR G "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-G
-.P
-Amount of green
-
-.P
-.BR B "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-B
-.P
-Amount of blue
-
-.P
-.BR Action "=<number> (0.0000..1.0000, default: 0.3333)"
-.P
-Action
-.P
-Type of color adjustment
-
-.P
-.BR Keep luma "=[1|0] (default: 1)"
-.P
-Keep luma
-.P
-Don't change brightness
-
-.P
-.BR Alpha controlled "=[1|0] (default: 0)"
-.P
-Alpha controlled
-.P
-Adjust only areas with nonzero alpha
-
-.P
-.BR Luma formula "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Luma formula
-.P
-.RE
 .B Suboptions for bg_f0r_delay0r
 
 .P
@@ -7565,210 +7020,6 @@
 
 .P
 .RE
-.B Suboptions for bg_f0r_pr0be
-
-.P
-.RS 2
-.BR Measurement "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Measurement
-.P
-What measurement to display
-
-.P
-.BR X "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-X
-.P
-X position of probe
-
-.P
-.BR Y "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Y
-.P
-Y position of probe
-
-.P
-.BR X size "=<number> (0.0000..1.0000, default: 0.2500)"
-.P
-X size
-.P
-X size of probe
-
-.P
-.BR Y size "=<number> (0.0000..1.0000, default: 0.2500)"
-.P
-Y size
-.P
-Y size of probe
-
-.P
-.BR 256 scale "=[1|0] (default: 0)"
-.P
-256 scale
-.P
-use 0-255 instead of 0.0-1.0
-
-.P
-.BR Show alpha "=[1|0] (default: 0)"
-.P
-Show alpha
-.P
-Display alpha value too
-
-.P
-.BR Big window "=[1|0] (default: 0)"
-.P
-Big window
-.P
-Display more data
-
-.P
-.RE
-.B Suboptions for bg_f0r_pr0file
-
-.P
-.RS 2
-.BR X "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-X
-.P
-X position of profile
-
-.P
-.BR Y "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Y
-.P
-Y position of profile
-
-.P
-.BR Tilt "=<number> (0.0000..1.0000, default: 0.5000)"
-.P
-Tilt
-.P
-Tilt of profile
-
-.P
-.BR Length "=<number> (0.0000..1.0000, default: 0.1584)"
-.P
-Length
-.P
-Length of profile
-
-.P
-.BR Channel "=<number> (0.0000..1.0000, default: 0.3750)"
-.P
-Channel
-.P
-Channel to numerically display
-
-.P
-.BR Marker 1 "=<number> (0.0000..1.0000, default: -0.2000)"
-.P
-Marker 1
-.P
-Position of marker 1
-
-.P
-.BR Marker 2 "=<number> (0.0000..1.0000, default: -0.2000)"
-.P
-Marker 2
-.P
-Position of marker 2
-
-.P
-.BR R trace "=[1|0] (default: 1)"
-.P
-R trace
-.P
-Show R trace on scope
-
-.P
-.BR G trace "=[1|0] (default: 1)"
-.P
-G trace
-.P
-Show G trace on scope
-
-.P
-.BR B trace "=[1|0] (default: 1)"
-.P
-B trace
-.P
-Show B trace on scope
-
-.P
-.BR Y trace "=[1|0] (default: 0)"
-.P
-Y trace
-.P
-Show Y' trace on scope
-
-.P
-.BR Pr trace "=[1|0] (default: 0)"
-.P
-Pr trace
-.P
-Show Pr trace on scope
-
-.P
-.BR Pb trace "=[1|0] (default: 0)"
-.P
-Pb trace
-.P
-Show Pb trace on scope
-
-.P
-.BR Alpha trace "=[1|0] (default: 0)"
-.P
-Alpha trace
-.P
-Show Alpha trace on scope
-
-.P
-.BR Display average "=[1|0] (default: 1)"
-.P
-Display average
-.P
-e
-
-.P
-.BR Display RMS "=[1|0] (default: 1)"
-.P
-Display RMS
-.P
-.BR Display minimum "=[1|0] (default: 0)"
-.P
-Display minimum
-.P
-.BR Display maximum "=[1|0] (default: 0)"
-.P
-Display maximum
-.P
-.BR 256 scale "=[1|0] (default: 0)"
-.P
-256 scale
-.P
-use 0-255 instead of 0.0-1.0
-
-.P
-.BR Color "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Color
-.P
-rec 601 or rec 709
-
-.P
-.BR Crosshair color "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Crosshair color
-.P
-Color of the profile marker
-
-.P
-.RE
 .B Suboptions for bg_f0r_primaries
 
 .P
@@ -7781,52 +7032,9 @@
 
 .P
 .RE
-.B Suboptions for bg_f0r_select0r
-
-.P
-.RS 2
-.BR Color to select "=<r>,<g>,<b> (default: 0.000,0.800,0.000)"
-.P
-<r>, <g> and <b> are in the range 0.0..1.0
-.P
-Color to select
-.P
-.BR Invert selection "=[1|0] (default: 0)"
-.P
-Invert selection
-.P
-.BR Delta R / A / Hue "=<number> (0.0000..1.0000, default: 0.2000)"
-.P
-Delta R / A / Hue
-.P
-.BR Delta G / B / Chroma "=<number> (0.0000..1.0000, default: 0.2000)"
-.P
-Delta G / B / Chroma
-.P
-.BR Delta B / I / I "=<number> (0.0000..1.0000, default: 0.2000)"
-.P
-Delta B / I / I
-.P
-.BR Selection subspace "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Selection subspace
-.P
-.BR Subspace shape "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Subspace shape
-.P
-.BR Edge mode "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Edge mode
-.P
-.BR Operation "=<number> (0.0000..1.0000, default: 0.0000)"
-.P
-Operation
-.P
-.RE
 .RE
 
-.B -vm
+.B \-vm
 .I <video monitor options>
 
 .RS 2
@@ -7912,7 +7120,7 @@
 .RS 2
 .BR device "=option[{suboptions}]"
 .P
-Supported options: /dev/video0
+Supported options: <None>
 .P
 Default: /dev/video0
 .P
@@ -7928,7 +7136,7 @@
 .RE
 .RE
 
-.B -m
+.B \-m
 .I <metadata_options>
 
 .RS 2
@@ -7967,16 +7175,17 @@
 .P
 Author
 .P
+.BR albumartist "=<string>"
+.P
+Album artist
+.P
 .BR copyright "=<string>"
 .P
 Copyright
 .P
 .BR date "=<string>"
 .P
-Date
-.P
-Complete date or year only
-
+Year
 .P
 .BR comment "=<string>"
 .P
@@ -7984,7 +7193,7 @@
 .P
 .RE
 
-.B -enc
+.B \-enc
 .I <encoding_options>
 
 .RS 2
@@ -7997,7 +7206,7 @@
 .P
 .BR audio_encoder "=option[{suboptions}]"
 .P
-Supported options: e_wav e_vorbis e_speex e_flacogg e_flac e_lame e_faac e_mpegaudio e_ffmpeg_audio b_lame
+Supported options: e_wav e_speex e_flacogg e_flac e_lame e_mpegaudio b_lame e_faac e_ffmpeg_audio e_vorbis
 .P
 Default: e_wav
 .P
@@ -8020,61 +7229,6 @@
 Bits per sample
 .P
 .RE
-.B Suboptions for audio_encoder=e_vorbis
-
-.P
-.RS 2
-.BR bitrate_mode "=<string>"
-.P
-Supported strings: vbr vbr_bitrate managed
-.P
-Default: VBR
-.P
-Bitrate mode
-.P
-Bitrate mode:
-VBR: You specify a quality and (optionally) a minimum and maximum
-bitrate
-VBR (bitrate): The specified nominal bitrate will be used for selecting
-the encoder mode.
-Managed: You specify a nominal bitrate and (optionally) a minimum and
-maximum bitrate
-VBR is recommended, managed bitrate might result in a worse quality
-
-.P
-.BR nominal_bitrate "=<number> (0..1000, default: 128)"
-.P
-Nominal bitrate (kbps)
-.P
-Nominal bitrate (in kbps) for managed mode
-
-.P
-.BR quality "=<number> (0.0..10.0, default: 3.0)"
-.P
-VBR Quality (10: best)
-.P
-Quality for VBR mode
-10: best (largest output file)
-0:  worst (smallest output file)
-
-.P
-.BR min_bitrate "=<number> (0..1000, default: 0)"
-.P
-Minimum bitrate (kbps)
-.P
-Optional minimum bitrate (in kbps)
-0 = unspecified
-
-.P
-.BR max_bitrate "=<number> (0..1000, default: 0)"
-.P
-Maximum bitrate (kbps)
-.P
-Optional maximum bitrate (in kbps)
-0 = unspecified
-
-.P
-.RE
 .B Suboptions for audio_encoder=e_speex
 
 .P
@@ -8285,6 +7439,94 @@
 
 .P
 .RE
+.B Suboptions for audio_encoder=e_mpegaudio
+
+.P
+.RS 2
+.BR bitrate "=<number> (32..448, default: 224)"
+.P
+Bitrate (kbps)
+.P
+.BR layer "=<number> (1..2, default: 2)"
+.P
+Layer (1 or 2)
+.P
+Audio layer
+
+.P
+.BR vcd "=[1|0] (default: 1)"
+.P
+VCD Compatible
+.P
+Make VCD compliant output. This forces layer II, 224 kbps and 44.1 KHz
+stereo
+
+.P
+.RE
+.B Suboptions for audio_encoder=b_lame
+
+.P
+.RS 2
+.BR server "=<string> (Default: localhost)"
+.P
+Server
+.P
+.BR port "=<number> (1..65535, default: 8000)"
+.P
+Port
+.P
+.BR mount "=<string> (Default: /stream.ogg)"
+.P
+Mount
+.P
+.BR user "=<string> (Default: source)"
+.P
+User
+.P
+.BR password "=<string>"
+.P
+Password
+.P
+.BR name "=<string> (Default: Test stream)"
+.P
+Name
+.P
+.BR description "=<string> (Default: Brought to you by gmerlin)"
+.P
+Description
+.P
+.BR stereo_mode "=<string>"
+.P
+Supported strings: Stereo Joint stereo Auto
+.P
+Default: Auto
+.P
+Stereo mode
+.P
+Stereo: Completely independent channels
+Joint stereo: Improve quality (save bits) by using similarities of the
+channels
+Auto (recommended): Select one of the above depending on quality or
+bitrate setting
+
+.P
+.BR quality "=<number> (0..9, default: 2)"
+.P
+Encoding speed
+.P
+0: Slowest encoding, best quality
+9: Fastest encoding, worst quality
+
+.P
+.BR cbr_bitrate "=<number> (8..320, default: 128)"
+.P
+Bitrate (kbps)
+.P
+Bitrate in kbps. If your selection is no valid mp3 bitrate, we'll choose
+the closest value.
+
+.P
+.RE
 .B Suboptions for audio_encoder=e_faac
 
 .P
@@ -8344,30 +7586,6 @@
 Don't use mid/side coding
 .P
 .RE
-.B Suboptions for audio_encoder=e_mpegaudio
-
-.P
-.RS 2
-.BR bitrate "=<number> (32..448, default: 224)"
-.P
-Bitrate (kbps)
-.P
-.BR layer "=<number> (1..2, default: 2)"
-.P
-Layer (1 or 2)
-.P
-Audio layer
-
-.P
-.BR vcd "=[1|0] (default: 1)"
-.P
-VCD Compatible
-.P
-Make VCD compliant output. This forces layer II, 224 kbps and 44.1 KHz
-stereo
-
-.P
-.RE
 .B Suboptions for audio_encoder=e_ffmpeg_audio
 
 .P
@@ -8441,73 +7659,64 @@
 .P
 .RE
 .RE
-.B Suboptions for audio_encoder=b_lame
+.B Suboptions for audio_encoder=e_vorbis
 
 .P
 .RS 2
-.BR server "=<string> (Default: localhost)"
-.P
-Server
-.P
-.BR port "=<number> (1..65535, default: 8000)"
-.P
-Port
-.P
-.BR mount "=<string> (Default: /stream.ogg)"
-.P
-Mount
-.P
-.BR user "=<string> (Default: source)"
-.P
-User
-.P
-.BR password "=<string>"
+.BR bitrate_mode "=<string>"
 .P
-Password
+Supported strings: vbr vbr_bitrate managed
 .P
-.BR name "=<string> (Default: Test stream)"
+Default: VBR
 .P
-Name
+Bitrate mode
 .P
-.BR description "=<string> (Default: Brought to you by gmerlin)"
+Bitrate mode:
+VBR: You specify a quality and (optionally) a minimum and maximum
+bitrate
+VBR (bitrate): The specified nominal bitrate will be used for selecting
+the encoder mode.
+Managed: You specify a nominal bitrate and (optionally) a minimum and
+maximum bitrate
+VBR is recommended, managed bitrate might result in a worse quality
+
 .P
-Description
+.BR nominal_bitrate "=<number> (0..1000, default: 128)"
 .P
-.BR stereo_mode "=<string>"
+Nominal bitrate (kbps)
 .P
-Supported strings: Stereo Joint stereo Auto
+Nominal bitrate (in kbps) for managed mode
+
 .P
-Default: Auto
+.BR quality "=<number> (0.0..10.0, default: 3.0)"
 .P
-Stereo mode
+VBR Quality (10: best)
 .P
-Stereo: Completely independent channels
-Joint stereo: Improve quality (save bits) by using similarities of the
-channels
-Auto (recommended): Select one of the above depending on quality or
-bitrate setting
+Quality for VBR mode
+10: best (largest output file)
+0:  worst (smallest output file)
 
 .P
-.BR quality "=<number> (0..9, default: 2)"
+.BR min_bitrate "=<number> (0..1000, default: 0)"
 .P
-Encoding speed
+Minimum bitrate (kbps)
 .P
-0: Slowest encoding, best quality
-9: Fastest encoding, worst quality
+Optional minimum bitrate (in kbps)
+0 = unspecified
 
 .P
-.BR cbr_bitrate "=<number> (8..320, default: 128)"
+.BR max_bitrate "=<number> (0..1000, default: 0)"
 .P
-Bitrate (kbps)
+Maximum bitrate (kbps)
 .P
-Bitrate in kbps. If your selection is no valid mp3 bitrate, we'll choose
-the closest value.
+Optional maximum bitrate (in kbps)
+0 = unspecified
 
 .P
 .RE
 .BR video_encoder "=option[{suboptions}]"
 .P
-Supported options: e_lqt e_y4m e_mpegvideo e_singlepic e_theora e_mpeg e_ffmpeg_video e_ffmpeg b_ogg
+Supported options: e_lqt e_y4m e_mpegvideo e_singlepic e_gavf e_theora b_ogg e_ffmpeg e_ffmpeg_video e_mpeg
 .P
 Default: e_lqt
 .P
@@ -8542,7 +7751,7 @@
 .P
 .BR codec "=option[{suboptions}]"
 .P
-Supported options: ima4 rawaudio twos ulaw sowt alaw in24 in32 fl32 fl64 lpcm vorbis vorbis_qt ffmpeg_mp2 ffmpeg_ac3 lame faac
+Supported options: ima4 rawaudio twos ulaw sowt alaw in24 in32 fl32 fl64 lpcm faac lame ffmpeg_mp2 ffmpeg_ac3 vorbis vorbis_qt
 .P
 Default: ima4
 .P
@@ -8601,64 +7810,25 @@
 Little endian
 .P
 .RE
-.B Suboptions for codec=vorbis
-
-.P
-.RS 2
-.BR vorbis_bitrate "=<number> (default: 128000)"
-.P
-Nominal Bitrate
-.P
-.BR vorbis_vbr "=[1|0] (default: 1)"
-.P
-Use variable bitrate
-.P
-.BR vorbis_max_bitrate "=<number> (default: -1)"
-.P
-Maximum Bitrate (-1 = no limit)
-.P
-.BR vorbis_min_bitrate "=<number> (default: -1)"
-.P
-Minimum Bitrate (-1 = no limit)
-.P
-.RE
-.B Suboptions for codec=vorbis_qt
+.B Suboptions for codec=faac
 
 .P
 .RS 2
-.BR vorbis_bitrate "=<number> (default: 128000)"
-.P
-Nominal Bitrate
-.P
-.BR vorbis_vbr "=[1|0] (default: 1)"
-.P
-Use variable bitrate
-.P
-.BR vorbis_max_bitrate "=<number> (default: -1)"
-.P
-Maximum Bitrate (-1 = no limit)
-.P
-.BR vorbis_min_bitrate "=<number> (default: -1)"
+.BR faac_bitrate "=<number> (default: 0)"
 .P
-Minimum Bitrate (-1 = no limit)
+Bitrate (kbps, 0 = VBR)
 .P
-.RE
-.B Suboptions for codec=ffmpeg_mp2
-
+.BR quality "=<number> (10..500, default: 100)"
 .P
-.RS 2
-.BR bit_rate_audio "=<number> (default: 128)"
+VBR Quality
 .P
-Bit rate (kbps)
+.BR object_type "=<string>"
 .P
-.RE
-.B Suboptions for codec=ffmpeg_ac3
-
+Supported strings: Low Main SSR LTP
 .P
-.RS 2
-.BR bit_rate_audio "=<number> (default: 128)"
+Default: Low
 .P
-Bit rate (kbps)
+Object type
 .P
 .RE
 .B Suboptions for codec=lame
@@ -8718,25 +7888,64 @@
 
 .P
 .RE
-.B Suboptions for codec=faac
+.B Suboptions for codec=ffmpeg_mp2
 
 .P
 .RS 2
-.BR faac_bitrate "=<number> (default: 0)"
+.BR bit_rate_audio "=<number> (default: 128)"
 .P
-Bitrate (kbps, 0 = VBR)
+Bit rate (kbps)
 .P
-.BR quality "=<number> (10..500, default: 100)"
+.RE
+.B Suboptions for codec=ffmpeg_ac3
+
 .P
-VBR Quality
+.RS 2
+.BR bit_rate_audio "=<number> (default: 128)"
 .P
-.BR object_type "=<string>"
+Bit rate (kbps)
 .P
-Supported strings: Low Main SSR LTP
+.RE
+.B Suboptions for codec=vorbis
+
 .P
-Default: Low
+.RS 2
+.BR vorbis_bitrate "=<number> (default: 128000)"
 .P
-Object type
+Nominal Bitrate
+.P
+.BR vorbis_vbr "=[1|0] (default: 1)"
+.P
+Use variable bitrate
+.P
+.BR vorbis_max_bitrate "=<number> (default: -1)"
+.P
+Maximum Bitrate (-1 = no limit)
+.P
+.BR vorbis_min_bitrate "=<number> (default: -1)"
+.P
+Minimum Bitrate (-1 = no limit)
+.P
+.RE
+.B Suboptions for codec=vorbis_qt
+
+.P
+.RS 2
+.BR vorbis_bitrate "=<number> (default: 128000)"
+.P
+Nominal Bitrate
+.P
+.BR vorbis_vbr "=[1|0] (default: 1)"
+.P
+Use variable bitrate
+.P
+.BR vorbis_max_bitrate "=<number> (default: -1)"
+.P
+Maximum Bitrate (-1 = no limit)
+.P
+.BR vorbis_min_bitrate "=<number> (default: -1)"
+.P
+Minimum Bitrate (-1 = no limit)
 .P
 .RE
 .BR box_top "=<number> (0..65535, default: 0)"
@@ -8785,12 +7994,25 @@
 .P
 .BR codec "=option[{suboptions}]"
 .P
-Supported options: raw v308 v408 v410 yuv2 yuv4 yv12 2vuy v210 rtjpeg jpeg mjpa png ffmpeg_mpg4 ffmpeg_msmpeg4v3 ffmpeg_msmpeg4v3_wmp ffmpeg_h263 ffmpeg_h263p ffmpeg_mjpg ffmpeg_rle ffmpeg_dv ffmpeg_dvcpro ffmpeg_dv50 ffmpeg_ffvhuff ffmpeg_ffv1 ffmpeg_dnxhd ffmpeg_imx x264 schroedinger yuvs
+Supported options: jpeg rtjpeg raw v308 v408 v410 yuv2 yuv4 yv12 2vuy v210 schroedinger png ffmpeg_mpg4 ffmpeg_msmpeg4v3 ffmpeg_msmpeg4v3_wmp ffmpeg_h263 ffmpeg_h263p ffmpeg_mjpg ffmpeg_rle ffmpeg_ffvhuff ffmpeg_ffv1 ffmpeg_dnxhd mjpa x264 ffmpeg_imx ffmpeg_dv ffmpeg_dvcpro ffmpeg_dv50 yuvs
 .P
-Default: raw
+Default: jpeg
 .P
 Codec
 .P
+.B Suboptions for codec=jpeg
+
+.P
+.RS 2
+.BR jpeg_quality "=<number> (1..100, default: 95)"
+.P
+Quality
+.P
+.BR jpeg_usefloat "=[1|0] (default: 0)"
+.P
+Use float
+.P
+.RE
 .B Suboptions for codec=rtjpeg
 
 .P
@@ -8812,30 +8034,185 @@
 Chroma quantiser
 .P
 .RE
-.B Suboptions for codec=jpeg
+.B Suboptions for codec=schroedinger
 
 .P
 .RS 2
-.BR jpeg_quality "=<number> (1..100, default: 95)"
+.BR enc_rate_control "=<string>"
+.P
+Supported strings: Constant noise threshold Constant bitrate Low delay Lossless Constant lambda Constant error Constant quality
+.P
+Default: Constant quality
+.P
+Rate control
+.P
+.BR enc_bitrate "=<number> (default: 13824000)"
+.P
+Bitrate
+.P
+.BR enc_buffer_size "=<number> (default: 0)"
+.P
+Buffer size
+.P
+.BR enc_buffer_level "=<number> (default: 0)"
+.P
+Buffer level
+.P
+.BR enc_noise_threshold "=<number> (0.00..100.00, default: 25.00)"
+.P
+Noise Threshold
+.P
+.BR enc_quality "=<number> (0.00..10.00, default: 5.00)"
 .P
 Quality
 .P
-.BR jpeg_usefloat "=[1|0] (default: 0)"
+.BR enc_enable_rdo_cbr "=[1|0] (default: 1)"
 .P
-Use float
+rdo cbr
 .P
-.RE
-.B Suboptions for codec=mjpa
+.BR enc_gop_structure "=<string>"
+.P
+Supported strings: Adaptive Intra only Backref Chained backref Biref Chained biref
+.P
+Default: Adaptive
+.P
+GOP Stucture
+.P
+.BR enc_au_distance "=<number> (default: 30)"
+.P
+GOP size
+.P
+.BR enc_open_gop "=[1|0] (default: 1)"
+.P
+Open GOPs
+.P
+Choose whether GOPs should be open or closed. Closed GOPs improve
+seeking accuracy for buggy decoders, open GOPs have a slightly
+better compression
 
 .P
-.RS 2
-.BR jpeg_quality "=<number> (1..100, default: 95)"
+.BR enc_mv_precision "=<number> (default: 0)"
 .P
-Quality
+MV Precision
 .P
-.BR jpeg_usefloat "=[1|0] (default: 0)"
+.BR enc_motion_block_size "=<string>"
 .P
-Use float
+Supported strings: Automatic Small Medium Large
+.P
+Default: Automatic
+.P
+Block size
+.P
+.BR enc_motion_block_overlap "=<string>"
+.P
+Supported strings: Automatic None Partial Full
+.P
+Default: Automatic
+.P
+Block overlap
+.P
+.BR enc_enable_chroma_me "=[1|0] (default: 0)"
+.P
+Enable chroma ME
+.P
+.BR enc_enable_global_motion "=[1|0] (default: 0)"
+.P
+Enable GMC
+.P
+Enable global motion estimation
+
+.P
+.BR enc_enable_phasecorr_estimation "=[1|0] (default: 0)"
+.P
+Enable phasecorrelation estimation
+.P
+.BR enc_enable_hierarchical_estimation "=[1|0] (default: 1)"
+.P
+Hierarchical estimation
+.P
+.BR enc_enable_phasecorr_estimation "=[1|0] (default: 0)"
+.P
+Phasecorr estimation
+.P
+.BR enc_enable_bigblock_estimation "=[1|0] (default: 1)"
+.P
+Bigblock estimation
+.P
+.BR enc_enable_global_motion "=[1|0] (default: 0)"
+.P
+Global motion estimation
+.P
+.BR enc_enable_deep_estimation "=[1|0] (default: 1)"
+.P
+Deep estimation
+.P
+.BR enc_enable_scene_change_detection "=[1|0] (default: 1)"
+.P
+Scene change detection
+.P
+.BR enc_intra_wavelet "=<string>"
+.P
+Supported strings: Deslauriers-Debuc (9,3) LeGall (5,3) Deslauriers-Debuc (13,5) Haar (no shift) Haar (single shift) Fidelity Daubechies (9,7)
+.P
+Default: Deslauriers-Debuc (9,3)
+.P
+Intra wavelet
+.P
+.BR enc_inter_wavelet "=<string>"
+.P
+Supported strings: Deslauriers-Debuc (9,3) LeGall (5,3) Deslauriers-Debuc (13,5) Haar (no shift) Haar (single shift) Fidelity Daubechies (9,7)
+.P
+Default: LeGall (5,3)
+.P
+Inter wavelet
+.P
+.BR enc_filtering "=<string>"
+.P
+Supported strings: None Center weighted median Gaussian Add noise Adaptive Gaussian
+.P
+Default: None
+.P
+Filter
+.P
+.BR enc_filter_value "=<number> (0..100, default: 5)"
+.P
+Filter value
+.P
+.BR enc_force_profile "=<string>"
+.P
+Supported strings: Auto VC-2 low delay VC-2 simple VC-2 main Main
+.P
+Default: Auto
+.P
+Force profile
+.P
+.BR enc_codeblock_size "=<string>"
+.P
+Supported strings: Auto Small Medium Large Full
+.P
+Default: Auto
+.P
+Codeblock size
+.P
+.BR enc_enable_multiquant "=[1|0] (default: 1)"
+.P
+Enable multiquant
+.P
+.BR enc_enable_dc_multiquant "=[1|0] (default: 0)"
+.P
+Enable DC multiquant
+.P
+.BR enc_enable_noarith "=[1|0] (default: 0)"
+.P
+Disable arithmetic coding
+.P
+.BR enc_downsample_levels "=<number> (2..8, default: 5)"
+.P
+Downsample levels
+.P
+.BR enc_transform_depth "=<number> (0..6, default: 3)"
+.P
+Transform depth
 .P
 .RE
 .B Suboptions for codec=png
@@ -10992,21 +10369,17 @@
 Coder type
 .P
 .RE
-.B Suboptions for codec=ffmpeg_imx
+.B Suboptions for codec=mjpa
 
 .P
 .RS 2
-.BR imx_bitrate "=<string>"
-.P
-Supported strings: 30 40 50
-.P
-Default: 50
+.BR jpeg_quality "=<number> (1..100, default: 95)"
 .P
-Bitrate (Mbps)
+Quality
 .P
-.BR imx_strip_vbi "=<number> (default: 1)"
+.BR jpeg_usefloat "=[1|0] (default: 0)"
 .P
-Strip VBI
+Use float
 .P
 .RE
 .B Suboptions for codec=x264
@@ -11406,185 +10779,21 @@
 Transform coefficient thresholding on P-frames
 .P
 .RE
-.B Suboptions for codec=schroedinger
+.B Suboptions for codec=ffmpeg_imx
 
 .P
 .RS 2
-.BR enc_rate_control "=<string>"
-.P
-Supported strings: Constant noise threshold Constant bitrate Low delay Lossless Constant lambda Constant error Constant quality
-.P
-Default: Constant quality
-.P
-Rate control
-.P
-.BR enc_bitrate "=<number> (default: 13824000)"
-.P
-Bitrate
-.P
-.BR enc_buffer_size "=<number> (default: 0)"
-.P
-Buffer size
-.P
-.BR enc_buffer_level "=<number> (default: 0)"
-.P
-Buffer level
-.P
-.BR enc_noise_threshold "=<number> (0.00..100.00, default: 25.00)"
-.P
-Noise Threshold
-.P
-.BR enc_quality "=<number> (0.00..10.00, default: 5.00)"
-.P
-Quality
-.P
-.BR enc_enable_rdo_cbr "=[1|0] (default: 1)"
-.P
-rdo cbr
-.P
-.BR enc_gop_structure "=<string>"
-.P
-Supported strings: Adaptive Intra only Backref Chained backref Biref Chained biref
-.P
-Default: Adaptive
-.P
-GOP Stucture
-.P
-.BR enc_au_distance "=<number> (default: 30)"
-.P
-GOP size
-.P
-.BR enc_open_gop "=[1|0] (default: 1)"
-.P
-Open GOPs
-.P
-Choose whether GOPs should be open or closed. Closed GOPs improve
-seeking accuracy for buggy decoders, open GOPs have a slightly
-better compression
-
-.P
-.BR enc_mv_precision "=<number> (default: 0)"
-.P
-MV Precision
-.P
-.BR enc_motion_block_size "=<string>"
-.P
-Supported strings: Automatic Small Medium Large
-.P
-Default: Automatic
-.P
-Block size
-.P
-.BR enc_motion_block_overlap "=<string>"
-.P
-Supported strings: Automatic None Partial Full
-.P
-Default: Automatic
-.P
-Block overlap
-.P
-.BR enc_enable_chroma_me "=[1|0] (default: 0)"
-.P
-Enable chroma ME
-.P
-.BR enc_enable_global_motion "=[1|0] (default: 0)"
-.P
-Enable GMC
-.P
-Enable global motion estimation
-
-.P
-.BR enc_enable_phasecorr_estimation "=[1|0] (default: 0)"
-.P
-Enable phasecorrelation estimation
-.P
-.BR enc_enable_hierarchical_estimation "=[1|0] (default: 1)"
-.P
-Hierarchical estimation
-.P
-.BR enc_enable_phasecorr_estimation "=[1|0] (default: 0)"
-.P
-Phasecorr estimation
-.P
-.BR enc_enable_bigblock_estimation "=[1|0] (default: 1)"
-.P
-Bigblock estimation
-.P
-.BR enc_enable_global_motion "=[1|0] (default: 0)"
-.P
-Global motion estimation
-.P
-.BR enc_enable_deep_estimation "=[1|0] (default: 1)"
-.P
-Deep estimation
-.P
-.BR enc_enable_scene_change_detection "=[1|0] (default: 1)"
-.P
-Scene change detection
-.P
-.BR enc_intra_wavelet "=<string>"
-.P
-Supported strings: Deslauriers-Debuc (9,3) LeGall (5,3) Deslauriers-Debuc (13,5) Haar (no shift) Haar (single shift) Fidelity Daubechies (9,7)
-.P
-Default: Deslauriers-Debuc (9,3)
-.P
-Intra wavelet
-.P
-.BR enc_inter_wavelet "=<string>"
-.P
-Supported strings: Deslauriers-Debuc (9,3) LeGall (5,3) Deslauriers-Debuc (13,5) Haar (no shift) Haar (single shift) Fidelity Daubechies (9,7)
-.P
-Default: LeGall (5,3)
-.P
-Inter wavelet
-.P
-.BR enc_filtering "=<string>"
-.P
-Supported strings: None Center weighted median Gaussian Add noise Adaptive Gaussian
-.P
-Default: None
-.P
-Filter
-.P
-.BR enc_filter_value "=<number> (0..100, default: 5)"
-.P
-Filter value
-.P
-.BR enc_force_profile "=<string>"
-.P
-Supported strings: Auto VC-2 low delay VC-2 simple VC-2 main Main
-.P
-Default: Auto
-.P
-Force profile
-.P
-.BR enc_codeblock_size "=<string>"
-.P
-Supported strings: Auto Small Medium Large Full
-.P
-Default: Auto
-.P
-Codeblock size
-.P
-.BR enc_enable_multiquant "=[1|0] (default: 1)"
-.P
-Enable multiquant
-.P
-.BR enc_enable_dc_multiquant "=[1|0] (default: 0)"
-.P
-Enable DC multiquant
-.P
-.BR enc_enable_noarith "=[1|0] (default: 0)"
+.BR imx_bitrate "=<string>"
 .P
-Disable arithmetic coding
+Supported strings: 30 40 50
 .P
-.BR enc_downsample_levels "=<number> (2..8, default: 5)"
+Default: 50
 .P
-Downsample levels
+Bitrate (Mbps)
 .P
-.BR enc_transform_depth "=<number> (0..6, default: 3)"
+.BR imx_strip_vbi "=<number> (default: 1)"
 .P
-Transform depth
+Strip VBI
 .P
 .RE
 .RE
@@ -11715,27 +10924,30 @@
 .RS 2
 .BR plugin "=option[{suboptions}]"
 .P
-Supported options: iw_jpeg iw_png iw_tiff iw_tga iw_bmp iw_pnm iw_gavl
+Supported options: iw_pnm iw_bmp iw_png iw_jpeg iw_tga iw_tiff iw_gavl
 .P
-Default: iw_jpeg
+Default: iw_pnm
 .P
 Plugin
 .P
-.B Suboptions for plugin=iw_jpeg
+.B Suboptions for plugin=iw_pnm
 
 .P
 .RS 2
-.BR quality "=<number> (0..100, default: 95)"
+.BR format "=<string>"
 .P
-Quality
+Supported strings: binary ascii
 .P
-.BR chroma_sampling "=<string>"
+Default: binary
 .P
-Supported strings: 4:2:0 4:2:2 4:4:4
+Format
 .P
-Default: 4:2:0
+.BR comment "=<string> (Default: Created with gmerlin)"
 .P
-Chroma sampling
+Comment
+.P
+Comment which will be written in front of every file
+
 .P
 .RE
 .B Suboptions for plugin=iw_png
@@ -11759,6 +10971,32 @@
 
 .P
 .RE
+.B Suboptions for plugin=iw_jpeg
+
+.P
+.RS 2
+.BR quality "=<number> (0..100, default: 95)"
+.P
+Quality
+.P
+.BR chroma_sampling "=<string>"
+.P
+Supported strings: 4:2:0 4:2:2 4:4:4
+.P
+Default: 4:2:0
+.P
+Chroma sampling
+.P
+.RE
+.B Suboptions for plugin=iw_tga
+
+.P
+.RS 2
+.BR rle "=[1|0] (default: 0)"
+.P
+Do RLE compression
+.P
+.RE
 .B Suboptions for plugin=iw_tiff
 
 .P
@@ -11780,42 +11018,57 @@
 Deflate compression level
 .P
 .RE
-.B Suboptions for plugin=iw_tga
-
+.BR frame_digits "=<number> (1..9, default: 4)"
 .P
-.RS 2
-.BR rle "=[1|0] (default: 0)"
+Framenumber digits
 .P
-Do RLE compression
+.BR frame_offset "=<number> (0..1000000, default: 0)"
+.P
+Framenumber offset
 .P
 .RE
-.B Suboptions for plugin=iw_pnm
+.B Suboptions for video_encoder=e_gavf
 
 .P
 .RS 2
 .BR format "=<string>"
 .P
-Supported strings: binary ascii
+Supported strings: disk
 .P
-Default: binary
+Default: (null)
 .P
 Format
 .P
-.BR comment "=<string> (Default: Created with gmerlin)"
+.BR sync_distance "=<number> (20..10000, default: 500)"
 .P
-Comment
+Sync distance (ms)
 .P
-Comment which will be written in front of every file
+Distance between sync headers if no stream has keyframes. Smaller
+distances produce larger overhead but speed up seeking
 
 .P
-.RE
-.BR frame_digits "=<number> (1..9, default: 4)"
+.BR sync_index "=[1|0] (default: 1)"
 .P
-Framenumber digits
+Write sync index
 .P
-.BR frame_offset "=<number> (0..1000000, default: 0)"
+Write a synchronisation index to enable seeking
+
 .P
-Framenumber offset
+.BR packet_index "=[1|0] (default: 1)"
+.P
+Write packet index
+.P
+Write a packet index to enable faster seeking
+
+.P
+.BR interleave "=[1|0] (default: 1)"
+.P
+Interleave
+.P
+Take care of proper interleaving. Enabling this increases encoding
+latency and memory usage. Disable this if the packets are already
+properly interleaved.
+
 .P
 .RE
 .B Suboptions for video_encoder=e_theora
@@ -12046,138 +11299,222 @@
 
 .P
 .RE
-.B Suboptions for video_encoder=e_mpeg
+.B Suboptions for video_encoder=b_ogg
 
 .P
 .RS 2
-.BR format "=<string>"
+.BR server "=<string> (Default: localhost)"
 .P
-Supported strings: mpeg1 vcd mpeg2 svcd dvd_nav dvd
+Server
 .P
-Default: mpeg1
+.BR port "=<number> (1..65535, default: 8000)"
 .P
-Format
+Port
 .P
-Output format. Note that for some output formats (e.g. VCD), you MUST
-use proper settings for the audio and video streams also, since this
-isn't done automatically
-
+.BR mount "=<string> (Default: /stream.ogg)"
 .P
-.BR tmp_dir "=<string>"
+Mount
 .P
-Directory for temporary files
+.BR user "=<string> (Default: source)"
 .P
-Leave empty to use the same directory as the final output file
+User
+.P
+.BR password "=<string>"
+.P
+Password
+.P
+.BR name "=<string> (Default: Test stream)"
+.P
+Name
+.P
+.BR description "=<string> (Default: Brought to you by gmerlin)"
+.P
+Description
+.P
+.BR codec "=option[{suboptions}]"
+.P
+Supported options: vorbis speex
+.P
+Default: vorbis
+.P
+Codec
+.P
+.B Suboptions for codec=vorbis
 
 .P
-.BR aux_stream_1 "=<string>"
+.RS 2
+.BR bitrate_mode "=<string>"
 .P
-Additional stream 1
+Supported strings: vbr vbr_bitrate managed
 .P
-Additional stream to multiplex into the final output file. Use this if
-you want e.g. create mp3 or AC3 audio with some other encoder
+Default: VBR
+.P
+Bitrate mode
+.P
+Bitrate mode:
+VBR: You specify a quality and (optionally) a minimum and maximum
+bitrate
+VBR (bitrate): The specified nominal bitrate will be used for
+selecting the encoder mode.
+Managed: You specify a nominal bitrate and (optionally) a minimum
+and maximum bitrate
+VBR is recommended, managed bitrate might result in a worse quality
 
 .P
-.BR aux_stream_2 "=<string>"
+.BR nominal_bitrate "=<number> (0..1000, default: 128)"
 .P
-Additional stream 2
+Nominal bitrate (kbps)
 .P
-Additional stream to multiplex into the final output file. Use this if
-you want e.g. create mp3 or AC3 audio with some other encoder
+Nominal bitrate (in kbps) for managed mode
 
 .P
-.BR aux_stream_3 "=<string>"
+.BR quality "=<number> (0.0..10.0, default: 3.0)"
 .P
-Additional stream 3
+VBR Quality (10: best)
 .P
-Additional stream to multiplex into the final output file. Use this if
-you want e.g. create mp3 or AC3 audio with some other encoder
+Quality for VBR mode
+10: best (largest output file)
+0:  worst (smallest output file)
 
 .P
-.BR bitrate "=<number> (32..448, default: 224)"
+.BR min_bitrate "=<number> (0..1000, default: 0)"
 .P
-Bitrate (kbps)
+Minimum bitrate (kbps)
 .P
-.BR layer "=<number> (1..2, default: 2)"
+Optional minimum bitrate (in kbps)
+0 = unspecified
+
 .P
-Layer (1 or 2)
+.BR max_bitrate "=<number> (0..1000, default: 0)"
 .P
-Audio layer
+Maximum bitrate (kbps)
+.P
+Optional maximum bitrate (in kbps)
+0 = unspecified
 
 .P
-.BR vcd "=[1|0] (default: 1)"
+.RE
+.B Suboptions for codec=speex
+
 .P
-VCD Compatible
+.RS 2
+.BR mode "=<string>"
 .P
-Make VCD compliant output. This forces layer II, 224 kbps and 44.1 KHz
-stereo
+Supported strings: auto nb wb uwb
+.P
+Default: auto
+.P
+Speex mode
+.P
+Encoding mode. If you select Auto, the mode will be taken from the
+samplerate.
 
 .P
-.BR format "=<string>"
+.BR quality "=<number> (0..10, default: 3)"
 .P
-Supported strings: mpeg1 mpeg2 vcd svcd dvd
+Quality (10: best)
 .P
-Default: mpeg1
+.BR complexity "=<number> (0..10, default: 3)"
 .P
-Format
+Encoding complexity
 .P
-Sets the MPEG flavour. Note, that for VCD, SVCD and DVD, you MUST
-provide valid frame sizes
+.BR nframes "=<number> (1..10, default: 1)"
+.P
+Frames per Ogg packet
+.P
+.BR bitrate "=<number> (0..128, default: 8)"
+.P
+Bitrate (kbps)
+.P
+Bitrate (in kbps). Set to 0 for seleting the standard bitrates for
+the encoding mode.
 
 .P
-.BR bitrate_mode "=<string>"
+.BR vbr "=[1|0] (default: 0)"
 .P
-Supported strings: auto vbr cbr
+Variable bitrate
 .P
-Default: auto
+.BR abr_bitrate "=<number> (0..128, default: 0)"
 .P
-Bitrate Mode
+Average bitrate (kbps)
 .P
-Specify constant or variable bitrate. For "Auto", constant bitrate will
-be used for MPEG-1, variable bitrate will be used for MPEG-2. For
-formats, which require CBR, this option is ignored
+Average bitrate (in kbps). Set to 0 for disabling ABR.
 
 .P
-.BR bitrate "=<number> (200..99999, default: 1150)"
+.BR vad "=[1|0] (default: 0)"
 .P
-Bitrate (kbps)
+Use voice activity detection
 .P
-Video bitrate in kbps. For VBR, it's the maximum bitrate. If the format
-requires a fixed bitrate (e.g. VCD) this option is ignored
+.BR dtx "=[1|0] (default: 0)"
+.P
+Enable file-based discontinuous transmission
+.P
+.RE
+.BR cbr "=[1|0] (default: 0)"
+.P
+Use constant bitrate
+.P
+For constant bitrate, choose a target bitrate. For variable bitrate,
+choose a nominal quality.
 
 .P
-.BR quantization "=<number> (1..31, default: 8)"
+.BR target_bitrate "=<number> (45..2000, default: 250)"
 .P
-Quantization
+Target bitrate (kbps)
 .P
-Minimum quantization for VBR. Lower numbers mean higher quality. For
-CBR, this option is ignored.
+.BR quality "=<number> (0..63, default: 10)"
+.P
+Nominal quality
+.P
+Quality for VBR mode
+63: best (largest output file)
+0:  worst (smallest output file)
 
 .P
-.BR quant_matrix "=<string>"
+.BR max_keyframe_interval "=<number> (1..1000, default: 64)"
 .P
-Supported strings: default kvcd tmpgenc hi-res
+Maximum keyframe interval
 .P
-Default: default
+.BR drop_frames "=[1|0] (default: 1)"
 .P
-Quantization matrices
+Enable frame dropping
 .P
-.BR bframes "=<number> (0..2, default: 0)"
+Drop frames to keep within bitrate buffer constraints. This can have a
+severe impact on quality, but is the only way to ensure that bitrate
+targets are met at low rates during sudden bursts of activity.
+
 .P
-Number of B-Frames
+.BR cap_overflow "=[1|0] (default: 1)"
 .P
-Specify the number of B-frames between 2 P/I frames. More B-frames slow
-down encoding and increase memory usage, but might give better
-compression results. For VCD, this option is ignored, since the VCD
-standard requires 2 B-frames, no matter if you like them or not.
+Don't bank excess bits for later use
+.P
+Ignore bitrate buffer overflows. If the encoder uses so few bits that
+the reservoir of available bits overflows, ignore the excess. The
+encoder will not try to use these extra bits in future frames. At high
+rates this may cause the result to be undersized, but allows a client to
+play the stream using a finite buffer; it should normally be enabled.
 
 .P
-.BR user_options "=<string>"
+.BR cap_underflow "=[1|0] (default: 0)"
 .P
-User options
+Don't try to make up shortfalls later
 .P
-Enter further commandline options for mpeg2enc here. Check the mpeg2enc
-manual page for details
+Ignore bitrate buffer underflows. If the encoder uses so many bits that
+the reservoir of available bits underflows, ignore the deficit. The
+encoder will not try to make up these extra bits in future frames. At
+low rates this may cause the result to be oversized; it should normally
+be disabled.
+
+.P
+.BR speed "=<number> (0.00..1.00, default: 0.00)"
+.P
+Encoding speed
+.P
+Higher speed levels favor quicker encoding over better quality per bit.
+Depending on the encoding mode, and the internal algorithms used,
+quality may actually improve, but in this case bitrate will also likely
+increase. In any case, overall rate/distortion performance will probably
+decrease.
 
 .P
 .BR default_timescale "=<number> (default: 25)"
@@ -12197,27 +11534,100 @@
 
 .P
 .RE
-.B Suboptions for video_encoder=e_ffmpeg_video
+.B Suboptions for video_encoder=e_ffmpeg
 
 .P
 .RS 2
 .BR format "=<string>"
 .P
-Supported strings: mpeg1video mpeg2video
+Supported strings: avi mpeg vob dvd flv asf mpegts matroska
 .P
-Default: mpeg1video
+Default: avi
 .P
 Format
 .P
 .BR codec "=option[{suboptions}]"
 .P
-Supported options: mpeg1video mpeg2video
+Supported options: pcm_s16le pcm_u8 pcm_alaw pcm_mulaw mp3 mp2 ac3 wma2 wma1
 .P
-Default: mpeg1video
+Default: pcm_s16le
 .P
 Codec
 .P
-.B Suboptions for codec=mpeg1video
+.B Suboptions for codec=mp3
+
+.P
+.RS 2
+.BR ff_bit_rate_str "=<string>"
+.P
+Supported strings: 32 40 48 56 64 80 96 112 128 160 192 224 256 320
+.P
+Default: 128
+.P
+Bit rate (kbps)
+.P
+.RE
+.B Suboptions for codec=mp2
+
+.P
+.RS 2
+.BR ff_bit_rate_str "=<string>"
+.P
+Supported strings: 32 48 56 64 80 96 112 128 160 192 224 256 320 384
+.P
+Default: 128
+.P
+Bit rate (kbps)
+.P
+.RE
+.B Suboptions for codec=ac3
+
+.P
+.RS 2
+.BR ff_bit_rate_str "=<string>"
+.P
+Supported strings: 32 40 48 56 64 80 96 112 128 160 192 224 256 320 384 448 512 576 640
+.P
+Default: 128
+.P
+Bit rate (kbps)
+.P
+.RE
+.B Suboptions for codec=wma2
+
+.P
+.RS 2
+.BR ff_bit_rate_str "=<string>"
+.P
+Supported strings: 24 48 64 96 128
+.P
+Default: 128
+.P
+Bit rate (kbps)
+.P
+.RE
+.B Suboptions for codec=wma1
+
+.P
+.RS 2
+.BR ff_bit_rate_str "=<string>"
+.P
+Supported strings: 24 48 64 96 128
+.P
+Default: 128
+.P
+Bit rate (kbps)
+.P
+.RE
+.BR codec "=option[{suboptions}]"
+.P
+Supported options: mpeg4 msmpeg4v3 mjpeg mpeg1video mpeg2video flv1 wmv1 libx264
+.P
+Default: mpeg4
+.P
+Codec
+.P
+.B Suboptions for codec=mpeg4
 
 .P
 .RS 2
@@ -12259,6 +11669,10 @@
 .P
 Avoid B-frames in high motion scenes
 .P
+.BR ff_flag_ac_pred "=[1|0] (default: 0)"
+.P
+MPEG-4 AC prediction
+.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -12400,6 +11814,13 @@
 -normal_q*factor+offset)
 
 .P
+.BR ff_flag_cbp_rd "=[1|0] (default: 0)"
+.P
+CBP RD
+.P
+Use rate distortion optimization for cbp
+
+.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -12463,6 +11884,33 @@
 Motion estimation diamond size. Negative means shape adaptive.
 
 .P
+.BR ff_flag_gmc "=[1|0] (default: 0)"
+.P
+Use global motion compensation
+.P
+Warning: GMC is not supported by all decoders
+
+.P
+.BR ff_flag_4mv "=[1|0] (default: 0)"
+.P
+4 MV per MB allowed
+.P
+Allow 4 motion vectors per macroblock (slightly better quality).
+Works better if MB decision mode is "Fewest bits" or "Rate
+distoration".
+
+.P
+.BR ff_flag_mv0 "=[1|0] (default: 0)"
+.P
+Always try a MB with MV=<0,0>
+.P
+.BR ff_flag_qp_rd "=[1|0] (default: 0)"
+.P
+QP RD
+.P
+Use rate distortion optimization for qp selection
+
+.P
 .BR ff_pre_me "=<number> (0..2, default: 0)"
 .P
 ME pre-pass
@@ -12507,6 +11955,48 @@
 adaptive.
 
 .P
+.BR ff_flag_qpel "=[1|0] (default: 0)"
+.P
+Use qpel MC
+.P
+Use 1/4 pixel motion compensation.  Warning: QPEL is not supported
+by all decoders.
+
+.P
+.BR ff_me_sub_cmp "=<string>"
+.P
+Supported strings: SAD SSE SATD DCT PSNR BIT RD ZERO VSAD VSSE NSSE
+.P
+Default: SAD
+.P
+Subpixel ME compare function
+.P
+Subpixel motion estimation compare function.
+SAD: Sum of absolute differences
+SSE: Sum of squared errors
+SATD: Sum of absolute Hadamard transformed differences
+DCT: Sum of absolute DCT transformed differences
+PSNR: Sum of squared quantization errors (low quality)
+BIT: Number of bits needed for the block
+RD: Rate distortion optimal (slow)
+ZERO: 0
+VSAD: Sum of absolute vertical differences
+VSSE: Sum of squared vertical differences
+NSSE: Noise preserving sum of squared differences
+
+.P
+.BR ff_me_sub_cmp_chroma "=[1|0] (default: 0)"
+.P
+Enable chroma subpixel ME compare
+.P
+.BR ff_me_subpel_quality "=<number> (1..8, default: 8)"
+.P
+Subpel ME quality
+.P
+Subpel motion estimation refinement quality (for qpel). Higher
+values mean higher quality but slower encoding.
+
+.P
 .BR ff_lumi_masking "=<number> (0.00..1.00, default: 0.00)"
 .P
 Luminance masking
@@ -12593,7 +12083,7 @@
 
 .P
 .RE
-.B Suboptions for codec=mpeg2video
+.B Suboptions for codec=msmpeg4v3
 
 .P
 .RS 2
@@ -12624,17 +12114,6 @@
 .P
 Strictly enforce GOP size
 .P
-.BR ff_max_b_frames "=<number> (0..16, default: 0)"
-.P
-Max B-Frames
-.P
-Maximum number of B-frames between non B-frames
-
-.P
-.BR ff_b_frame_strategy "=[1|0] (default: 0)"
-.P
-Avoid B-frames in high motion scenes
-.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -12758,24 +12237,6 @@
 Quantizer offset between P-frames and I-frames
 
 .P
-.BR ff_b_quant_factor "=<number> (-31.00..31.00, default: 1.25)"
-.P
-B quantizer factor
-.P
-Quantizer factor between B-frames and non-B-frames
-
-.P
-.BR ff_b_quant_offset "=<number> (0.00..31.00, default: 1.25)"
-.P
-B quantizer offset
-.P
-Quantizer offset between B-frames and non-B-frames
-if > 0 then the last p frame quantizer will be used (q=
-lastp_q*factor+offset)
-if < 0 then normal ratecontrol will be done (q=
--normal_q*factor+offset)
-
-.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -12969,117 +12430,145 @@
 
 .P
 .RE
-.BR default_timescale "=<number> (default: 25)"
+.B Suboptions for codec=mjpeg
+
 .P
-Default timescale
+.RS 2
+.BR ff_bit_rate_video "=<number> (default: 800)"
 .P
-For formats, which support only constant framerates, set the default
-timescale here
-
+Bit rate (kbps)
 .P
-.BR default_frame_duration "=<number> (default: 1)"
+.BR ff_bit_rate_tolerance "=<number> (default: 8000)"
 .P
-Default frame duration
+Bitrate tolerance (kbps)
 .P
-For formats, which support only constant framerates, set the default
-frame duration here
+Number of bits the bitstream is allowed to diverge from the
+reference. Unused for constant quantizer encoding
 
 .P
-.RE
-.B Suboptions for video_encoder=e_ffmpeg
+.BR ff_rc_min_rate "=<number> (default: 0)"
+.P
+Minimum bitrate (kbps)
+.P
+Minimum bitrate (0 means arbitrary)
 
 .P
-.RS 2
-.BR format "=<string>"
+.BR ff_rc_max_rate "=<number> (default: 0)"
 .P
-Supported strings: avi mpeg vob dvd flv asf mpegts
+Maximum bitrate (kbps)
 .P
-Default: avi
+Maximum bitrate (0 means arbitrary)
+
 .P
-Format
+.BR ff_rc_buffer_size "=<number> (default: 0)"
 .P
-.BR codec "=option[{suboptions}]"
+RC buffer size
 .P
-Supported options: pcm_s16le pcm_u8 pcm_alaw pcm_mulaw mp3 mp2 ac3 wma2 wma1
+Decoder bitstream buffer size in kbits. When encoding with max
+and/or min bitrate, this must be specified.
+
 .P
-Default: pcm_s16le
+.BR ff_rc_initial_cplx "=<number> (0.0..99.0, default: 0.0)"
 .P
-Codec
+Initial RC complexity
 .P
-.B Suboptions for codec=mp3
+.BR ff_rc_initial_buffer_occupancy "=<number> (default: 0)"
+.P
+Initial RC buffer occupancy
+.P
+Number of kilobits which should be loaded into the rc buffer before
+encoding starts. Must not be larger than RC buffer size
 
 .P
-.RS 2
-.BR ff_bit_rate_str "=<string>"
+.BR ff_qmin "=<number> (0..31, default: 2)"
 .P
-Supported strings: 32 40 48 56 64 80 96 112 128 160 192 224 256 320
+Minimum quantizer scale
 .P
-Default: 128
+.BR ff_qmax "=<number> (0..31, default: 31)"
 .P
-Bit rate (kbps)
+Maximum quantizer scale
 .P
-.RE
-.B Suboptions for codec=mp2
+.BR ff_max_qdiff "=<number> (0..31, default: 3)"
+.P
+Maximum quantizer difference
+.P
+Maximum quantizer difference between frames
 
 .P
-.RS 2
-.BR ff_bit_rate_str "=<string>"
+.BR ff_flag_qscale "=[1|0] (default: 0)"
 .P
-Supported strings: 32 48 56 64 80 96 112 128 160 192 224 256 320 384
+Use fixed quantizer
 .P
-Default: 128
+Use fixed quality encoding
+
 .P
-Bit rate (kbps)
+.BR ff_qscale "=<number> (1..31, default: 10)"
 .P
-.RE
-.B Suboptions for codec=ac3
+Fixed quantizer
+.P
+Quantizer for fixed quality encoding. Lower means better, 1 is not
+recommended
 
 .P
-.RS 2
-.BR ff_bit_rate_str "=<string>"
+.BR ff_qcompress "=<number> (0.00..1.00, default: 0.50)"
 .P
-Supported strings: 32 40 48 56 64 80 96 112 128 160 192 224 256 320 384 448 512 576 640
+Quantizer compression
 .P
-Default: 128
+Amount of qscale change between easy & hard scenes
+
 .P
-Bit rate (kbps)
+.BR ff_qblur "=<number> (0.00..1.00, default: 0.00)"
 .P
-.RE
-.B Suboptions for codec=wma2
+Quantizer blur
+.P
+Amount of qscale smoothing over time
 
 .P
-.RS 2
-.BR ff_bit_rate_str "=<string>"
+.BR ff_quantizer_noise_shaping "=<number> (0..3, default: 0)"
 .P
-Supported strings: 24 48 64 96 128
+Quantizer noise shaping
 .P
-Default: 128
+Choose quantization such that noise will be masked by
+similar-frequency content in the image
+
 .P
-Bit rate (kbps)
+.BR ff_trellis "=[1|0] (default: 0)"
 .P
-.RE
-.B Suboptions for codec=wma1
+Use trellis quantization
+.P
+Use trellis quantization (improves quality)
 
 .P
-.RS 2
-.BR ff_bit_rate_str "=<string>"
+.BR ff_strict_std_compliance "=<number> (-2..2, default: 0)"
 .P
-Supported strings: 24 48 64 96 128
+Standards compliance
 .P
-Default: 128
+2: Strictly conform to a older more strict version of the spec or
+reference software
+1: Strictly conform to all the things in the spec no matter what
+consequences
+0: Default
+-1: Allow inofficial extensions
+-2: Allow non standarized experimental things
+
 .P
-Bit rate (kbps)
+.BR ff_noise_reduction "=<number> (0..2000, default: 0)"
 .P
-.RE
-.BR codec "=option[{suboptions}]"
+Noise reduction
 .P
-Supported options: mpeg4 msmpeg4v3 mjpeg mpeg1video mpeg2video flv1 wmv1
+.BR ff_flag_gray "=[1|0] (default: 0)"
 .P
-Default: mpeg4
+Grayscale mode
 .P
-Codec
+.BR ff_flag_bitexact "=[1|0] (default: 0)"
 .P
-.B Suboptions for codec=mpeg4
+Use only bitexact stuff
+.P
+Use only bitexact stuff (except (i)dct)
+
+.P
+.RE
+.B Suboptions for codec=mpeg1video
 
 .P
 .RS 2
@@ -13121,10 +12610,6 @@
 .P
 Avoid B-frames in high motion scenes
 .P
-.BR ff_flag_ac_pred "=[1|0] (default: 0)"
-.P
-MPEG-4 AC prediction
-.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -13266,13 +12751,6 @@
 -normal_q*factor+offset)
 
 .P
-.BR ff_flag_cbp_rd "=[1|0] (default: 0)"
-.P
-CBP RD
-.P
-Use rate distortion optimization for cbp
-
-.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -13336,33 +12814,6 @@
 Motion estimation diamond size. Negative means shape adaptive.
 
 .P
-.BR ff_flag_gmc "=[1|0] (default: 0)"
-.P
-Use global motion compensation
-.P
-Warning: GMC is not supported by all decoders
-
-.P
-.BR ff_flag_4mv "=[1|0] (default: 0)"
-.P
-4 MV per MB allowed
-.P
-Allow 4 motion vectors per macroblock (slightly better quality).
-Works better if MB decision mode is "Fewest bits" or "Rate
-distoration".
-
-.P
-.BR ff_flag_mv0 "=[1|0] (default: 0)"
-.P
-Always try a MB with MV=<0,0>
-.P
-.BR ff_flag_qp_rd "=[1|0] (default: 0)"
-.P
-QP RD
-.P
-Use rate distortion optimization for qp selection
-
-.P
 .BR ff_pre_me "=<number> (0..2, default: 0)"
 .P
 ME pre-pass
@@ -13407,48 +12858,6 @@
 adaptive.
 
 .P
-.BR ff_flag_qpel "=[1|0] (default: 0)"
-.P
-Use qpel MC
-.P
-Use 1/4 pixel motion compensation.  Warning: QPEL is not supported
-by all decoders.
-
-.P
-.BR ff_me_sub_cmp "=<string>"
-.P
-Supported strings: SAD SSE SATD DCT PSNR BIT RD ZERO VSAD VSSE NSSE
-.P
-Default: SAD
-.P
-Subpixel ME compare function
-.P
-Subpixel motion estimation compare function.
-SAD: Sum of absolute differences
-SSE: Sum of squared errors
-SATD: Sum of absolute Hadamard transformed differences
-DCT: Sum of absolute DCT transformed differences
-PSNR: Sum of squared quantization errors (low quality)
-BIT: Number of bits needed for the block
-RD: Rate distortion optimal (slow)
-ZERO: 0
-VSAD: Sum of absolute vertical differences
-VSSE: Sum of squared vertical differences
-NSSE: Noise preserving sum of squared differences
-
-.P
-.BR ff_me_sub_cmp_chroma "=[1|0] (default: 0)"
-.P
-Enable chroma subpixel ME compare
-.P
-.BR ff_me_subpel_quality "=<number> (1..8, default: 8)"
-.P
-Subpel ME quality
-.P
-Subpel motion estimation refinement quality (for qpel). Higher
-values mean higher quality but slower encoding.
-
-.P
 .BR ff_lumi_masking "=<number> (0.00..1.00, default: 0.00)"
 .P
 Luminance masking
@@ -13535,7 +12944,7 @@
 
 .P
 .RE
-.B Suboptions for codec=msmpeg4v3
+.B Suboptions for codec=mpeg2video
 
 .P
 .RS 2
@@ -13566,6 +12975,17 @@
 .P
 Strictly enforce GOP size
 .P
+.BR ff_max_b_frames "=<number> (0..16, default: 0)"
+.P
+Max B-Frames
+.P
+Maximum number of B-frames between non B-frames
+
+.P
+.BR ff_b_frame_strategy "=[1|0] (default: 0)"
+.P
+Avoid B-frames in high motion scenes
+.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -13689,6 +13109,24 @@
 Quantizer offset between P-frames and I-frames
 
 .P
+.BR ff_b_quant_factor "=<number> (-31.00..31.00, default: 1.25)"
+.P
+B quantizer factor
+.P
+Quantizer factor between B-frames and non-B-frames
+
+.P
+.BR ff_b_quant_offset "=<number> (0.00..31.00, default: 1.25)"
+.P
+B quantizer offset
+.P
+Quantizer offset between B-frames and non-B-frames
+if > 0 then the last p frame quantizer will be used (q=
+lastp_q*factor+offset)
+if < 0 then normal ratecontrol will be done (q=
+-normal_q*factor+offset)
+
+.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -13882,145 +13320,7 @@
 
 .P
 .RE
-.B Suboptions for codec=mjpeg
-
-.P
-.RS 2
-.BR ff_bit_rate_video "=<number> (default: 800)"
-.P
-Bit rate (kbps)
-.P
-.BR ff_bit_rate_tolerance "=<number> (default: 8000)"
-.P
-Bitrate tolerance (kbps)
-.P
-Number of bits the bitstream is allowed to diverge from the
-reference. Unused for constant quantizer encoding
-
-.P
-.BR ff_rc_min_rate "=<number> (default: 0)"
-.P
-Minimum bitrate (kbps)
-.P
-Minimum bitrate (0 means arbitrary)
-
-.P
-.BR ff_rc_max_rate "=<number> (default: 0)"
-.P
-Maximum bitrate (kbps)
-.P
-Maximum bitrate (0 means arbitrary)
-
-.P
-.BR ff_rc_buffer_size "=<number> (default: 0)"
-.P
-RC buffer size
-.P
-Decoder bitstream buffer size in kbits. When encoding with max
-and/or min bitrate, this must be specified.
-
-.P
-.BR ff_rc_initial_cplx "=<number> (0.0..99.0, default: 0.0)"
-.P
-Initial RC complexity
-.P
-.BR ff_rc_initial_buffer_occupancy "=<number> (default: 0)"
-.P
-Initial RC buffer occupancy
-.P
-Number of kilobits which should be loaded into the rc buffer before
-encoding starts. Must not be larger than RC buffer size
-
-.P
-.BR ff_qmin "=<number> (0..31, default: 2)"
-.P
-Minimum quantizer scale
-.P
-.BR ff_qmax "=<number> (0..31, default: 31)"
-.P
-Maximum quantizer scale
-.P
-.BR ff_max_qdiff "=<number> (0..31, default: 3)"
-.P
-Maximum quantizer difference
-.P
-Maximum quantizer difference between frames
-
-.P
-.BR ff_flag_qscale "=[1|0] (default: 0)"
-.P
-Use fixed quantizer
-.P
-Use fixed quality encoding
-
-.P
-.BR ff_qscale "=<number> (1..31, default: 10)"
-.P
-Fixed quantizer
-.P
-Quantizer for fixed quality encoding. Lower means better, 1 is not
-recommended
-
-.P
-.BR ff_qcompress "=<number> (0.00..1.00, default: 0.50)"
-.P
-Quantizer compression
-.P
-Amount of qscale change between easy & hard scenes
-
-.P
-.BR ff_qblur "=<number> (0.00..1.00, default: 0.00)"
-.P
-Quantizer blur
-.P
-Amount of qscale smoothing over time
-
-.P
-.BR ff_quantizer_noise_shaping "=<number> (0..3, default: 0)"
-.P
-Quantizer noise shaping
-.P
-Choose quantization such that noise will be masked by
-similar-frequency content in the image
-
-.P
-.BR ff_trellis "=[1|0] (default: 0)"
-.P
-Use trellis quantization
-.P
-Use trellis quantization (improves quality)
-
-.P
-.BR ff_strict_std_compliance "=<number> (-2..2, default: 0)"
-.P
-Standards compliance
-.P
-2: Strictly conform to a older more strict version of the spec or
-reference software
-1: Strictly conform to all the things in the spec no matter what
-consequences
-0: Default
--1: Allow inofficial extensions
--2: Allow non standarized experimental things
-
-.P
-.BR ff_noise_reduction "=<number> (0..2000, default: 0)"
-.P
-Noise reduction
-.P
-.BR ff_flag_gray "=[1|0] (default: 0)"
-.P
-Grayscale mode
-.P
-.BR ff_flag_bitexact "=[1|0] (default: 0)"
-.P
-Use only bitexact stuff
-.P
-Use only bitexact stuff (except (i)dct)
-
-.P
-.RE
-.B Suboptions for codec=mpeg1video
+.B Suboptions for codec=flv1
 
 .P
 .RS 2
@@ -14051,17 +13351,6 @@
 .P
 Strictly enforce GOP size
 .P
-.BR ff_max_b_frames "=<number> (0..16, default: 0)"
-.P
-Max B-Frames
-.P
-Maximum number of B-frames between non B-frames
-
-.P
-.BR ff_b_frame_strategy "=[1|0] (default: 0)"
-.P
-Avoid B-frames in high motion scenes
-.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -14185,24 +13474,6 @@
 Quantizer offset between P-frames and I-frames
 
 .P
-.BR ff_b_quant_factor "=<number> (-31.00..31.00, default: 1.25)"
-.P
-B quantizer factor
-.P
-Quantizer factor between B-frames and non-B-frames
-
-.P
-.BR ff_b_quant_offset "=<number> (0.00..31.00, default: 1.25)"
-.P
-B quantizer offset
-.P
-Quantizer offset between B-frames and non-B-frames
-if > 0 then the last p frame quantizer will be used (q=
-lastp_q*factor+offset)
-if < 0 then normal ratecontrol will be done (q=
--normal_q*factor+offset)
-
-.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -14396,7 +13667,7 @@
 
 .P
 .RE
-.B Suboptions for codec=mpeg2video
+.B Suboptions for codec=wmv1
 
 .P
 .RS 2
@@ -14427,17 +13698,6 @@
 .P
 Strictly enforce GOP size
 .P
-.BR ff_max_b_frames "=<number> (0..16, default: 0)"
-.P
-Max B-Frames
-.P
-Maximum number of B-frames between non B-frames
-
-.P
-.BR ff_b_frame_strategy "=[1|0] (default: 0)"
-.P
-Avoid B-frames in high motion scenes
-.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -14561,24 +13821,6 @@
 Quantizer offset between P-frames and I-frames
 
 .P
-.BR ff_b_quant_factor "=<number> (-31.00..31.00, default: 1.25)"
-.P
-B quantizer factor
-.P
-Quantizer factor between B-frames and non-B-frames
-
-.P
-.BR ff_b_quant_offset "=<number> (0.00..31.00, default: 1.25)"
-.P
-B quantizer offset
-.P
-Quantizer offset between B-frames and non-B-frames
-if > 0 then the last p frame quantizer will be used (q=
-lastp_q*factor+offset)
-if < 0 then normal ratecontrol will be done (q=
--normal_q*factor+offset)
-
-.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -14772,7 +14014,86 @@
 
 .P
 .RE
-.B Suboptions for codec=flv1
+.B Suboptions for codec=libx264
+
+.P
+.RS 2
+.BR libx264_preset "=<string>"
+.P
+Supported strings: ultrafast superfast veryfast faster fast medium slow slower veryslow placebo
+.P
+Default: medium
+.P
+Preset
+.P
+.BR libx264_tune "=<string>"
+.P
+Supported strings: $none film animation grain stillimage psnr ssim fastdecode zerolatency
+.P
+Default: $none
+.P
+Tune
+.P
+.BR ff_bit_rate_video "=<number> (0..10000, default: 0)"
+.P
+Bit rate (kbps)
+.P
+If > 0 encode with average bitrate
+
+.P
+.BR libx264_crf "=<number> (-1.00..51.00, default: 23.00)"
+.P
+Quality-based VBR
+.P
+Negative means disable
+
+.P
+.BR libx264_qp "=<number> (-1..69, default: -1)"
+.P
+Force constant QP
+.P
+Negative means disable, 0 means lossless
+
+.P
+.RE
+.BR default_timescale "=<number> (default: 25)"
+.P
+Default timescale
+.P
+For formats, which support only constant framerates, set the default
+timescale here
+
+.P
+.BR default_frame_duration "=<number> (default: 1)"
+.P
+Default frame duration
+.P
+For formats, which support only constant framerates, set the default
+frame duration here
+
+.P
+.RE
+.B Suboptions for video_encoder=e_ffmpeg_video
+
+.P
+.RS 2
+.BR format "=<string>"
+.P
+Supported strings: mpeg1video mpeg2video
+.P
+Default: mpeg1video
+.P
+Format
+.P
+.BR codec "=option[{suboptions}]"
+.P
+Supported options: mpeg1video mpeg2video
+.P
+Default: mpeg1video
+.P
+Codec
+.P
+.B Suboptions for codec=mpeg1video
 
 .P
 .RS 2
@@ -14803,6 +14124,17 @@
 .P
 Strictly enforce GOP size
 .P
+.BR ff_max_b_frames "=<number> (0..16, default: 0)"
+.P
+Max B-Frames
+.P
+Maximum number of B-frames between non B-frames
+
+.P
+.BR ff_b_frame_strategy "=[1|0] (default: 0)"
+.P
+Avoid B-frames in high motion scenes
+.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -14926,6 +14258,24 @@
 Quantizer offset between P-frames and I-frames
 
 .P
+.BR ff_b_quant_factor "=<number> (-31.00..31.00, default: 1.25)"
+.P
+B quantizer factor
+.P
+Quantizer factor between B-frames and non-B-frames
+
+.P
+.BR ff_b_quant_offset "=<number> (0.00..31.00, default: 1.25)"
+.P
+B quantizer offset
+.P
+Quantizer offset between B-frames and non-B-frames
+if > 0 then the last p frame quantizer will be used (q=
+lastp_q*factor+offset)
+if < 0 then normal ratecontrol will be done (q=
+-normal_q*factor+offset)
+
+.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -15119,7 +14469,7 @@
 
 .P
 .RE
-.B Suboptions for codec=wmv1
+.B Suboptions for codec=mpeg2video
 
 .P
 .RS 2
@@ -15150,6 +14500,17 @@
 .P
 Strictly enforce GOP size
 .P
+.BR ff_max_b_frames "=<number> (0..16, default: 0)"
+.P
+Max B-Frames
+.P
+Maximum number of B-frames between non B-frames
+
+.P
+.BR ff_b_frame_strategy "=[1|0] (default: 0)"
+.P
+Avoid B-frames in high motion scenes
+.P
 .BR ff_bit_rate_video "=<number> (default: 800)"
 .P
 Bit rate (kbps)
@@ -15273,6 +14634,24 @@
 Quantizer offset between P-frames and I-frames
 
 .P
+.BR ff_b_quant_factor "=<number> (-31.00..31.00, default: 1.25)"
+.P
+B quantizer factor
+.P
+Quantizer factor between B-frames and non-B-frames
+
+.P
+.BR ff_b_quant_offset "=<number> (0.00..31.00, default: 1.25)"
+.P
+B quantizer offset
+.P
+Quantizer offset between B-frames and non-B-frames
+if > 0 then the last p frame quantizer will be used (q=
+lastp_q*factor+offset)
+if < 0 then normal ratecontrol will be done (q=
+-normal_q*factor+offset)
+
+.P
 .BR ff_me_method "=<string>"
 .P
 Supported strings: Zero Phods Log X1 Epzs Full
@@ -15483,222 +14862,138 @@
 
 .P
 .RE
-.B Suboptions for video_encoder=b_ogg
-
-.P
-.RS 2
-.BR server "=<string> (Default: localhost)"
-.P
-Server
-.P
-.BR port "=<number> (1..65535, default: 8000)"
-.P
-Port
-.P
-.BR mount "=<string> (Default: /stream.ogg)"
-.P
-Mount
-.P
-.BR user "=<string> (Default: source)"
-.P
-User
-.P
-.BR password "=<string>"
-.P
-Password
-.P
-.BR name "=<string> (Default: Test stream)"
-.P
-Name
-.P
-.BR description "=<string> (Default: Brought to you by gmerlin)"
-.P
-Description
-.P
-.BR codec "=option[{suboptions}]"
-.P
-Supported options: vorbis speex
-.P
-Default: vorbis
-.P
-Codec
-.P
-.B Suboptions for codec=vorbis
+.B Suboptions for video_encoder=e_mpeg
 
 .P
 .RS 2
-.BR bitrate_mode "=<string>"
+.BR format "=<string>"
 .P
-Supported strings: vbr vbr_bitrate managed
+Supported strings: mpeg1 vcd mpeg2 svcd dvd_nav dvd
 .P
-Default: VBR
+Default: mpeg1
 .P
-Bitrate mode
+Format
 .P
-Bitrate mode:
-VBR: You specify a quality and (optionally) a minimum and maximum
-bitrate
-VBR (bitrate): The specified nominal bitrate will be used for
-selecting the encoder mode.
-Managed: You specify a nominal bitrate and (optionally) a minimum
-and maximum bitrate
-VBR is recommended, managed bitrate might result in a worse quality
+Output format. Note that for some output formats (e.g. VCD), you MUST
+use proper settings for the audio and video streams also, since this
+isn't done automatically
 
 .P
-.BR nominal_bitrate "=<number> (0..1000, default: 128)"
+.BR tmp_dir "=<string>"
 .P
-Nominal bitrate (kbps)
+Directory for temporary files
 .P
-Nominal bitrate (in kbps) for managed mode
+Leave empty to use the same directory as the final output file
 
 .P
-.BR quality "=<number> (0.0..10.0, default: 3.0)"
+.BR aux_stream_1 "=<string>"
 .P
-VBR Quality (10: best)
+Additional stream 1
 .P
-Quality for VBR mode
-10: best (largest output file)
-0:  worst (smallest output file)
+Additional stream to multiplex into the final output file. Use this if
+you want e.g. create mp3 or AC3 audio with some other encoder
 
 .P
-.BR min_bitrate "=<number> (0..1000, default: 0)"
+.BR aux_stream_2 "=<string>"
 .P
-Minimum bitrate (kbps)
+Additional stream 2
 .P
-Optional minimum bitrate (in kbps)
-0 = unspecified
+Additional stream to multiplex into the final output file. Use this if
+you want e.g. create mp3 or AC3 audio with some other encoder
 
 .P
-.BR max_bitrate "=<number> (0..1000, default: 0)"
-.P
-Maximum bitrate (kbps)
+.BR aux_stream_3 "=<string>"
 .P
-Optional maximum bitrate (in kbps)
-0 = unspecified
-
+Additional stream 3
 .P
-.RE
-.B Suboptions for codec=speex
+Additional stream to multiplex into the final output file. Use this if
+you want e.g. create mp3 or AC3 audio with some other encoder
 
 .P
-.RS 2
-.BR mode "=<string>"
+.BR bitrate "=<number> (32..448, default: 224)"
 .P
-Supported strings: auto nb wb uwb
+Bitrate (kbps)
 .P
-Default: auto
+.BR layer "=<number> (1..2, default: 2)"
 .P
-Speex mode
+Layer (1 or 2)
 .P
-Encoding mode. If you select Auto, the mode will be taken from the
-samplerate.
+Audio layer
 
 .P
-.BR quality "=<number> (0..10, default: 3)"
-.P
-Quality (10: best)
-.P
-.BR complexity "=<number> (0..10, default: 3)"
-.P
-Encoding complexity
-.P
-.BR nframes "=<number> (1..10, default: 1)"
-.P
-Frames per Ogg packet
-.P
-.BR bitrate "=<number> (0..128, default: 8)"
+.BR vcd "=[1|0] (default: 1)"
 .P
-Bitrate (kbps)
+VCD Compatible
 .P
-Bitrate (in kbps). Set to 0 for seleting the standard bitrates for
-the encoding mode.
+Make VCD compliant output. This forces layer II, 224 kbps and 44.1 KHz
+stereo
 
 .P
-.BR vbr "=[1|0] (default: 0)"
+.BR format "=<string>"
 .P
-Variable bitrate
+Supported strings: mpeg1 mpeg2 vcd svcd dvd
 .P
-.BR abr_bitrate "=<number> (0..128, default: 0)"
+Default: mpeg1
 .P
-Average bitrate (kbps)
+Format
 .P
-Average bitrate (in kbps). Set to 0 for disabling ABR.
+Sets the MPEG flavour. Note, that for VCD, SVCD and DVD, you MUST
+provide valid frame sizes
 
 .P
-.BR vad "=[1|0] (default: 0)"
-.P
-Use voice activity detection
-.P
-.BR dtx "=[1|0] (default: 0)"
+.BR bitrate_mode "=<string>"
 .P
-Enable file-based discontinuous transmission
+Supported strings: auto vbr cbr
 .P
-.RE
-.BR cbr "=[1|0] (default: 0)"
+Default: auto
 .P
-Use constant bitrate
+Bitrate Mode
 .P
-For constant bitrate, choose a target bitrate. For variable bitrate,
-choose a nominal quality.
+Specify constant or variable bitrate. For "Auto", constant bitrate will
+be used for MPEG-1, variable bitrate will be used for MPEG-2. For
+formats, which require CBR, this option is ignored
 
 .P
-.BR target_bitrate "=<number> (45..2000, default: 250)"
-.P
-Target bitrate (kbps)
-.P
-.BR quality "=<number> (0..63, default: 10)"
+.BR bitrate "=<number> (200..99999, default: 1150)"
 .P
-Nominal quality
+Bitrate (kbps)
 .P
-Quality for VBR mode
-63: best (largest output file)
-0:  worst (smallest output file)
+Video bitrate in kbps. For VBR, it's the maximum bitrate. If the format
+requires a fixed bitrate (e.g. VCD) this option is ignored
 
 .P
-.BR max_keyframe_interval "=<number> (1..1000, default: 64)"
-.P
-Maximum keyframe interval
-.P
-.BR drop_frames "=[1|0] (default: 1)"
+.BR quantization "=<number> (1..31, default: 8)"
 .P
-Enable frame dropping
+Quantization
 .P
-Drop frames to keep within bitrate buffer constraints. This can have a
-severe impact on quality, but is the only way to ensure that bitrate
-targets are met at low rates during sudden bursts of activity.
+Minimum quantization for VBR. Lower numbers mean higher quality. For
+CBR, this option is ignored.
 
 .P
-.BR cap_overflow "=[1|0] (default: 1)"
+.BR quant_matrix "=<string>"
 .P
-Don't bank excess bits for later use
+Supported strings: default kvcd tmpgenc hi-res
 .P
-Ignore bitrate buffer overflows. If the encoder uses so few bits that
-the reservoir of available bits overflows, ignore the excess. The
-encoder will not try to use these extra bits in future frames. At high
-rates this may cause the result to be undersized, but allows a client to
-play the stream using a finite buffer; it should normally be enabled.
-
+Default: default
 .P
-.BR cap_underflow "=[1|0] (default: 0)"
+Quantization matrices
 .P
-Don't try to make up shortfalls later
+.BR bframes "=<number> (0..2, default: 0)"
 .P
-Ignore bitrate buffer underflows. If the encoder uses so many bits that
-the reservoir of available bits underflows, ignore the deficit. The
-encoder will not try to make up these extra bits in future frames. At
-low rates this may cause the result to be oversized; it should normally
-be disabled.
+Number of B-Frames
+.P
+Specify the number of B-frames between 2 P/I frames. More B-frames slow
+down encoding and increase memory usage, but might give better
+compression results. For VCD, this option is ignored, since the VCD
+standard requires 2 B-frames, no matter if you like them or not.
 
 .P
-.BR speed "=<number> (0.00..1.00, default: 0.00)"
+.BR user_options "=<string>"
 .P
-Encoding speed
+User options
 .P
-Higher speed levels favor quicker encoding over better quality per bit.
-Depending on the encoding mode, and the internal algorithms used,
-quality may actually improve, but in this case bitrate will also likely
-increase. In any case, overall rate/distortion performance will probably
-decrease.
+Enter further commandline options for mpeg2enc here. Check the mpeg2enc
+manual page for details
 
 .P
 .BR default_timescale "=<number> (default: 25)"
@@ -15720,7 +15015,7 @@
 .RE
 .RE
 
-.B -o
+.B \-o
 .I <output_options>
 
 .RS 2
@@ -15756,13 +15051,13 @@
 .P
 .RE
 
-.B -r
+.B \-r
 
 .RS 2
 Record to file
 .RE
 
-.B -syslog
+.B \-syslog
 .I <name>
 
 .RS 2
@@ -15772,25 +15067,25 @@
 .SH GENERIC OPTIONS
 The following generic options are available for all gmerlin applications
 
-.B -help
+.B \-help
 
 .RS 2
 Print this help message and exit
 .RE
 
-.B -help-man
+.B \-help\-man
 
 .RS 2
 Print this help message as a manual page and exit
 .RE
 
-.B -help-texi
+.B \-help\-texi
 
 .RS 2
 Print this help message in texinfo format and exit
 .RE
 
-.B -version
+.B \-version
 
 .RS 2
 Print version info and exit

gmerlin-1.2.0.tar.gz/apps/cmdlinerecorder/gmerlin-record.c -> gmerlin-4256.tar.gz/apps/cmdlinerecorder/gmerlin-record.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -57,7 +57,6 @@
 
 static int do_record = 0;
 
-static int do_syslog = 0;
 
 #define DELAY_TIME 50
 #define PING_INTERVAL 20
@@ -223,7 +222,6 @@
     exit(-1);
     }
   bg_log_syslog_init((*_argv)[arg]);
-  do_syslog = 1;
   bg_cmdline_remove_arg(argc, _argv, arg);
   }
 
@@ -312,13 +310,14 @@
     .package =  PACKAGE,
     .version =  VERSION,
     .name =     "gmerlin-record",
+    .long_name = TRS("Commandline recorder"),
     .synopsis = TRS("[options]\n"),
     .help_before = TRS("Commandline recorder\n"),
     .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
                                        {  } },
     .files = (bg_cmdline_ext_doc_t[])
     { { "~/.gmerlin/plugins.xml",
-        TRS("Cache of the plugin registry (shared by all applicatons)") },
+        TRS("Cache of the plugin registry (shared by all applications)") },
       { "~/.gmerlin/generic/config.xml",
         TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
       { /* End */ }
@@ -432,9 +431,6 @@
     timeout_counter++;
     if(timeout_counter >= PING_INTERVAL)
       timeout_counter = 0;
-
-    if(do_syslog)
-      bg_log_syslog_flush();
     
     gavl_time_delay(&delay_time);
     }

gmerlin-4256.tar.gz/apps/db2nmj Added

gmerlin-4256.tar.gz/apps/db2nmj/Makefile.am Added

gmerlin-4256.tar.gz/apps/db2nmj/create.c Added

@@ -0,0 +1,303 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include "db2nmj.h"
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "db2nmj.create"
+
+#include <unistd.h>
+#include <stdlib.h>
+
+static const char * create_commands[] =
+  {
+    "CREATE TABLE FAVOURITES (ID INTEGER PRIMARY KEY, TYPE TEXT, MEDIA_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE DB_VERSION (ID INTEGER PRIMARY KEY, VERSION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT)",
+    "CREATE TABLE SCAN_DIRS (ID INTEGER PRIMARY KEY, DIRECTORY TEXT, NAME TEXT, SCAN_TIME TEXT, SIZE INTEGER, CATEGORY INTEGER, STATUS TEXT DEFAULT 0, SEQUENCE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SCAN_SYSTEM (ID INTEGER PRIMARY KEY, TYPE TEXT, VALUE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE CONTENT_PROVIDERS ( ID INTEGER PRIMARY KEY, NAME TEXT, DESCRIPTION TEXT, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONGS (ID INTEGER PRIMARY KEY, TITLE TEXT, SEARCH_TITLE TEXT, PATH TEXT, SCAN_DIRS_ID INTEGER, FOLDERS_ID INTEGER, RUNTIME TEXT, FORMAT TEXT, LYRIC TEXT, RATING INTEGER DEFAULT 0, HASH TEXT, SIZE INTEGER, PLAY_COUNT INTEGER DEFAULT 0, BIT_RATE TEXT, TRACK_POSITION INTEGER, RELEASE_DATE TEXT DEFAULT '9999-01-01', CREATE_TIME TEXT, UPDATE_STATE TEXT, FILE_STATUS TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_ALBUMS (ID INTEGER PRIMARY KEY, TITLE TEXT, LANGUAGE TEXT, SEARCH_TITLE TEXT, TOTAL_ITEM TEXT DEFAULT 0, RELEASE_DATE TEXT DEFAULT '9999-01-01', UPDATE_STATE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_ALBUMS_SONGS (ID INTEGER PRIMARY KEY, ALBUMS_ID INTEGER , SONGS_ID INTEGER, SEQUENCE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_FOLDERS (ID INTEGER PRIMARY KEY, FOLDER TEXT, TOTAL_ITEM TEXT DEFAULT 0, PATH TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_GENRES_SONGS (ID INTEGER PRIMARY KEY, SONGS_ID INTEGER, GENRES_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_GENRES (ID INTEGER PRIMARY KEY, NAME TEXT, DESCRIPTION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_GENRES_SONG_ALBUMS (ID INTEGER PRIMARY KEY, ALBUMS_ID INTEGER, GENRES_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_GROUPS_SONG_ALBUMS (ID INTEGER PRIMARY KEY, GROUPS_ID INTEGER, ALBUMS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_GROUPS (ID INTEGER PRIMARY KEY, NAME TEXT, LANGUAGE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_PLS (ID INTEGER PRIMARY KEY, NAME TEXT, PATH TEXT, FORMAT TEXT, SCAN_DIRS_ID INTEGER, SIZE INTEGER, TOTAL_ITEM TEXT DEFAULT 0, CREATE_TIME TEXT, UPDATE_STATE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_PLS_ITEM (ID INTEGER PRIMARY KEY, PLS_ID INTEGER , SONGS_ID INTEGER , SEQUENCE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_LAST_OPEN (ID INTEGER PRIMARY KEY, SONGS_ID INTEGER , CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_PERSONS_SONGS (ID INTEGER PRIMARY KEY, PERSONS_ID INTEGER, SONGS_ID INTEGER, PERSON_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_PERSONS_SONG_ALBUMS (ID INTEGER PRIMARY KEY, PERSONS_ID INTEGER , ALBUMS_ID INTEGER, PERSON_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_PERSONS (ID INTEGER PRIMARY KEY, NAME TEXT , POSTER TEXT, THUMBNAIL TEXT, BIOGRAPHY TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SONG_ALBUM_POSTERS (ID INTEGER PRIMARY KEY, POSTER TEXT, POSTER_HASH TEXT, THUMBNAIL TEXT, THUMBNAIL_HASH TEXT, TYPE TEXT, CREATE_TIME TEXT, MODIFY_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE PHOTOS (ID INTEGER PRIMARY KEY, TITLE TEXT , SEARCH_TITLE TEXT , PATH TEXT, SCAN_DIRS_ID INTEGER, THUMBNAIL TEXT, PREVIEW TEXT, FORMAT TEXT, WIDTH TEXT, HEIGHT TEXT, CAPTURE_TIME TEXT DEFAULT '9999-01-01', F_NUMBER TEXT, SHUTTLE_SPEED TEXT, FOCAL_LENGTH TEXT, ISO_SPEED TEXT, FLASH TEXT, MODEL TEXT, SIZE INTEGER, CREATE_TIME TEXT, UPDATE_STATE TEXT, FILE_STATUS TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE PHOTO_ALBUMS (ID INTEGER PRIMARY KEY, TITLE TEXT, SEARCH_TITLE TEXT, PATH TEXT, TOTAL_ITEM INTEGER, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE PHOTO_ALBUMS_PHOTOS (ID INTEGER PRIMARY KEY, PHOTO_ALBUMS_ID INTEGER , PHOTOS_ID INTEGER, SEQUENCE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE PHOTO_DATE (ID INTEGER PRIMARY KEY, CAPTURE_TIME TEXT , TOTAL_ITEM INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE PHOTO_LAST_OPEN (ID INTEGER PRIMARY KEY, PHOTOS_ID INTEGER , CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEOS (ID INTEGER PRIMARY KEY, PATH TEXT, FILE_TYPE TEXT, SCAN_DIRS_ID INTEGER, CREATE_TIME TEXT, UPDATE_STATE TEXT, FILE_STATUS TEXT, HASH TEXT, SIZE INTEGER, THREE_D INTEGER DEFAULT 0, RESOLUTION TEXT, PLAY_COUNT INTEGER DEFAULT 0, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOWS (ID INTEGER PRIMARY KEY, TITLE TEXT , SEARCH_TITLE TEXT , LAST_PLAY_ITEM TEXT, TOTAL_ITEM INTEGER DEFAULT 0, YEAR TEXT DEFAULT '9999', RELEASE_DATE TEXT DEFAULT '9999-01-01', POSTERS_ID INTEGER, RATING INTEGER DEFAULT 0, RESOLUTION TEXT, PARENTAL_CONTROL TEXT, RUNTIME INTEGER DEFAULT 0, CREATE_TIME TEXT, TTID TEXT, UPDATE_STATE TEXT, TITLE_TYPE TEXT, CONTENT_ID INTEGER, CONTENT_TTID INTEGER, THREE_D INTEGER DEFAULT 0, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEO_SUBTITLES ( ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, FILE_NAME TEXT , LANGUAGE TEXT, SIZE INTEGER, CREATE_TIME TEXT, TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOW_GROUPS_SHOWS ( ID INTEGER PRIMARY KEY, GROUPS_ID INTEGER , SHOWS_ID INTEGER, TITLE_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOW_GROUPS (ID INTEGER PRIMARY KEY, NAME TEXT , GROUP_TYPE TEXT, LANGUAGE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE EPISODES ( ID INTEGER PRIMARY KEY, EPISODE_ID INTEGER, SERIES_ID INTEGER, SEASON_ID INTEGER, SEASON INTEGER, EPISODE INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SYNOPSISES ( ID INTEGER PRIMARY KEY, SUMMARY TEXT, TAGLINE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOWS_PERSONS ( ID INTEGER PRIMARY KEY, PERSONS_ID INTEGER, SHOWS_ID INTEGER, PERSON_TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEO_PERSONS ( ID INTEGER PRIMARY KEY, NAME TEXT, POSTER TEXT, THUMBNAIL TEXT, BIOGRAPHY TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOWS_GENRES ( ID INTEGER PRIMARY KEY, GENRES_ID INTEGER , SHOWS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEO_GENRES ( ID INTEGER PRIMARY KEY, NAME TEXT , DESCRIPTION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEO_BOOKMARKS (ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, TITLE TEXT, SEARCH_TITLE TEXT, BOOKMARK_TIME INTEGER, THUMBNAIL TEXT, TYPE TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEO_POSTERS ( ID INTEGER PRIMARY KEY, POSTER TEXT , POSTER_HASH TEXT, THUMBNAIL TEXT, THUMBNAIL_HASH TEXT, WALLPAPER TEXT, TYPE TEXT, CREATE_TIME TEXT, MODIFY_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE TV_LAST_OPEN (ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE MOVIE_LAST_OPEN (ID INTEGER PRIMARY KEY, VIDEOS_ID INTEGER, CREATE_TIME TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE KEYWORDS (ID INTEGER PRIMARY KEY, KEYWORD TEXT, DESCRIPTION TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOWS_KEYWORDS ( ID INTEGER PRIMARY KEY, KEYWORDS_ID INTEGER , SHOWS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE SHOWS_VIDEOS ( ID INTEGER PRIMARY KEY, SHOWS_ID INTEGER , VIDEOS_ID INTEGER, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE TABLE VIDEO_PROPERTIES (ID INTEGER PRIMARY KEY, RUNTIME INTEGER DEFAULT 0, RESOLUTION TEXT, WIDTH TEXT, HEIGHT TEXT, ASPECT_RATIO TEXT, SYSTEM TEXT, VIDEO_CODEC TEXT, FPS TEXT, CUSTOM1 TEXT, CUSTOM2 TEXT, CUSTOM3 TEXT, CUSTOM4 TEXT, CUSTOM5 TEXT);",
+    "CREATE INDEX IDX_VIDEOS_SCAN_DIRS_ID ON VIDEOS(SCAN_DIRS_ID ASC)",
+    "CREATE INDEX IDX_SONGS_SCAN_DIRS_ID ON SONGS(SCAN_DIRS_ID ASC)",
+    "CREATE INDEX IDX_PHOTOS_SCAN_DIRS_ID ON PHOTOS(SCAN_DIRS_ID ASC)",
+    "CREATE INDEX IDX_SHOWS_CONTENT_TTID ON SHOWS(CONTENT_TTID ASC)",
+    "CREATE INDEX IDX_SHOWS_TITLE ON SHOWS(TITLE ASC)",
+    "CREATE INDEX IDX_SHOWS_SEARCH_TITLE ON SHOWS(SEARCH_TITLE ASC)",
+    "CREATE INDEX IDX_SHOWS_YEAR ON SHOWS(YEAR ASC)",
+    "CREATE INDEX IDX_SHOWS_RATING ON SHOWS(RATING ASC)",
+    "CREATE INDEX IDX_SHOWS_PARENTAL_CONTROL ON SHOWS(PARENTAL_CONTROL ASC)",
+    "CREATE INDEX IDX_VIDEO_SUBTITLES_VIDEOS_ID ON VIDEO_SUBTITLES(VIDEOS_ID ASC)",
+    "CREATE INDEX IDX_SONGS_TITLE ON SONGS(TITLE ASC)",
+    "CREATE INDEX IDX_SONGS_SEARCH_TITLE ON SONGS(SEARCH_TITLE ASC)",
+    "CREATE INDEX IDX_SONGS_RATING ON SONGS(RATING ASC)",
+    "CREATE INDEX IDX_SONGS_RELEASE_DATE ON SONGS(RELEASE_DATE ASC)",
+    "CREATE INDEX IDX_SONG_ALBUMS_TITLE ON SONG_ALBUMS(TITLE ASC)",
+    "CREATE INDEX IDX_SONG_ALBUMS_SEARCH_TITLE ON SONG_ALBUMS(SEARCH_TITLE ASC)",
+    "CREATE INDEX IDX_SONG_ALBUMS_RELEASE_DATE ON SONG_ALBUMS(RELEASE_DATE ASC)",
+    "CREATE INDEX IDX_SONG_ALBUM_SONGS_ALBUMS_ID ON SONG_ALBUMS_SONGS(ALBUMS_ID ASC)",
+    "CREATE INDEX IDX_SONG_ALBUM_SONGS_SONGS_ID ON SONG_ALBUMS_SONGS(SONGS_ID ASC)",
+    "CREATE INDEX IDX_SONG_GENRES_SONGS_GENRES_ID ON SONG_GENRES_SONGS(GENRES_ID ASC)",
+    "CREATE INDEX IDX_SONG_GENRES_SONGS_SONGS_ID ON SONG_GENRES_SONGS(SONGS_ID ASC)",
+    "CREATE INDEX IDX_SONG_GENRES_SONG_ALBUMS_ALBUMS_ID ON SONG_GENRES_SONG_ALBUMS(ALBUMS_ID ASC)",
+    "CREATE INDEX IDX_SONG_GENRES_SONG_ALBUMS_GENRES_ID ON SONG_GENRES_SONG_ALBUMS(GENRES_ID ASC)",
+    "CREATE INDEX IDX_SONG_GROUPS_SONG_ALBUMS_GROUPS_ID ON SONG_GROUPS_SONG_ALBUMS(GROUPS_ID ASC)",
+    "CREATE INDEX IDX_SONG_GROUPS_SONG_ALBUMS_ALBUMS_ID ON SONG_GROUPS_SONG_ALBUMS(ALBUMS_ID ASC)",
+    "CREATE INDEX IDX_SONG_PERSONS_SONGS_PERSONS_ID ON SONG_PERSONS_SONGS(PERSONS_ID ASC)",
+    "CREATE INDEX IDX_SONG_PERSONS_SONGS_SONGS_ID ON SONG_PERSONS_SONGS(SONGS_ID ASC)",
+    "CREATE INDEX IDX_SONG_PERSONS_SONG_ALBUMS_PERSONS_ID ON SONG_PERSONS_SONG_ALBUMS(PERSONS_ID ASC)",
+    "CREATE INDEX IDX_SONG_PERSONS_SONG_ALBUMS_ALBUMS_ID ON SONG_PERSONS_SONG_ALBUMS(ALBUMS_ID ASC)",
+    "CREATE INDEX IDX_PHOTOS_TITLE ON PHOTOS(TITLE ASC)",
+    "CREATE INDEX IDX_PHOTOS_SEARCH_TITLE ON PHOTOS(SEARCH_TITLE ASC)",
+    "CREATE INDEX IDX_PHOTO_DATE_CAPTURE_TIME ON PHOTO_DATE(CAPTURE_TIME ASC)",
+    "CREATE INDEX IDX_PHOTO_ALBUMS_PHOTOS_PHOTO_ALBUMS_ID ON PHOTO_ALBUMS_PHOTOS(PHOTO_ALBUMS_ID ASC)",
+    "CREATE INDEX IDX_PHOTO_ALBUMS_PHOTOS_PHOTOS_ID ON PHOTO_ALBUMS_PHOTOS(PHOTOS_ID ASC)",
+    "CREATE UNIQUE INDEX UIDX_SHOWS_GENRES_GENRES_ID ON SHOWS_GENRES(SHOWS_ID ASC, GENRES_ID ASC)",
+    "CREATE UNIQUE INDEX UIDX_SHOWS_PERSONS_PERSONS_ID ON SHOWS_PERSONS(PERSONS_ID ASC, SHOWS_ID ASC, PERSON_TYPE ASC)",
+    "CREATE UNIQUE INDEX UIDX_EPISODES_ID ON EPISODES(EPISODE_ID ASC, SERIES_ID ASC, SEASON_ID ASC)",
+    "CREATE UNIQUE INDEX UIDX_SONGS_PATH ON SONGS(PATH ASC)",
+    "CREATE UNIQUE INDEX UIDX_PHOTOS_PATH ON PHOTOS(PATH ASC)",
+    NULL,
+  };
+
+const char * directories[] =
+  {
+    "nmj_database",
+    "nmj_database/media",
+    "nmj_database/media/photo",
+    "nmj_database/media/photo/preview",
+    "nmj_database/media/photo/thumbnail",
+    "nmj_database/media/video",
+    "nmj_database/media/video/poster",
+    "nmj_database/media/video/preview",
+    "nmj_database/media/video/thumbnail",
+    "nmj_database/media/music",
+    "nmj_database/media/music/poster",
+    "nmj_database/media/music/preview",
+    "nmj_database/media/music/thumbnail",
+    NULL,
+  };
+
+static sqlite3 * create_db(void)
+  {
+  int i;
+  int result;
+  sqlite3 * db = NULL;
+  i = 0;
+  while(directories[i])
+    {
+    if(!bg_ensure_directory(directories[i], 0))
+      return NULL;
+    i++;
+    }
+
+  result = sqlite3_open(DATABASE_FILE, &db);
+  if(result)
+    {
+    fprintf(stderr, "Can't open database %s: %s\n",
+            DATABASE_FILE, sqlite3_errmsg(db));
+    goto fail;
+    }
+
+  bg_sqlite_exec(db, "BEGIN TRANSACTION;", NULL, NULL);
+  
+  i = 0;
+  while(create_commands[i])
+    {
+    if(!bg_sqlite_exec(db, create_commands[i], NULL, NULL))
+      goto fail;
+    i++;
+    }
+  /* Set version number */
+  if(!bg_sqlite_exec(db, "INSERT INTO DB_VERSION ( ID, VERSION ) VALUES ( 1, '"DATABASE_VERSION"' );",
+                     NULL, NULL))
+    goto fail;
+
+  /* Set SCAN_SYSTEM */
+  if(!bg_sqlite_exec(db, "INSERT INTO SCAN_SYSTEM ( ID, TYPE, VALUE ) VALUES ( 1, 'RUNNING_STATUS', 0 );",
+                     NULL, NULL))
+    goto fail;
+    
+  /* Create album groups */
+
+#if 0  
+  i = 0;
+  while(bg_nmj_album_groups[i])
+    {
+    id = bg_sqlite_get_next_id(db, "SONG_GROUPS");
+    sql = sqlite3_mprintf("INSERT INTO SONG_GROUPS "
+                          "( ID, NAME, LANGUAGE ) VALUES "
+                          "( %"PRId64", %Q, 'EN' );",
+                          id, bg_nmj_album_groups[i]);
+    result = bg_sqlite_exec(db, sql, NULL, NULL);
+    sqlite3_free(sql);
+    if(!result)
+      goto fail;
+    i++;
+    }
+#endif
+  return db;
+  
+  fail:
+  if(db)
+    sqlite3_close(db);
+  return NULL;
+  }
+
+static const char * cleanup_tables[] =
+  {
+    "EPISODES",
+    "FAVOURITES",
+    "KEYWORDS",
+    "MOVIE_LAST_OPEN",
+    "PHOTOS",
+    "PHOTO_ALBUMS",
+    "PHOTO_ALBUMS_PHOTOS",
+    "PHOTO_DATE",
+    "PHOTO_LAST_OPEN",
+    "SCAN_DIRS",
+    "SHOWS",
+    "SHOWS_GENRES",
+    "SHOWS_KEYWORDS",
+    "SHOWS_PERSONS",
+    "SHOWS_VIDEOS",
+    "SHOW_GROUPS",
+    "SHOW_GROUPS_SHOWS",
+    "SONGS",
+    "SONG_ALBUMS",
+    "SONG_ALBUMS_SONGS",
+    "SONG_ALBUM_POSTERS",
+    "SONG_FOLDERS",
+    "SONG_GENRES",
+    "SONG_GENRES_SONGS",
+    "SONG_GENRES_SONG_ALBUMS",
+    "SONG_GROUPS",
+    "SONG_GROUPS_SONG_ALBUMS",
+    "SONG_LAST_OPEN",
+    "SONG_PERSONS",
+    "SONG_PERSONS_SONGS",
+    "SONG_PERSONS_SONG_ALBUMS",
+    "SONG_PLS",
+    "SONG_PLS_ITEM",
+    "SYNOPSISES",
+    "TV_LAST_OPEN",
+    "VIDEOS",
+    "VIDEO_BOOKMARKS",
+    "VIDEO_GENRES",
+    "VIDEO_PERSONS",
+    "VIDEO_POSTERS",
+    "VIDEO_PROPERTIES",
+    "VIDEO_SUBTITLES",
+    NULL,
+  };
+
+static void cleanup_db(sqlite3 * db)
+  {
+  int i = 0;
+  int result;
+  char * sql;
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up database");
+  while(cleanup_tables[i])
+    {
+    sql = bg_sprintf("DELETE FROM %s", cleanup_tables[i]);
+    result = bg_sqlite_exec(db, sql, NULL, NULL);
+    free(sql);
+    if(!result)
+      return;
+    i++;
+    }
+  }
+
+sqlite3 * bg_nmj_create()
+  {
+  int result;
+  sqlite3 * db = NULL;
+  int exists = 0;
+  
+  if(!access(DATABASE_FILE, R_OK | W_OK))
+    exists = 1;
+  
+  /* Create database */
+  
+  if(!exists)
+    db = create_db();
+  else
+    {
+    result = sqlite3_open(DATABASE_FILE, &db);
+    if(result)
+      {
+      fprintf(stderr, "Can't open database %s: %s\n",
+              DATABASE_FILE, sqlite3_errmsg(db));
+      goto fail;
+      }
+
+    bg_sqlite_exec(db, "BEGIN TRANSACTION;", NULL, NULL);
+
+    cleanup_db(db);
+    }
+
+  return db;
+  fail:
+  
+  if(db)
+    sqlite3_close(db);
+  return NULL;
+  }

gmerlin-4256.tar.gz/apps/db2nmj/db2nmj.h Added

@@ -0,0 +1,27 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#define DATABASE_FILE "nmj_database/media.db"
+#define DATABASE_VERSION "2.0.0"
+
+#include <bgsqlite.h>
+
+sqlite3 * bg_nmj_create();

gmerlin-4256.tar.gz/apps/db2nmj/gmerlin-db2nmj.c Added

@@ -0,0 +1,1164 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/mediadb.h>
+#include <gmerlin/cmdline.h>
+
+#include "db2nmj.h"
+
+
+
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+
+#define LOG_DOMAIN "gmerlin-db2nmj"
+
+char * path = ".";
+
+#define ROOT_DIR_SIZE 2048
+char root_dir[ROOT_DIR_SIZE];
+int root_dir_len = 0;
+
+bg_db_t * db;
+sqlite3 * nmj;
+
+/* Values for title_type:
+   1: Movie (single part)
+   2: TV Series
+   3: Episode
+   5: Season
+   6: Movie (multipart)
+   
+ */
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-root",
+      .help_string = "Root directory of the database",
+      .argv         = &path,
+    },
+    { }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gmerlin-db2nmj",
+    .long_name = TRS("Convert a gmerlin media db into the nmj-2.0.0 format"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gmerlin database to nmj translator\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+static const struct
+  {
+  char c;
+  char * escaped;
+  }
+escape_rules[] =
+  {
+    { '\'', "&apos;" },
+    { '&',  "&amp;" },
+    { /* End */      }
+  };
+
+static char * escape_string(const char * str)
+  {
+  int done;
+  int i;
+  const char * pos;
+  char * ret = NULL;
+  char buf[2];
+
+  if(!str)
+    return NULL;
+  
+  buf[1] = '\0';
+
+  pos = str;
+  while(*pos != '\0')
+    {
+    done = 0;
+    i = 0;
+    while(escape_rules[i].escaped)
+      {
+      if(escape_rules[i].c == *pos)
+        {
+        ret = gavl_strcat(ret, escape_rules[i].escaped);
+        done = 1;
+        break;
+        }
+      i++;
+      }
+    if(!done)
+      {
+      buf[0] = *pos;
+      ret = gavl_strcat(ret, buf);
+      }
+    pos++;
+    }
+  return ret;
+  }
+
+/*
+ *  Categories are summed up from the following:
+ *  
+ *   3: Video
+ *   4: Video (private)
+ *  16: Photo
+ *  40: Music
+ */
+
+static void query_scan_dir_callback(void * priv, void * obj)
+  {
+  char * sql;
+  bg_db_dir_t * dir = obj;
+
+  int category = 0;
+
+  if(dir->scan_flags & BG_DB_SCAN_AUDIO)
+    category += 40;
+  
+  if(dir->scan_flags & BG_DB_SCAN_VIDEO)
+    category += 3;
+
+  if(dir->scan_flags & BG_DB_SCAN_PHOTO)
+    category += 16;
+  
+  sql = sqlite3_mprintf("INSERT INTO SCAN_DIRS ( ID, DIRECTORY, NAME, SIZE, CATEGORY, STATUS ) VALUES "
+                        "( %"PRId64", %Q, %Q, %"PRId64", %d, '3')",
+                        bg_db_object_get_id(dir),
+                        dir->path + root_dir_len, dir->obj.label, dir->obj.size, category);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+static const struct
+  {
+  const char * mimetype;
+  const char * format;
+  }
+mimetypes[] =
+  {
+    { "audio/mpeg", "MPEG Audio" },
+    { "audio/flac", "Flac"       },
+    { "audio/ogg",  "Vorbis"     },
+    { "image/jpeg", "JPEG"       },
+    { "video/x-msvideo", "AVI"   },
+    { "video/mpeg",      "MPEG-1"   },
+    { "video/MP2P",      "MPEG-2"   },
+    { "video/x-matroska",  "Matroska"   },
+    { "video/x-flv", "Flash Video" },
+    { "video/mp4",   "MP4" },
+    { /* End */ },
+  };
+  
+static const char * mimetype_to_format(const char * mimetype)
+  {
+  int i = 0;
+
+  if(mimetype) // Prevent crash
+    {
+    while(mimetypes[i].mimetype)
+      {
+      if(!strcmp(mimetypes[i].mimetype, mimetype))
+        return mimetypes[i].format;
+      i++;
+      }
+    }
+  
+  return "Unknown";
+  }
+
+static void query_audio_file_callback(void * priv, void * obj)
+  {
+  char * sql;
+  bg_db_audio_file_t * af = obj;
+  int64_t id;
+  
+  char date[BG_DB_DATE_STRING_LEN];
+  char mtime[BG_DB_TIME_STRING_LEN];
+    
+  char * title = escape_string(af->title);
+  char * search_title = escape_string(af->search_title);
+  char * artist = escape_string(af->artist);
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Song: %s: %s", af->artist, af->title);
+  
+  /* SONGS */
+  
+  sql = sqlite3_mprintf("INSERT INTO SONGS ( "
+                        "ID,"
+                        "TITLE,"
+                        "SEARCH_TITLE,"
+                        "PATH,"
+                        "SCAN_DIRS_ID,"
+                        "RUNTIME,"
+                        "FORMAT,"
+                        "RATING,"
+                        "SIZE,"
+                        "PLAY_COUNT,"
+                        "BIT_RATE,"
+                        "TRACK_POSITION,"
+                        "RELEASE_DATE,"
+                        "CREATE_TIME,"
+                        "UPDATE_STATE "
+                        " ) VALUES ( "
+                        "%"PRId64"," // ID
+                        "%Q,"        // TITLE
+                        "%Q,"        // SEARCH_TITLE
+                        "%Q,"        // PATH
+                        "%"PRId64"," // SCAN_DIRS_ID
+                        "%"PRId64"," // RUNTIME
+                        "%Q,"        // FORMAT
+                        "0,"         // RATING
+                        "%"PRId64"," // SIZE
+                        "0,"         // PLAY_COUNT
+                        "%Q,"        // BIT_RATE
+                        "%d,"        // TRACK_POSITION
+                        "%Q,"        // RELEASE_DATE
+                        "%Q,"        // CREATE_TIME
+                        "2 );",      // UPDATE_STATE
+                        bg_db_object_get_id(af),
+                        title,
+                        search_title,
+                        af->file.path + root_dir_len,
+                        af->file.scan_dir_id,
+                        af->file.obj.duration / GAVL_TIME_SCALE,
+                        mimetype_to_format(af->file.mimetype),
+                        af->file.obj.size,
+                        af->bitrate,
+                        af->track,
+                        bg_db_date_to_string(&af->date, date),
+                        bg_db_time_to_string(af->file.mtime, mtime));
+  
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_PERSONS */
+
+  sql = sqlite3_mprintf("INSERT OR IGNORE INTO SONG_PERSONS ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                        af->artist_id, artist);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_PERSONS_SONGS */
+
+  id = bg_sqlite_get_next_id(nmj, "SONG_PERSONS_SONGS");
+
+  sql = sqlite3_mprintf("INSERT INTO SONG_PERSONS_SONGS ( ID, PERSONS_ID, SONGS_ID, PERSON_TYPE ) VALUES ( %"PRId64", %"PRId64", %"PRId64", 'ARTIST' );",
+                        id, af->artist_id, bg_db_object_get_id(af));
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+  /* SONG_GENRES */
+  sql = sqlite3_mprintf("INSERT OR IGNORE INTO SONG_GENRES ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                        af->genre_id, af->genre);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_GENRES_SONGS */
+
+  id = bg_sqlite_get_next_id(nmj, "SONG_GENRES_SONGS");
+
+  sql = sqlite3_mprintf("INSERT INTO SONG_GENRES_SONGS ( ID, SONGS_ID, GENRES_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64" );",
+                        id, bg_db_object_get_id(af), af->genre_id);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  free(title);
+  free(search_title);
+  free(artist);
+  }
+
+static void query_audio_album_song_callback(void * priv, void * obj)
+  {
+  int64_t id;
+  bg_db_audio_file_t * af = obj;
+  char * sql;
+  
+  id = bg_sqlite_get_next_id(nmj, "SONG_ALBUMS_SONGS");
+
+  sql = sqlite3_mprintf("INSERT INTO SONG_ALBUMS_SONGS ( ID, ALBUMS_ID, SONGS_ID, SEQUENCE ) "
+                        "VALUES "
+                        "( %"PRId64", %"PRId64", %"PRId64", %"PRId64" );",
+                        id, af->album_id, bg_db_object_get_id(obj), af->track);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+static void query_audio_album_callback(void * priv, void * obj)
+  {
+  int64_t group_id;
+  char * sql;
+  bg_db_audio_album_t * a = obj;
+  int64_t id;
+  const char * group;
+  bg_db_image_file_t * cover;
+  bg_db_image_file_t * cover_small;
+  bg_db_image_file_t * thumb;
+  
+  char date[BG_DB_DATE_STRING_LEN];
+  char mtime[BG_DB_TIME_STRING_LEN];
+  
+  char * title = escape_string(a->title);
+  char * search_title = escape_string(a->search_title);
+  char * artist = escape_string(a->artist);
+
+  /* Group */
+  group = bg_db_get_group(artist, &group_id);
+
+  /* Hack */
+  if(!strcmp(group, "Others"))
+    group = "_OTHERS";
+  /* /Hack */
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Album: %s: %s", a->artist, a->title);
+    
+  // SONG_ALBUMS
+  
+  sql = sqlite3_mprintf("INSERT INTO SONG_ALBUMS ( "
+                        "ID,"
+                        "TITLE,"
+                        "SEARCH_TITLE,"
+                        "TOTAL_ITEM,"
+                        "RELEASE_DATE,"
+                        "UPDATE_STATE"
+                        ") VALUES ("
+                        "%"PRId64"," // ID
+                        "%Q,"        // TITLE
+                        "%Q,"        // SEARCH_TITLE
+                        "'%d',"      // TOTAL_ITEM
+                        "%Q,"        // RELEASE_DATE
+                        "3);",       // UPDATE_STATE
+                        bg_db_object_get_id(obj),
+                        title,
+                        search_title,
+                        a->obj.children,
+                        bg_db_date_to_string(&a->date, date));
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+  // SONG_ALBUMS_SONGS
+  bg_db_query_children(db, bg_db_object_get_id(a), query_audio_album_song_callback, NULL,
+                       0, 0, NULL);
+
+
+  /* SONG_GENRES */
+  sql = sqlite3_mprintf("INSERT OR IGNORE INTO SONG_GENRES ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                        a->genre_id, a->genre);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_GENRES_SONG_ALBUMS */
+  id = bg_sqlite_get_next_id(nmj, "SONG_GENRES_SONG_ALBUMS");
+
+  sql = sqlite3_mprintf("INSERT INTO SONG_GENRES_SONG_ALBUMS ( ID, ALBUMS_ID, GENRES_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64" );",
+                        id, bg_db_object_get_id(a), a->genre_id);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_PERSONS */
+
+  sql = sqlite3_mprintf("INSERT OR IGNORE INTO SONG_PERSONS ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                        a->artist_id, artist);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_GROUPS */
+  
+  sql = sqlite3_mprintf("INSERT OR IGNORE INTO SONG_GROUPS ( ID, NAME, LANGUAGE ) VALUES ( %"PRId64", %Q, 'EN' );",
+                        group_id, group);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_GROUPS_SONG_ALBUMS */
+  
+  sql = sqlite3_mprintf("INSERT INTO SONG_GROUPS_SONG_ALBUMS ( ID, GROUPS_ID, ALBUMS_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64" );",
+                        bg_db_object_get_id(a), group_id, bg_db_object_get_id(a));
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_PERSONS_SONG_ALBUMS */
+
+  sql = sqlite3_mprintf("INSERT INTO SONG_PERSONS_SONG_ALBUMS ( ID, PERSONS_ID, ALBUMS_ID, PERSON_TYPE, CUSTOM1 ) VALUES ( %"PRId64", %"PRId64", %"PRId64", 'ARTIST', '%d' );",
+                        bg_db_object_get_id(a), a->artist_id, bg_db_object_get_id(a), group_id);
+  
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  /* SONG_ALBUM_POSTERS */
+
+  if(a->cover_id <= 0)
+    return;
+
+  cover = bg_db_object_query(db, a->cover_id);
+  cover_small = bg_db_get_thumbnail(db, a->cover_id, 600, 600, 0, "image/jpeg");
+  thumb = bg_db_get_thumbnail(db, a->cover_id, 248, 248, 0, "image/jpeg");
+
+  if(cover_small && thumb)
+    {
+    sql = sqlite3_mprintf("INSERT INTO SONG_ALBUM_POSTERS ( ID, POSTER, THUMBNAIL, CREATE_TIME ) VALUES ( %"PRId64", %Q, %Q, %Q );",
+                          bg_db_object_get_id(a),
+                          cover_small->file.path + root_dir_len,
+                          thumb->file.path + root_dir_len, bg_db_time_to_string(cover->file.mtime, mtime));
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+    }
+
+  if(cover)
+    bg_db_object_unref(cover);
+  if(cover_small)
+    bg_db_object_unref(cover_small);
+  if(thumb)
+    bg_db_object_unref(thumb);
+
+  free(title);
+  free(search_title);
+  free(artist);
+  
+  }
+
+static int64_t pls_id;
+static int pls_index;
+
+static void query_playlist_item_callback(void * priv, void * obj)
+  {
+  char * sql;
+  int64_t id;
+  id = bg_sqlite_get_next_id(nmj, "SONG_PLS_ITEM");
+
+  sql = sqlite3_mprintf("INSERT INTO SONG_PLS_ITEM ( ID, PLS_ID, SONGS_ID, SEQUENCE ) "
+                        "VALUES "
+                        "( %"PRId64", %"PRId64", %"PRId64", %d );",
+                        id, pls_id, bg_db_object_get_id(obj), pls_index);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  pls_index++;  
+  }
+
+static void query_playlist_callback(void * priv, void * obj)
+  {
+  char * sql;
+  bg_db_object_t * p = obj;
+  char time_str[BG_DB_TIME_STRING_LEN];
+  char * path = bg_sprintf("MUSIC/PLAYLISTS/%s.M3U", p->label);
+  time_t t = time(NULL);
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Playlist: %s", p->label);
+  
+  /* SONG_PLS */
+  sql = sqlite3_mprintf("INSERT INTO SONG_PLS ( ID, NAME, PATH, TOTAL_ITEM, CREATE_TIME ) VALUES ( %"PRId64", %Q, %Q, '%d', %Q );",
+                        bg_db_object_get_id(p),
+                        p->label, path, p->children, bg_db_time_to_string(t, time_str));
+
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  free(path);
+  
+  /* SONG_PLS_ITEM */
+
+  pls_id = bg_db_object_get_id(p);
+  pls_index = 1;
+  
+  bg_db_query_children(db, bg_db_object_get_id(p), query_playlist_item_callback, NULL,
+                       0, 0, NULL);
+    
+  }
+
+ /*
+  * Public Domain implementation by Kamil Dziobek. turbos11(at)gmail.com
+  * This code implements Gibest hash algorithm first use in Media Player Classics
+  * For more implementation(various languages and authors) see:
+  * http://trac.opensubtitles.org/projects/opensubtitles/wiki/HashSourceCodes   
+  *
+  * -works only on little-endian procesor DEC, Intel and compatible
+  * -sizeof(unsigned long long) must be 8
+  *
+  *
+  * Changed for gmerlin to use uint64_t
+  */
+
+
+static uint64_t analizefileOSHahs(char *fileName)
+  {
+  FILE        *file;
+  int i;
+  uint64_t t1=0;
+  uint64_t buffer1[8192*2];
+  file = fopen(fileName, "rb");
+  if(!file)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot analyze file %s: %s",
+           fileName, strerror(errno));
+    return 0;
+    }
+  fread(buffer1, 8192, 8, file);
+  fseek(file, -65536, SEEK_END);
+  fread(&buffer1[8192], 8192, 8, file); 
+  for (i=0;i<8192*2;i++)
+    t1+=buffer1[i];
+  t1+= ftell(file); //add filesize
+  fclose(file); 
+  return  t1;
+  };
+
+static void translate_video_file(bg_db_video_file_t * f)
+  {
+  char * sql;
+  char time_str[BG_DB_TIME_STRING_LEN];
+  time_t t = time(NULL);
+
+  /* Videos */
+  sql = sqlite3_mprintf("INSERT INTO VIDEOS ( "
+                        "ID, "
+                        "PATH, "
+                        "FILE_TYPE, "
+                        "SCAN_DIRS_ID, "
+                        "CREATE_TIME, "
+                        "UPDATE_STATE, "
+                        "HASH, "
+                        "SIZE, "
+                        "THREE_D, "
+                        "PLAY_COUNT "
+                        ") VALUES ( "
+                        "%"PRId64", "
+                        "%Q, "
+                        "3, "
+                        "%"PRId64", "
+                        "%Q, "
+                        "'2', "
+                        "'%016"PRIx64"', "
+                        "%"PRId64", "
+                        "0, "
+                        "0"
+                        ");",
+                        bg_db_object_get_id(f),
+                        f->file.path + root_dir_len,
+                        f->file.scan_dir_id,
+                        bg_db_time_to_string(t, time_str),
+                        analizefileOSHahs(f->file.path),
+                        f->file.obj.size);
+
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  sql = sqlite3_mprintf("INSERT INTO VIDEO_PROPERTIES ( "
+                        "ID, "
+                        "RUNTIME, "
+                        "RESOLUTION, "
+                        "WIDTH, "
+                        "HEIGHT, "
+                        "ASPECT_RATIO, "
+                        "SYSTEM, "
+                        "VIDEO_CODEC, "
+                        "FPS "
+                        ") VALUES ("
+                        "%"PRId64", "
+                        "%"PRId64", "
+                        "'%dx%d', "
+                        "'%d', "
+                        "'%d', "
+                        "'%d:%d', "
+                        "%Q, "
+                        "%Q, "
+                        "'%.3f'"
+                        ");",
+                        bg_db_object_get_id(f),
+                        f->file.obj.duration / GAVL_TIME_SCALE,
+                        f->width, f->height,
+                        f->width, f->height,
+                        f->aspect_num, f->aspect_den,
+                        mimetype_to_format(f->file.mimetype),
+                        f->video_codec,
+                        f->frame_duration ? (double)f->timescale / (double)f->frame_duration : (double)f->timescale);
+  
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+static void translate_video_info(bg_db_video_info_t * f, int64_t id,
+                                 int total_items, gavl_time_t total_duration, int title_type,
+                                 const char * title, const char * search_title)
+  {
+  int64_t group_id;
+  const char * group;
+  char * synopsis;
+  
+  char * sql;
+  char time_str[BG_DB_TIME_STRING_LEN];
+  char date_str[BG_DB_DATE_STRING_LEN];
+  time_t t = time(NULL);
+  int64_t next_id;
+  int i;
+  bg_db_time_to_string(t, time_str);
+
+  if(!title)
+    title = f->title;
+  if(!search_title)
+    search_title = f->search_title;
+    
+  sql = sqlite3_mprintf("INSERT INTO SHOWS ( "
+                        "ID, "
+                        "TITLE, "
+                        "SEARCH_TITLE, "
+                        "TOTAL_ITEM, "
+                        "YEAR, "
+                        "RELEASE_DATE, "
+                        "RATING, "
+                        "PARENTAL_CONTROL, "
+                        "RUNTIME, "
+                        "CREATE_TIME, "
+                        "UPDATE_STATE, "
+                        "TITLE_TYPE"
+                        ") VALUES ("
+                        "%"PRId64", "
+                        "%Q, "
+                        "%Q, "
+                        "%d, "
+                        "'%d', "
+                        "%Q, "
+                        "%s, "
+                        "%Q, "
+                        "%"PRId64", "
+                        "%Q, "
+                        "2, "
+                        "%d);",
+                        id,
+                        title,
+                        search_title,
+                        total_items,
+                        f->date.year,
+                        bg_db_date_to_string(&f->date, date_str),
+                        f->rating ? f->rating : "0.0",
+                        f->parental_control,
+                        total_duration / GAVL_TIME_SCALE,
+                        time_str,
+                        title_type);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  if(title_type != 3)
+    {
+    /* Group */
+
+    group = bg_db_get_group(search_title, &group_id);
+  
+    /* SHOW_GROUPS */
+  
+    sql = sqlite3_mprintf("INSERT OR IGNORE INTO SHOW_GROUPS ( ID, NAME, LANGUAGE ) VALUES ( %d, %Q, 'EN' );",
+                          group_id, group);
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+
+    /* SHOW_GROUPS_SHOWS */
+  
+    sql = sqlite3_mprintf("INSERT INTO SHOW_GROUPS_SHOWS ( ID, GROUPS_ID, SHOWS_ID, TITLE_TYPE ) VALUES ( %"PRId64", %"PRId64", %"PRId64", %d );",
+                          id, group_id, id, title_type);
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+    }
+  
+  
+  /* Genres */
+
+  if(f->genres)
+    {
+    i = 0;
+    while(f->genres[i])
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_GENRES ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                            f->genre_ids[i], f->genres[i]);
+      bg_sqlite_exec(nmj, sql, NULL, NULL);
+      sqlite3_free(sql);
+
+      next_id = bg_sqlite_get_next_id(nmj, "SHOWS_GENRES");
+
+      sql = sqlite3_mprintf("INSERT INTO SHOWS_GENRES ( ID, GENRES_ID, SHOWS_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64" );",
+                            next_id, f->genre_ids[i], id);
+      bg_sqlite_exec(nmj, sql, NULL, NULL);
+      sqlite3_free(sql);
+      
+      i++;
+      }
+    }
+
+  /* Directors */
+  if(f->directors)
+    {
+    i = 0;
+    while(f->directors[i])
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_PERSONS ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                            f->director_ids[i], f->directors[i]);
+      bg_sqlite_exec(nmj, sql, NULL, NULL);
+      sqlite3_free(sql);
+
+      next_id = bg_sqlite_get_next_id(nmj, "SHOWS_PERSONS");
+
+      sql = sqlite3_mprintf("INSERT INTO SHOWS_PERSONS ( ID, PERSONS_ID, SHOWS_ID, PERSON_TYPE ) VALUES ( %"PRId64", %"PRId64", %"PRId64", 'DIRECTOR' );",
+                            next_id, f->director_ids[i], id);
+      bg_sqlite_exec(nmj, sql, NULL, NULL);
+      sqlite3_free(sql);
+      
+      i++;
+      }
+    }
+
+  /* Actors */
+  if(f->actors)
+    {
+    i = 0;
+    while(f->actors[i])
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_PERSONS ( ID, NAME ) VALUES ( %"PRId64", %Q );",
+                            f->actor_ids[i], f->actors[i]);
+      bg_sqlite_exec(nmj, sql, NULL, NULL);
+      sqlite3_free(sql);
+
+      next_id = bg_sqlite_get_next_id(nmj, "SHOWS_PERSONS");
+
+      sql = sqlite3_mprintf("INSERT INTO SHOWS_PERSONS ( ID, PERSONS_ID, SHOWS_ID, PERSON_TYPE ) VALUES ( %"PRId64", %"PRId64", %"PRId64", 'CAST' );",
+                            next_id, f->actor_ids[i], id);
+      bg_sqlite_exec(nmj, sql, NULL, NULL);
+      sqlite3_free(sql);
+      
+      i++;
+      }
+    }
+
+  /* Synopsis */
+
+  synopsis = NULL;
+
+  if(f->title_orig)
+    synopsis = bg_sprintf("OT: %s\n", f->title_orig);
+  
+  if(f->countries)
+    {
+    i = 0;
+    while(f->countries[i])
+      {
+      if(i)
+        synopsis = gavl_strcat(synopsis, ", ");
+      synopsis = gavl_strcat(synopsis, f->countries[i]);
+      i++;
+      }
+    }
+
+  /* Audio languages */
+  if(f->audio_languages && f->audio_languages[0])
+    {
+    if(synopsis)
+      synopsis = gavl_strcat(synopsis, "\n");
+    synopsis = gavl_strcat(synopsis, "A: ");
+    i = 0;
+    while(f->audio_languages[i])
+      {
+      if(i)
+        synopsis = gavl_strcat(synopsis, ", ");
+      synopsis = gavl_strcat(synopsis, bg_get_language_name(f->audio_languages[i]));
+      i++;
+      }
+    }
+  
+  /* Subtitle languages */
+  if(f->subtitle_languages && f->subtitle_languages[0])
+    {
+    if(synopsis)
+      synopsis = gavl_strcat(synopsis, "\n");
+    synopsis = gavl_strcat(synopsis, "S: ");
+    i = 0;
+    while(f->subtitle_languages[i])
+      {
+      if(i)
+        synopsis = gavl_strcat(synopsis, ", ");
+      synopsis = gavl_strcat(synopsis, bg_get_language_name(f->subtitle_languages[i]));
+      i++;
+      }
+    }
+  
+  if(f->plot)
+    {
+    if(synopsis)
+      synopsis = gavl_strcat(synopsis, "\n");
+    synopsis = gavl_strcat(synopsis, f->plot);
+    }
+
+  if(synopsis)
+    {
+    sql = sqlite3_mprintf("INSERT INTO SYNOPSISES ( ID, SUMMARY ) VALUES ( %"PRId64", %Q );",
+                          id, synopsis);
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+    free(synopsis);
+    }
+  
+  
+  /* Images */
+
+  if((f->poster_id > 0) || (f->fanart_id > 0))
+    {
+    bg_db_file_t * poster = NULL;
+    bg_db_file_t * poster_thumb = NULL;
+    
+    bg_db_file_t * wallpaper = NULL;
+
+    if(f->poster_id)
+      {
+      poster = bg_db_get_thumbnail(db, f->poster_id, 220, 330, 0, "image/jpeg");
+      poster_thumb = bg_db_get_thumbnail(db, f->poster_id, 124, 185, 0, "image/jpeg");
+      }
+
+    if(f->fanart_id > 0)
+      wallpaper = bg_db_get_thumbnail(db, f->fanart_id, 1280, 720, 0, "image/jpeg");
+
+    sql = sqlite3_mprintf("INSERT INTO VIDEO_POSTERS ( "
+                          "ID, "
+                          "POSTER, "
+                          "THUMBNAIL, "
+                          "WALLPAPER, "
+                          "TYPE, "
+                          "CREATE_TIME "
+                          ") VALUES ( "
+                          "%"PRId64", "
+                          "%Q, "
+                          "%Q, "
+                          "%Q, "
+                          "1, "
+                          "%Q);",
+                          id,
+                          (poster ? poster->path + root_dir_len : NULL),
+                          (poster_thumb ? poster_thumb->path + root_dir_len : NULL),
+                          (wallpaper ? wallpaper->path + root_dir_len : NULL),
+                          time_str);
+
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+
+    if(poster)
+      bg_db_object_unref(poster);
+    if(poster_thumb)
+      bg_db_object_unref(poster_thumb);
+    if(wallpaper)
+      bg_db_object_unref(wallpaper);
+    
+    }
+  else // Add dummy entry
+    {
+    sql = sqlite3_mprintf("INSERT INTO VIDEO_POSTERS ( "
+                          "ID, "
+                          "CREATE_TIME "
+                          ") VALUES ( "
+                          "%"PRId64", "
+                          "%Q);",
+                          id,
+                          time_str);
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+    }
+  
+  }
+
+static int64_t multipart_movie_duration;
+static int multipart_movie_items;
+
+static void query_movie_part_callback(void * priv, void * obj)
+  {
+  int64_t id;
+  char * sql;
+  bg_db_video_file_t * f = obj;
+
+  
+  translate_video_file(f);
+  multipart_movie_duration += f->file.obj.duration;
+  multipart_movie_items++;
+
+  id = bg_sqlite_get_next_id(nmj, "SHOWS_VIDEOS");
+  sql = sqlite3_mprintf("INSERT INTO SHOWS_VIDEOS ( ID, SHOWS_ID, VIDEOS_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64");",
+                        id, f->collection, bg_db_object_get_id(f));
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+
+  }
+
+static void query_movie_callback(void * priv, void * obj)
+  {
+  if(bg_db_object_get_type(obj) == BG_DB_OBJECT_MOVIE)
+    {
+    int64_t id;
+    char * sql;
+    bg_db_movie_t * m = obj;
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating movie %s", m->info.title);
+        
+    /* Save file details */
+    translate_video_file(&m->file);
+    translate_video_info(&m->info, bg_db_object_get_id(obj),
+                         1, m->file.file.obj.duration, 1, NULL, NULL);
+
+    id = bg_sqlite_get_next_id(nmj, "SHOWS_VIDEOS");
+    sql = sqlite3_mprintf("INSERT INTO SHOWS_VIDEOS ( ID, SHOWS_ID, VIDEOS_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64");",
+                          id, bg_db_object_get_id(m), bg_db_object_get_id(m));
+    bg_sqlite_exec(nmj, sql, NULL, NULL);
+    sqlite3_free(sql);
+    }
+  else if(bg_db_object_get_type(obj) == BG_DB_OBJECT_MOVIE_MULTIPART)
+    {
+    bg_db_video_container_t * m = obj;
+    multipart_movie_duration = 0;
+    multipart_movie_items = 0;
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating movie %s", m->info.title);
+    
+    bg_db_query_children(db, bg_db_object_get_id(obj), query_movie_part_callback, NULL,
+                         0, 0, NULL);
+
+    translate_video_info(&m->info, bg_db_object_get_id(obj),
+                         multipart_movie_items, multipart_movie_duration, 6, NULL, NULL);
+    }
+  }
+
+/* TV Series */
+
+typedef struct
+  {
+  int total_items;
+  int64_t total_duration;
+
+  int season_items;
+  int64_t season_duration;
+  
+  int64_t series;
+  int64_t season;
+  int season_index;
+  const char * series_title;
+  const char * series_search_title;
+  } tv_t;
+
+static int get_season_index(const char * label)
+  {
+  const char * pos = label + (strlen(label) - 1);
+  while(isdigit(*pos))
+    pos--;
+  pos++;
+  return atoi(pos);
+  }
+
+static void query_episode_callback(void * priv, void * obj)
+  {
+  tv_t * t;
+  int64_t id;
+  bg_db_movie_t * m = obj;
+  char * sql;
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating episode %s", m->info.title);
+
+  t = priv;
+  
+  /* Save file details */
+  translate_video_file(&m->file);
+  translate_video_info(&m->info, bg_db_object_get_id(obj),
+                       1, m->file.file.obj.duration, 3, NULL, NULL);
+
+  id = bg_sqlite_get_next_id(nmj, "SHOWS_VIDEOS");
+  sql = sqlite3_mprintf("INSERT INTO SHOWS_VIDEOS ( ID, SHOWS_ID, VIDEOS_ID ) VALUES ( %"PRId64", %"PRId64", %"PRId64");",
+                        id, bg_db_object_get_id(m), bg_db_object_get_id(m));
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  id = bg_sqlite_get_next_id(nmj, "EPISODES");
+  sql = sqlite3_mprintf("INSERT INTO EPISODES ( ID, EPISODE_ID, SERIES_ID, SEASON_ID, SEASON, EPISODE ) VALUES ( %"PRId64", %"PRId64", %"PRId64", %"PRId64", %d, %d);",
+                        id, bg_db_object_get_id(m), t->series, t->season, t->season_index, m->file.index);
+  bg_sqlite_exec(nmj, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+  t->season_items++;
+  t->season_duration += m->file.file.obj.duration;
+  }
+
+static void query_season_callback(void * priv, void * obj)
+  {
+  tv_t * t;
+  bg_db_video_container_t * c = obj;
+  char * title;
+  char * search_title;
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating season %s", c->info.title);
+
+  t = priv;
+  t->season_items = 0;
+  t->season_duration = 0;
+  t->season = bg_db_object_get_id(obj);
+  t->season_index = get_season_index(c->info.title);
+
+  title = bg_sprintf("%s %s", t->series_title, c->info.title);
+  search_title = bg_sprintf("%s %s", t->series_search_title, c->info.title);
+  
+  bg_db_query_children(db, bg_db_object_get_id(obj), query_episode_callback, priv,
+                       0, 0, NULL);
+  
+  translate_video_info(&c->info, bg_db_object_get_id(obj),
+                       t->season_items, t->season_duration, 5, title, search_title);
+  free(title);
+  free(search_title);
+    
+  t->total_items += t->season_items;
+  t->total_duration += t->season_duration;
+  }
+  
+static void query_tvseries_callback(void * priv, void * obj)
+  {
+  bg_db_video_container_t * c = obj;
+  tv_t tv;
+  memset(&tv, 0, sizeof(tv));
+
+  tv.series = bg_db_object_get_id(obj);
+  tv.series_title = c->info.title;
+  tv.series_search_title = c->info.search_title;
+  
+  bg_db_query_children(db, bg_db_object_get_id(obj), query_season_callback, &tv,
+                       0, 0, NULL);
+  
+  translate_video_info(&c->info, bg_db_object_get_id(obj),
+                       tv.total_items, tv.total_duration, 2, NULL, NULL);
+  
+  }
+
+int main(int argc, char ** argv)
+  {
+  bg_cfg_section_t * cfg_section;
+  char * tmp_path;
+  bg_plugin_registry_t * plugin_reg;
+  bg_cfg_registry_t * cfg_reg;
+  char * sql;
+  
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+
+  /* Create plugin registry */
+  cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+  
+  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(cfg_section);
+
+  if(chdir(path))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't change directory to %s", path);
+    return -1;
+    }
+
+  if(!getcwd(root_dir, ROOT_DIR_SIZE-2))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't get current directory");
+    return -1;
+    }
+
+  strcat(root_dir, "/");
+
+  root_dir_len = strlen(root_dir);
+  
+  db = bg_db_create(path, plugin_reg, 0);
+  if(!db)
+    return -1;
+
+  nmj = bg_nmj_create();
+  if(!nmj)
+    return -1;
+
+  /* Scan dirs */
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating scan directories");
+
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (PARENT_ID = 0)",
+                        BG_DB_OBJECT_DIRECTORY);
+
+  bg_db_query_sql(db, sql, query_scan_dir_callback, NULL);
+  sqlite3_free(sql);
+
+  /* Songs */
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating audio files");
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d)",
+                        BG_DB_OBJECT_AUDIO_FILE);
+  bg_db_query_sql(db, sql, query_audio_file_callback, NULL);
+  sqlite3_free(sql);
+
+  /* Albums */
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating audio albums");
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d)",
+                        BG_DB_OBJECT_AUDIO_ALBUM);
+  bg_db_query_sql(db, sql, query_audio_album_callback, NULL);
+  sqlite3_free(sql);
+
+  /* Playlists */
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating playlists");
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d)",
+                        BG_DB_OBJECT_PLAYLIST);
+  bg_db_query_sql(db, sql, query_playlist_callback, NULL);
+  sqlite3_free(sql);
+
+  /* Movies */
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating movies");
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) | (TYPE = %d)",
+                        BG_DB_OBJECT_MOVIE, BG_DB_OBJECT_MOVIE_MULTIPART);
+  bg_db_query_sql(db, sql, query_movie_callback, NULL);
+  sqlite3_free(sql);
+
+  /* TV Series */
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Translating TV Series");
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d)",
+                        BG_DB_OBJECT_TVSERIES);
+  bg_db_query_sql(db, sql, query_tvseries_callback, NULL);
+  sqlite3_free(sql);
+  
+  
+  
+  /* Close databases */
+  bg_sqlite_exec(nmj, "END;", NULL, NULL);
+
+  bg_db_destroy(db);
+  sqlite3_close(nmj);
+  
+  return 0;
+  }

gmerlin-4256.tar.gz/apps/dbedit Added

gmerlin-4256.tar.gz/apps/dbedit/Makefile.am Added

gmerlin-4256.tar.gz/apps/dbedit/gmerlin-dbedit.c Added

@@ -0,0 +1,302 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/mediadb.h>
+#include <gmerlin/cmdline.h>
+
+#define LOG_DOMAIN "gmerlin-dbedit"
+
+static int num_add_dirs = 0;
+static char ** add_dirs = NULL;
+
+static int num_del_dirs = 0;
+static char ** del_dirs = NULL;
+
+static int num_add_albums = 0;
+static char ** add_albums = NULL;
+
+static int do_create = 0;
+
+static int scan_type_opt = 0;
+
+static char * path = ".";
+
+static char * dump_object = NULL;
+static char * dump_children = NULL;
+
+static int num_add_radio_albums = 0;
+static char ** add_radio_albums = NULL;
+
+
+static void
+opt_a(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -add requires an argument\n");
+    exit(-1);
+    }
+  
+  add_dirs = realloc(add_dirs,
+                     sizeof(*add_dirs) * (num_add_dirs+1));
+  add_dirs[num_add_dirs] = (*_argv)[arg];
+  num_add_dirs++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_d(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -del requires an argument\n");
+    exit(-1);
+    }
+  
+  del_dirs = realloc(del_dirs,
+                     sizeof(*del_dirs) * (num_del_dirs+1));
+  del_dirs[num_del_dirs] = (*_argv)[arg];
+  num_del_dirs++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_add_album(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -add-album requires an argument\n");
+    exit(-1);
+    }
+  
+  add_albums = realloc(add_albums,
+                     sizeof(*add_albums) * (num_add_albums+1));
+  add_albums[num_add_albums] = (*_argv)[arg];
+  num_add_albums++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_add_radio_album(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -add-radio-album requires an argument\n");
+    exit(-1);
+    }
+  
+  add_radio_albums = realloc(add_radio_albums,
+                     sizeof(*add_radio_albums) * (num_add_radio_albums+1));
+  add_radio_albums[num_add_radio_albums] = (*_argv)[arg];
+  num_add_radio_albums++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_create(void * data, int * argc, char *** _argv, int arg)
+  {
+  do_create = 1;
+  }
+
+static void
+opt_audio(void * data, int * argc, char *** _argv, int arg)
+  {
+  scan_type_opt |= BG_DB_SCAN_AUDIO;
+  }
+
+static void
+opt_video(void * data, int * argc, char *** _argv, int arg)
+  {
+  scan_type_opt |= BG_DB_SCAN_VIDEO;
+  }
+
+static void
+opt_photo(void * data, int * argc, char *** _argv, int arg)
+  {
+  scan_type_opt |= BG_DB_SCAN_PHOTO;
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-create",
+      .help_string = TRS("Create a new database in the current directory"),
+      .callback =    opt_create,
+    },
+    {
+      .arg =         "-root",
+      .help_string = "Root directory of the database",
+      .argv         = &path,
+    },
+    {
+      .arg =         "-add",
+      .help_arg =    "<directory>",
+      .help_string = TRS("Add this directory"),
+      .callback =    opt_a,
+    },
+    {
+      .arg =         "-del",
+      .help_arg =    "<directory>",
+      .help_string = TRS("Delete this directory"),
+      .callback =    opt_d,
+    },
+    {
+      .arg =         "-add-album",
+      .help_arg =    "<album>",
+      .help_string = TRS("Add an album as a playlist"),
+      .callback =    opt_add_album,
+    },
+    {
+      .arg =         "-add-radio-album",
+      .help_arg =    "<album>",
+      .help_string = TRS("Add an album containing radio stations"),
+      .callback =    opt_add_radio_album,
+    },
+    {
+      .arg =         "-audio",
+      .help_string = TRS("Add audio files"),
+      .callback =    opt_audio,
+    },
+    {
+      .arg =         "-video",
+      .help_string = TRS("Add video files"),
+      .callback =    opt_video,
+    },
+    {
+      .arg =         "-photo",
+      .help_string = TRS("Add photo files"),
+      .callback =    opt_photo,
+    },
+    {
+      .arg =         "-do",
+      .help_arg =    "<ID>",
+      .help_string = TRS("Dump database object"),
+      .argv = &dump_object,
+    },
+    {
+      .arg =         "-dc",
+      .help_arg =    "<ID>",
+      .help_string = TRS("Dump children of the specified object"),
+      .argv = &dump_children,
+    },
+    { /* End */ }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gmerlin-dbedit",
+    .long_name = TRS("Editor for the gmerlin media database"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gmerlin db editor\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+static void callback(void * priv, void * object)
+  {
+  bg_db_object_dump(object);
+  }
+
+int main(int argc, char ** argv)
+  {
+  bg_cfg_section_t * cfg_section;
+  char * tmp_path;
+  bg_plugin_registry_t * plugin_reg;
+  bg_cfg_registry_t * cfg_reg;
+  bg_db_t * db;
+  int scan_type;
+  int i;
+  
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+
+  /* Create plugin registry */
+  cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+  
+  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(cfg_section);
+
+  db = bg_db_create(path, plugin_reg, do_create);
+  if(!db)
+    return -1;
+
+  if(scan_type_opt)
+    scan_type = scan_type_opt;
+  else
+    scan_type = BG_DB_SCAN_AUDIO | BG_DB_SCAN_VIDEO | BG_DB_SCAN_PHOTO;
+
+  for(i = 0; i < num_add_dirs; i++)
+    bg_db_add_directory(db, add_dirs[i], scan_type);
+  for(i = 0; i < num_del_dirs; i++)
+    bg_db_del_directory(db, del_dirs[i]);
+  for(i = 0; i < num_add_albums; i++)
+    bg_db_add_album(db, add_albums[i]);
+  for(i = 0; i < num_add_radio_albums; i++)
+    bg_db_add_radio_album(db, add_radio_albums[i]);
+  
+  if(dump_object)
+    {
+    bg_db_object_t * obj;
+    int64_t id = strtoll(dump_object, NULL, 10);
+    obj = bg_db_object_query(db, id);
+    if(!obj)
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No such object");
+    else
+      {
+      bg_db_object_dump(obj);
+      bg_db_object_unref(obj);
+      }
+    }
+  if(dump_children)
+    {
+    int64_t id = strtoll(dump_children, NULL, 10);
+    bg_db_query_children(db, id, callback, NULL, 0, 0, NULL);
+    }
+  
+  bg_db_destroy(db);
+
+  bg_plugin_registry_destroy(plugin_reg);
+  bg_cfg_registry_destroy(cfg_reg);
+  
+
+  return 0;
+  }

gmerlin-4256.tar.gz/apps/gavftools Added

gmerlin-4256.tar.gz/apps/gavftools/Makefile.am Added

gmerlin-4256.tar.gz/apps/gavftools/decode_album.c Added

@@ -0,0 +1,382 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavf-decode.h"
+#include <string.h>
+
+/* Stat */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <ctype.h>
+
+#define LOG_DOMAIN "gavf-decode.album"
+
+void album_init(album_t * a)
+  {
+  memset(a, 0, sizeof(*a));
+  }
+
+void album_free(album_t * a)
+  {
+  if(a->entries)
+    free(a->entries);
+  if(a->first)
+    bg_album_entries_destroy(a->first);
+
+  bg_mediaconnector_free(&a->in_conn);
+  bg_mediaconnector_free(&a->out_conn);
+  if(a->h)
+    bg_plugin_unref(a->h);
+  gavl_metadata_free(&a->m);
+  }
+
+
+static bg_album_entry_t * load_gmerlin_album(const char * filename)
+  {
+  char * album_xml;
+  bg_album_entry_t * ret;
+
+  album_xml = bg_read_file(filename, NULL);
+
+  if(!album_xml)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s could not be opened",
+           album_file);
+    return NULL;
+    }
+
+  ret = bg_album_entries_new_from_xml(album_xml);
+  free(album_xml);
+  return ret;
+  }
+
+static bg_album_entry_t * load_m3u(const char * filename)
+  {
+  int seconds;
+  int idx;
+  char * pos;
+  char * m3u;
+  char ** lines;
+  bg_album_entry_t * ret = NULL;
+  bg_album_entry_t * end = NULL;
+  bg_album_entry_t * new_entry;
+
+  m3u = bg_read_file(filename, NULL);
+
+  if(!m3u)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Playlist file %s could not be opened",
+           filename);
+    return NULL;
+    }
+
+  lines = bg_strbreak(m3u, '\n');
+
+  idx = 0;
+  while(lines[idx])
+    {
+    if((pos = strchr(lines[idx], '\r')))
+      *pos = '\0';
+    idx++;
+    }
+
+  idx = 0;
+
+  /* Create entries */
+  while(lines[idx])
+    {
+    if(!strncmp(lines[idx], "#EXTM3U", 7))
+      {
+      idx++;
+      continue;
+      }
+
+    /* Create entry */
+
+    if(!strncmp(lines[idx], "#EXTINF:", 8))
+      {
+      new_entry = calloc(1, sizeof(*new_entry));
+      
+      /* Get duration (approximate) */
+      pos = lines[idx] + 8;
+      seconds = atoi(lines[idx]);
+      new_entry->duration = (int64_t)seconds * GAVL_TIME_SCALE;
+      pos = strchr(pos, ',');
+      if(pos)
+        {
+        pos++;
+        while(isspace(*pos) && (*pos != '\0'))
+          pos++;
+        if(*pos != '\0')
+          new_entry->name = gavl_strdup(pos);
+        }
+      idx++;
+      }
+    else if(*(lines[idx]) != '#')
+      {
+      if(!new_entry)
+        new_entry = calloc(1, sizeof(*new_entry));
+      new_entry->location = gavl_strdup(lines[idx]);
+
+      if(!end)
+        {
+        ret = new_entry;
+        end = ret;
+        }
+      else
+        {
+        end->next = new_entry;
+        end = end->next;
+        }
+      idx++;
+      new_entry = NULL;
+      }
+    else
+      idx++;
+    }
+
+  free(m3u);
+  bg_strbreak_free(lines);
+  return ret;
+  
+  }
+
+static int album_load(album_t * a)
+  {
+  int i;
+  bg_album_entry_t * e;
+
+  if(album_file)
+    a->first = load_gmerlin_album(album_file);
+  else if(m3u_file)
+    a->first = load_m3u(m3u_file);
+    
+  
+  if(!a->first)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s contains no entries",
+           album_file);
+    return 0;
+    }
+
+  /* Count entries */
+  e = a->first;
+  while(e)
+    {
+    a->num_entries++;
+    e = e->next;
+    }
+
+  /* Set up array */
+  a->entries = calloc(a->num_entries, sizeof(a->entries));
+  e = a->first;
+
+  for(i = 0; i < a->num_entries; i++)
+    {
+    a->entries[i] = e;
+    e = e->next;
+    }
+
+  /* Shuffle */
+  if(shuffle)
+    {
+    int idx;
+    for(i = 0; i < a->num_entries; i++)
+      {
+      idx = rand() % a->num_entries;
+      e = a->entries[i];
+      a->entries[i] = a->entries[idx];
+      a->entries[idx] = e;
+      }
+    }
+  return 1;
+  }
+
+static bg_album_entry_t * album_next(album_t * a)
+  {
+  bg_album_entry_t * ret;
+  
+  if(a->current_entry == a->num_entries)
+    {
+    if(!loop)
+      return NULL;
+    else a->current_entry = 0;
+    }
+  
+  ret = a->entries[a->current_entry];
+  
+  a->current_entry++;
+  return ret;
+  }
+
+static void create_streams(album_t * a, gavf_stream_type_t type)
+  {
+  int i, num;
+  num = bg_mediaconnector_get_num_streams(&a->in_conn, type);
+  for(i = 0; i < num; i++)
+    stream_create(bg_mediaconnector_get_stream(&a->in_conn,
+                                                type, i), a);
+  }
+
+int init_decode_album(album_t * a)
+  {
+  int ret = 0;
+  bg_album_entry_t * e;
+
+  if(!album_load(a))
+    return ret;
+  
+  e = album_next(a);
+
+  if(!load_album_entry(e, &a->in_conn, &a->h, &a->m))
+    return ret;
+
+  /* Set up the conn2 from conn1 */
+  a->num_streams = a->in_conn.num_streams;
+
+  create_streams(a, GAVF_STREAM_AUDIO);
+  create_streams(a, GAVF_STREAM_VIDEO);
+  create_streams(a, GAVF_STREAM_TEXT);
+  create_streams(a, GAVF_STREAM_OVERLAY);
+
+  a->active_streams = a->num_streams;
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Loaded %s", (char*)e->location);
+  
+  ret = 1;
+  return ret;
+  }
+
+static int match_streams(album_t * a, const char *location,
+                         gavf_stream_type_t type)
+  {
+  if(bg_mediaconnector_get_num_streams(&a->in_conn, type) !=
+     bg_mediaconnector_get_num_streams(&a->out_conn, type))
+    {
+    bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+           "Skipping %s (number of %s stream doesn't match)",
+           location, gavf_stream_type_name(type));
+    return 0;
+    }
+  return 1;
+  }
+
+static int replug_streams(album_t * a, gavf_stream_type_t type)
+  {
+  int i, num;
+  bg_mediaconnector_stream_t * is, * os;
+  
+  num = bg_mediaconnector_get_num_streams(&a->in_conn, type);
+  for(i = 0; i < num; i++)
+    {
+    is = bg_mediaconnector_get_stream(&a->in_conn, type, i);
+    os = bg_mediaconnector_get_stream(&a->out_conn, type, i);
+    if(!stream_replug(os->priv, is))
+      return 0;
+    }
+  return 1;
+  }
+
+
+int album_set_eof(album_t * a)
+  {
+  int i;
+  bg_album_entry_t * e;
+  gavl_time_t test_time;
+  stream_t * s;
+  gavf_t * g;
+  
+  a->active_streams--;
+
+  if(a->active_streams > 0)
+    return 0;
+
+  /* Get end time */
+
+  for(i = 0; i < a->num_streams; i++)
+    {
+    if((a->out_conn.streams[i]->type == GAVF_STREAM_AUDIO) ||
+       (a->out_conn.streams[i]->type == GAVF_STREAM_VIDEO))
+      {
+      s = a->out_conn.streams[i]->priv;
+
+      test_time = gavl_time_unscale(s->out_scale, s->pts);
+      if(a->end_time < test_time)
+        a->end_time = test_time;
+      }       
+    }
+  
+  while(1)
+    {
+    gavl_metadata_free(&a->m);
+    gavl_metadata_init(&a->m);
+    
+    bg_mediaconnector_free(&a->in_conn);
+    bg_mediaconnector_init(&a->in_conn);
+    if(a->h)
+      {
+      bg_plugin_unref(a->h);
+      a->h = NULL;
+      }
+    
+    e = album_next(a);
+    if(!e)
+      {
+      a->eof = 1;
+      return 0;
+      }
+    
+    /* Load next track */
+    
+    if(!load_album_entry(e, &a->in_conn,
+                         &a->h, &a->m))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Skipping %s", (char*)e->location);
+      continue;
+      }
+
+    if(!match_streams(a, e->location, GAVF_STREAM_AUDIO) ||
+       !match_streams(a, e->location, GAVF_STREAM_VIDEO) ||
+       !match_streams(a, e->location, GAVF_STREAM_TEXT) ||
+       !match_streams(a, e->location, GAVF_STREAM_OVERLAY))
+      continue;
+
+    /* replug streams */
+    if(!replug_streams(a, GAVF_STREAM_AUDIO) ||
+       !replug_streams(a, GAVF_STREAM_VIDEO) ||
+       !replug_streams(a, GAVF_STREAM_TEXT) ||
+       !replug_streams(a, GAVF_STREAM_OVERLAY))
+      continue;
+    
+    break;
+    }
+
+  g = bg_plug_get_gavf(a->out_plug);
+  gavf_update_metadata(g, &a->m);
+
+  a->active_streams = a->num_streams;
+    
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Loaded %s", (char*)e->location);
+  
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/gavftools/decode_albumstream.c Added

@@ -0,0 +1,371 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavf-decode.h"
+
+#define LOG_DOMAIN "gavf-decode.albumstream"
+
+
+int stream_replug(stream_t * s, bg_mediaconnector_stream_t * in_stream)
+  {
+  s->in_stream = in_stream;
+ 
+  switch(s->in_stream->type)
+    {
+    case GAVF_STREAM_AUDIO:
+      gavl_audio_source_set_dst(s->in_stream->asrc, 0, &s->afmt);
+
+      if(gavl_audio_source_read_frame(s->in_stream->asrc,
+                                      &s->next_aframe) != GAVL_SOURCE_OK)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't get first audio frame");
+        return 0;
+        }
+      s->mute_time = gavl_time_scale(s->in_scale, s->a->end_time) - s->pts;
+
+      if(s->mute_time < 0)
+        s->mute_time = 0;
+      
+      s->mute_time += s->next_aframe->timestamp;
+      
+      bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Audio mute time: %"PRId64" (%"PRId64")",
+              s->mute_time, gavl_time_unscale(s->in_scale, s->mute_time));
+      
+      break;
+    case GAVF_STREAM_VIDEO:
+      {
+      gavl_rectangle_f_t in_rect;
+      gavl_rectangle_i_t out_rect;
+      
+      gavl_video_format_t src_format;
+      
+      gavl_video_format_copy(&src_format,
+                             gavl_video_source_get_src_format(in_stream->vsrc));
+
+      gavl_rectangle_f_set_all(&in_rect, &src_format);
+      
+      gavl_rectangle_fit_aspect(&out_rect,   // gavl_rectangle_t * r,
+                                &src_format,  // gavl_video_format_t * src_format,
+                                &in_rect,    // gavl_rectangle_t * src_rect,
+                                &s->vfmt, // gavl_video_format_t * dst_format,
+                                1.0,        // float zoom,
+                                0.0          // float squeeze
+                                );
+      
+      gavl_rectangle_crop_to_format_scale(&in_rect,
+                                          &out_rect,
+                                          &src_format,
+                                          &s->vfmt);
+      gavl_video_options_set_rectangles(gavl_video_source_get_options(in_stream->vsrc),
+                                        &in_rect, &out_rect);
+      
+
+      gavl_video_source_set_dst(in_stream->vsrc, 0, &s->vfmt);
+
+      if(gavl_video_source_read_frame(s->in_stream->vsrc,
+                                      &s->next_vframe) != GAVL_SOURCE_OK)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't get first video frame");
+        return 0;
+        }
+      s->mute_time = gavl_time_scale(s->in_scale, s->a->end_time) - s->pts;
+
+      if(s->mute_time < 0)
+        s->mute_time = 0;
+      
+      s->mute_time += s->next_vframe->timestamp;
+
+      bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Video mute time: %"PRId64" (%"PRId64")",
+             s->mute_time, gavl_time_unscale(s->in_scale, s->mute_time));
+      }
+      break;
+    case GAVF_STREAM_TEXT:
+      break;
+    case GAVF_STREAM_OVERLAY:
+      gavl_video_source_set_dst(in_stream->vsrc, 0, &s->vfmt);
+      break;
+    }
+  return 1;
+  }
+
+  
+static gavl_source_status_t read_audio(void * priv, gavl_audio_frame_t ** ret)
+  {
+  stream_t * s = priv;
+
+  if(s->a->eof)
+    {
+    //    fprintf(stderr, "Audio EOF 1\n");
+    return GAVL_SOURCE_EOF;
+    }
+  if(s->mute_time)
+    {
+    if(!s->mute_aframe)
+      s->mute_aframe = gavl_audio_frame_create(&s->afmt);
+    gavl_audio_frame_mute(s->mute_aframe, &s->afmt);
+    s->mute_aframe->valid_samples = s->mute_time;
+    if(s->mute_aframe->valid_samples > s->afmt.samples_per_frame)
+      s->mute_aframe->valid_samples = s->afmt.samples_per_frame;
+    *ret = s->mute_aframe;
+    s->mute_time -= s->mute_aframe->valid_samples;
+    s->pts += s->mute_aframe->valid_samples;
+    return GAVL_SOURCE_OK;
+    }
+  else if(s->next_aframe)
+    {
+    s->next_aframe->timestamp = s->pts;
+    s->pts += s->next_aframe->valid_samples;
+    
+    *ret = s->next_aframe;
+    
+    s->next_aframe = NULL;
+
+    return GAVL_SOURCE_OK;
+    }
+  else
+    {
+    gavl_audio_frame_t * f;
+
+    while(1)
+      {
+      f = NULL;
+      
+      s->st = gavl_audio_source_read_frame(s->in_stream->asrc, &f);
+
+      switch(s->st)
+        {
+        case GAVL_SOURCE_OK:
+          
+          f->timestamp = s->pts;
+          s->pts += f->valid_samples;
+
+          *ret = f;
+          return s->st;
+          break;
+        case GAVL_SOURCE_EOF:
+          if(!album_set_eof(s->a))
+            {
+            //            if(s->a->eof)
+            //              fprintf(stderr, "Audio EOF 2\n");
+            
+            return s->a->eof ? GAVL_SOURCE_EOF : GAVL_SOURCE_AGAIN;
+            }
+          break;
+        case GAVL_SOURCE_AGAIN:
+          bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+                 "Unexpected return code from audio source");
+          
+          break;
+        }
+      }
+    }
+ 
+  //  fprintf(stderr, "Audio EOF 3\n");
+  return GAVL_SOURCE_EOF;
+  }
+
+static gavl_source_status_t read_video(void * priv, gavl_video_frame_t ** ret)
+  {
+  stream_t * s = priv;
+
+  if(s->a->eof)
+    {
+    //    fprintf(stderr, "Video EOF 1\n");
+    return GAVL_SOURCE_EOF;
+    }
+  if(s->mute_time)
+    {
+    if(!s->mute_vframe)
+      {
+      s->mute_vframe = gavl_video_frame_create(&s->vfmt);
+      gavl_video_frame_clear(s->mute_vframe, &s->vfmt);
+      }
+    s->mute_vframe->timestamp = s->pts;
+    s->mute_vframe->duration = s->mute_time;
+    s->pts += s->mute_vframe->duration;
+    *ret = s->mute_vframe;
+    s->mute_time = 0;
+    return GAVL_SOURCE_OK;
+    }
+  else if(s->next_vframe)
+    {
+    *ret = s->next_vframe;
+    (*ret)->timestamp = s->pts;
+    s->pts += (*ret)->duration;
+    s->next_vframe = NULL;
+    return GAVL_SOURCE_OK;
+    }
+  else
+    {
+    gavl_video_frame_t * f;
+
+    while(1)
+      {
+      f = NULL;
+      s->st = gavl_video_source_read_frame(s->in_stream->vsrc, &f);
+
+      switch(s->st)
+        {
+        case GAVL_SOURCE_OK:
+          *ret = f;
+          (*ret)->timestamp = s->pts;
+          s->pts += (*ret)->duration;
+          return s->st;
+          break;
+        case GAVL_SOURCE_EOF:
+          if(!album_set_eof(s->a))
+            {
+            //            if(s->a->eof)
+            //              fprintf(stderr, "Video EOF 2\n");
+            
+            return s->a->eof ? GAVL_SOURCE_EOF : GAVL_SOURCE_AGAIN;
+            }
+          break;
+        case GAVL_SOURCE_AGAIN:
+          /* Not handled */
+          bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+                 "Unexpected return code from video source");
+          break;
+        }
+
+      }
+    
+    }
+
+  //  fprintf(stderr, "Video EOF 3\n");
+  return GAVL_SOURCE_EOF;
+  }
+
+static gavl_source_status_t read_overlay(void * priv, gavl_video_frame_t ** ret)
+  {
+  stream_t * s = priv;
+  if(s->a->eof)
+    return GAVL_SOURCE_EOF;
+  return GAVL_SOURCE_EOF;
+  }
+
+static gavl_source_status_t read_text(void * priv, gavl_packet_t ** ret)
+  {
+  stream_t * s = priv;
+  if(s->a->eof)
+    return GAVL_SOURCE_EOF;
+  return GAVL_SOURCE_EOF;
+  }
+
+static void stream_destroy(bg_mediaconnector_stream_t * ms)
+  {
+  stream_t * s = ms->priv;
+  if(s->asrc)
+    gavl_audio_source_destroy(s->asrc);
+  if(s->vsrc)
+    gavl_video_source_destroy(s->vsrc);
+  if(s->psrc)
+    gavl_packet_source_destroy(s->psrc);
+  if(s->mute_aframe)
+    gavl_audio_frame_destroy(s->mute_aframe);
+  if(s->mute_vframe)
+    gavl_video_frame_destroy(s->mute_vframe);
+  free(s);
+  }
+
+int stream_create(bg_mediaconnector_stream_t * in_stream,
+                  album_t * a)
+  {
+  bg_mediaconnector_stream_t * out_stream = NULL;
+  stream_t * ret = calloc(1, sizeof(*ret));
+  ret->in_stream = in_stream;
+  ret->a = a;
+
+  switch(ret->in_stream->type)
+    {
+    case GAVF_STREAM_AUDIO:
+      gavl_audio_format_copy(&ret->afmt, gavl_audio_source_get_src_format(ret->in_stream->asrc));
+      ret->in_scale = ret->afmt.samplerate;
+      ret->asrc = 
+        gavl_audio_source_create(read_audio, ret, 
+                                 GAVL_SOURCE_SRC_ALLOC | GAVL_SOURCE_SRC_FRAMESIZE_MAX,
+                                 &ret->afmt);
+      out_stream = bg_mediaconnector_add_audio_stream(&a->out_conn,
+                                                      NULL, ret->asrc, NULL);
+
+      if(gavl_audio_source_read_frame(ret->in_stream->asrc,
+                                      &ret->next_aframe) != GAVL_SOURCE_OK)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't get first audio frame");
+        return 0;
+        }
+      ret->mute_time = ret->next_aframe->timestamp;
+      break;
+    case GAVF_STREAM_VIDEO:
+      gavl_video_format_copy(&ret->vfmt, gavl_video_source_get_src_format(ret->in_stream->vsrc));
+
+      /* Adjust format: We set the timescale to 1000 and the framerate to variable */
+      ret->vfmt.timescale = 1000;
+      ret->vfmt.frame_duration = 0;
+      ret->vfmt.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+
+      ret->in_scale = ret->vfmt.timescale;
+      
+      gavl_video_source_set_dst(ret->in_stream->vsrc, 0, &ret->vfmt);
+      
+      ret->vsrc =
+        gavl_video_source_create(read_video, ret, GAVL_SOURCE_SRC_ALLOC, &ret->vfmt);
+      out_stream = bg_mediaconnector_add_video_stream(&a->out_conn,
+                                                      NULL, ret->vsrc, NULL);
+
+
+      if(gavl_video_source_read_frame(ret->in_stream->vsrc,
+                                      &ret->next_vframe) != GAVL_SOURCE_OK)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't get first video frame");
+        return 0;
+        }
+      ret->mute_time = ret->next_vframe->timestamp;
+      
+      break;
+    case GAVF_STREAM_TEXT:
+      ret->psrc =
+        gavl_packet_source_create_text(read_text, ret, GAVL_SOURCE_SRC_ALLOC, ret->in_stream->timescale);
+      out_stream = bg_mediaconnector_add_text_stream(&a->out_conn,
+                                                     NULL, ret->psrc, ret->in_stream->timescale);
+      break;
+    case GAVF_STREAM_OVERLAY:
+      gavl_video_format_copy(&ret->vfmt, gavl_video_source_get_src_format(ret->in_stream->vsrc));
+      ret->in_scale = ret->vfmt.timescale;
+      
+      ret->vsrc =
+        gavl_video_source_create(read_overlay, ret, GAVL_SOURCE_SRC_ALLOC,
+                                 gavl_video_source_get_src_format(ret->in_stream->vsrc));
+      out_stream = bg_mediaconnector_add_overlay_stream(&a->out_conn,
+                                                         NULL, ret->vsrc, NULL);
+      break;
+    }
+
+  if(ret)
+    ret->out_scale = ret->in_scale;
+  
+  if(out_stream)
+    {
+    out_stream->priv = ret;
+    out_stream->free_priv = stream_destroy;
+    }
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/gavftools/decode_load.c Added

@@ -0,0 +1,287 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavf-decode.h"
+#include <string.h>
+
+#define LOG_DOMAIN "gavf-decode.load"
+
+int load_input_file(const char * file, const char * plugin_name,
+                    int track, bg_mediaconnector_t * conn,
+                    bg_input_callbacks_t * cb,
+                    bg_plugin_handle_t ** hp, 
+                    gavl_metadata_t * m, gavl_chapter_list_t ** cl,
+                    int edl, int force_decompress)
+  {
+  gavl_audio_source_t * asrc;
+  gavl_video_source_t * vsrc;
+  gavl_packet_source_t * psrc;
+  bg_track_info_t * track_info;
+  const bg_plugin_info_t * plugin_info;
+  bg_input_plugin_t * plugin;
+  void * priv;
+  int i;
+  const gavl_metadata_t * stream_metadata;
+  
+  if(plugin_name)
+    {
+    plugin_info = bg_plugin_find_by_name(plugin_reg, plugin_name);
+    if(!plugin_info)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Input plugin %s not found", plugin_name);
+      goto fail;
+      }
+    }
+  else
+    plugin_info = NULL;
+
+  if(!bg_input_plugin_load(plugin_reg,
+                           file,
+                           plugin_info,
+                           hp, cb, edl))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't load %s", file);
+    goto fail;
+    }
+  
+  plugin = (bg_input_plugin_t*)((*hp)->plugin);
+  priv = (*hp)->priv;
+  
+  /* Select track and get track info */
+  if((track < 0) ||
+     (track >= plugin->get_num_tracks(priv)))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No such track %d", track);
+    goto fail;
+    }
+
+  if(plugin->set_track)
+    plugin->set_track(priv, track);
+  
+  track_info = plugin->get_track_info(priv, track);
+
+  /* Extract metadata */
+  gavl_metadata_free(m);
+  gavl_metadata_init(m);
+  gavl_metadata_copy(m, &track_info->metadata);
+
+  if(!gavl_metadata_get(m, GAVL_META_LABEL))
+    {
+    if(strcmp(file, "-"))
+      {
+      gavl_metadata_set_nocpy(m, GAVL_META_LABEL,
+                              bg_get_track_name_default(file,
+                                                        track,
+                                                        plugin->get_num_tracks(priv)));
+      }
+    }
+  if(cl)
+    *cl = track_info->chapter_list;
+
+  /* Select A/V streams */
+  if(!audio_actions)  
+    audio_actions = gavftools_get_stream_actions(track_info->num_audio_streams,
+                                                 GAVF_STREAM_AUDIO);
+  if(!video_actions)
+    video_actions = gavftools_get_stream_actions(track_info->num_video_streams,
+                                                 GAVF_STREAM_VIDEO);
+  if(!text_actions)
+    text_actions = gavftools_get_stream_actions(track_info->num_text_streams,
+                                                GAVF_STREAM_TEXT);
+  if(!overlay_actions)
+    overlay_actions = gavftools_get_stream_actions(track_info->num_overlay_streams,
+                                                   GAVF_STREAM_OVERLAY);
+
+  /* Check for compressed reading */
+
+  for(i = 0; i < track_info->num_audio_streams; i++)
+    {
+    if((audio_actions[i] == BG_STREAM_ACTION_READRAW) &&
+       (force_decompress || !plugin->get_audio_compression_info ||
+        !plugin->get_audio_compression_info(priv, i, NULL)))
+      {
+      audio_actions[i] = BG_STREAM_ACTION_DECODE;
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Audio stream %d cannot be read compressed",
+             i+1);
+      }
+    }
+
+  for(i = 0; i < track_info->num_video_streams; i++)
+    {
+    if((video_actions[i] == BG_STREAM_ACTION_READRAW) &&
+       (force_decompress || !plugin->get_video_compression_info ||
+        !plugin->get_video_compression_info(priv, i, NULL)))
+      {
+      video_actions[i] = BG_STREAM_ACTION_DECODE;
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Video stream %d cannot be read compressed",
+             i+1);
+      }
+    }
+
+  for(i = 0; i < track_info->num_overlay_streams; i++)
+    {
+    if((overlay_actions[i] == BG_STREAM_ACTION_READRAW) &&
+       (force_decompress || !plugin->get_overlay_compression_info ||
+        !plugin->get_overlay_compression_info(priv, i, NULL)))
+      {
+      overlay_actions[i] = BG_STREAM_ACTION_DECODE;
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Overlay stream %d cannot be read compressed",
+             i+1);
+      }
+    }
+
+  /* Enable streams */
+  
+  if(plugin->set_audio_stream)
+    {
+    for(i = 0; i < track_info->num_audio_streams; i++)
+      plugin->set_audio_stream(priv, i, audio_actions[i]);
+    }
+  if(plugin->set_video_stream)
+    {
+    for(i = 0; i < track_info->num_video_streams; i++)
+      plugin->set_video_stream(priv, i, video_actions[i]);
+    }
+  if(plugin->set_text_stream)
+    {
+    for(i = 0; i < track_info->num_text_streams; i++)
+      plugin->set_text_stream(priv, i, text_actions[i]);
+    }
+  if(plugin->set_overlay_stream)
+    {
+    for(i = 0; i < track_info->num_overlay_streams; i++)
+      plugin->set_overlay_stream(priv, i, overlay_actions[i]);
+    }
+  
+  /* Start plugin */
+  if(plugin->start && !plugin->start(priv))
+    goto fail;
+  
+  for(i = 0; i < track_info->num_audio_streams; i++)
+    {
+    stream_metadata = &track_info->audio_streams[i].m;
+    
+    switch(audio_actions[i])
+      {
+      case BG_STREAM_ACTION_OFF:
+        asrc = NULL;
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_DECODE:
+        asrc = plugin->get_audio_source(priv, i);
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_READRAW:
+        psrc = plugin->get_audio_packet_source(priv, i);
+        asrc = NULL;
+        break;
+      }
+
+    if(asrc || psrc)
+      bg_mediaconnector_add_audio_stream(conn, stream_metadata, asrc, psrc);
+    }
+  
+  for(i = 0; i < track_info->num_video_streams; i++)
+    {
+    stream_metadata = &track_info->video_streams[i].m;
+    switch(video_actions[i])
+      {
+      case BG_STREAM_ACTION_OFF:
+        vsrc = NULL;
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_DECODE:
+        vsrc = plugin->get_video_source(priv, i);
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_READRAW:
+        psrc = plugin->get_video_packet_source(priv, i);
+        vsrc = NULL;
+        break;
+      }
+    if(vsrc || psrc)
+      bg_mediaconnector_add_video_stream(conn, stream_metadata, vsrc, psrc);
+    }
+  
+  for(i = 0; i < track_info->num_text_streams; i++)
+    {
+    stream_metadata = &track_info->text_streams[i].m;
+    switch(text_actions[i])
+      {
+      case BG_STREAM_ACTION_OFF:
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_DECODE:
+      case BG_STREAM_ACTION_READRAW:
+        psrc = plugin->get_text_source(priv, i);
+        break;
+      }
+    if(psrc)
+      bg_mediaconnector_add_text_stream(conn, stream_metadata, psrc,
+                                        track_info->text_streams[i].timescale);
+    }
+  
+  for(i = 0; i < track_info->num_overlay_streams; i++)
+    {
+    stream_metadata = &track_info->overlay_streams[i].m;
+    switch(overlay_actions[i])
+      {
+      case BG_STREAM_ACTION_OFF:
+        vsrc = NULL;
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_DECODE:
+        vsrc = plugin->get_overlay_source(priv, i);
+        psrc = NULL;
+        break;
+      case BG_STREAM_ACTION_READRAW:
+        vsrc = NULL;
+        psrc = plugin->get_overlay_packet_source(priv, i);
+        break;
+      }
+    if(vsrc || psrc)
+      bg_mediaconnector_add_overlay_stream(conn, stream_metadata, vsrc, psrc);
+    }
+
+  return 1;
+  fail:
+  
+  return 0;
+  }
+
+/* Stuff for loading albums */
+
+int load_album_entry(bg_album_entry_t * entry,
+                     bg_mediaconnector_t * conn,
+                     bg_plugin_handle_t ** hp, 
+                     gavl_metadata_t * m)
+  {
+  int ret = load_input_file(entry->location, entry->plugin,
+                            entry->index, conn,
+                            NULL, hp, m, NULL,
+                            !!(entry->flags & BG_ALBUM_ENTRY_EDL), 1);
+  if(!ret)
+    return ret;
+  
+  gavl_metadata_set(m, GAVL_META_LABEL, entry->name);
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-decode.c Added

@@ -0,0 +1,372 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <signal.h>
+
+
+#include "gavf-decode.h"
+
+#define LOG_DOMAIN "gavf-decode"
+
+static char * input_file   = "-";
+
+char * album_file   = NULL;
+char * m3u_file   = NULL;
+
+static char * input_plugin = NULL;
+static bg_plug_t * out_plug = NULL;
+static int use_edl = 0;
+static int selected_track = 0;
+
+int shuffle = 0;
+int loop    = 0;
+
+bg_stream_action_t * audio_actions = NULL;
+bg_stream_action_t * video_actions = NULL;
+bg_stream_action_t * text_actions = NULL;
+bg_stream_action_t * overlay_actions = NULL;
+
+double seek_pos = -1.0;
+
+static void opt_t(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -t requires an argument\n");
+    exit(-1);
+    }
+  selected_track = atoi((*_argv)[arg]) - 1;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_seek(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -seek requires an argument\n");
+    exit(-1);
+    }
+  seek_pos = strtod((*_argv)[arg], NULL);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_shuffle(void * data, int * argc, char *** _argv, int arg)
+  {
+  shuffle = 1;
+  }
+
+static void opt_loop(void * data, int * argc, char *** _argv, int arg)
+  {
+  loop = 1;
+  }
+
+static void opt_edl(void * data, int * argc, char *** _argv, int arg)
+  {
+  use_edl = 1;
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-i",
+      .help_arg =    "<location>",
+      .help_string = TRS("Set input file or location"),
+      .argv     =    &input_file,
+    },
+    {
+      .arg =         "-a",
+      .help_arg =    "<album>",
+      .help_string = TRS("Album file"),
+      .argv     =    &album_file,
+    },
+    {
+      .arg =         "-m3u",
+      .help_arg =    "<file>",
+      .help_string = TRS("m3u playlist"),
+      .argv     =    &m3u_file,
+    },
+    {
+      .arg =         "-loop",
+      .help_string = TRS("Loop album"),
+      .callback =    opt_loop,
+    },
+    {
+      .arg =         "-shuffle",
+      .help_string = TRS("Shuffle"),
+      .callback =    opt_shuffle,
+    },
+    {
+      .arg =         "-p",
+      .help_arg =    "<plugin>",
+      .help_string = TRS("Set input file plugin to use"),
+      .argv   =       &input_plugin,
+      
+    },
+    {
+      .arg =         "-t",
+      .help_arg =    "<track>",
+      .help_string = TRS("Track (starting with 1)"),
+      .callback =    opt_t,
+    },
+    {
+      .arg =         "-edl",
+      .help_string = TRS("Use EDL"),
+      .callback =    opt_edl,
+    },
+    {
+      .arg =         "-seek",
+      .help_arg =    "<seconds>",
+      .help_string = TRS("Seek to position"),
+      .callback =    opt_seek,
+    },
+    GAVFTOOLS_AUDIO_STREAM_OPTIONS,
+    GAVFTOOLS_VIDEO_STREAM_OPTIONS,
+    GAVFTOOLS_TEXT_STREAM_OPTIONS,
+    GAVFTOOLS_OVERLAY_STREAM_OPTIONS,
+    GAVFTOOLS_OUTPLUG_OPTIONS,
+    GAVFTOOLS_LOG_OPTIONS,
+    {
+      /* End */
+    }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-decode",
+    .long_name = TRS("Decode a media source and output a gavf stream"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf decoder\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+typedef struct
+  {
+  bg_plug_t * out_plug;
+  } cb_data_t;
+
+static void update_metadata(void * priv, const gavl_metadata_t * m)
+  {
+  cb_data_t * d = priv;
+  gavf_t * g = bg_plug_get_gavf(d->out_plug);
+  gavf_update_metadata(g, m);
+  }
+
+/* Main */
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  bg_mediaconnector_t * conn;
+
+  bg_mediaconnector_t file_conn;
+
+  
+  bg_plugin_handle_t * h = NULL;
+  bg_input_callbacks_t cb;
+  cb_data_t cb_data;
+  gavl_chapter_list_t * cl = NULL; 
+  gavl_metadata_t m;
+  album_t album;
+  int is_album = 0;
+  
+  gavl_metadata_init(&m); 
+  album_init(&album);  
+
+  memset(&cb, 0, sizeof(cb));
+  memset(&cb_data, 0, sizeof(cb_data));
+  
+  gavftools_block_sigpipe();
+  bg_mediaconnector_init(&file_conn);  
+
+  gavftools_init();
+
+  gavftools_set_cmdline_parameters(global_options);
+  
+  /* Handle commandline options */
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+  
+  /* Create out plug */
+
+  out_plug = gavftools_create_out_plug();
+
+  cb_data.out_plug = out_plug;
+  cb.data = &cb_data;
+  cb.metadata_changed = update_metadata;
+  
+  
+  /* Open location */
+  if(album_file || m3u_file)
+    {
+    srand(time(NULL));
+    
+    if(input_file && strcmp(input_file, "-"))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "-i <location> cannot be used with -a <album> or -m3u <playlist>");
+      return ret;
+      }
+    if(seek_pos > 0.0)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "-seek cannot be used with -a <album> or -m3u <playlist>");
+      return ret;
+      }
+    /* Initialize from album */
+    if(!init_decode_album(&album))
+      return ret;
+    
+    conn = &album.out_conn;
+
+    is_album = 1;
+    album.out_plug = out_plug;
+    }
+  else
+    {
+    int force_decompress = 0;
+    
+    if(!input_file)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No input file or source given");
+      return ret;
+      }
+    if(shuffle)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Shuffle only works with -a <album>");
+      return ret;
+      }
+    if(loop)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Looping only works with -a <album>");
+      return ret;
+      }
+
+    if(seek_pos > 0.0)
+      force_decompress = 1;
+    
+    if(!load_input_file(input_file, input_plugin,
+                        selected_track, &file_conn,
+                        &cb, &h, &m, &cl, use_edl, force_decompress))
+      return ret;
+
+    if(seek_pos > 0.0)
+      {
+      bg_track_info_t * ti;
+      bg_input_plugin_t * plugin = (bg_input_plugin_t *)h->plugin;
+      gavl_time_t seek_time;
+      if(!plugin->seek)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Plugin %s doesn't support seeking",
+               h->info->name);
+        return ret;
+        }
+      ti = plugin->get_track_info(h->priv, selected_track);
+      if(!(ti->flags & BG_TRACK_SEEKABLE))
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "%s is not seekable",
+               input_file);
+        return ret;
+        }
+      seek_time = gavl_seconds_to_time(seek_pos);
+      plugin->seek(h->priv, &seek_time, GAVL_TIME_SCALE);
+      }
+    
+    conn = &file_conn;
+    }
+
+  bg_mediaconnector_create_conn(conn);
+
+  gavftools_set_output_metadata(&m);
+ 
+  /* Open output plug */
+  if(!bg_plug_open_location(out_plug, gavftools_out_file,
+                            &m, cl))
+    goto fail;
+
+  gavl_metadata_free(&m);
+  
+  /* Initialize output plug */
+  if(!bg_plug_setup_writer(out_plug, conn))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up plug writer failed");
+    goto fail;
+    }
+
+  
+
+  bg_mediaconnector_start(conn);
+
+  if(is_album)
+    {
+    gavf_t * g = bg_plug_get_gavf(out_plug);
+    gavf_update_metadata(g, &album.m);
+    }
+  
+  while(1)
+    {
+    if(gavftools_stop() ||
+       bg_plug_got_error(out_plug) ||
+       !bg_mediaconnector_iteration(conn))
+      break;
+    }
+  ret = EXIT_SUCCESS;
+  fail:
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+  
+  /* Cleanup */
+  if(audio_actions)
+    free(audio_actions);
+  if(video_actions)
+    free(video_actions);
+  if(text_actions)
+    free(text_actions);
+  if(overlay_actions)
+    free(overlay_actions);
+  
+  bg_mediaconnector_free(&file_conn);
+
+  if(out_plug)
+    bg_plug_destroy(out_plug);
+  album_free(&album);
+  
+  if(h)
+    bg_plugin_unref(h);
+  
+  gavftools_cleanup();
+  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-decode.h Added

@@ -0,0 +1,117 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+#include <gmerlin/tree.h>
+
+#include <gavl/metatags.h>
+
+extern bg_stream_action_t * audio_actions;
+extern bg_stream_action_t * video_actions;
+extern bg_stream_action_t * text_actions;
+extern bg_stream_action_t * overlay_actions;
+
+extern char * album_file;
+extern char * m3u_file;
+
+extern int shuffle;
+extern int loop;
+
+int load_input_file(const char * file, const char * plugin_name,
+                    int track, bg_mediaconnector_t * conn,
+                    bg_input_callbacks_t * cb,
+                    bg_plugin_handle_t ** hp, 
+                    gavl_metadata_t * m, gavl_chapter_list_t ** cl,
+                    int edl, int force_decompress);
+
+int load_album_entry(bg_album_entry_t * entry,
+                     bg_mediaconnector_t * conn,
+                     bg_plugin_handle_t ** hp, 
+                     gavl_metadata_t * m);
+
+
+typedef struct
+  {
+  int num_entries;
+  int current_entry;
+  bg_album_entry_t ** entries;
+  bg_album_entry_t * first;
+  
+  bg_plugin_handle_t * h;
+  gavl_metadata_t m;
+
+  bg_mediaconnector_t in_conn;
+  bg_mediaconnector_t out_conn;
+
+  int num_streams;
+  int active_streams;
+
+  int eof; // Album is done
+
+  gavl_time_t end_time;
+
+  bg_plug_t * out_plug;
+  } album_t;
+
+typedef struct
+  {
+  bg_mediaconnector_stream_t * in_stream;
+
+  gavl_audio_source_t * asrc;
+  gavl_video_source_t * vsrc;
+  gavl_packet_source_t * psrc;
+
+  gavl_audio_frame_t * mute_aframe;
+  gavl_video_frame_t * mute_vframe;
+
+  gavl_audio_frame_t * next_aframe;
+  gavl_video_frame_t * next_vframe;
+
+  gavl_audio_format_t afmt;
+  gavl_video_format_t vfmt;
+
+  int64_t pts_offset;
+  int64_t pts;
+
+  /* Time to mute the output (Audio or video) so we can keep A/V sync across multiple files */
+  int64_t mute_time;
+
+  int in_scale;
+  int out_scale;
+
+  gavl_source_status_t st;
+  
+  album_t * a;
+  } stream_t;
+
+/* decode_album.c */
+
+void album_init(album_t * a);
+void album_free(album_t * a);
+int init_decode_album(album_t * a);
+
+int album_set_eof(album_t * a);
+
+/* decode_albumstream.c */
+
+int stream_replug(stream_t * s, bg_mediaconnector_stream_t * in_stream);
+int stream_create(bg_mediaconnector_stream_t * in_stream,
+                  album_t * a);

gmerlin-4256.tar.gz/apps/gavftools/gavf-demux.c Added

@@ -0,0 +1,350 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+#include <gavl/metatags.h>
+
+#define LOG_DOMAIN "gavf-demux"
+
+static bg_plug_t * in_plug = NULL;
+
+static bg_plug_t ** out_plugs = NULL;
+
+static int num_out_plugs = 0;
+
+static char ** outfiles_a = NULL;
+static char ** outfiles_v = NULL;
+static char ** outfiles_t = NULL;
+static char ** outfiles_o = NULL;
+
+static int num_outfiles_a = 0;
+static int num_outfiles_v = 0;
+static int num_outfiles_t = 0;
+static int num_outfiles_o = 0;
+
+static int files_added_a = 0;
+static int files_added_v = 0;
+static int files_added_t = 0;
+static int files_added_o = 0;
+
+static char * prefix = NULL;
+
+static void
+opt_oa(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -oa requires an argument\n");
+    exit(-1);
+    }
+  
+  outfiles_a = realloc(outfiles_a, sizeof(*outfiles_a) * (num_outfiles_a+1));
+  outfiles_a[num_outfiles_a] = (*_argv)[arg];
+  num_outfiles_a++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_ov(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -ov requires an argument\n");
+    exit(-1);
+    }
+  
+  outfiles_v = realloc(outfiles_v, sizeof(*outfiles_v) * (num_outfiles_v+1));
+  outfiles_v[num_outfiles_v] = (*_argv)[arg];
+  num_outfiles_v++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_ot(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -ot requires an argument\n");
+    exit(-1);
+    }
+  
+  outfiles_t = realloc(outfiles_t, sizeof(*outfiles_t) * (num_outfiles_t+1));
+  outfiles_t[num_outfiles_t] = (*_argv)[arg];
+  num_outfiles_t++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void
+opt_oo(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -oo requires an argument\n");
+    exit(-1);
+    }
+  
+  outfiles_o = realloc(outfiles_o, sizeof(*outfiles_o) * (num_outfiles_o+1));
+  outfiles_o[num_outfiles_o] = (*_argv)[arg];
+  num_outfiles_o++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    GAVFTOOLS_INPLUG_OPTIONS,
+    GAVFTOOLS_AUDIO_STREAM_OPTIONS,
+    GAVFTOOLS_VIDEO_STREAM_OPTIONS,
+    GAVFTOOLS_TEXT_STREAM_OPTIONS,
+    GAVFTOOLS_OVERLAY_STREAM_OPTIONS,
+    {
+      .arg =         "-oa",
+      .help_arg =    "<output>",
+      .help_string = TRS("Output file or location for audio. Use this option multiple times to add more outputs."),
+      .callback    = &opt_oa,
+    },
+    {
+      .arg =         "-ov",
+      .help_arg =    "<output>",
+      .help_string = TRS("Output file or location for video. Use this option multiple times to add more outputs."),
+      .callback    = &opt_ov,
+    },
+    {
+      .arg =         "-ot",
+      .help_arg =    "<output>",
+      .help_string = TRS("Output file or location for text. Use this option multiple times to add more outputs."),
+      .callback    = &opt_ot,
+    },
+    {
+      .arg =         "-oo",
+      .help_arg =    "<output>",
+      .help_string = TRS("Output file or location for overlays. Use this option multiple times to add more outputs."),
+      .callback    = &opt_oo,
+    },
+    {
+      .arg =         "-pre",
+      .help_arg =    "<prefix>",
+      .help_string = TRS("Output file prefix"),
+      .argv    = &prefix,
+    },
+    GAVFTOOLS_OOPT_OPTIONS,
+    GAVFTOOLS_LOG_OPTIONS,
+    { /* End */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-demux",
+    .long_name = TRS("Split a gavf stream into the elementary streams"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf demuxer\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+
+static char * get_out_name(bg_mediaconnector_stream_t * st)
+  {
+  const gavl_metadata_t * m;
+  int * num_outfiles;
+  int * files_added;
+  char ** outfiles;
+  char * ret = NULL;
+  const char * label;
+  char * opt = NULL;
+  
+  m = bg_plug_get_metadata(in_plug);
+  
+  switch(st->type)
+    {
+    case GAVF_STREAM_AUDIO:
+      num_outfiles = &num_outfiles_a;
+      files_added = &files_added_a;
+      outfiles = outfiles_a;
+      opt = "-oa";
+      break;
+    case GAVF_STREAM_VIDEO:
+      num_outfiles = &num_outfiles_v;
+      files_added = &files_added_v;
+      outfiles = outfiles_v;
+      opt = "-ov";
+      break;
+    case GAVF_STREAM_TEXT:
+      num_outfiles = &num_outfiles_t;
+      files_added = &files_added_t;
+      outfiles = outfiles_t;
+      opt = "-ot";
+      break;
+    case GAVF_STREAM_OVERLAY:
+      num_outfiles = &num_outfiles_o;
+      files_added = &files_added_o;
+      outfiles = outfiles_o;
+      opt = "-oo";
+      break;
+    }
+  if(*num_outfiles > *files_added)
+    {
+    ret = gavl_strdup(outfiles[*files_added]);
+    (*files_added)++;
+    }
+  else if(prefix)
+    {
+    ret = bg_sprintf("%s_%s_%03d.gavf", prefix,
+                     gavf_stream_type_name(st->type), st->src_index + 1);
+    }
+  else if((label = gavl_metadata_get(m, GAVL_META_LABEL)))
+    {
+    ret = bg_sprintf("%s_%s_%03d.gavf", label,
+                     gavf_stream_type_name(st->type),
+                     st->src_index + 1);
+    }
+  else
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "No output filename given, use -pre or %s",
+           opt);
+    }
+  return ret;
+  }
+
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  int i;
+  bg_mediaconnector_t conn;
+  bg_mediaconnector_stream_t * st;
+  
+  gavftools_init();
+  
+  gavftools_block_sigpipe();
+  bg_mediaconnector_init(&conn);
+
+  gavftools_set_cmdline_parameters(global_options);
+
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+
+  in_plug = gavftools_create_in_plug();
+
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+  
+  gavftools_set_stream_actions(in_plug);
+
+  if(!bg_plug_start(in_plug))
+    goto fail;
+  
+  if(!bg_plug_setup_reader(in_plug, &conn))
+    goto fail;
+
+  bg_mediaconnector_create_conn(&conn);
+
+  /* Create out plugs */
+  num_out_plugs = conn.num_streams;
+  out_plugs = calloc(num_out_plugs, sizeof(*out_plugs));
+  
+  for(i = 0; i < conn.num_streams; i++)
+    {
+    char * filename;
+    const gavf_stream_header_t * h;
+
+    st = conn.streams[i];
+
+    if(!(filename = get_out_name(st)))
+      goto fail;
+    
+    out_plugs[i] = gavftools_create_out_plug();
+    
+    if(!gavftools_open_out_plug_from_in_plug(out_plugs[i], filename,
+                                             in_plug) ||
+       !bg_plug_add_mediaconnector_stream(out_plugs[i], st) ||
+       !bg_plug_start(out_plugs[i]) ||
+       !(h = gavf_get_stream(bg_plug_get_gavf(out_plugs[i]), 0, st->type)) ||
+       !bg_plug_connect_mediaconnector_stream(out_plugs[i], st, h))
+      goto fail;
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Opened %s", filename);
+    
+    free(filename);
+    }
+
+  /* Fire up connector */
+  bg_mediaconnector_start(&conn);
+  
+  /* Main loop */
+  
+  while(1)
+    {
+    if(bg_plug_got_error(in_plug))
+      break;
+
+    if(gavftools_stop() ||
+       !bg_mediaconnector_iteration(&conn))
+      break;
+    }
+  
+  ret = EXIT_SUCCESS;
+  fail:
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+
+  bg_mediaconnector_free(&conn);
+
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+  
+  for(i = 0; i < num_out_plugs; i++)
+    {
+    if(out_plugs[i])
+      bg_plug_destroy(out_plugs[i]);
+    }
+
+  if(outfiles_a)
+    free(outfiles_a);
+  if(outfiles_v)
+    free(outfiles_v);
+  if(outfiles_t)
+    free(outfiles_t);
+  if(outfiles_o)
+    free(outfiles_o);
+  if(out_plugs)
+    free(out_plugs);
+  
+  gavftools_cleanup();
+  
+
+  
+  return ret;
+
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-encode.c Added

@@ -0,0 +1,567 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+#include <gmerlin/encoder.h>
+#include <gavl/metatags.h>
+
+static bg_plug_t * in_plug = NULL;
+
+#define LOG_DOMAIN "gavf-encode"
+
+static gavl_metadata_t ac_options;
+static gavl_metadata_t vc_options;
+static gavl_metadata_t oc_options;
+static gavl_metadata_t tc_options;
+
+const uint32_t stream_mask =
+BG_STREAM_AUDIO | BG_STREAM_VIDEO | BG_STREAM_TEXT | BG_STREAM_OVERLAY;
+
+const uint32_t plugin_mask = BG_PLUGIN_FILE | BG_PLUGIN_BROADCAST;
+
+static bg_parameter_info_t * enc_params = NULL;
+static bg_parameter_info_t * enc_params_simple = NULL;
+
+static bg_cfg_section_t * enc_section = NULL;
+
+static const char * out_file = NULL;
+
+static void opt_ac(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -ac requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&ac_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_vc(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vc requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&vc_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_tc(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -tc requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&oc_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_oc(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -oc requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&oc_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_enc(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -enc requires an argument\n");
+    exit(-1);
+    }
+
+  if(!bg_cmdline_apply_options(enc_section,
+                               NULL,
+                               NULL,
+                               enc_params_simple,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    GAVFTOOLS_INPLUG_OPTIONS,
+    GAVFTOOLS_AUDIO_STREAM_OPTIONS,
+    GAVFTOOLS_VIDEO_STREAM_OPTIONS,
+    GAVFTOOLS_TEXT_STREAM_OPTIONS,
+    GAVFTOOLS_OVERLAY_STREAM_OPTIONS,
+    {
+      .arg =         "-enc",
+      .help_arg =    "<options>",
+      .help_string = "Encoding options",
+      .callback =    opt_enc,
+    },
+    {
+      .arg =         "-ac",
+      .help_arg =    "<options>",
+      .help_string = "Audio compression options",
+      .callback =    opt_ac,
+    },
+    {
+      .arg =         "-vc",
+      .help_arg =    "<options>",
+      .help_string = "Video compression options",
+      .callback =    opt_vc,
+    },
+    {
+      .arg =         "-tc",
+      .help_arg =    "<options>",
+      .help_string = "Text  compression options",
+      .callback =    opt_tc,
+    },
+    {
+      .arg =         "-oc",
+      .help_arg =    "<options>",
+      .help_string = "Overlay compression options",
+      .callback =    opt_oc,
+    },
+    {
+      .arg =         "-o",
+      .help_arg =    "<output>",
+      .help_string = TRS("Output file (without extension) or location "),
+      .argv    =    (char**)&out_file,
+    },
+
+    GAVFTOOLS_LOG_OPTIONS,
+    { /* End */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-encode",
+    .long_name = TRS("Encode a gavf stream to another format"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf encoder\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+
+  };
+
+static void metadata_callback(void * priv, const gavl_metadata_t * m)
+  {
+  bg_encoder_update_metadata(priv, m);
+  }
+
+static bg_cfg_section_t * get_stream_section(bg_encoder_t * enc,
+                                             bg_stream_type_t t, int in_index)
+  {
+  bg_cfg_section_t * ret;
+  const bg_cfg_section_t * sec;
+
+  const char * options_string;
+  gavl_metadata_t * options;
+  const bg_parameter_info_t * params;
+  
+  switch(t)
+    {
+    case BG_STREAM_AUDIO:
+      options = &ac_options;
+      break;
+    case BG_STREAM_VIDEO:
+      options = &vc_options;
+      break;
+    case BG_STREAM_TEXT:
+      options = &tc_options;
+      break;
+    case BG_STREAM_OVERLAY:
+      options = &oc_options;
+      break;
+    }
+  params = bg_encoder_get_stream_parameters(enc, t);
+  options_string = bg_cmdline_get_stream_options(options, in_index);
+
+  sec = bg_encoder_get_stream_section(enc, t);
+  if(!sec)
+    return NULL;
+  
+  ret = bg_cfg_section_copy(bg_encoder_get_stream_section(enc, t));
+  
+  if(options_string)
+    {
+    if(!bg_cmdline_apply_options(ret, NULL, NULL,
+                                 params, options_string))
+      exit(-1);
+    }
+  return ret;
+  }
+
+int main(int argc, char ** argv)
+  {
+  int do_delete;
+  int ret = EXIT_FAILURE;
+  int i, num;
+  bg_mediaconnector_t conn;
+  bg_encoder_t * enc = NULL;
+  gavf_program_header_t * ph;
+  gavf_t * g;
+  const gavf_stream_header_t * sh;
+  bg_mediaconnector_stream_t * cs;
+
+  gavl_audio_sink_t * asink;
+  gavl_video_sink_t * vsink;
+  gavl_packet_sink_t * psink;
+  
+  bg_stream_action_t * audio_actions = NULL;
+  bg_stream_action_t * video_actions = NULL;
+  bg_stream_action_t * text_actions = NULL;
+  bg_stream_action_t * overlay_actions = NULL;
+  
+  gavl_metadata_init(&ac_options);
+  gavl_metadata_init(&vc_options);
+  gavl_metadata_init(&oc_options);
+  gavl_metadata_init(&tc_options);
+  
+  bg_mediaconnector_init(&conn);
+  gavftools_init();
+
+  /* Create encoder parameters */
+  enc_params =
+    bg_plugin_registry_create_encoder_parameters(plugin_reg,
+                                                 stream_mask,
+                                                 plugin_mask, 1);
+  enc_params_simple =
+    bg_plugin_registry_create_encoder_parameters(plugin_reg,
+                                                 stream_mask,
+                                                 plugin_mask, 0);
+
+  enc_section = bg_encoder_section_get_from_registry(plugin_reg,
+                                                     enc_params,
+                                                     stream_mask,
+                                                     plugin_mask);
+  
+  // bg_parameters_dump(enc_params, "enc_params.xml");
+  // bg_parameters_dump(enc_params_simple, "enc_params_simple.xml");
+
+  bg_cmdline_arg_set_parameters(global_options, "-enc",
+                                enc_params_simple);
+
+  gavftools_set_cmdline_parameters(global_options);
+  
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  in_plug = gavftools_create_in_plug();
+  
+  enc = bg_encoder_create(plugin_reg,
+                          enc_section, // bg_cfg_section_t * section,
+                          NULL, // bg_transcoder_track_t * tt,
+                          stream_mask,
+                          plugin_mask);
+  
+  /* Open */
+
+  g = bg_plug_get_gavf(in_plug);
+  ph = gavf_get_program_header(g);
+
+  gavf_options_set_metadata_callback(gavf_get_options(g),
+                                     metadata_callback, enc);
+  
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+    
+  if(!out_file)
+    out_file = gavl_metadata_get(&ph->m, GAVL_META_LABEL);
+#if 0
+  if(!out_file)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No output file given");
+    goto fail;
+    }
+#endif
+  if(!bg_encoder_open(enc, out_file, &ph->m, gavf_get_chapter_list(g)))
+    goto fail;
+  
+  /* Set stream actions */
+  
+  num = gavf_get_num_streams(g, GAVF_STREAM_AUDIO);
+  audio_actions = gavftools_get_stream_actions(num, GAVF_STREAM_AUDIO);
+  
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_AUDIO);
+    /* Check if we can write the stream compressed */
+    if((sh->ci.id != GAVL_CODEC_ID_NONE) &&
+       (audio_actions[i] == BG_STREAM_ACTION_READRAW) && 
+        !bg_encoder_writes_compressed_audio(enc, &sh->format.audio, &sh->ci))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Audio stream %d cannot be written compressed", i+1);
+      audio_actions[i] = BG_STREAM_ACTION_DECODE;
+      }
+    bg_plug_set_stream_action(in_plug, sh, audio_actions[i]);
+    }
+
+  num = gavf_get_num_streams(g, GAVF_STREAM_VIDEO);
+  video_actions = gavftools_get_stream_actions(num, GAVF_STREAM_VIDEO);
+  
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_VIDEO);
+    /* Check if we can write the stream compressed */
+    if((sh->ci.id != GAVL_CODEC_ID_NONE) &&
+       (video_actions[i] == BG_STREAM_ACTION_READRAW) &&
+        !bg_encoder_writes_compressed_video(enc, &sh->format.video, &sh->ci))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Video stream %d cannot be written compressed", i+1);
+      video_actions[i] = BG_STREAM_ACTION_DECODE;
+      }      
+    bg_plug_set_stream_action(in_plug, sh, video_actions[i]);
+    }
+
+  num = gavf_get_num_streams(g, GAVF_STREAM_TEXT);
+  text_actions = gavftools_get_stream_actions(num, GAVF_STREAM_TEXT);
+
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_TEXT);
+    bg_plug_set_stream_action(in_plug, sh, text_actions[i]);
+    }
+
+  num = gavf_get_num_streams(g, GAVF_STREAM_OVERLAY);
+  overlay_actions = gavftools_get_stream_actions(num, GAVF_STREAM_OVERLAY);
+  
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_OVERLAY);
+    /* Check if we can write the stream compressed */
+    if((sh->ci.id != GAVL_CODEC_ID_NONE) &&
+       (overlay_actions[i] == BG_STREAM_ACTION_READRAW) &&
+        !bg_encoder_writes_compressed_overlay(enc, &sh->format.video, &sh->ci))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Overlay stream %d cannot be written compressed", i+1);
+      overlay_actions[i] = BG_STREAM_ACTION_DECODE;
+      }
+    bg_plug_set_stream_action(in_plug, sh, overlay_actions[i]);
+    }
+  
+  /* Start decoder and initialize media connector */
+
+  if(!bg_plug_start(in_plug) ||
+     !bg_plug_setup_reader(in_plug, &conn))
+    return 0;
+
+  bg_mediaconnector_create_conn(&conn);
+  
+  /* Set up encoder */
+
+  for(i = 0; i < conn.num_streams; i++)
+    {
+    cs = conn.streams[i];
+    switch(cs->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        if(cs->asrc)
+          {
+          bg_cfg_section_t * s = get_stream_section(enc, BG_STREAM_AUDIO, cs->src_index);
+          cs->dst_index =
+            bg_encoder_add_audio_stream(enc, &cs->m,
+                                        gavl_audio_source_get_src_format(cs->asrc),
+                                        cs->src_index, s);
+          if(s)
+            bg_cfg_section_destroy(s);
+          }
+        else
+          cs->dst_index =
+            bg_encoder_add_audio_stream_compressed(enc, &cs->m,
+                                                   gavl_packet_source_get_audio_format(cs->psrc),
+                                                   gavl_packet_source_get_ci(cs->psrc),
+                                                   cs->src_index);
+        break;
+      case GAVF_STREAM_VIDEO:
+        if(cs->vsrc)
+          {
+          bg_cfg_section_t * s = get_stream_section(enc, BG_STREAM_VIDEO, cs->src_index);
+          cs->dst_index =
+            bg_encoder_add_video_stream(enc, &cs->m,
+                                        gavl_video_source_get_src_format(cs->vsrc),
+                                        cs->src_index, s);
+          if(s)
+            bg_cfg_section_destroy(s);
+          }
+        else
+          cs->dst_index =
+            bg_encoder_add_video_stream_compressed(enc, &cs->m,
+                                                   gavl_packet_source_get_video_format(cs->psrc),
+                                                   gavl_packet_source_get_ci(cs->psrc),
+                                                   cs->src_index);
+        break;
+      case GAVF_STREAM_TEXT:
+        {
+        bg_cfg_section_t * s = get_stream_section(enc, BG_STREAM_TEXT, cs->src_index);
+        cs->dst_index = bg_encoder_add_text_stream(enc, &cs->m,
+                                                   cs->timescale, cs->src_index, s);
+        if(s)
+          bg_cfg_section_destroy(s);
+        }
+        break;
+      case GAVF_STREAM_OVERLAY:
+        if(cs->vsrc)
+          {
+          bg_cfg_section_t * s = get_stream_section(enc, BG_STREAM_OVERLAY, cs->src_index);
+          bg_encoder_add_overlay_stream(enc,
+                                        &cs->m,
+                                        gavl_video_source_get_src_format(cs->vsrc),
+                                        cs->src_index,
+                                        BG_STREAM_OVERLAY,
+                                        s);
+          if(s)
+            bg_cfg_section_destroy(s);
+          }
+        else
+          bg_encoder_add_overlay_stream_compressed(enc,
+                                                   &cs->m,
+                                                   gavl_packet_source_get_video_format(cs->psrc),
+                                                   gavl_packet_source_get_ci(cs->psrc),
+                                                   cs->src_index);
+        break;
+      }
+    }
+
+  /* Start */
+  if(!bg_encoder_start(enc))
+    goto fail;
+
+  /* Connect sinks */
+
+  for(i = 0; i < conn.num_streams; i++)
+    {
+    cs = conn.streams[i];
+
+    asink = NULL;
+    vsink = NULL;
+    psink = NULL;
+    
+    switch(cs->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        if(cs->aconn)
+          asink = bg_encoder_get_audio_sink(enc, cs->dst_index);
+        else
+          psink = bg_encoder_get_audio_packet_sink(enc, cs->dst_index);
+        break;
+      case GAVF_STREAM_VIDEO:
+        if(cs->vconn)
+          vsink = bg_encoder_get_video_sink(enc, cs->dst_index);
+        else
+          psink = bg_encoder_get_video_packet_sink(enc, cs->dst_index);
+        break;
+      case GAVF_STREAM_TEXT:
+        psink = bg_encoder_get_text_sink(enc, cs->dst_index);
+        break;
+      case GAVF_STREAM_OVERLAY:
+        if(cs->vconn)
+          vsink = bg_encoder_get_overlay_sink(enc, cs->dst_index);
+        else
+          psink = bg_encoder_get_overlay_packet_sink(enc, cs->dst_index);
+        break;
+      }
+
+    if(asink)
+      gavl_audio_connector_connect(cs->aconn, asink);
+    else if(vsink)
+      gavl_video_connector_connect(cs->vconn, vsink);
+    else if(psink)
+      gavl_packet_connector_connect(cs->pconn, psink);
+    }
+
+  /* Fire up connector */
+
+  bg_mediaconnector_start(&conn);
+  
+  /* Main loop */
+
+  do_delete = 0;
+  
+  while(1)
+    {
+    if(bg_plug_got_error(in_plug))
+      {
+      do_delete = 1;
+      break;
+      }
+    if(gavftools_stop() ||
+       !bg_mediaconnector_iteration(&conn))
+      break;
+    }
+  
+  ret = EXIT_SUCCESS;
+  
+  /* Cleanup */
+
+  fail:
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+  
+  bg_mediaconnector_free(&conn);
+
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+
+  if(enc)
+    bg_encoder_destroy(enc, do_delete);
+  
+  gavl_metadata_free(&ac_options);
+  gavl_metadata_free(&vc_options);
+  gavl_metadata_free(&oc_options);
+
+  if(audio_actions)
+    free(audio_actions);
+  if(video_actions)
+    free(video_actions);
+  if(text_actions)
+    free(text_actions);
+  if(overlay_actions)
+    free(overlay_actions);
+  
+  gavftools_cleanup();
+
+  if(enc_params)
+    bg_parameter_info_destroy_array(enc_params);
+  if(enc_params_simple)
+    bg_parameter_info_destroy_array(enc_params_simple);
+
+  if(enc_section)
+    bg_cfg_section_destroy(enc_section);
+  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-filter.c Added

@@ -0,0 +1,406 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+#include <gmerlin/filters.h>
+#include <gmerlin/bggavl.h>
+
+#define LOG_DOMAIN "gavf-filter"
+
+static gavl_metadata_t af_options;
+static gavl_metadata_t vf_options;
+
+static bg_parameter_info_t * af_parameters;
+static bg_parameter_info_t * vf_parameters;
+
+static bg_plug_t * in_plug = NULL;
+static bg_plug_t * out_plug = NULL;
+
+
+static void opt_af(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -af requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&af_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_vf(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vf requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&vf_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    GAVFTOOLS_INPLUG_OPTIONS,
+    GAVFTOOLS_AQ_OPTIONS,
+    GAVFTOOLS_VQ_OPTIONS,
+    GAVFTOOLS_AUDIO_STREAM_OPTIONS,
+    GAVFTOOLS_VIDEO_STREAM_OPTIONS,
+    GAVFTOOLS_TEXT_STREAM_OPTIONS,
+    GAVFTOOLS_OVERLAY_STREAM_OPTIONS,
+    {
+      .arg =         "-af",
+      .help_arg =    "<options>",
+      .help_string = "Audio compression options",
+      .callback =    opt_af,
+    },
+    {
+      .arg =         "-vf",
+      .help_arg =    "<options>",
+      .help_string = "Video compression options",
+      .callback =    opt_vf,
+    },
+    GAVFTOOLS_OUTPLUG_OPTIONS,
+    GAVFTOOLS_LOG_OPTIONS,
+    { /* End */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-filter",
+    .long_name = TRS("Apply A/V filter to a gavf stream"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf filter\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+static bg_parameter_info_t * create_af_parameters()
+  {
+  bg_parameter_info_t * ret;
+  bg_audio_filter_chain_t * ch =
+    bg_audio_filter_chain_create(&gavltools_aopt, plugin_reg);
+
+  ret =
+    bg_parameter_info_copy_array(bg_audio_filter_chain_get_parameters(ch));
+  
+  bg_audio_filter_chain_destroy(ch);
+  return ret;
+  }
+
+static bg_parameter_info_t * create_vf_parameters()
+  {
+  bg_parameter_info_t * ret;
+  bg_video_filter_chain_t * ch =
+    bg_video_filter_chain_create(&gavltools_vopt, plugin_reg);
+
+  ret =
+    bg_parameter_info_copy_array(bg_video_filter_chain_get_parameters(ch));
+  
+  bg_video_filter_chain_destroy(ch);
+  return ret;
+  }
+  
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  bg_mediaconnector_t conn;
+  bg_stream_action_t * audio_actions = NULL;
+  bg_stream_action_t * video_actions = NULL;
+  bg_stream_action_t * text_actions = NULL;
+  bg_stream_action_t * overlay_actions = NULL;
+
+  bg_audio_filter_chain_t ** audio_filters;
+  bg_video_filter_chain_t ** video_filters;
+  int num_audio_streams;
+  int num_video_streams;
+  int num, i;
+  gavf_t * g;
+  const gavf_stream_header_t * sh;
+  
+  gavftools_init();
+  
+  gavftools_block_sigpipe();
+  bg_mediaconnector_init(&conn);
+  
+
+  /* Create dummy audio and video filter chain to obtain the parameters */
+  af_parameters = create_af_parameters();
+  vf_parameters = create_vf_parameters();
+
+  bg_cmdline_arg_set_parameters(global_options, "-af",
+                                af_parameters);
+  bg_cmdline_arg_set_parameters(global_options, "-vf",
+                                vf_parameters);
+  
+  gavl_metadata_init(&af_options);
+  gavl_metadata_init(&vf_options);
+
+  gavftools_set_cmdline_parameters(global_options);
+  
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+  
+  in_plug = gavftools_create_in_plug();
+  out_plug = gavftools_create_out_plug();
+
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+  
+  g = bg_plug_get_gavf(in_plug);
+  
+  /* Get stream actions */
+
+  num_audio_streams = gavf_get_num_streams(g, GAVF_STREAM_AUDIO);
+  audio_actions = gavftools_get_stream_actions(num_audio_streams,
+                                               GAVF_STREAM_AUDIO);
+
+  for(i = 0; i < num_audio_streams; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_AUDIO);
+
+    if((sh->ci.id != GAVL_CODEC_ID_NONE) &&
+       (bg_cmdline_get_stream_options(&af_options, i)))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+             "Decompressing audio stream %d", i+1);
+      bg_plug_set_stream_action(in_plug, sh, BG_STREAM_ACTION_DECODE);
+      }
+    else
+      {
+      bg_plug_set_stream_action(in_plug, sh, audio_actions[i]);
+      }
+    }
+  
+  num_video_streams = gavf_get_num_streams(g, GAVF_STREAM_VIDEO);
+  video_actions = gavftools_get_stream_actions(num_video_streams,
+                                               GAVF_STREAM_VIDEO);
+
+  for(i = 0; i < num_video_streams; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_VIDEO);
+
+    if((sh->ci.id != GAVL_CODEC_ID_NONE) &&
+       (bg_cmdline_get_stream_options(&vf_options, i)))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+             "Decompressing video stream %d", i+1);
+      bg_plug_set_stream_action(in_plug, sh, BG_STREAM_ACTION_DECODE);
+      }
+    else
+      {
+      bg_plug_set_stream_action(in_plug, sh, video_actions[i]);
+      }
+    }
+
+  num = gavf_get_num_streams(g, GAVF_STREAM_TEXT);
+  text_actions = gavftools_get_stream_actions(num, GAVF_STREAM_TEXT);
+
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_TEXT);
+    bg_plug_set_stream_action(in_plug, sh, text_actions[i]);
+    }
+
+  num = gavf_get_num_streams(g, GAVF_STREAM_OVERLAY);
+  overlay_actions = gavftools_get_stream_actions(num, GAVF_STREAM_OVERLAY);
+
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_OVERLAY);
+    bg_plug_set_stream_action(in_plug, sh, overlay_actions[i]);
+    }
+  
+  
+  /* Start input plug */
+
+  if(!bg_plug_start(in_plug))
+    goto fail;
+  
+  /* Set up filters */
+  audio_filters = calloc(num_audio_streams, sizeof(*audio_filters));
+  video_filters = calloc(num_audio_streams, sizeof(*video_filters));
+
+  for(i = 0; i < num_audio_streams; i++)
+    {
+    gavl_audio_source_t * asrc;
+    
+    const char * filter_options;
+    bg_cfg_section_t * sec;
+
+    filter_options = bg_cmdline_get_stream_options(&af_options, i);
+    if(!filter_options)
+      continue;
+
+    sh = gavf_get_stream(g, i, GAVF_STREAM_AUDIO);
+    
+    audio_filters[i] =
+      bg_audio_filter_chain_create(&gavltools_aopt, plugin_reg);
+    
+    sec = bg_cfg_section_create_from_parameters("af", af_parameters);
+
+    if(!bg_cmdline_apply_options(sec,
+                                 bg_audio_filter_chain_set_parameter,
+                                 audio_filters[i],
+                                 af_parameters,
+                                 filter_options))
+      exit(-1);
+
+    asrc = NULL;
+    
+    bg_plug_get_stream_source(in_plug, sh, &asrc, NULL, NULL);
+    asrc = bg_audio_filter_chain_connect(audio_filters[i], asrc);
+    bg_plug_set_audio_proxy(in_plug, i, asrc, NULL);
+    bg_cfg_section_destroy(sec);
+    }
+
+  for(i = 0; i < num_video_streams; i++)
+    {
+    gavl_video_source_t * vsrc;
+    
+    const char * filter_options;
+    bg_cfg_section_t * sec;
+
+    filter_options = bg_cmdline_get_stream_options(&vf_options, i);
+    if(!filter_options)
+      continue;
+
+    sh = gavf_get_stream(g, i, GAVF_STREAM_VIDEO);
+    
+    video_filters[i] =
+      bg_video_filter_chain_create(&gavltools_vopt, plugin_reg);
+    
+    sec = bg_cfg_section_create_from_parameters("vf", vf_parameters);
+
+    if(!bg_cmdline_apply_options(sec,
+                                 bg_video_filter_chain_set_parameter,
+                                 video_filters[i],
+                                 vf_parameters,
+                                 filter_options))
+      exit(-1);
+
+    vsrc = NULL;
+    
+    bg_plug_get_stream_source(in_plug, sh, NULL, &vsrc, NULL);
+    vsrc = bg_video_filter_chain_connect(video_filters[i], vsrc);
+    bg_plug_set_video_proxy(in_plug, i, vsrc, NULL);
+    bg_cfg_section_destroy(sec);
+    }
+
+  if(!bg_plug_setup_reader(in_plug, &conn))
+    goto fail;
+
+  bg_mediaconnector_create_conn(&conn);
+    
+  /* Set up out plug */
+
+  g = bg_plug_get_gavf(in_plug);
+
+  /* Open output plug */
+
+  if(!gavftools_open_out_plug_from_in_plug(out_plug, NULL, in_plug))
+    goto fail;
+  
+  if(!bg_plug_setup_writer(out_plug, &conn))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up plug writer failed");
+    goto fail;
+    }
+
+  /* Fire up connector */
+
+  bg_mediaconnector_start(&conn);
+  
+  /* Run */
+
+  while(1)
+    {
+    if(bg_plug_got_error(in_plug))
+      break;
+
+    if(gavftools_stop() ||
+       !bg_mediaconnector_iteration(&conn))
+      break;
+    }
+
+
+  ret = EXIT_SUCCESS;
+  
+  fail:
+  
+  /* Cleanup */
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+  
+  for(i = 0; i < num_audio_streams; i++)
+    {
+    if(audio_filters[i])
+      bg_audio_filter_chain_destroy(audio_filters[i]);
+    }
+  if(audio_filters)
+    free(audio_filters);
+
+  for(i = 0; i < num_video_streams; i++)
+    {
+    if(video_filters[i])
+      bg_video_filter_chain_destroy(video_filters[i]);
+    }
+  if(video_filters)
+    free(video_filters);
+
+  
+  bg_mediaconnector_free(&conn);
+ 
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+
+  if(out_plug)
+    bg_plug_destroy(out_plug);
+  
+  gavftools_cleanup();
+
+  if(audio_actions)
+    free(audio_actions);
+  if(video_actions)
+    free(video_actions);
+  if(text_actions)
+    free(text_actions);
+  if(overlay_actions)
+    free(overlay_actions);
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-info.c Added

@@ -0,0 +1,86 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    GAVFTOOLS_INPLUG_OPTIONS,
+    {
+      /* End */
+    }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-info",
+    .long_name = TRS("Print info about a gavf stream and exit"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf info\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+  };
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  bg_plug_t * in_plug;
+  gavf_t * g;
+  gavf_program_header_t * ph;
+  
+  gavftools_init();
+
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    goto fail;
+
+  in_plug = gavftools_create_in_plug();
+
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+
+  g = bg_plug_get_gavf(in_plug);
+
+  ph = gavf_get_program_header(g);
+
+  /* Dump info */
+  gavf_program_header_dump(ph);
+  ret = EXIT_SUCCESS;
+  fail:
+
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+
+  gavftools_cleanup();
+
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-mux.c Added

@@ -0,0 +1,206 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+#define LOG_DOMAIN "gavf-mux"
+
+static bg_plug_t ** in_plugs = NULL;
+static bg_plug_t * out_plug = NULL;
+
+static char ** infiles = NULL;
+static int num_infiles = 0;
+
+static void
+opt_i(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -i requires an argument\n");
+    exit(-1);
+    }
+  
+  infiles = realloc(infiles, sizeof(*infiles) * (num_infiles+1));
+  infiles[num_infiles] = (*_argv)[arg];
+  num_infiles++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-i",
+      .help_arg =    "<location>",
+      .help_string = TRS("Input file or location. Use this option multiple times to add more inputs."),
+      .callback    = &opt_i,
+    },
+    GAVFTOOLS_OUTPLUG_OPTIONS,
+    GAVFTOOLS_LOG_OPTIONS,
+    { /* End */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-mux",
+    .long_name = TRS("Multiplex multiple gavf stream into one"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf tee\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+static void set_stream_actions(bg_plug_t * in_plug, gavf_stream_type_t type)
+  {
+  gavf_t * g;
+  int num, i;
+  const gavf_stream_header_t * sh;
+
+  g = bg_plug_get_gavf(in_plug);
+
+  num = gavf_get_num_streams(g, type);
+
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, type);
+    bg_plug_set_stream_action(in_plug, sh, BG_STREAM_ACTION_READRAW);
+    }
+  }
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  int i;
+  bg_mediaconnector_t conn;
+  
+  gavftools_init();
+  
+  gavftools_block_sigpipe();
+  bg_mediaconnector_init(&conn);
+
+  gavftools_set_cmdline_parameters(global_options);
+
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+
+  if(!num_infiles)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Need at least one input file");
+    goto fail;
+    }
+
+  out_plug = gavftools_create_out_plug();
+  
+  in_plugs = calloc(num_infiles, sizeof(*in_plugs));
+  for(i = 0; i < num_infiles; i++)
+    {
+    in_plugs[i] = gavftools_create_in_plug();
+
+    if(!bg_plug_open_location(in_plugs[i], infiles[i], NULL, NULL))
+      goto fail;
+
+    set_stream_actions(in_plugs[i], GAVF_STREAM_AUDIO);
+    set_stream_actions(in_plugs[i], GAVF_STREAM_VIDEO);
+    set_stream_actions(in_plugs[i], GAVF_STREAM_TEXT);
+    set_stream_actions(in_plugs[i], GAVF_STREAM_OVERLAY);
+
+    if(!bg_plug_start(in_plugs[i]))
+      goto fail;
+
+    if(!bg_plug_setup_reader(in_plugs[i], &conn))
+      goto fail;
+
+    /* Copy metadata and so on from first source */
+    if(!i)
+      {
+      if(!gavftools_open_out_plug_from_in_plug(out_plug, NULL,
+                                               in_plugs[i]))
+        goto fail;
+      }
+    }
+
+  bg_mediaconnector_create_conn(&conn);
+  
+  if(!bg_plug_setup_writer(out_plug, &conn))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up plug writer failed");
+    goto fail;
+    }
+
+  /* Fire up connector */
+
+  bg_mediaconnector_start(&conn);
+
+  /* Run */
+
+  while(1)
+    {
+    for(i = 0; i < num_infiles; i++)
+      {
+      if(bg_plug_got_error(in_plugs[i]))
+        {
+        bg_log(BG_LOG_INFO, LOG_DOMAIN, "Error reading from %s",
+               infiles[i]);
+        goto fail;
+        }
+      }
+    
+    if(gavftools_stop() ||
+       !bg_mediaconnector_iteration(&conn))
+      break;
+    }
+  
+  ret = EXIT_SUCCESS;
+  fail:
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+
+  bg_mediaconnector_free(&conn);
+  
+  if(out_plug)
+    bg_plug_destroy(out_plug);
+  
+  for(i = 0; i < num_infiles; i++)
+    {
+    if(in_plugs[i])
+      bg_plug_destroy(in_plugs[i]);
+    }
+
+  if(infiles)
+    free(infiles);
+  if(in_plugs)
+    free(in_plugs);
+  
+  gavftools_cleanup();
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-play.c Added

@@ -0,0 +1,891 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+
+
+#include "gavftools.h"
+
+#include <gmerlin/ov.h>
+#include <gmerlin/textrenderer.h>
+#include <gmerlin/subtitle.h>
+
+#define LOG_DOMAIN "gavf-play"
+
+// #define DUMP_VIDEO_TIMESTAMPS
+
+static bg_plug_t * in_plug = NULL;
+static int nosync = 0;
+
+static char * title = "gavf-play";
+
+static bg_cfg_section_t * audio_section = NULL;
+static bg_cfg_section_t * video_section = NULL;
+static bg_cfg_section_t * subrender_section = NULL;
+
+/* 
+ * Stream indices:
+ * -2:   Select 0 as default
+ * -1:   Disable
+ *  >= 0: Select by index, complain if stream is missing
+ */
+
+static int audio_stream   = -2; // Select 0 as default
+static int video_stream   = -2; // Select 0 as default
+static int text_stream    = -1;
+static int overlay_stream = -1;
+
+typedef struct player_s player_t;
+
+#define FLAG_ACTIVE    (1<<0)
+#define FLAG_HAS_DELAY (1<<1) // Audio plugin reports latency
+
+static gavl_time_t player_get_time(player_t * p);
+
+typedef struct
+  {
+  gavl_audio_format_t fmt;
+  bg_plugin_handle_t * h;
+  bg_oa_plugin_t * plugin;
+  bg_parameter_info_t * parameters;
+
+  int flags;
+  
+  gavl_audio_sink_t * sink_int;
+  gavl_audio_sink_t * sink_ext;
+  int64_t samples_written;
+  
+  } audio_stream_t;
+
+typedef struct
+  {
+  gavl_video_format_t fmt;
+  bg_plugin_handle_t * h;
+  bg_ov_plugin_t * plugin;
+  bg_ov_t * ov;
+  bg_parameter_info_t * parameters;
+  
+  player_t * p; // For synchronizing
+
+  int flags;
+
+  bg_text_renderer_t * renderer;
+  bg_subtitle_handler_t * sh;
+  
+  } video_stream_t;
+
+static const bg_parameter_info_t audio_parameters[] =
+  {
+    {
+      .name      = "plugin",
+      .long_name = TRS("Plugin"),
+      .type      = BG_PARAMETER_MULTI_MENU,
+      .flags     = BG_PARAMETER_PLUGIN,
+    },
+    { /* End */ },
+  };
+
+static const bg_parameter_info_t video_parameters[] =
+  {
+    {
+      .name      = "plugin",
+      .long_name = TRS("Plugin"),
+      .type      = BG_PARAMETER_MULTI_MENU,
+      .flags     = BG_PARAMETER_PLUGIN,
+    },
+    { /* End */ },
+  };
+
+static void init_audio(audio_stream_t * as)
+  {
+  as->parameters =
+    bg_parameter_info_copy_array(audio_parameters);
+  bg_plugin_registry_set_parameter_info(plugin_reg,
+                                        BG_PLUGIN_OUTPUT_AUDIO,
+                                        BG_PLUGIN_PLAYBACK,
+                                        &as->parameters[0]);
+
+  audio_section = bg_cfg_section_create_from_parameters("audio",
+                                                        as->parameters);
+
+  }
+
+static void cleanup_audio(audio_stream_t * as)
+  {
+  bg_parameter_info_destroy_array(as->parameters);
+  if(as->h)
+    bg_plugin_unref(as->h);
+  if(as->sink_ext)
+    gavl_audio_sink_destroy(as->sink_ext);
+  }
+
+static void cleanup_video(video_stream_t * vs)
+  {
+  bg_parameter_info_destroy_array(vs->parameters);
+  if(vs->ov)
+    bg_ov_destroy(vs->ov);
+  if(vs->h)
+    bg_plugin_unref(vs->h);
+  }
+
+static void init_video(video_stream_t * vs)
+  {
+  vs->parameters =
+    bg_parameter_info_copy_array(video_parameters);
+  bg_plugin_registry_set_parameter_info(plugin_reg,
+                                        BG_PLUGIN_OUTPUT_VIDEO,
+                                        BG_PLUGIN_PLAYBACK,
+                                        &vs->parameters[0]);
+  video_section = bg_cfg_section_create_from_parameters("video",
+                                                        vs->parameters);
+  }
+
+static gavl_audio_frame_t * get_audio_frame(void * priv)
+  {
+  audio_stream_t * as = priv;
+  return gavl_audio_sink_get_frame(as->sink_int);
+  }
+
+static gavl_sink_status_t put_audio_frame(void * priv,
+                                          gavl_audio_frame_t * f)
+  {
+  gavl_time_t wait_time;
+  gavl_sink_status_t ret;
+  audio_stream_t * as = priv;
+
+  //  fprintf(stderr, "Put audio %d\n", f->valid_samples);
+  
+  bg_plugin_lock(as->h);
+  if((ret = gavl_audio_sink_put_frame(as->sink_int, f)) != GAVL_SINK_OK)
+    {
+    bg_plugin_unlock(as->h);
+    return ret;
+    }
+  as->samples_written += f->valid_samples;
+  bg_plugin_unlock(as->h);
+
+  wait_time = gavl_time_unscale(as->fmt.samplerate,
+                                f->valid_samples / 2);
+  gavl_time_delay(&wait_time);
+  return ret;
+  }
+
+static void open_audio(audio_stream_t * as,
+                       bg_mediaconnector_stream_t * s)
+  {
+  as->flags |= FLAG_ACTIVE;
+  gavl_audio_format_copy(&as->fmt,
+                         gavl_audio_source_get_src_format(s->asrc));
+  as->plugin->open(as->h->priv, &as->fmt);
+
+  if(as->plugin->get_delay)
+    {
+    as->flags |= FLAG_HAS_DELAY;
+    as->sink_int = as->plugin->get_sink(as->h->priv);
+    as->sink_ext =
+      gavl_audio_sink_create(get_audio_frame,
+                             put_audio_frame, as,
+                             gavl_audio_sink_get_format(as->sink_int));
+    gavl_audio_connector_connect(s->aconn, as->sink_ext);
+    }
+  else
+    gavl_audio_connector_connect(s->aconn, as->plugin->get_sink(as->h->priv));
+  }
+
+static void start_audio(audio_stream_t * as)
+  {
+  if(as->plugin->start)
+    as->plugin->start(as->h->priv);
+  }
+
+
+static gavl_time_t audio_stream_get_time(audio_stream_t * as)
+  {
+  gavl_time_t ret;
+  bg_plugin_lock(as->h);
+  ret = gavl_time_unscale(as->fmt.samplerate,
+                          as->samples_written -
+                          as->plugin->get_delay(as->h->priv));
+  bg_plugin_unlock(as->h);
+  return ret;
+  }
+
+static void
+process_cb_video(void * priv, gavl_video_frame_t * frame)
+  {
+  gavl_time_t frame_time, cur_time, diff_time;
+  player_t * p;
+  video_stream_t * vs = priv;
+
+  /* Handle subtitle */
+  
+  //  fprintf(stderr, "Process video\n");
+
+  p = vs->p;
+  frame_time = gavl_time_unscale(vs->fmt.timescale,
+                                 frame->timestamp);
+
+  cur_time = player_get_time(p);
+  
+  diff_time = frame_time - cur_time;
+#ifdef DUMP_VIDEO_TIMESTAMPS
+  fprintf(stderr,
+          "cur: %"PRId64", frame: %"PRId64", dur: %"PRId64", diff: %"PRId64"\n",
+          cur_time, frame_time,
+          gavl_time_unscale(vs->fmt.timescale, frame->duration),
+          diff_time);
+#endif
+  
+  if((diff_time > 0) && !nosync)
+    gavl_time_delay(&diff_time);
+
+  if(vs->sh)
+    bg_subtitle_handler_update(vs->sh, frame);
+  
+  //  fprintf(stderr, "Process video done\n");
+  }
+
+static void open_video(video_stream_t * vs,
+                       bg_mediaconnector_stream_t * s)
+  {
+  vs->flags |= FLAG_ACTIVE;
+  gavl_video_format_copy(&vs->fmt,
+                         gavl_video_source_get_src_format(s->vsrc));
+
+  vs->ov = bg_ov_create(vs->h);
+  bg_ov_open(vs->ov, &vs->fmt, 1);
+  bg_ov_set_window_title(vs->ov, title);
+
+  gavl_video_connector_connect(s->vconn, bg_ov_get_sink(vs->ov));
+  gavl_video_connector_set_process_func(s->vconn, process_cb_video, vs);
+  }
+
+static void open_subtitle(video_stream_t * vs,
+                          bg_mediaconnector_stream_t * s)
+  {
+  gavl_video_format_t format;
+  gavl_video_sink_t * sink;
+  gavl_video_source_t * src;
+  
+  if(s->type == GAVF_STREAM_TEXT)
+    {
+    vs->renderer = bg_text_renderer_create();
+    bg_cfg_section_apply(subrender_section,
+                         bg_text_renderer_get_parameters(),
+                         bg_text_renderer_set_parameter,
+                         vs->renderer);
+
+    gavl_video_format_copy(&format, &vs->fmt);
+
+    format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+    format.timescale = s->timescale;
+
+    sink = bg_ov_add_overlay_stream(vs->ov, &format);
+    src = bg_text_renderer_connect(vs->renderer, s->psrc, &vs->fmt, &format);
+    }
+  else if(s->type == GAVF_STREAM_OVERLAY)
+    {
+    src = s->vsrc;
+    gavl_video_format_copy(&format, gavl_video_source_get_src_format(src));
+    sink = bg_ov_add_overlay_stream(vs->ov, &format);
+    }
+  
+  vs->sh = bg_subtitle_handler_create();
+  bg_subtitle_handler_init(vs->sh, &vs->fmt, src, sink);
+  }
+
+static void start_video(video_stream_t * vs)
+  {
+  bg_ov_show_window(vs->ov, 1);
+  }
+
+static void set_audio_parameter(void * data,
+                                const char * name,
+                                const bg_parameter_value_t * val)
+  {
+  audio_stream_t * s = data;
+  
+  if(!name)
+    return;
+
+  if(!strcmp(name, "plugin"))
+    {
+    const bg_plugin_info_t * info;
+    
+    if(s->h &&
+       !strcmp(s->h->info->name, val->val_str))
+      return;
+    
+    if(s->h)
+      bg_plugin_unref(s->h);
+    
+    info = bg_plugin_find_by_name(plugin_reg, val->val_str);
+    s->h = bg_plugin_load(plugin_reg, info);
+    s->plugin = (bg_oa_plugin_t*)(s->h->plugin);
+    }
+  }
+
+static void set_video_parameter(void * data,
+                                const char * name,
+                                const bg_parameter_value_t * val)
+  {
+  video_stream_t * s = data;
+  
+  if(!name)
+    return;
+  
+  if(!strcmp(name, "plugin"))
+    {
+    const bg_plugin_info_t * info;
+    
+    if(s->h &&
+       !strcmp(s->h->info->name, val->val_str))
+      return;
+    
+    if(s->h)
+      bg_plugin_unref(s->h);
+    
+    info = bg_plugin_find_by_name(plugin_reg, val->val_str);
+    s->h = bg_plugin_load(plugin_reg, info);
+    s->plugin = (bg_ov_plugin_t*)(s->h->plugin);
+    }
+  }
+
+struct player_s
+  {
+  audio_stream_t as;
+  video_stream_t vs;
+  gavl_timer_t * timer;
+  };
+
+static player_t player;
+
+static void player_init(player_t * p)
+  {
+  memset(p, 0, sizeof(*p));
+  
+  p->vs.p = p;
+  init_audio(&p->as);
+  init_video(&p->vs);
+  
+  subrender_section =
+    bg_cfg_section_create_from_parameters("subrender",
+                                          bg_text_renderer_get_parameters());
+  }
+
+static void player_cleanup(player_t * p)
+  {
+  cleanup_audio(&p->as);
+  cleanup_video(&p->vs);
+  if(p->timer)
+    gavl_timer_destroy(p->timer);
+  }
+
+static void player_open(player_t * p, bg_mediaconnector_t * conn)
+  {
+  int i;
+
+  /* A/V */
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    switch(conn->streams[i]->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        open_audio(&p->as, conn->streams[i]);
+        break;
+      case GAVF_STREAM_VIDEO:
+        open_video(&p->vs, conn->streams[i]);
+        break;
+      case GAVF_STREAM_TEXT:
+      case GAVF_STREAM_OVERLAY:
+        break;
+      }
+    }
+
+  /* subtitle */
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    switch(conn->streams[i]->type)
+      {
+      case GAVF_STREAM_AUDIO:
+      case GAVF_STREAM_VIDEO:
+        break;
+      case GAVF_STREAM_TEXT:
+      case GAVF_STREAM_OVERLAY:
+        open_subtitle(&p->vs, conn->streams[i]);
+        break;
+      }
+    }
+  
+  if(!(p->as.flags & FLAG_HAS_DELAY))
+    p->timer = gavl_timer_create();
+  
+  }
+
+static void player_start(player_t * p)
+  {
+  if(p->as.flags & FLAG_ACTIVE)
+    start_audio(&p->as);
+  if(p->vs.flags & FLAG_ACTIVE)
+    start_video(&p->vs);
+  }
+
+static gavl_time_t player_get_time(player_t * p)
+  {
+  if(p->timer)
+    {
+    if(!gavl_timer_is_running(p->timer))
+      gavl_timer_start(p->timer);
+    return gavl_timer_get(p->timer);
+    }
+  return audio_stream_get_time(&p->as);
+  }
+
+/* Option processing */
+
+static void opt_aud(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -aud requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(audio_section,
+                               set_audio_parameter,
+                               &player.as,
+                               player.as.parameters,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_vid(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vid requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(video_section,
+                               set_video_parameter,
+                               &player.vs,
+                               player.vs.parameters,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_subrender(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -subrender requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(subrender_section,
+                               NULL,
+                               NULL,
+                               bg_text_renderer_get_parameters(),
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_as(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -as requires an argument\n");
+    exit(-1);
+    }
+  audio_stream = atoi((*_argv)[arg]) - 1;
+  if(audio_stream < -1)
+    audio_stream = -1;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_vs(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vs requires an argument\n");
+    exit(-1);
+    }
+  video_stream = atoi((*_argv)[arg]) - 1;
+  if(video_stream < -1)
+    video_stream = -1;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_ts(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -ts requires an argument\n");
+    exit(-1);
+    }
+  text_stream = atoi((*_argv)[arg]) - 1;
+  if(text_stream < -1)
+    text_stream = -1;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_os(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -os requires an argument\n");
+    exit(-1);
+    }
+  overlay_stream = atoi((*_argv)[arg]) - 1;
+  if(overlay_stream < -1)
+    overlay_stream = -1;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_nosync(void * data, int * argc, char *** _argv, int arg)
+  {
+  nosync = 1;
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-aud",
+      .help_arg =    "<audio_options>",
+      .help_string = "Set audio recording options",
+      .callback =    opt_aud,
+    },
+    {
+      .arg =         "-vid",
+      .help_arg =    "<video_options>",
+      .help_string = "Set video recording options",
+      .callback =    opt_vid,
+    },
+    {
+      .arg =         "-as",
+      .help_arg =    "<stream>",
+      .help_string = "Select audio stream (default: 1)",
+      .callback =    opt_as,
+    },
+    {
+      .arg =         "-vs",
+      .help_arg =    "<stream>",
+      .help_string = "Select video stream (default: 1)",
+      .callback =    opt_vs,
+    },
+    {
+      .arg =         "-ts",
+      .help_arg =    "<stream>",
+      .help_string = "Select text stream (default: disabled)",
+      .callback =    opt_ts,
+    },
+    {
+      .arg =         "-os",
+      .help_arg =    "<stream>",
+      .help_string = "Select overlay stream (default: disabled)",
+      .callback =    opt_os,
+    },
+    GAVFTOOLS_INPLUG_OPTIONS,
+    {
+      .arg =         "-subrender",
+      .help_arg =    "<options>",
+      .help_string = "Set the options for rendering text subtitles",
+      .callback =    opt_subrender,
+    },
+    {
+      .arg =         "-title",
+      .help_arg =    "<title>",
+      .help_string = "Set window title",
+      .argv =        &title,
+    },
+    {
+      .arg =         "-nosync",
+      .help_string = "Don't try to keep A/V sync",
+      .callback =    opt_nosync,
+    },
+    GAVFTOOLS_LOG_OPTIONS,
+    {
+      /* End */
+    }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-play",
+    .long_name = TRS("Playback of a gavf stream"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf player\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+static const gavf_stream_header_t *
+find_stream(gavf_t * g, int type, int index)
+  {
+  const gavf_stream_header_t * ret;
+  
+  /* No stream was selected, choose first one and
+     be silent if there is none */
+  if(index == -2)
+    return gavf_get_stream(g, 0, type);
+  else if(index == -1)
+    return NULL;
+  else // >= 0
+    {
+    ret = gavf_get_stream(g, index, type);
+    if(!ret)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No %s stream %d",
+             gavf_stream_type_name(type),
+             index + 1);
+      }
+    }
+  return ret;
+  }
+
+static int stream_equal(const gavf_stream_header_t * h1,
+                        const gavf_stream_header_t * h2)
+  {
+  if(!h1 || !h2)
+    return 0;
+  return (h1->id == h2->id);
+  }
+                         
+
+int main(int argc, char ** argv)
+  {
+  const gavf_stream_header_t * as;
+  const gavf_stream_header_t * vs;
+  const gavf_stream_header_t * ts;
+  const gavf_stream_header_t * os;
+  
+  const gavf_program_header_t * ph;
+  gavl_time_t delay_time = GAVL_TIME_SCALE / 100; // 10 ms
+  
+  gavf_t * g;
+  int ret = EXIT_FAILURE;
+  int i;
+  
+  bg_mediaconnector_t conn;
+  
+  bg_mediaconnector_init(&conn);
+  gavftools_init();
+
+  player_init(&player);
+
+  bg_cmdline_arg_set_parameters(global_options, "-aud", player.as.parameters);
+  bg_cmdline_arg_set_parameters(global_options, "-vid", player.vs.parameters);
+  bg_cmdline_arg_set_parameters(global_options, "-subrender",
+                                bg_text_renderer_get_parameters());
+
+  gavftools_set_cmdline_parameters(global_options);
+  
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    goto fail;
+
+  in_plug = gavftools_create_in_plug();
+  
+  /* Open */
+
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+  
+  /* Select streams */
+  
+  g = bg_plug_get_gavf(in_plug);
+
+  as = find_stream(g, GAVF_STREAM_AUDIO, audio_stream);
+  vs = find_stream(g, GAVF_STREAM_VIDEO, video_stream);
+
+  if(text_stream >= 0)
+    ts = find_stream(g, GAVF_STREAM_TEXT, text_stream);
+  else
+    ts = NULL;
+  
+  if(overlay_stream >= 0)
+    os = find_stream(g, GAVF_STREAM_OVERLAY, overlay_stream);
+  else
+    os = NULL;
+
+  if(os && ts)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Both overlay and text stream specified, omitting overlay stream");
+    os = NULL;
+    }
+
+  /* Plugin set by the commandline, apply sub parameters */
+  if(player.as.plugin)
+    {
+    const bg_parameter_info_t * parameters;
+    bg_cfg_section_t * subsection =
+      bg_cfg_section_find_subsection(audio_section, "plugin");
+    
+    subsection =
+      bg_cfg_section_find_subsection(subsection, player.as.h->info->name);
+    
+    if(player.as.h->plugin->get_parameters)
+      {
+      parameters = player.as.h->plugin->get_parameters(player.as.h->priv);
+      
+      bg_cfg_section_apply(subsection, parameters, player.as.h->plugin->set_parameter,
+                           player.as.h->priv);
+      }
+    }
+  
+  if(!player.as.plugin && as)
+    {
+    const bg_plugin_info_t * info =
+      bg_plugin_registry_get_default(plugin_reg,
+                                     BG_PLUGIN_OUTPUT_AUDIO, BG_PLUGIN_PLAYBACK);
+
+    if(!info)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No audio output plugin found");
+      as = NULL;
+      }
+    else
+      {
+      bg_parameter_value_t val;
+      val.val_str = info->name;
+      set_audio_parameter(&player.as,
+                          "plugin", &val);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using %s for audio output", info->name);
+      }
+    
+    }
+  
+  if(!player.vs.plugin && vs)
+    {
+    const bg_plugin_info_t * info =
+      bg_plugin_registry_get_default(plugin_reg,
+                                     BG_PLUGIN_OUTPUT_VIDEO, BG_PLUGIN_PLAYBACK);
+
+    if(!info)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No video output plugin found");
+      as = NULL;
+      }
+    else
+      {
+      bg_parameter_value_t val;
+      val.val_str = info->name;
+      set_video_parameter(&player.vs,
+                          "plugin", &val);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using %s for video output", info->name);
+      }
+    }
+
+  if(!as && !vs)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Neither audio nor video can be played, exiting");
+    goto fail;
+    }
+
+  ph = gavf_get_program_header(g);
+  
+  for(i = 0; i < ph->num_streams; i++)
+    {
+    if(stream_equal(&ph->streams[i], as) ||
+       stream_equal(&ph->streams[i], vs) ||
+       stream_equal(&ph->streams[i], ts) ||
+       stream_equal(&ph->streams[i], os))
+      bg_plug_set_stream_action(in_plug, &ph->streams[i],
+                                BG_STREAM_ACTION_DECODE);
+    else
+      bg_plug_set_stream_action(in_plug, &ph->streams[i],
+                                BG_STREAM_ACTION_OFF);
+    }
+  
+  /* Start plug and set up media connector */
+  
+  if(!bg_plug_start(in_plug) ||
+     !bg_plug_setup_reader(in_plug, &conn))
+    goto fail;
+    
+  bg_mediaconnector_create_conn(&conn);
+  
+  bg_mediaconnector_create_threads(&conn, 0);
+  bg_mediaconnector_threads_init_separate(&conn);
+  
+  /* Initialize output plugins */
+
+  player_open(&player, &conn);
+  
+  /* Start media connector */
+
+  bg_mediaconnector_start(&conn);
+
+  player_start(&player);
+  
+  bg_mediaconnector_threads_start(&conn);
+  
+  /* Main loop */
+  while(1)
+    {
+    /* Check for end */
+    if(gavftools_stop() ||
+       bg_mediaconnector_done(&conn))
+      break;
+
+    gavl_time_delay(&delay_time);
+    }
+
+  ret = EXIT_SUCCESS;
+  fail:
+
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+  
+  /* Cleanup */
+  bg_mediaconnector_threads_stop(&conn);
+  bg_mediaconnector_free(&conn);
+
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+
+  player_cleanup(&player);
+  
+  gavftools_cleanup();
+
+  if(audio_section)
+    bg_cfg_section_destroy(audio_section);
+  if(video_section)
+    bg_cfg_section_destroy(video_section);
+  if(subrender_section)
+    bg_cfg_section_destroy(subrender_section);  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-recompress.c Added

@@ -0,0 +1,442 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+static bg_plug_t * in_plug = NULL;
+static bg_plug_t * out_plug = NULL;
+
+#define LOG_DOMAIN "gavf-recompress"
+
+static gavl_metadata_t ac_options;
+static gavl_metadata_t vc_options;
+static gavl_metadata_t oc_options;
+
+static bg_parameter_info_t * ac_parameters = NULL;
+static bg_parameter_info_t * vc_parameters = NULL;
+static bg_parameter_info_t * oc_parameters = NULL;
+
+static bg_cfg_section_t ** ac_sections = NULL;
+static bg_cfg_section_t ** vc_sections = NULL;
+static bg_cfg_section_t ** oc_sections = NULL;
+
+static int num_audio_streams = 0;
+static int num_video_streams = 0;
+static int num_overlay_streams = 0;
+
+static bg_stream_action_t * audio_actions = NULL;
+static bg_stream_action_t * video_actions = NULL;
+static bg_stream_action_t * text_actions = NULL;
+static bg_stream_action_t * overlay_actions = NULL;
+
+static int force_audio = 0;
+static int force_video = 0;
+static int force_overlay = 0;
+
+static bg_cfg_section_t **
+create_stream_sections(const bg_parameter_info_t * parameters,
+                       int num, gavl_metadata_t * options)
+  {
+  int i;
+  const char * opt;
+  bg_cfg_section_t ** ret;
+
+  if(!num)
+    return NULL;
+
+  ret = calloc(num, sizeof(*ret));
+
+  for(i = 0; i < num; i++)
+    {
+    opt = bg_cmdline_get_stream_options(options, i);
+    if(opt)
+      {
+      ret[i] = bg_cfg_section_create_from_parameters("compression",
+                                                     parameters);
+      if(!bg_cfg_section_set_parameters_from_string(ret[i], parameters,
+                                                    opt))
+        {
+        exit(-1);
+        }
+      }
+    }
+  return ret;
+  }
+
+static void destroy_stream_sections(bg_cfg_section_t ** sec, int num)
+  {
+  int i;
+  if(!sec)
+    return;
+  for(i = 0; i < num; i++)
+    {
+    if(sec[i])
+      bg_cfg_section_destroy(sec[i]);
+    }
+  free(sec);
+  }
+
+static void opt_ac(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -ac requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&ac_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_vc(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vc requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&vc_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_oc(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -oc requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_set_stream_options(&oc_options,(*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_fa(void * data, int * argc, char *** _argv, int arg)
+  {
+  force_audio = 1;
+  }
+
+static void opt_fv(void * data, int * argc, char *** _argv, int arg)
+  {
+  force_video = 1;
+  }
+
+static void opt_fo(void * data, int * argc, char *** _argv, int arg)
+  {
+  force_overlay = 1;
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    GAVFTOOLS_INPLUG_OPTIONS,
+    GAVFTOOLS_OUTPLUG_OPTIONS,
+    GAVFTOOLS_AUDIO_STREAM_OPTIONS,
+    GAVFTOOLS_VIDEO_STREAM_OPTIONS,
+    GAVFTOOLS_TEXT_STREAM_OPTIONS,
+    GAVFTOOLS_OVERLAY_STREAM_OPTIONS,
+    {
+      .arg =         "-ac",
+      .help_arg =    "<options>",
+      .help_string = TRS("Audio compression options"),
+      .callback =    opt_ac,
+    },
+    {
+      .arg =         "-vc",
+      .help_arg =    "<options>",
+      .help_string = TRS("Video compression options"),
+      .callback =    opt_vc,
+    },
+    {
+      .arg =         "-oc",
+      .help_arg =    "<options>",
+      .help_string = TRS("Overlay compression options"),
+      .callback =    opt_oc,
+    },
+    {
+      .arg =         "-fa",
+      .help_string = TRS("Force audio recompression even if the input stream has the desired compression already."),
+      .callback =    opt_fa,
+    },
+    {
+      .arg =         "-fv",
+      .help_string = TRS("Force video recompression even if the input stream has the desired compression already."),
+      .callback =    opt_fv,
+    },
+    {
+      .arg =         "-fo",
+      .help_string = TRS("Force overlay recompression even if the input stream has the desired compression already."),
+      .callback =    opt_fo,
+    },
+    GAVFTOOLS_LOG_OPTIONS,
+    { /* End */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-recompress",
+    .long_name = TRS("Recompress streams of a gavf stream"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf recompressor\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+
+  };
+
+static bg_stream_action_t
+get_stream_action(bg_stream_action_t action, bg_cfg_section_t * section,
+                  int force, const gavl_compression_info_t * ci)
+  {
+  gavl_codec_id_t id;
+  switch(action)
+    {
+    case BG_STREAM_ACTION_OFF:
+    case BG_STREAM_ACTION_DECODE:
+      return action;
+      break;
+    case BG_STREAM_ACTION_READRAW:
+      if(!section)
+        return BG_STREAM_ACTION_READRAW;
+      id = bg_plugin_registry_get_compressor_id(plugin_reg, section);
+      if((id != ci->id) || force)
+        return BG_STREAM_ACTION_DECODE;
+      else
+        return BG_STREAM_ACTION_READRAW;
+      break;
+    }
+  return BG_STREAM_ACTION_OFF;
+  }
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  bg_mediaconnector_t conn;
+  gavf_t * g;
+  int i;
+  int num_text_streams;
+  int num;
+  const gavf_stream_header_t * sh;
+  bg_mediaconnector_stream_t * mc;
+  
+  gavl_metadata_init(&ac_options);
+  gavl_metadata_init(&vc_options);
+  gavl_metadata_init(&oc_options);
+  
+  bg_mediaconnector_init(&conn);
+  gavftools_init();
+
+  ac_parameters =
+    bg_plugin_registry_create_compressor_parameters(plugin_reg,
+                                                    BG_PLUGIN_AUDIO_COMPRESSOR);
+  vc_parameters =
+    bg_plugin_registry_create_compressor_parameters(plugin_reg,
+                                                    BG_PLUGIN_VIDEO_COMPRESSOR);
+  oc_parameters =
+    bg_plugin_registry_create_compressor_parameters(plugin_reg,
+                                                    BG_PLUGIN_OVERLAY_COMPRESSOR);
+
+  
+  bg_cmdline_arg_set_parameters(global_options, "-ac", ac_parameters);
+  bg_cmdline_arg_set_parameters(global_options, "-vc", vc_parameters);
+  bg_cmdline_arg_set_parameters(global_options, "-oc", oc_parameters);
+
+  /* Handle commandline options */
+  bg_cmdline_init(&app_data);
+  
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+  
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    goto fail;
+  
+  /* Open input plug */
+  in_plug = gavftools_create_in_plug();
+  out_plug = gavftools_create_out_plug();
+  
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+
+  /* Check which streams we have */
+  g = bg_plug_get_gavf(in_plug);
+
+  num_audio_streams = gavf_get_num_streams(g, GAVF_STREAM_AUDIO);
+  num_video_streams = gavf_get_num_streams(g, GAVF_STREAM_VIDEO);
+  num_overlay_streams = gavf_get_num_streams(g, GAVF_STREAM_OVERLAY);
+  num_text_streams = gavf_get_num_streams(g, GAVF_STREAM_TEXT);
+
+  audio_actions = gavftools_get_stream_actions(num_audio_streams,
+                                               GAVF_STREAM_AUDIO);
+  video_actions = gavftools_get_stream_actions(num_video_streams,
+                                               GAVF_STREAM_VIDEO);
+  text_actions = gavftools_get_stream_actions(num_text_streams,
+                                               GAVF_STREAM_TEXT);
+  overlay_actions = gavftools_get_stream_actions(num_overlay_streams,
+                                                 GAVF_STREAM_OVERLAY);
+  
+  ac_sections =
+    create_stream_sections(ac_parameters,
+                           num_audio_streams, &ac_options);
+  vc_sections =
+    create_stream_sections(vc_parameters,
+                           num_video_streams, &vc_options);
+
+  oc_sections =
+    create_stream_sections(oc_parameters,
+                           num_overlay_streams, &oc_options);
+  
+  for(i = 0; i < num_audio_streams; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_AUDIO);
+
+    bg_plug_set_stream_action(in_plug, sh,
+                              get_stream_action(audio_actions[i],
+                                                ac_sections[i],
+                                                force_audio, &sh->ci));
+    }
+  for(i = 0; i < num_video_streams; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_VIDEO);
+    bg_plug_set_stream_action(in_plug, sh,
+                              get_stream_action(video_actions[i],
+                                                vc_sections[i],
+                                                force_video, &sh->ci));
+
+    }
+  for(i = 0; i < num_overlay_streams; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_OVERLAY);
+    bg_plug_set_stream_action(in_plug, sh,
+                              get_stream_action(overlay_actions[i],
+                                                oc_sections[i],
+                                                force_overlay, &sh->ci));
+    }
+  for(i = 0; i < num_text_streams; i++)
+    {
+    sh = gavf_get_stream(g, i, GAVF_STREAM_TEXT);
+    bg_plug_set_stream_action(in_plug, sh, text_actions[i]);
+    }
+
+  /* Start decoder and initialize media connector */
+
+  if(!bg_plug_start(in_plug) ||
+     !bg_plug_setup_reader(in_plug, &conn))
+    goto fail;
+
+  bg_mediaconnector_create_conn(&conn);
+
+  /* Set encode sections in the media connector */
+
+  num = bg_mediaconnector_get_num_streams(&conn, GAVF_STREAM_AUDIO);
+  for(i = 0; i < num; i++)
+    {
+    mc = bg_mediaconnector_get_stream(&conn, GAVF_STREAM_AUDIO, i);
+    if(mc->asrc)
+      mc->encode_section = ac_sections[mc->src_index];
+    }
+
+  num = bg_mediaconnector_get_num_streams(&conn, GAVF_STREAM_VIDEO);
+  for(i = 0; i < num; i++)
+    {
+    mc = bg_mediaconnector_get_stream(&conn, GAVF_STREAM_VIDEO, i);
+    if(mc->vsrc)
+      mc->encode_section = vc_sections[mc->src_index];
+    
+    }
+
+  num = bg_mediaconnector_get_num_streams(&conn, GAVF_STREAM_OVERLAY);
+  for(i = 0; i < num; i++)
+    {
+    mc = bg_mediaconnector_get_stream(&conn, GAVF_STREAM_OVERLAY, i);
+    if(mc->vsrc)
+      mc->encode_section = oc_sections[mc->src_index];
+    }
+  
+  if(!gavftools_open_out_plug_from_in_plug(out_plug, NULL, in_plug))
+    goto fail;
+  
+  bg_plug_set_compressor_config(out_plug,
+                                ac_parameters,
+                                vc_parameters,
+                                oc_parameters);
+
+  if(!bg_plug_setup_writer(out_plug, &conn))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up plug writer failed");
+    goto fail;
+    }
+
+  /* Fire up connector */
+
+  bg_mediaconnector_start(&conn);
+
+  /* Run */
+
+  while(1)
+    {
+    if(bg_plug_got_error(in_plug))
+      break;
+
+    if(gavftools_stop() ||
+       !bg_mediaconnector_iteration(&conn))
+      break;
+    }
+  
+  /* Cleanup */
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+  
+  ret = EXIT_SUCCESS;
+  fail:
+  
+  destroy_stream_sections(ac_sections, num_audio_streams);
+  destroy_stream_sections(vc_sections, num_video_streams);
+  destroy_stream_sections(oc_sections, num_overlay_streams);
+
+  bg_mediaconnector_free(&conn);
+
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+
+  if(out_plug)
+    bg_plug_destroy(out_plug);
+  
+  gavftools_cleanup();
+
+  if(audio_actions)
+    free(audio_actions);
+  if(video_actions)
+    free(video_actions);
+  if(text_actions)
+    free(text_actions);
+  if(overlay_actions)
+    free(overlay_actions);
+
+  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-record.c Added

@@ -0,0 +1,395 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <signal.h>
+
+#include "gavftools.h"
+
+#include <gavl/metatags.h>
+
+#include <language_table.h>
+
+#define LOG_DOMAIN "gavf-record"
+
+
+
+/* Global stuff */
+
+
+static bg_plug_t * out_plug = NULL;
+
+static bg_cfg_section_t * audio_section = NULL;
+static bg_cfg_section_t * video_section = NULL;
+
+/* Recorder module */
+
+static const bg_parameter_info_t audio_parameters[] =
+  {
+    {
+      .name      = "plugin",
+      .long_name = TRS("Plugin"),
+      .type      = BG_PARAMETER_MULTI_MENU,
+      .flags     = BG_PARAMETER_PLUGIN,
+    },
+    {
+      .name      = "language",
+      .long_name = TRS("Language"),
+      .type      = BG_PARAMETER_STRINGLIST,
+      .val_default = { .val_str = "eng" },
+      .multi_names = bg_language_codes,
+      .multi_labels = bg_language_labels,
+    },
+    { /* End */ },
+  };
+
+static const bg_parameter_info_t video_parameters[] =
+  {
+    {
+      .name      = "plugin",
+      .long_name = TRS("Plugin"),
+      .type      = BG_PARAMETER_MULTI_MENU,
+      .flags     = BG_PARAMETER_PLUGIN,
+    },
+    { /* End */ },
+  };
+
+typedef struct
+  {
+  bg_plugin_handle_t * h;
+  bg_recorder_plugin_t * plugin;
+  bg_parameter_info_t * parameters;
+  gavl_metadata_t m;
+  } recorder_stream_t;
+
+typedef struct
+  {
+  recorder_stream_t as;
+  recorder_stream_t vs;
+  } recorder_t;
+
+static recorder_t rec;
+
+static void recorder_stream_init(recorder_stream_t * s,
+                                 const bg_parameter_info_t * parameters,
+                                 const char * name, bg_cfg_section_t ** section,
+                                 uint32_t type_mask)
+  {
+  memset(s, 0, sizeof(*s));
+  s->parameters = bg_parameter_info_copy_array(parameters);
+  
+  bg_plugin_registry_set_parameter_info(plugin_reg,
+                                        type_mask,
+                                        BG_PLUGIN_RECORDER,
+                                        &s->parameters[0]);
+  if(!(*section))
+    *section = bg_cfg_section_create_from_parameters(name, s->parameters);
+  }
+
+static void recorder_stream_cleanup(recorder_stream_t * s)
+  {
+  if(s->parameters)
+    bg_parameter_info_destroy_array(s->parameters);
+  gavl_metadata_free(&s->m);
+  if(s->h)
+    bg_plugin_unref(s->h);
+  }
+
+static void recorder_init(recorder_t * rec)
+  {
+  recorder_stream_init(&rec->as,
+                       audio_parameters,
+                       "audio", &audio_section,
+                       BG_PLUGIN_RECORDER_AUDIO);
+  recorder_stream_init(&rec->vs,
+                       video_parameters,
+                       "video", &video_section,
+                       BG_PLUGIN_RECORDER_VIDEO);
+  }
+
+static void recorder_cleanup(recorder_t * rec)
+  {
+  recorder_stream_cleanup(&rec->as);
+  recorder_stream_cleanup(&rec->vs);
+  }
+
+static void recorder_stream_set_parameter(void * sp, const char * name,
+                                          const bg_parameter_value_t * val)
+  {
+  recorder_stream_t * s= sp;
+
+  // fprintf(stderr, "recorder_stream_set_parameter %s\n", name);
+  
+  if(!name)
+    {
+    if(s->h && s->plugin->common.set_parameter)
+      s->plugin->common.set_parameter(s->h->priv, NULL, NULL);
+    return;
+    }
+  else if(!strcmp(name, "language"))
+    gavl_metadata_set(&s->m, GAVL_META_LANGUAGE, val->val_str);
+  else if(!strcmp(name, "plugin"))
+    {
+    const bg_plugin_info_t * info;
+    
+    if(s->h &&
+       !strcmp(s->h->info->name, val->val_str))
+      return;
+    
+    if(s->h)
+      bg_plugin_unref(s->h);
+    
+    info = bg_plugin_find_by_name(plugin_reg, val->val_str);
+    s->h = bg_plugin_load(plugin_reg, info);
+    s->plugin = (bg_recorder_plugin_t*)(s->h->plugin);
+    // if(s->input_plugin->set_callbacks)
+    // s->input_plugin->set_callbacks(s->h->priv, &rec->recorder_cb);
+    }
+  else if(s->h && s->plugin->common.set_parameter)
+    s->plugin->common.set_parameter(s->h->priv, name, val);
+  
+  }
+
+static int recorder_stream_open(recorder_stream_t * s, int type,
+                                bg_mediaconnector_t * conn)
+  {
+  gavl_compression_info_t ci;
+  gavl_audio_format_t afmt;
+  gavl_video_format_t vfmt;
+  
+  if(!s->h)
+    {
+    bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Not recording %s: No plugin set",
+           (type == GAVF_STREAM_AUDIO ? "audio" : "video"));
+    return 0;
+    }
+  memset(&ci, 0, sizeof(ci));
+  memset(&afmt, 0, sizeof(afmt));
+  memset(&vfmt, 0, sizeof(vfmt));
+
+  if(!s->plugin->open(s->h->priv, &afmt, &vfmt, &s->m))
+    {
+    bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Opening %s recorder failed",
+           (type == GAVF_STREAM_AUDIO ? "audio" : "video"));
+    return 0;
+    }
+
+  bg_metadata_date_now(&s->m, GAVL_META_DATE_CREATE);
+  
+  if(type == GAVF_STREAM_AUDIO)
+    {
+    gavl_audio_source_t * asrc;
+    asrc = s->plugin->get_audio_source(s->h->priv);
+    bg_mediaconnector_add_audio_stream(conn, &s->m, asrc, NULL);
+    }
+  else if(type == GAVF_STREAM_VIDEO)
+    {
+    gavl_video_source_t * vsrc;
+    vsrc = s->plugin->get_video_source(s->h->priv);
+    bg_mediaconnector_add_video_stream(conn, &s->m, vsrc, NULL);
+    }
+  return 1;
+  }
+
+static int recorder_open(recorder_t * rec, bg_mediaconnector_t * conn)
+  {
+  int do_audio;
+  int do_video;
+
+  do_audio = recorder_stream_open(&rec->as, GAVF_STREAM_AUDIO, conn);
+  do_video = recorder_stream_open(&rec->vs, GAVF_STREAM_VIDEO, conn);
+  
+  bg_mediaconnector_create_conn(conn);
+  
+  if(!do_audio && !do_video)
+    return 0;
+  return 1;
+  }
+
+/* Config stuff */
+
+static void opt_aud(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -aud requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(audio_section,
+                               recorder_stream_set_parameter,
+                               &rec.as,
+                               rec.as.parameters,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_vid(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vid requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(video_section,
+                               recorder_stream_set_parameter,
+                               &rec.vs,
+                               rec.vs.parameters,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-aud",
+      .help_arg =    "<audio_options>",
+      .help_string = "Set audio recording options",
+      .callback =    opt_aud,
+    },
+    {
+      .arg =         "-vid",
+      .help_arg =    "<video_options>",
+      .help_string = "Set video recording options",
+      .callback =    opt_vid,
+    },
+    GAVFTOOLS_OUTPLUG_OPTIONS,
+    GAVFTOOLS_LOG_OPTIONS,
+    {
+      /* End */
+    }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-record",
+    .long_name = TRS("Record an A/V stream and output a gavf stream"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf recorder\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  bg_mediaconnector_t conn;
+  gavl_time_t delay_time = GAVL_TIME_SCALE / 100;
+  gavl_metadata_t m;
+  gavftools_block_sigpipe();
+  bg_mediaconnector_init(&conn);
+  
+  gavftools_init();
+  
+  /* Create plugin regsitry */
+  
+  /* Initialize streams */
+  recorder_init(&rec);
+
+  bg_cmdline_arg_set_parameters(global_options, "-aud", rec.as.parameters);
+  bg_cmdline_arg_set_parameters(global_options, "-vid", rec.vs.parameters);
+
+  gavftools_set_cmdline_parameters(global_options);
+  
+    
+  /* Handle commandline options */
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  out_plug = gavftools_create_out_plug();
+    
+  /* Open plugins */
+  if(!recorder_open(&rec, &conn))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Opening recorder plugins failed");
+    goto the_end;
+    }
+
+  gavl_metadata_init(&m);
+  gavftools_set_output_metadata(&m);
+
+  /* Open output plug */
+  if(!bg_plug_open_location(out_plug, gavftools_out_file,
+                            (const gavl_metadata_t *)0,
+                            (const gavl_chapter_list_t*)0))
+    goto the_end;
+  
+  gavl_metadata_free(&m);
+
+  /* Initialize output plug */
+  if(!bg_plug_setup_writer(out_plug, &conn))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up plug writer failed");
+    goto the_end;
+    }
+  
+  /* Initialize threads */
+  bg_mediaconnector_start(&conn);
+  bg_mediaconnector_create_threads(&conn, 0);
+  bg_mediaconnector_threads_init_separate(&conn);
+
+  bg_mediaconnector_threads_start(&conn);
+  
+  /* Main loop */
+  while(1)
+    {
+    if(gavftools_stop() ||
+       bg_mediaconnector_done(&conn) ||
+       bg_plug_got_error(out_plug))
+      break;
+    gavl_time_delay(&delay_time);
+    }
+
+  bg_mediaconnector_threads_stop(&conn);
+  
+  /* Cleanup */
+  
+  ret = EXIT_SUCCESS;
+  the_end:
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+
+  bg_mediaconnector_free(&conn);
+
+  if(out_plug)
+    bg_plug_destroy(out_plug);
+
+  recorder_cleanup(&rec);
+  
+  gavftools_cleanup();
+
+  if(audio_section)
+    bg_cfg_section_destroy(audio_section);
+  if(video_section)
+    bg_cfg_section_destroy(video_section);
+  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavf-server.h Added

@@ -0,0 +1,229 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+#define DUMP_HTTP_HEADERS
+
+#define CLIENT_TIMEOUT 5000
+
+/* Buffer */
+
+#define BUFFER_TYPE_PACKET      0
+#define BUFFER_TYPE_METADATA    1
+#define BUFFER_TYPE_SYNC_HEADER 2
+
+typedef struct buffer_element_s
+  {
+  int type;
+  gavl_packet_t p;
+  gavl_metadata_t m;
+
+  int64_t seq; // Sequence number
+
+  struct buffer_element_s * next;
+  } buffer_element_t;
+
+void buffer_element_set_sync_header(buffer_element_t * el);
+
+void buffer_element_set_packet(buffer_element_t * el,
+                               const gavl_packet_t * p);
+
+void buffer_element_set_metadata(buffer_element_t * el,
+                                 const gavl_metadata_t * m);
+
+typedef struct buffer_s buffer_t;
+
+
+buffer_t * buffer_create(int num_elements);
+
+void buffer_destroy(buffer_t *);
+
+buffer_element_t * buffer_get_write(buffer_t *);
+void buffer_done_write(buffer_t *);
+
+int buffer_get_read(buffer_t *, int64_t * seq, buffer_element_t ** el);
+
+void buffer_wait(buffer_t * b);
+
+// void buffer_done_read(buffer_t *, buffer_element_t *);
+
+buffer_element_t * buffer_get_first(buffer_t *);
+
+int64_t buffer_get_start_seq(buffer_t *);
+
+void buffer_advance(buffer_t *);
+
+void buffer_stop(buffer_t * b);
+
+int buffer_get_free(buffer_t * b);
+
+/* Filter: Outputs data to the client socket */
+
+typedef struct
+  {
+  int is_supported;
+  int (*supported)();
+  
+  int (*probe)(const gavf_program_header_t * ph,
+               const gavl_metadata_t * request);
+  
+  void * (*create)(const gavf_program_header_t * ph,
+                   const gavl_metadata_t * req,
+                   const gavl_metadata_t * vars,
+                   const gavl_metadata_t * inline_metadata,
+                   gavl_metadata_t * res);
+
+  int (*start)(void * priv,
+               const gavf_program_header_t * ph,
+               const gavl_metadata_t * req,
+               const gavl_metadata_t * vars,
+               const gavl_metadata_t * inline_metadata,
+               gavf_io_t * io, int flags);
+  
+  int (*put_buffer)(void * priv, buffer_element_t *);
+  void (*destroy)(void * priv);
+  } filter_t;
+
+void filter_init();
+
+const filter_t * filter_find(const gavf_program_header_t * ph,
+                             const gavl_metadata_t * request);
+
+/* Client (= listener) connection */
+
+#define CLIENT_STATUS_STARTING     0
+#define CLIENT_STATUS_WAIT_SYNC    1
+#define CLIENT_STATUS_RUNNING      2
+#define CLIENT_STATUS_DONE         3
+#define CLIENT_STATUS_STOP         4
+
+typedef struct
+  {
+  buffer_t * buf;
+
+  pthread_mutex_t status_mutex;
+  pthread_mutex_t seq_mutex;
+  int64_t seq;
+  
+  int status;
+  int fd;
+
+  pthread_t thread;
+
+  const filter_t * f;
+  void * priv;
+  
+  } client_t;
+
+client_t * client_create(int fd, const gavf_program_header_t * ph,
+                         buffer_t * buf,
+                         const gavl_metadata_t * req,
+                         gavl_metadata_t * res,
+                         const gavl_metadata_t * url_vars,
+                         const gavl_metadata_t * inline_metadata);
+
+void client_destroy(client_t * cl);
+int client_iteration(client_t * cl);
+
+int64_t client_get_seq(client_t * cl);
+int client_get_status(client_t * cl);
+void client_set_status(client_t * c, int status);
+
+/* One program */
+
+#define PROGRAM_STATUS_DONE    0
+#define PROGRAM_STATUS_RUNNING 1
+#define PROGRAM_STATUS_STOP    2
+
+#define PROGRAM_HAVE_HEADER    (1<<0)
+
+typedef struct
+  {
+  pthread_mutex_t client_mutex;
+  pthread_mutex_t status_mutex;
+  pthread_mutex_t metadata_mutex;
+  gavl_metadata_t m;
+  int have_m; // 1 if we received a metadata update yet
+
+  char * name;
+
+  bg_plug_t * in_plug;
+  bg_mediaconnector_t conn;
+  bg_plug_t * conn_plug;
+  
+  int clients_alloc;
+  int num_clients;
+  client_t ** clients;
+  
+  
+  int status;
+  int flags;
+  
+  pthread_t thread;
+
+  gavf_program_header_t ph;
+
+  buffer_t * buf;
+
+  gavl_timer_t * timer;
+  
+  } program_t;
+
+program_t * program_create_from_socket(const char * name, int fd,
+                                       const gavl_metadata_t * url_vars);
+
+program_t * program_create_from_plug(const char * name, bg_plug_t * plug,
+                                     const gavl_metadata_t * url_vars);
+
+int program_get_status(program_t * p);
+
+void program_destroy(program_t *);
+void program_attach_client(program_t *, int fd,
+                           const gavl_metadata_t * req,
+                           gavl_metadata_t * res,
+                           const gavl_metadata_t * url_vars);
+
+void program_run(program_t * p);
+
+
+typedef struct
+  {
+  pthread_mutex_t program_mutex;
+
+  program_t ** programs;
+  int num_programs;
+  int programs_alloc;
+  
+  int * listen_sockets;
+  char ** listen_addresses;
+  
+  int num_listen_sockets;
+    
+  } server_t;
+
+server_t * server_create(char ** listen_addresses,
+                         int num_listen_addresses);
+
+int server_iteration(server_t * s);
+
+void server_destroy(server_t * s);
+

gmerlin-4256.tar.gz/apps/gavftools/gavf-tee.c Added

@@ -0,0 +1,182 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "gavftools.h"
+
+#define LOG_DOMAIN "gavf-tee"
+
+static bg_plug_t * in_plug = NULL;
+static bg_plug_t ** out_plugs = NULL;
+
+static char ** outfiles = NULL;
+static int num_outfiles = 0;
+
+static void
+opt_o(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -o requires an argument\n");
+    exit(-1);
+    }
+  
+  outfiles = realloc(outfiles, sizeof(*outfiles) * (num_outfiles+1));
+  outfiles[num_outfiles] = (*_argv)[arg];
+  num_outfiles++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    GAVFTOOLS_INPLUG_OPTIONS,
+    GAVFTOOLS_AUDIO_STREAM_OPTIONS,
+    GAVFTOOLS_VIDEO_STREAM_OPTIONS,
+    GAVFTOOLS_TEXT_STREAM_OPTIONS,
+    GAVFTOOLS_OVERLAY_STREAM_OPTIONS,
+    {
+      .arg =         "-o",
+      .help_arg =    "<output>",
+      .help_string = TRS("Output file or location. Use this option multiple times to add more outputs."),
+      .callback    = &opt_o,
+    },
+    GAVFTOOLS_OOPT_OPTIONS,
+    GAVFTOOLS_LOG_OPTIONS,
+    { /* End */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gavf-tee",
+    .long_name = TRS("Send a gavf stream to one or more destinations"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf tee\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+
+int main(int argc, char ** argv)
+  {
+  int ret = EXIT_FAILURE;
+  int i;
+  bg_mediaconnector_t conn;
+  
+  gavftools_init();
+  
+  gavftools_block_sigpipe();
+  bg_mediaconnector_init(&conn);
+
+  gavftools_set_cmdline_parameters(global_options);
+
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!bg_cmdline_check_unsupported(argc, argv))
+    return -1;
+
+  in_plug = gavftools_create_in_plug();
+
+  if(!bg_plug_open_location(in_plug, gavftools_in_file, NULL, NULL))
+    goto fail;
+  
+  gavftools_set_stream_actions(in_plug);
+  
+  if(!bg_plug_start(in_plug))
+    goto fail;
+
+  if(!num_outfiles)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Need at least one output file");
+    goto fail;
+    }
+
+  if(!bg_plug_setup_reader(in_plug, &conn))
+    goto fail;
+
+  bg_mediaconnector_create_conn(&conn);
+  
+  out_plugs = calloc(num_outfiles, sizeof(*out_plugs));
+
+  for(i = 0; i < num_outfiles; i++)
+    {
+    out_plugs[i] = gavftools_create_out_plug();
+
+    if(!gavftools_open_out_plug_from_in_plug(out_plugs[i], outfiles[i],
+                                             in_plug))
+      goto fail;
+    
+    if(!bg_plug_setup_writer(out_plugs[i], &conn))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up plug writer failed");
+      goto fail;
+      }
+    }
+  /* Fire up connector */
+
+  bg_mediaconnector_start(&conn);
+
+  /* Run */
+
+  while(1)
+    {
+    if(bg_plug_got_error(in_plug))
+      break;
+
+    if(gavftools_stop() ||
+       !bg_mediaconnector_iteration(&conn))
+      break;
+    }
+  
+  ret = EXIT_SUCCESS;
+  fail:
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up");
+
+  bg_mediaconnector_free(&conn);
+
+  if(in_plug)
+    bg_plug_destroy(in_plug);
+  
+  for(i = 0; i < num_outfiles; i++)
+    bg_plug_destroy(out_plugs[i]);
+
+  if(outfiles)
+    free(outfiles);
+  if(out_plugs)
+    free(out_plugs);
+  
+  gavftools_cleanup();
+  
+
+  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavftools.c Added

@@ -0,0 +1,611 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <pthread.h>
+#include <signal.h>
+#include <string.h>
+
+#include "gavftools.h"
+
+#define LOG_DOMAIN "gavftools"
+
+bg_plugin_registry_t * plugin_reg = NULL;
+bg_cfg_registry_t * cfg_reg = NULL;
+
+char * gavftools_in_file  = NULL;
+char * gavftools_out_file = NULL;
+
+static int got_sigint = 0;
+struct sigaction old_int_sigaction;
+struct sigaction old_term_sigaction;
+
+/* Quality parameters */
+
+bg_cfg_section_t * aq_section = NULL;
+bg_cfg_section_t * vq_section = NULL;
+
+static const bg_parameter_info_t aq_params[] =
+  {
+    BG_GAVL_PARAM_CONVERSION_QUALITY,
+    BG_GAVL_PARAM_RESAMPLE_MODE,
+    BG_GAVL_PARAM_AUDIO_DITHER_MODE,
+    { /* End */ },
+  };
+
+static const bg_parameter_info_t vq_params[] =
+  {
+    BG_GAVL_PARAM_CONVERSION_QUALITY,
+    BG_GAVL_PARAM_DEINTERLACE,
+    BG_GAVL_PARAM_SCALE_MODE,
+    BG_GAVL_PARAM_RESAMPLE_CHROMA,
+    BG_GAVL_PARAM_ALPHA,
+    BG_GAVL_PARAM_BACKGROUND,
+    { /* End */ },
+  };
+
+/* Conversion options */
+
+bg_gavl_audio_options_t gavltools_aopt;
+bg_gavl_video_options_t gavltools_vopt;
+
+static void sigint_handler(int sig)
+  {
+  got_sigint = 1;
+  sigaction(SIGINT, &old_int_sigaction, 0);
+  sigaction(SIGTERM, &old_term_sigaction, 0);
+  
+  switch(sig)
+    {
+    case SIGINT:
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Caught SIGINT, terminating");
+      break;
+    case SIGTERM:
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Caught SIGTERM, terminating");
+      break;
+    }
+  }
+
+static void set_sigint_handler()
+  {
+  struct sigaction sa;
+  sa.sa_flags = 0;
+  sigemptyset(&sa.sa_mask);
+  sa.sa_handler = sigint_handler;
+  if (sigaction(SIGINT, &sa, &old_int_sigaction) == -1)
+    fprintf(stderr, "sigaction failed\n");
+  if (sigaction(SIGTERM, &sa, &old_term_sigaction) == -1)
+    fprintf(stderr, "sigaction failed\n");
+  }
+
+int gavftools_stop()
+  {
+  return got_sigint;
+  }
+
+void gavftools_init()
+  {
+  char * tmp_path;
+  bg_cfg_section_t * cfg_section;
+    
+  cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+    
+  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(cfg_section);
+
+  if(bg_plugin_registry_changed(plugin_reg))
+    {     
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Plugin registry changed");
+    tmp_path =  bg_search_file_write("generic", "config.xml");
+    bg_cfg_registry_save(cfg_reg, tmp_path);
+    if(tmp_path)
+      free(tmp_path);
+    }
+
+  set_sigint_handler();
+
+  /* Quality options */
+  
+  bg_gavl_audio_options_init(&gavltools_aopt);
+  bg_gavl_video_options_init(&gavltools_vopt);
+
+  aq_section = bg_cfg_section_create_from_parameters("aq", aq_params);
+  vq_section = bg_cfg_section_create_from_parameters("vq", vq_params);
+  
+  }
+
+
+static bg_cfg_section_t * iopt_section = NULL;
+static bg_cfg_section_t * oopt_section = NULL;
+
+static bg_stream_action_t * a_actions = NULL;
+static int num_a_actions = 0;
+
+static bg_stream_action_t * v_actions = NULL;
+static int num_v_actions = 0;
+
+static bg_stream_action_t * t_actions = NULL;
+static int num_t_actions = 0;
+
+static bg_stream_action_t * o_actions = NULL;
+static int num_o_actions = 0;
+
+static char ** meta_fields = NULL;
+int num_meta_fields = 0;
+
+void gavftools_cleanup(int save_regs)
+  {
+  bg_plugin_registry_destroy(plugin_reg);
+  bg_cfg_registry_destroy(cfg_reg);
+
+
+  if(iopt_section)
+    bg_cfg_section_destroy(iopt_section);
+  if(oopt_section)
+    bg_cfg_section_destroy(oopt_section);
+  
+
+  if(a_actions) free(a_actions);
+  if(v_actions) free(v_actions);
+  if(t_actions) free(t_actions);
+  if(o_actions) free(o_actions);
+
+  if(meta_fields)
+    free(meta_fields);
+
+  bg_gavl_audio_options_free(&gavltools_aopt);
+  bg_gavl_video_options_free(&gavltools_vopt);
+
+  if(aq_section)
+    bg_cfg_section_destroy(aq_section);
+  if(vq_section)
+    bg_cfg_section_destroy(vq_section);
+
+  xmlCleanupParser();
+ 
+  }
+
+void gavftools_set_output_metadata(gavl_metadata_t * m)
+  {
+  int i;
+  char * key;
+  char * pos;
+  for(i = 0; i < num_meta_fields; i++)
+    {
+    pos = strchr(meta_fields[i], '=');
+    if(!pos)
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Ignoring metadata string \"%s\" ('=' missing)",
+             meta_fields[i]);
+      continue;
+      }
+    key = gavl_strndup(meta_fields[i], pos);
+    pos++;
+    if(*pos == '\0')
+      pos = NULL;
+    gavl_metadata_set(m, key, pos);
+    free(key);
+    }
+  }
+
+
+bg_cfg_section_t * gavftools_iopt_section(void)
+  {
+  if(!iopt_section)
+    {
+    iopt_section =
+      bg_cfg_section_create_from_parameters("iopt",
+                                            bg_plug_get_input_parameters());
+    }
+  return iopt_section;
+  }
+
+bg_cfg_section_t * gavftools_oopt_section(void)
+  {
+  if(!oopt_section)
+    {
+    oopt_section =
+      bg_cfg_section_create_from_parameters("oopt",
+                                            bg_plug_get_output_parameters());
+    }
+  return oopt_section;
+  }
+
+
+static void set_aq_parameter(void * data, const char * name,
+                             const bg_parameter_value_t * val)
+  {
+  bg_gavl_audio_set_parameter(&gavltools_aopt, name, val);
+  }
+
+static void set_vq_parameter(void * data, const char * name,
+                             const bg_parameter_value_t * val)
+  {
+  bg_gavl_video_set_parameter(&gavltools_vopt, name, val);
+  }
+
+
+void
+gavftools_opt_aq(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -aq requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(aq_section,
+                               set_aq_parameter,
+                               NULL,
+                               aq_params,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+void
+gavftools_opt_vq(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vq requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(vq_section,
+                               set_vq_parameter,
+                               NULL,
+                               vq_params,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+
+void
+gavftools_opt_iopt(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -iopt requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(gavftools_iopt_section(),
+                               NULL,
+                               NULL,
+                               bg_plug_get_input_parameters(),
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+void
+gavftools_opt_oopt(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -oopt requires an argument\n");
+    exit(-1);
+    }
+  if(!bg_cmdline_apply_options(gavftools_oopt_section(),
+                               NULL,
+                               NULL,
+                               bg_plug_get_output_parameters(),
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+void
+gavftools_opt_m(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -m requires an argument\n");
+    exit(-1);
+    }
+  meta_fields = realloc(meta_fields, (num_meta_fields+1) * sizeof(*meta_fields));
+  meta_fields[num_meta_fields] = (*_argv)[arg];
+  num_meta_fields++;
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+
+void
+gavftools_block_sigpipe(void)
+  {
+  signal(SIGPIPE, SIG_IGN);
+#if 0
+  sigset_t newset;
+  /* Block SIGPIPE */
+  sigemptyset(&newset);
+  sigaddset(&newset, SIGPIPE);
+  pthread_sigmask(SIG_BLOCK, &newset, NULL);
+#endif
+  }
+
+/* Stream actions */
+
+static bg_stream_action_t * stream_actions_from_arg(const char * arg, int * num_p)
+  {
+  int i;
+  char ** actions_c;
+  bg_stream_action_t * ret;
+  int num;
+
+  actions_c = bg_strbreak(arg, ',');
+  num = 0;
+  while(actions_c[num])
+    num++;
+
+  ret = calloc(num, sizeof(*ret));
+
+  for(i = 0; i < num; i++)
+    {
+    if(*(actions_c[i]) == 'd')
+      ret[i] = BG_STREAM_ACTION_DECODE;
+    else if(*(actions_c[i]) == 'm')
+      ret[i] = BG_STREAM_ACTION_OFF;
+    else if(*(actions_c[i]) == 'c')
+      ret[i] = BG_STREAM_ACTION_READRAW;
+    }
+  *num_p = num;
+  bg_strbreak_free(actions_c);
+  return ret;
+  }
+
+void
+gavftools_opt_as(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -as requires an argument\n");
+    exit(-1);
+    }
+
+  a_actions = stream_actions_from_arg((*_argv)[arg], &num_a_actions);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  
+  }
+
+void
+gavftools_opt_vs(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vs requires an argument\n");
+    exit(-1);
+    }
+  v_actions = stream_actions_from_arg((*_argv)[arg], &num_v_actions);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  
+  }
+
+void
+gavftools_opt_os(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -os requires an argument\n");
+    exit(-1);
+    }
+  o_actions = stream_actions_from_arg((*_argv)[arg], &num_o_actions);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+
+  }
+
+void
+gavftools_opt_ts(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -ts requires an argument\n");
+    exit(-1);
+    }
+  t_actions = stream_actions_from_arg((*_argv)[arg], &num_t_actions);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+void gavftools_opt_v(void * data, int * argc, char *** _argv, int arg)
+  {
+  int val, verbose = 0;
+
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -v requires an argument\n");
+    exit(-1);
+    }
+  val = atoi((*_argv)[arg]);  
+  
+  if(val > 0)
+    verbose |= BG_LOG_ERROR;
+  if(val > 1)
+    verbose |= BG_LOG_WARNING;
+  if(val > 2)
+    verbose |= BG_LOG_INFO;
+  if(val > 3)
+    verbose |= BG_LOG_DEBUG;
+  bg_log_set_verbose(verbose);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+void gavftools_opt_syslog(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -syslog requires an argument\n");
+    exit(-1);
+    }
+  bg_log_syslog_init((*_argv)[arg]);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+
+
+bg_stream_action_t *
+gavftools_get_stream_actions(int num, gavf_stream_type_t type)
+  {
+  int i;
+  int num_actions;
+  bg_stream_action_t * actions;
+  bg_stream_action_t * ret;
+  bg_stream_action_t def_action = BG_STREAM_ACTION_READRAW;
+  
+  if(!num)
+    return NULL;
+  
+  switch(type)
+    {
+    case GAVF_STREAM_AUDIO:
+      actions = a_actions;
+      num_actions = num_a_actions;
+      break;
+    case GAVF_STREAM_VIDEO:
+      actions = v_actions;
+      num_actions = num_v_actions;
+      break;
+    case GAVF_STREAM_TEXT:
+      actions = t_actions;
+      num_actions = num_t_actions;
+      break;
+    case GAVF_STREAM_OVERLAY:
+      actions = o_actions;
+      num_actions = num_o_actions;
+      break;
+    default:
+      return NULL;
+    }
+
+  if(!num_actions)
+    {
+    ret = calloc(num, sizeof(*ret));
+    for(i = 0; i < num; i++)
+      ret[i] = def_action;
+    return ret;
+    }
+  
+  ret = calloc(num, sizeof(*ret));
+  
+  i = num;
+  if(i > num_actions)
+    i = num_actions;
+
+  memcpy(ret, actions, i * sizeof(*actions));
+
+  if(num > num_actions)
+    {
+    for(i = num_actions; i < num; i++)
+      ret[i] = BG_STREAM_ACTION_OFF;
+    }
+  return ret;
+  }
+
+bg_plug_t * gavftools_create_in_plug()
+  {
+  bg_plug_t * in_plug;
+  in_plug = bg_plug_create_reader(plugin_reg);
+  bg_cfg_section_apply(gavftools_iopt_section(),
+                       bg_plug_get_input_parameters(),
+                       bg_plug_set_parameter,
+                       in_plug);
+  return in_plug;
+  }
+
+bg_plug_t * gavftools_create_out_plug()
+  {
+  bg_plug_t * out_plug;
+  out_plug = bg_plug_create_writer(plugin_reg);
+  bg_cfg_section_apply(gavftools_oopt_section(),
+                       bg_plug_get_output_parameters(),
+                       bg_plug_set_parameter,
+                       out_plug);
+  return out_plug;
+  }
+
+void gavftools_set_cmdline_parameters(bg_cmdline_arg_t * args)
+  {
+  bg_cmdline_arg_set_parameters(args, "-iopt",
+                                bg_plug_get_input_parameters());
+  bg_cmdline_arg_set_parameters(args, "-oopt",
+                                bg_plug_get_output_parameters());
+  bg_cmdline_arg_set_parameters(args, "-aq", aq_params);
+  bg_cmdline_arg_set_parameters(args, "-vq", aq_params);
+  }
+
+
+int gavftools_open_out_plug_from_in_plug(bg_plug_t * out_plug,
+                                         const char * name,
+                                         bg_plug_t * in_plug)
+  {
+  gavl_metadata_t m;
+  gavl_metadata_init(&m);
+  gavl_metadata_copy(&m, bg_plug_get_metadata(in_plug));
+  gavftools_set_output_metadata(&m);
+  if(!name)
+    name = gavftools_out_file;
+  if(!bg_plug_open_location(out_plug, name,
+                            &m,
+                            bg_plug_get_chapter_list(in_plug)))
+    {
+    gavl_metadata_free(&m);
+    return 0;
+    }
+  bg_plug_transfer_metadata(in_plug, out_plug);
+  gavl_metadata_free(&m);
+  return 1;
+  }
+
+static void set_stream_actions(bg_plug_t * in_plug, gavf_stream_type_t type)
+  {
+  gavf_t * g;
+  int num, i;
+  const gavf_stream_header_t * sh;
+
+  bg_stream_action_t * actions = NULL;
+  
+  g = bg_plug_get_gavf(in_plug);
+
+  num = gavf_get_num_streams(g, type);
+
+  if(!num)
+    return;
+  
+  actions = gavftools_get_stream_actions(num, type);
+
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, type);
+    bg_plug_set_stream_action(in_plug, sh, actions[i]);
+    }
+  
+  if(actions)
+    free(actions);
+  }
+
+
+void gavftools_set_stream_actions(bg_plug_t * p)
+  {
+  set_stream_actions(p, GAVF_STREAM_AUDIO);
+  set_stream_actions(p, GAVF_STREAM_VIDEO);
+  set_stream_actions(p, GAVF_STREAM_TEXT);
+  set_stream_actions(p, GAVF_STREAM_OVERLAY);
+  }

gmerlin-4256.tar.gz/apps/gavftools/gavftools.h Added

@@ -0,0 +1,209 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/cmdline.h>
+#include <gmerlin/log.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/bgplug.h>
+#include <gmerlin/mediaconnector.h>
+#include <gmerlin/bggavl.h>
+
+extern bg_plugin_registry_t * plugin_reg;
+extern bg_cfg_registry_t * cfg_reg;
+
+extern char * gavftools_in_file;
+extern char * gavftools_out_file;
+
+void gavftools_init();
+void gavftools_cleanup();
+
+int gavftools_stop();
+
+bg_cfg_section_t *
+gavftools_iopt_section(void);
+
+bg_cfg_section_t *
+gavftools_oopt_section(void);
+
+void
+gavftools_opt_aq(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_vq(void * data, int * argc, char *** _argv, int arg);
+
+
+void
+gavftools_opt_iopt(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_oopt(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_as(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_vs(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_os(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_ts(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_v(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_m(void * data, int * argc, char *** _argv, int arg);
+
+void
+gavftools_opt_syslog(void * data, int * argc, char *** _argv, int arg);
+
+extern bg_gavl_audio_options_t gavltools_aopt;
+extern bg_gavl_video_options_t gavltools_vopt;
+
+bg_plug_t * gavftools_create_in_plug();
+bg_plug_t * gavftools_create_out_plug();
+
+bg_stream_action_t * gavftools_get_stream_actions(int num, gavf_stream_type_t type);
+
+void gavftools_set_output_metadata(gavl_metadata_t * m);
+
+#define GAVFTOOLS_INPLUG_OPTIONS                \
+  {                                             \
+    .arg =         "-i",                        \
+    .help_arg =    "<input_file>",                 \
+    .help_string = TRS("Input file or location"),  \
+    .argv    =    &gavftools_in_file,              \
+  },                                             \
+  { \
+    .arg =         "-iopt", \
+    .help_arg =    "<input_options>", \
+    .help_string = "", \
+    .callback =    gavftools_opt_iopt, \
+  }
+
+#define GAVFTOOLS_OOPT_OPTIONS \
+  {                                       \
+    .arg =         "-oopt",                     \
+    .help_arg =    "<output_options>",          \
+    .help_string = TRS("options"),              \
+    .callback =    gavftools_opt_oopt,          \
+  }
+
+#define GAVFTOOLS_M_OPTIONS \
+  {                                      \
+    .arg =         "-m",                 \
+    .help_arg =    "name=value",         \
+    .help_string = TRS("Set global metadata of the output (can be used multiple times). Use \"name=\" to clear a field"), \
+    .callback    = gavftools_opt_m,      \
+  }
+
+#define GAVFTOOLS_OUTPLUG_OPTIONS                \
+  { \
+    .arg =         "-o", \
+    .help_arg =    "<output>", \
+    .help_string = TRS("Output file or location"), \
+    .argv    =    &gavftools_out_file, \
+  }, \
+  GAVFTOOLS_M_OPTIONS, \
+  GAVFTOOLS_OOPT_OPTIONS
+
+#define GAVFTOOLS_AUDIO_STREAM_OPTIONS \
+  { \
+    .arg =         "-as", \
+    .help_arg =    "<stream_selector>", \
+    .help_string = TRS("Comma separated list of characters 'd' (decode), 'm' (mute) or 'c' (read compressed)"), \
+    .callback =    gavftools_opt_as, \
+  }
+
+#define GAVFTOOLS_VIDEO_STREAM_OPTIONS          \
+  { \
+    .arg =         "-vs", \
+    .help_arg =    "<stream_selector>", \
+    .help_string = TRS("Comma separated list of characters 'd' (decode), 'm' (mute) or 'c' (read compressed)"), \
+    .callback =    gavftools_opt_vs, \
+  }
+
+#define GAVFTOOLS_TEXT_STREAM_OPTIONS          \
+  { \
+    .arg =         "-ts", \
+    .help_arg =    "<stream_selector>", \
+    .help_string = TRS("Comma separated list of characters 'm' (mute) or 'c' (read)"), \
+    .callback =    gavftools_opt_ts, \
+  }
+
+#define GAVFTOOLS_OVERLAY_STREAM_OPTIONS           \
+  { \
+    .arg =         "-os", \
+    .help_arg =    "<stream_selector>", \
+    .help_string = TRS("Comma separated list of characters 'd' (decode), 'm' (mute) or 'c' (read compressed)"), \
+    .callback =    gavftools_opt_os, \
+  }
+
+#define GAVFTOOLS_LOG_OPTIONS           \
+  {                                         \
+  .arg =         "-v",                                  \
+  .help_arg =    "level",                             \
+  .help_string = "Set verbosity level (0..4)",                  \
+  .callback =    gavftools_opt_v,                               \
+  }, \
+  {                                         \
+  .arg =         "-syslog",                                  \
+  .help_arg =    "name",                             \
+  .help_string = "Send log messages to syslog",     \
+  .callback =    gavftools_opt_syslog,              \
+  }
+#define GAVFTOOLS_AQ_OPTIONS           \
+  {                                         \
+  .arg =         "-aq",                                  \
+    .help_arg =    "options",                             \
+    .help_string = "Audio conversion options",        \
+    .callback =    gavftools_opt_aq,                               \
+  }
+
+#define GAVFTOOLS_VQ_OPTIONS                \
+  {                                         \
+  .arg =         "-vq",                                  \
+    .help_arg =    "options",                             \
+    .help_string = "Video conversion options",        \
+    .callback =    gavftools_opt_vq,                               \
+  }
+
+
+
+bg_stream_action_t * gavftools_get_stream_action(gavf_stream_type_t type,
+                                                 int num);
+
+void gavftools_set_compresspor_options(bg_cmdline_arg_t * global_options);
+
+void gavftools_block_sigpipe(void);
+
+void gavftools_set_cmdline_parameters(bg_cmdline_arg_t * args);
+
+int gavftools_open_out_plug_from_in_plug(bg_plug_t * out_plug,
+                                         const char * name,
+                                         bg_plug_t * in_plug);
+
+void gavftools_set_stream_actions(bg_plug_t * p);

gmerlin-4256.tar.gz/apps/gavftools/program.c Added

@@ -0,0 +1,281 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gavftools.h>
+
+#define FLAG_DISCONTINUOUS (1<<0)
+
+typedef struct stream_s
+  {
+  int type;
+  
+  gavl_audio_connector_t * aconn;
+  gavl_video_connector_t * vconn;
+  gavl_packet_connector_t * pconn;
+
+  gavl_audio_source_t * asrc;
+  gavl_video_source_t * vsrc;
+  gavl_packet_source_t * psrc;
+  
+  gavl_time_t max_pts;
+  uint32_t timescale;
+
+  int flags;
+
+  int out_index;
+  
+  int (*process)(struct stream_s * s);
+
+  const gavl_metadata_t * m;
+  } stream_t;
+
+static void process_cb_audio(void * priv, gavl_audio_frame_t * frame)
+  {
+  
+  stream_t * s = priv;
+
+  s->max_pts = gavl_time_unscale(s->timescale,
+                                 frame->timestamp + frame->valid_samples);
+  
+  }
+
+static int process_audio(stream_t * s)
+  {
+  return gavl_audio_connector_process(s->aconn);
+  }
+
+static void process_cb_video(void * priv, gavl_video_frame_t * frame)
+  {
+  gavl_time_t pts;
+
+  stream_t * s = priv;
+
+  pts = gavl_time_unscale(s->timescale,
+                          frame->timestamp + frame->duration);
+  if(pts > s->max_pts)
+    s->max_pts = pts;
+  
+  }
+
+static int process_video(stream_t * s)
+  {
+  return gavl_video_connector_process(s->vconn);
+  
+  }
+
+
+static void process_cb_packet(void * priv, gavl_packet_t * packet)
+  {
+  gavl_time_t pts;
+  stream_t * s = priv;
+
+  pts = gavl_time_unscale(s->timescale,
+                          packet->pts + packet->duration);
+  if(pts > s->max_pts)
+    s->max_pts = pts;
+  }
+
+static int process_packet(stream_t * s)
+  {
+  return gavl_packet_connector_process(s->pconn);
+  }
+
+
+struct bg_program_s
+  {
+  int num_streams;
+  
+  stream_t ** streams;
+
+  bg_plug_t * src_plug;
+  bg_plug_t * dst_plug;
+  };
+
+bg_program_t * bg_program_create()
+  {
+  bg_program_t * ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+static stream_t * append_stream(bg_program_t * p)
+  {
+  stream_t * ret;
+
+  p->streams = realloc(p->streams,
+                       sizeof(*p->streams) * (p->num_streams+1));
+  p->streams[p->num_streams] =
+    calloc(1, sizeof(*(p->streams[p->num_streams])));
+  ret = p->streams[p->num_streams];
+  p->num_streams++;
+  
+  ret->max_pts = GAVL_TIME_UNDEFINED;
+  return ret;
+  }
+
+void bg_program_add_audio_stream(bg_program_t * p,
+                                 gavl_audio_source_t * asrc,
+                                 gavl_packet_source_t * psrc,
+                                 const gavl_metadata_t * m)
+  {
+  stream_t * s;
+  s = append_stream(p);
+  s->type = GAVF_STREAM_AUDIO;
+  s->m = m;
+  if(asrc)
+    {
+    s->asrc = asrc;
+    s->aconn = gavl_audio_connector_create(asrc);
+    gavl_audio_connector_set_process_func(s->aconn,
+                                          process_cb_audio,
+                                          s);
+    s->process = process_audio;
+    }
+  else if(psrc)
+    {
+    s->psrc = psrc;
+    s->pconn = gavl_packet_connector_create(psrc);
+    gavl_packet_connector_set_process_func(s->pconn,
+                                          process_cb_packet,
+                                          s);
+    s->process = process_packet;
+    }
+  }
+
+void bg_program_add_video_stream(bg_program_t * p,
+                                 gavl_video_source_t * vsrc,
+                                 gavl_packet_source_t * psrc,
+                                 const gavl_metadata_t * m)
+  {
+  stream_t * s;
+  s = append_stream(p);
+  s->type = GAVF_STREAM_VIDEO;
+  s->m = m;
+  
+  if(vsrc)
+    {
+    s->vsrc = vsrc;
+    s->vconn = gavl_video_connector_create(vsrc);
+    gavl_video_connector_set_process_func(s->vconn,
+                                          process_cb_video,
+                                          s);
+    s->process = process_video;
+    }
+  else if(psrc)
+    {
+    s->psrc = psrc;
+    s->pconn = gavl_packet_connector_create(psrc);
+    gavl_packet_connector_set_process_func(s->pconn,
+                                          process_cb_packet,
+                                          s);
+    s->process = process_packet;
+    }
+  }
+
+
+void bg_program_add_text_stream(bg_program_t * p,
+                                gavl_packet_source_t * psrc,
+                                uint32_t timescale,
+                                const gavl_metadata_t * m)
+  {
+  stream_t * s;
+  s = append_stream(p);
+  s->type = GAVF_STREAM_VIDEO;
+  s->m = m;
+
+  s->psrc = psrc;
+  s->pconn = gavl_packet_connector_create(psrc);
+  gavl_packet_connector_set_process_func(s->pconn,
+                                         process_cb_packet,
+                                         s);
+  
+  s->process = process_packet;
+  s->flags |= FLAG_DISCONTINUOUS;
+  s->timescale = timescale;
+  }
+
+void bg_program_connect_dst_plug(bg_program_t * p, bg_plug_t * dst)
+  {
+  int i;
+  gavf_t * g;
+  stream_t * s;
+  const gavl_audio_format_t * afmt;
+  const gavl_video_format_t * vfmt;
+  const gavl_compression_info_t * ci;
+  
+  p->dst_plug = dst;
+
+  g = bg_plug_get_gavf(p->dst_plug);
+
+  for(i = 0; i < p->num_streams; i++)
+    {
+    s = p->streams[i];
+
+    switch(s->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        if(s->asrc)
+          {
+          afmt = gavl_audio_source_get_src_format(s->asrc);
+          s->out_index = gavf_add_audio_stream(g, NULL, afmt, s->m);
+          }
+        else if(s->psrc)
+          {
+          afmt = gavl_packet_source_get_audio_format(s->psrc);
+          ci = gavl_packet_source_get_ci(s->psrc);
+          s->out_index = gavf_add_audio_stream(g, ci, afmt, s->m);
+          }
+        break;
+      case GAVF_STREAM_VIDEO:
+        if(s->vsrc)
+          {
+          vfmt = gavl_video_source_get_src_format(s->vsrc);
+          s->out_index = gavf_add_video_stream(g, NULL, vfmt, s->m);
+          }
+        else if(s->psrc)
+          {
+          vfmt = gavl_packet_source_get_video_format(s->psrc);
+          ci = gavl_packet_source_get_ci(s->psrc);
+          s->out_index = gavf_add_video_stream(g, ci, vfmt, s->m);
+          }
+        break;
+      case GAVF_STREAM_TEXT:
+        if(s->pconn)
+          {
+          s->out_index = gavf_add_text_stream(g, s->timescale, s->m);
+          }
+        break;
+      }
+    }
+  
+  }
+
+void bg_program_connect_src_plug(bg_program_t * p, bg_plug_t * src)
+  {
+  p->src_plug = src;
+
+  
+  
+  }
+
+void bg_program_destroy(bg_program_t * p)
+  {
+  
+  }

gmerlin-1.2.0.tar.gz/apps/kbd/Makefile.am -> gmerlin-4256.tar.gz/apps/kbd/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/kbd/kbd.c -> gmerlin-4256.tar.gz/apps/kbd/kbd.c Changed

gmerlin-1.2.0.tar.gz/apps/kbd/kbd.h -> gmerlin-4256.tar.gz/apps/kbd/kbd.h Changed

gmerlin-1.2.0.tar.gz/apps/kbd/kbd_config.c -> gmerlin-4256.tar.gz/apps/kbd/kbd_config.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -300,10 +300,10 @@
   if(ret)
     {
     kbd->scancode = atoi(gtk_entry_get_text(GTK_ENTRY(dlg->scancode)));
-    kbd->modifiers = bg_strdup(kbd->modifiers,
-                               gtk_entry_get_text(GTK_ENTRY(dlg->modifiers)));
-    kbd->command = bg_strdup(kbd->command,
-                             gtk_entry_get_text(GTK_ENTRY(dlg->command)));
+    kbd->modifiers = gavl_strrep(kbd->modifiers,
+                                 gtk_entry_get_text(GTK_ENTRY(dlg->modifiers)));
+    kbd->command = gavl_strrep(kbd->command,
+                               gtk_entry_get_text(GTK_ENTRY(dlg->command)));
     }
 
   edit_dialog_destroy(dlg);
@@ -616,7 +616,7 @@
   ret->kbd_button = gtk_check_button_new_with_label(TR("Daemon running"));
 
   bg_gtk_tooltips_set_tip(ret->kbd_button,
-                          TRS("Switch deamon on and off. If you want to start the daemon with each start of X, add \"gmerlin_kbd\" to your startup programs"),
+                          TRS("Switch daemon on and off. If you want to start the daemon with each start of X, add \"gmerlin_kbd\" to your startup programs"),
                           PACKAGE);
   
   ret->add_button =
@@ -733,7 +733,7 @@
 
   gtk_widget_show(ret->window);
 
-  ret->remote = bg_remote_client_create(KBD_REMOTE_ID, 0);
+  ret->remote = bg_remote_client_create(KBD_REMOTE_ID);
 
   if(bg_remote_client_init(ret->remote,
                            "localhost", KBD_REMOTE_PORT, 10000))

gmerlin-1.2.0.tar.gz/apps/kbd/kbd_daemon.c -> gmerlin-4256.tar.gz/apps/kbd/kbd_daemon.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -100,7 +100,6 @@
         }
       }
     }
-  bg_log_syslog_flush();
   }
 
 static void ungrab_keys(kbd_daemon_t * d)
@@ -114,7 +113,6 @@
                  d->root);
       }
     }
-  bg_log_syslog_flush();
   }
 
 static void kbd_daemon_destroy(kbd_daemon_t * d)
@@ -131,7 +129,6 @@
     }
   bg_log(BG_LOG_INFO, LOG_DOMAIN, "Exiting");
   
-  bg_log_syslog_flush();
   bg_msg_queue_destroy(d->log_queue);
   free(d);
   }
@@ -171,7 +168,6 @@
     return NULL;
     }
   grab_keys(ret);
-  bg_log_syslog_flush();
   return ret;
   }
 
@@ -243,7 +239,6 @@
           break;
         }
       }
-    bg_log_syslog_flush();
     gavl_time_delay(&delay_time);
     }
   }
@@ -251,50 +246,9 @@
 int main(int argc, char ** argv)
   {
   /* Our process ID and Session ID */
-  pid_t pid, sid;
   kbd_daemon_t * d;
-  
-#if 1
-  /* Fork off the parent process */
-  pid = fork();
-  if(pid < 0)
-    {
-    exit(EXIT_FAILURE);
-    }
-  /* If we got a good PID, then
-     we can exit the parent process. */
-  if(pid > 0)
-    {
-    exit(EXIT_SUCCESS);
-    }
-  
-  /* Change the file mode mask */
-  umask(0);
-                
-  /* Open any logs here */        
-                
-  /* Create a new SID for the child process */
-  sid = setsid();
-  if (sid < 0)
-    {
-    /* Log the failure */
-    exit(EXIT_FAILURE);
-    }
-  
-  /* Change the current working directory */
-  if ((chdir("/")) < 0)
-    {
-    /* Log the failure */
-    exit(EXIT_FAILURE);
-    }
-  
-  /* Close out the standard file descriptors */
-  close(STDIN_FILENO);
-  close(STDOUT_FILENO);
-  close(STDERR_FILENO);
-#endif
-  
-  
+
+  bg_daemonize();
   
   /* Create application */
   d = kbd_daemon_create();

gmerlin-1.2.0.tar.gz/apps/kbd/kbd_remote.c -> gmerlin-4256.tar.gz/apps/kbd/kbd_remote.c Changed

gmerlin-1.2.0.tar.gz/apps/kbd/kbd_remote.h -> gmerlin-4256.tar.gz/apps/kbd/kbd_remote.h Changed

gmerlin-1.2.0.tar.gz/apps/kbd/keys.c -> gmerlin-4256.tar.gz/apps/kbd/keys.c Changed

gmerlin-1.2.0.tar.gz/apps/kbd/keys_xml.c -> gmerlin-4256.tar.gz/apps/kbd/keys_xml.c Changed

gmerlin-4256.tar.gz/apps/mediaserver Added

gmerlin-4256.tar.gz/apps/mediaserver/Makefile.am Added

gmerlin-4256.tar.gz/apps/mediaserver/buffer.c Added

@@ -0,0 +1,268 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <stdlib.h>
+#include <string.h>
+
+#define LOG_DOMAIN "server.buffer"
+
+
+static buffer_element_t * buffer_element_create();
+static void buffer_element_destroy(buffer_element_t *);
+
+struct buffer_s
+  {
+  int elements_alloc;
+  int num_elements;
+  buffer_element_t ** elements;
+
+  int64_t seq;
+  
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+  };
+
+buffer_element_t * buffer_get_first(buffer_t * b)
+  {
+  return b->num_elements ? b->elements[0] : NULL;
+  }
+
+void buffer_element_set_sync_header(buffer_element_t * el,
+                                    const int64_t * sh, int num_streams)
+  {
+  el->type = BUFFER_TYPE_SYNC_HEADER;
+
+  if(!el->sh)
+    el->sh = calloc(num_streams, sizeof(*el->sh));
+  memcpy(el->sh, sh, num_streams * sizeof(*el->sh));
+  }
+
+void buffer_element_set_packet(buffer_element_t * el,
+                               const gavl_packet_t * p)
+  {
+  gavl_packet_reset(&el->p);
+  gavl_packet_copy(&el->p, p);
+  el->type = BUFFER_TYPE_PACKET;
+  }
+
+void buffer_element_set_metadata(buffer_element_t * el,
+                                 const gavl_metadata_t * m)
+  {
+  gavl_metadata_free(&el->m);
+  gavl_metadata_init(&el->m);
+  gavl_metadata_copy(&el->m, m);
+  el->type = BUFFER_TYPE_METADATA;
+  }
+
+static buffer_element_t * buffer_element_create()
+  {
+  buffer_element_t * ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+static void buffer_element_destroy(buffer_element_t * el)
+  {
+  gavl_metadata_free(&el->m);
+  gavl_packet_free(&el->p);
+
+  if(el->sh)
+    free(el->sh);
+  
+  free(el);
+  }
+
+buffer_t * buffer_create(int num_elements)
+  {
+  int i;
+  buffer_t * ret = calloc(1, sizeof(*ret));
+
+  ret->elements_alloc = num_elements;
+  ret->elements = calloc(ret->elements_alloc, sizeof(*ret->elements));
+
+  pthread_mutex_init(&ret->mutex, NULL);
+  pthread_cond_init(&ret->cond, NULL);
+  
+  for(i = 0; i < ret->elements_alloc; i++)
+    ret->elements[i] = buffer_element_create();
+  
+  return ret;
+  }
+
+void buffer_destroy(buffer_t * b)
+  {
+  pthread_mutex_destroy(&b->mutex);
+  pthread_cond_destroy(&b->cond);
+  
+  free(b);
+  }
+
+void buffer_stop(buffer_t * b)
+  {
+  int i;
+
+  pthread_mutex_lock(&b->mutex);
+
+  for(i = 0; i < b->elements_alloc; i++)
+    buffer_element_destroy(b->elements[i]);
+  free(b->elements);
+  b->elements = NULL;
+  
+  pthread_cond_broadcast(&b->cond);
+  pthread_mutex_unlock(&b->mutex);
+  }
+
+buffer_element_t * buffer_get_write(buffer_t * b)
+  {
+  buffer_element_t * ret;
+
+  pthread_mutex_lock(&b->mutex);
+  if(b->num_elements >= b->elements_alloc)
+    {
+    buffer_element_t * el;
+    el = b->elements[0];
+    memmove(b->elements, b->elements + 1,
+            (b->elements_alloc - 1) * sizeof(*b->elements));
+    b->elements[b->elements_alloc-1] = el;
+    b->num_elements--;
+    }
+  ret = b->elements[b->num_elements];
+  ret->seq = b->seq++;
+
+  // fprintf(stderr, "get_write %d %"PRId64"\n", b->num_elements,
+  // ret->seq);
+  
+  pthread_mutex_unlock(&b->mutex);
+  
+  return ret;
+  }
+
+void buffer_done_write(buffer_t * b)
+  {
+  pthread_mutex_lock(&b->mutex);
+  
+  b->num_elements++;
+  pthread_cond_broadcast(&b->cond);
+  
+  pthread_mutex_unlock(&b->mutex);
+  }
+
+void buffer_get_fullness(buffer_t * b,
+                         int * num_elements, int * max_elements)
+  {
+  pthread_mutex_lock(&b->mutex);
+  *num_elements = b->num_elements;
+  *max_elements = b->elements_alloc;
+  pthread_mutex_unlock(&b->mutex);
+  }
+
+
+int buffer_get_free(buffer_t * b)
+  {
+  int ret;
+  pthread_mutex_lock(&b->mutex);
+  ret = b->elements_alloc - b->num_elements;
+  pthread_mutex_unlock(&b->mutex);
+  return ret;
+  }
+
+int64_t buffer_get_start_seq(buffer_t * b)
+  {
+  int64_t ret;
+
+  pthread_mutex_lock(&b->mutex);
+  
+  ret = b->num_elements ?
+    b->elements[0]->seq : b->seq;
+
+  pthread_mutex_unlock(&b->mutex);
+  return ret;
+  }
+
+
+int buffer_get_read(buffer_t * b, int64_t * seq, buffer_element_t ** el)
+  {
+  int idx;
+  
+  pthread_mutex_lock(&b->mutex);
+  
+  if(!b->elements)
+    {
+    pthread_mutex_unlock(&b->mutex);
+    return 0;
+    }
+
+  /* Initialize to the middle of the buffer */
+  if(*seq < 0)
+    *seq = b->elements[b->num_elements/4]->seq;
+  
+  if(*seq < b->elements[0]->seq)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Buffer underflow for client");
+    pthread_mutex_unlock(&b->mutex);
+    return 0;
+    }
+  
+  idx = *seq - b->elements[0]->seq;
+  
+  if(idx < b->num_elements)
+    {
+    if(b->elements[idx]->seq != *seq)
+      {
+      // Buffer messed up (bug?)
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Got wrong buffer element: Wanted %"PRId64", got %"PRId64,
+             *seq, b->elements[idx]->seq);
+      pthread_mutex_unlock(&b->mutex);
+      return 0;
+      }
+    // Success
+    *el = b->elements[idx];
+
+    (*seq)++;
+    return 1;
+    }
+
+  // No element available
+  pthread_mutex_unlock(&b->mutex);
+  return 1;
+  }
+
+void buffer_done_read(buffer_t * b)
+  {
+  pthread_mutex_unlock(&b->mutex);
+  }
+
+void buffer_wait(buffer_t * b)
+  {
+  struct timeval now;
+  struct timespec timeout;
+
+  gettimeofday(&now, NULL);
+  timeout.tv_sec = now.tv_sec + 1;
+  timeout.tv_nsec = now.tv_usec * 1000;
+  
+  pthread_mutex_lock(&b->mutex);
+  
+  //  pthread_cond_wait(&b->cond, &b->mutex);
+  pthread_cond_timedwait(&b->cond, &b->mutex, &timeout);
+  pthread_mutex_unlock(&b->mutex);
+  }

gmerlin-4256.tar.gz/apps/mediaserver/client.c Added

@@ -0,0 +1,81 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <unistd.h> // close
+
+#define LOG_DOMAIN "server.client"
+
+static void client_set_status(client_t * c, int status)
+  {
+  pthread_mutex_lock(&c->status_mutex);
+  c->status = status;
+  pthread_mutex_unlock(&c->status_mutex);
+  }
+
+static void * client_func(void * priv)
+  {
+  client_t * c = priv;
+  c->func(c);
+  client_set_status(c, CLIENT_STATUS_DONE);
+  return NULL;
+  }
+  
+client_t * client_create(int type, int fd, void * data,
+                         void (*free_data)(void*), void (*func)(client_t*))
+  {
+  client_t * ret = calloc(1, sizeof(*ret));
+  pthread_mutex_init(&ret->status_mutex, NULL);
+  ret->fd = fd;
+  ret->free_data = free_data;
+  ret->func = func;
+  ret->data = data;
+  ret->type = type;
+  pthread_create(&ret->thread, NULL, client_func, ret);
+  return ret;
+  }
+
+int client_get_status(client_t * c)
+  {
+  int ret;
+  pthread_mutex_lock(&c->status_mutex);
+  ret = c->status;
+  pthread_mutex_unlock(&c->status_mutex);
+  return ret;
+  }
+
+
+void client_destroy(server_t * s, client_t * c)
+  {
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Closing client thread");
+  shutdown(c->fd, SHUT_RDWR);
+  client_set_status(c, CLIENT_STATUS_STOP);
+  pthread_join(c->thread, NULL);
+
+  if(c->free_data)
+    c->free_data(c->data);
+  if(c->name)
+    free(c->name);
+
+  pthread_mutex_destroy(&c->status_mutex);
+  close(c->fd);
+  free(c);
+  }

gmerlin-4256.tar.gz/apps/mediaserver/filter.c Added

@@ -0,0 +1,790 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <gavl/metatags.h>
+#include <gmerlin/bgplug.h>
+#include <gmerlin/http.h>
+
+#include "server.h"
+#include "rtp.h"
+
+
+#define LOG_DOMAIN "server.filter"
+
+
+/* */
+
+/*
+ *  bgplug
+ */
+
+static int probe_bgplug(int protocol,
+                        const gavf_program_header_t * ph,
+                        const gavl_metadata_t * request)
+  {
+  return 1;
+  }
+
+static void * create_bgplug(server_t * s,
+                            const gavf_program_header_t * ph,
+                            const gavl_metadata_t * req,
+                            const gavl_metadata_t * inline_metadata,
+                            gavl_metadata_t * res)
+  {
+  bg_plug_t * ret;
+
+  ret = bg_plug_create_writer(s->plugin_reg);
+
+  gavl_metadata_set(res, "Content-Type", bg_plug_mimetype);
+  
+  return ret;
+  }
+
+static int start_bgplug(void * priv,
+                        const gavf_program_header_t * ph,
+                        const gavl_metadata_t * req,
+                        const gavl_metadata_t * inline_metadata,
+                        int fd)
+  {
+  int flags = 0;
+  gavf_io_t * io;
+  
+  //  bg_parameter_value_t val;
+
+  bg_plug_t * p = priv;
+
+  if(!(io = bg_plug_io_open_socket(fd, BG_PLUG_IO_METHOD_WRITE, &flags,
+                                   CLIENT_TIMEOUT)))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Creating client I/O module failed");
+//    bg_plug_response_set_status(res, BG_PLUG_IO_STATUS_406);
+    return 0;
+    }
+  
+  //  fprintf(stderr, "start_bgplug\n");
+
+  //  val.val_i = 1024;
+  //  gavl_metadata_get_int(vars, "shm", &val.val_i);
+  //  bg_plug_set_parameter(p, "shm", &val);
+
+  if(!bg_plug_open(p, io, NULL, NULL, flags))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "bg_plug_open failed");
+    return 0;
+    }
+  
+  if(!bg_plug_set_from_ph(p, ph))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "bg_plug_set_from_ph failed");
+    return 0;
+    }
+  if(inline_metadata)
+    gavf_update_metadata(bg_plug_get_gavf(p), inline_metadata);
+
+  return 1;  
+  }
+
+static int put_buffer_bgplug(void * priv, buffer_element_t * el)
+  {
+  bg_plug_t * p = priv;
+  //  fprintf(stderr, "Put buffer bgplug\n");
+
+  switch(el->type)
+    {
+    case BUFFER_TYPE_PACKET:
+      if(bg_plug_put_packet(p, &el->p) != GAVL_SINK_OK)
+        return 0;
+      break;
+    case BUFFER_TYPE_METADATA:
+      if(!gavf_update_metadata(bg_plug_get_gavf(p),
+                               &el->m))
+        return 0;
+      break;
+    }
+  return 1;
+  }
+
+static void destroy_bgplug(void * priv)
+  {
+  bg_plug_t * p = priv;
+  bg_plug_destroy(p);
+  }
+
+/*
+ *  Generic filters: raw or with muxer and optional
+ *  icy metadata
+ */
+
+typedef struct
+  {
+  icy_t m;
+  gavf_io_t * io_ext;
+  gavf_io_t * io_int;
+  
+  bg_plugin_handle_t * h;
+  bg_encoder_plugin_t * plugin;
+
+  struct
+    {
+    const gavf_stream_header_t * h;
+    int idx;
+    gavl_packet_sink_t * psink;
+    } * streams;
+  
+  int num_streams;
+  
+  } filter_generic_t;
+
+static int supported_generic(bg_plugin_registry_t * plugin_reg, const char * plugin)
+  {
+  if(plugin && !bg_plugin_find_by_name(plugin_reg, plugin))
+    return 0;
+  return 1;
+  }
+
+static void * create_generic(server_t * s,
+                             const gavf_program_header_t * ph,
+                             const gavl_metadata_t * req,
+                             const gavl_metadata_t * inline_metadata,
+                             gavl_metadata_t * res,
+                             const char * plugin_name, int use_icy)
+  {
+  const bg_plugin_info_t * info;
+  filter_generic_t * ret = calloc(1, sizeof(*ret));
+  
+  if(use_icy)
+    icy_init(&ret->m, ph, req, inline_metadata, res);
+
+  if(plugin_name)
+    {
+    /* Load and initialize plugin */
+    info = bg_plugin_find_by_name(s->plugin_reg, plugin_name);
+    ret->h = bg_plugin_load(s->plugin_reg, info);
+    ret->plugin = (bg_encoder_plugin_t*)(ret->h->plugin);
+    }
+  
+  //  v.val_str = "adts";
+  //  ret->plugin->common.set_parameter(ret->h->priv, "format", &v);
+  
+  return ret; 
+  }
+
+static int write_icy(void * priv, const uint8_t * data, int len)
+  {
+  filter_generic_t * f = priv;
+  return icy_write(&f->m, data, len, f->io_ext);
+  }
+
+
+static int start_generic(void * priv,
+                         const gavf_program_header_t * ph,
+                         const gavl_metadata_t * req,
+                         const gavl_metadata_t * inline_metadata,
+                         int fd)
+  {
+  filter_generic_t * m = priv;
+  int flags = 0;
+  int i;
+  const gavf_stream_header_t * h;
+  
+  gavl_metadata_t empty;
+  gavl_metadata_init(&empty);
+  
+  if(!(m->io_ext = bg_plug_io_open_socket(fd, BG_PLUG_IO_METHOD_WRITE, &flags,
+                                          CLIENT_TIMEOUT)))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Creating client I/O module failed");
+//    bg_plug_response_set_status(res, BG_PLUG_IO_STATUS_406);
+    return 0;
+    }
+
+  if(!m->plugin)
+    return 1; // Raw
+  
+  if(m->m.metaint > 0)
+    {
+    m->io_int = gavf_io_create(NULL, write_icy, NULL, NULL, NULL, m);
+    m->plugin->open_io(m->h->priv, m->io_int, &empty, NULL);
+    }
+  else
+    m->plugin->open_io(m->h->priv, m->io_ext, &empty, NULL);
+  
+  m->streams = calloc(ph->num_streams, sizeof(*m->streams));
+
+  for(i = 0; i < ph->num_streams; i++)
+    {
+    h = &ph->streams[i];
+    switch(h->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        if(!m->plugin->writes_compressed_audio(m->h->priv,
+                                               &h->format.audio,
+                                               &h->ci))
+          continue;
+        
+        m->streams[m->num_streams].idx = 
+          m->plugin->add_audio_stream_compressed(m->h->priv,
+                                                 &h->m,
+                                                 &h->format.audio,
+                                                 &h->ci);
+        m->streams[m->num_streams].h = h;
+        m->num_streams++;
+        break;
+      case GAVF_STREAM_VIDEO:
+        if(!m->plugin->writes_compressed_video(m->h->priv,
+                                               &h->format.video,
+                                               &h->ci))
+          continue;
+        
+        m->streams[m->num_streams].idx = 
+          m->plugin->add_video_stream_compressed(m->h->priv,
+                                                 &h->m,
+                                                 &h->format.video,
+                                                 &h->ci);
+        m->streams[m->num_streams].h = h;
+        m->num_streams++;
+        break;
+      case GAVF_STREAM_TEXT:
+        break;
+      case GAVF_STREAM_OVERLAY:
+        break;
+      }
+    }
+  
+
+  if(!m->plugin->start(m->h->priv))
+    return 0;
+
+  for(i = 0; i < ph->num_streams; i++)
+    {
+    h = m->streams[i].h;
+    switch(h->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        m->streams[i].psink = m->plugin->get_audio_packet_sink(m->h->priv, m->streams[i].idx);
+        break;
+      case GAVF_STREAM_VIDEO:
+        m->streams[i].psink = m->plugin->get_video_packet_sink(m->h->priv, m->streams[i].idx);
+        break;
+      case GAVF_STREAM_TEXT:
+        break;
+      case GAVF_STREAM_OVERLAY:
+        break;
+      }
+    }
+  return 1;
+  }
+
+static int put_buffer_generic_raw(void * priv, buffer_element_t * el)
+  {
+  filter_generic_t * m = priv;
+  
+  //  fprintf(stderr, "Put buffer mp3\n");
+  
+  switch(el->type)
+    {
+    case BUFFER_TYPE_PACKET:
+      if(m->m.metaint > 0)
+        return icy_write(&m->m, el->p.data, el->p.data_len, m->io_ext);
+      else
+        return gavf_io_write_data(m->io_ext, el->p.data, el->p.data_len);
+      break;
+    case BUFFER_TYPE_METADATA:
+      if(m->m.metaint > 0)
+        icy_update_metadata(&m->m, &el->m);
+      return 1;
+      break;
+    }
+  return 1;
+  }
+
+static int put_buffer_generic_plugin(void * priv, buffer_element_t * el)
+  {
+  filter_generic_t * m = priv;
+
+  //  fprintf(stderr, "Put buffer mp3\n");
+  
+  switch(el->type)
+    {
+    case BUFFER_TYPE_PACKET:
+      {
+      int i;
+      for(i = 0; i < m->num_streams; i++)
+        {
+        if(m->streams[i].h->id == el->p.id)
+          return (gavl_packet_sink_put_packet(m->streams[i].psink, &el->p) == GAVL_SINK_OK);
+        }
+      }
+      break;
+    case BUFFER_TYPE_METADATA:
+      if(m->m.metaint > 0)
+        icy_update_metadata(&m->m, &el->m);
+      return 1;
+      break;
+    }
+  return 1;
+  }
+
+static void destroy_generic(void * priv)
+  {
+  filter_generic_t * m = priv;
+
+  if(m->h)
+    {
+    m->plugin->close(m->h->priv, 0);
+    bg_plugin_unref(m->h);
+    }
+  
+  if(m->io_int)
+    gavf_io_destroy(m->io_int);
+  if(m->io_ext)
+    gavf_io_destroy(m->io_ext);
+  
+  icy_free(&m->m);
+
+  if(m->streams)
+    free(m->streams);
+  
+  free(m);
+  }
+
+static int probe_audio_generic(int protocol,
+                               const gavf_program_header_t * ph,
+                               gavl_codec_id_t id)
+  {
+  if(protocol != PROTOCOL_HTTP)
+    return 0;
+  if(ph->num_streams != 1)
+    return 0;
+  if(ph->streams[0].type != GAVF_STREAM_AUDIO)
+    return 0;
+  if(ph->streams[0].ci.id != id)
+    return 0;
+  //  if(ph->streams[0].ci.bitrate == GAVL_BITRATE_VBR)
+  //    return 0;
+  return 1;
+  }
+
+static int probe_generic(int protocol,
+                         const gavf_program_header_t * ph,
+                         const gavl_codec_id_t * ids)
+  {
+  int i, j;
+  int supported;
+  
+  if(protocol != PROTOCOL_HTTP)
+    return 0;
+
+  for(i = 0; i < ph->num_streams; i++)
+    {
+    supported = 0;
+    
+    if((ph->streams[i].type != GAVF_STREAM_AUDIO) &&
+       (ph->streams[i].type != GAVF_STREAM_VIDEO))
+      continue;
+
+    j = 0;
+    while(ids[j] != GAVL_CODEC_ID_NONE)
+      {
+      if(ids[j] == ph->streams[i].ci.id)
+        {
+        supported = 1;
+        break;
+        }
+      j++;
+      }
+    if(!supported)
+      return 0;
+    }
+  return 1;
+  }
+
+
+/*
+ *  mp3
+ */
+
+#if 0
+typedef struct
+  {
+  icy_t m;
+  gavf_io_t * io;
+  } mp3_t;
+#endif
+
+static int supported_mp3(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, NULL);
+  }
+
+static int probe_mp3(int protocol,
+                     const gavf_program_header_t * ph,
+                     const gavl_metadata_t * req)
+  {
+  return probe_audio_generic(protocol, ph, GAVL_CODEC_ID_MP3);
+  }
+
+static void * create_mp3(server_t * s,
+                         const gavf_program_header_t * ph,
+                         const gavl_metadata_t * req,
+                         const gavl_metadata_t * inline_metadata,
+                         gavl_metadata_t * res)
+  {
+  void * ret = create_generic(s, ph, req, inline_metadata, res, NULL, 1);
+  //  gavl_metadata_set(res, "Content-Type", "audio/mpeg");
+  return ret;
+  }
+
+/* ADTS */
+
+static int supported_adts(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_ffmpeg_audio");
+  }
+
+static int probe_adts(int protocol,
+                     const gavf_program_header_t * ph,
+                     const gavl_metadata_t * req)
+  {
+  return probe_audio_generic(protocol, ph, GAVL_CODEC_ID_AAC);
+  }
+
+static void * create_adts(server_t * s,
+                         const gavf_program_header_t * ph,
+                         const gavl_metadata_t * req,
+                         const gavl_metadata_t * inline_metadata,
+                         gavl_metadata_t * res)
+  {
+  bg_parameter_value_t v;
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_ffmpeg_audio", 1);
+  v.val_str = "adts";
+  m->plugin->common.set_parameter(m->h->priv, "format", &v);
+  return m;
+  }
+
+/* Vorbis */
+
+static int supported_vorbis(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_vorbis");
+  }
+
+static int probe_vorbis(int protocol,
+                        const gavf_program_header_t * ph,
+                        const gavl_metadata_t * req)
+  {
+  return probe_audio_generic(protocol, ph, GAVL_CODEC_ID_VORBIS);
+  }
+
+static void * create_vorbis(server_t * s,
+                            const gavf_program_header_t * ph,
+                            const gavl_metadata_t * req,
+                            const gavl_metadata_t * inline_metadata,
+                            gavl_metadata_t * res)
+  {
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_vorbis", 0);
+  gavl_metadata_set(res, "Content-Type", "audio/ogg");
+  return m;
+  }
+
+/* Opus */
+
+static int supported_opus(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_opus");
+  }
+
+static int probe_opus(int protocol,
+                      const gavf_program_header_t * ph,
+                      const gavl_metadata_t * req)
+  {
+  return probe_audio_generic(protocol, ph, GAVL_CODEC_ID_OPUS);
+  }
+
+static void * create_opus(server_t * s,
+                          const gavf_program_header_t * ph,
+                          const gavl_metadata_t * req,
+                          const gavl_metadata_t * inline_metadata,
+                          gavl_metadata_t * res)
+  {
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_opus", 0);
+  gavl_metadata_set(res, "Content-Type", "audio/opus");
+  return m;
+  }
+
+/* Flac */
+
+static int supported_flac(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_flac");
+  }
+
+static int probe_flac(int protocol,
+                      const gavf_program_header_t * ph,
+                      const gavl_metadata_t * req)
+  {
+  return probe_audio_generic(protocol, ph, GAVL_CODEC_ID_FLAC);
+  }
+
+static void * create_flac(server_t * s,
+                          const gavf_program_header_t * ph,
+                          const gavl_metadata_t * req,
+                          const gavl_metadata_t * inline_metadata,
+                          gavl_metadata_t * res)
+  {
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_flac", 0);
+  gavl_metadata_set(res, "Content-Type", "audio/flac");
+  return m;
+  }
+
+/* MPEG-2 transport stream */
+
+static int supported_ts(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_ffmpeg");
+  }
+
+static const gavl_codec_id_t ts_codecs[] =
+  {
+    GAVL_CODEC_ID_MPEG1,
+    GAVL_CODEC_ID_MPEG2,
+    GAVL_CODEC_ID_AC3,
+    GAVL_CODEC_ID_MP2,
+    GAVL_CODEC_ID_NONE,
+  };
+
+static int probe_ts(int protocol,
+                    const gavf_program_header_t * ph,
+                    const gavl_metadata_t * req)
+  {
+  return probe_generic(protocol, ph, ts_codecs);
+  }
+
+static void * create_ts(server_t * s,
+                        const gavf_program_header_t * ph,
+                        const gavl_metadata_t * req,
+                        const gavl_metadata_t * inline_metadata,
+                        gavl_metadata_t * res)
+  {
+  bg_parameter_value_t v;
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_ffmpeg", 0);
+  
+  v.val_str = "mpegts";
+  m->plugin->common.set_parameter(m->h->priv, "format", &v);
+
+  gavl_metadata_set(res, "Content-Type", "video/MP2T");
+  return m;
+  }
+
+/* Theora */
+
+static int supported_theora(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_theora");
+  }
+
+static const gavl_codec_id_t theora_codecs[] =
+  {
+    GAVL_CODEC_ID_VORBIS,
+    GAVL_CODEC_ID_THEORA,
+    GAVL_CODEC_ID_NONE,
+  };
+
+static int probe_theora(int protocol,
+                         const gavf_program_header_t * ph,
+                         const gavl_metadata_t * req)
+  {
+  return probe_generic(protocol, ph, theora_codecs);
+  }
+
+static void * create_theora(server_t * s,
+                            const gavf_program_header_t * ph,
+                            const gavl_metadata_t * req,
+                            const gavl_metadata_t * inline_metadata,
+                            gavl_metadata_t * res)
+  {
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_theora", 0);
+  gavl_metadata_set(res, "Content-Type", "video/ogg");
+  return m;
+  }
+
+/* Webm */
+
+static int supported_webm(bg_plugin_registry_t * plugin_reg)
+  {
+  return supported_generic(plugin_reg, "e_ffmpeg");
+  }
+
+static const gavl_codec_id_t webm_codecs[] =
+  {
+    GAVL_CODEC_ID_VORBIS,
+    GAVL_CODEC_ID_VP8,
+    GAVL_CODEC_ID_NONE,
+  };
+
+static int probe_webm(int protocol,
+                      const gavf_program_header_t * ph,
+                      const gavl_metadata_t * req)
+  {
+  return probe_generic(protocol, ph, webm_codecs);
+  }
+
+static void * create_webm(server_t * s,
+                          const gavf_program_header_t * ph,
+                          const gavl_metadata_t * req,
+                          const gavl_metadata_t * inline_metadata,
+                          gavl_metadata_t * res)
+  {
+  bg_parameter_value_t v;
+  filter_generic_t * m = create_generic(s, ph, req, inline_metadata, res, "e_ffmpeg", 0);
+  
+  v.val_str = "webm";
+  m->plugin->common.set_parameter(m->h->priv, "format", &v);
+
+  gavl_metadata_set(res, "Content-Type", "video/webm");
+  return m;
+  }
+
+
+/* */
+
+static filter_t filter_bgplug =
+  {
+    .is_supported = 1,
+    .probe = probe_bgplug,
+    .create = create_bgplug,
+    .start = start_bgplug,
+    .put_buffer = put_buffer_bgplug,
+    .destroy = destroy_bgplug,
+  };
+
+static filter_t filters[] =
+  {
+    {
+    .supported = supported_mp3,
+    .probe = probe_mp3,
+    .create = create_mp3,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_raw,
+    .destroy = destroy_generic,
+    },
+    {
+    .supported = rtp_supported,
+    .probe = rtp_probe,
+    .create = rtp_create,
+    .start = rtp_start,
+    .put_buffer = rtp_put_buffer,
+    .destroy = rtp_destroy,
+    },
+    {
+    .supported = supported_adts,
+    .probe = probe_adts,
+    .create = create_adts,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    {
+    .supported = supported_vorbis,
+    .probe = probe_vorbis,
+    .create = create_vorbis,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    {
+    .supported = supported_opus,
+    .probe = probe_opus,
+    .create = create_opus,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    {
+    .supported = supported_flac,
+    .probe = probe_flac,
+    .create = create_flac,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    /* Audio / Video */
+    {
+    .supported = supported_ts,
+    .probe = probe_ts,
+    .create = create_ts,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    {
+    .supported = supported_theora,
+    .probe = probe_theora,
+    .create = create_theora,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    {
+    .supported = supported_webm,
+    .probe = probe_webm,
+    .create = create_webm,
+    .start = start_generic,
+    .put_buffer = put_buffer_generic_plugin,
+    .destroy = destroy_generic,
+    },
+    { /* End */ },
+  }; 
+
+void filter_init(bg_plugin_registry_t * plugin_reg)
+  {
+  int i = 0;
+  while(filters[i].supported)
+    {
+    filters[i].is_supported = filters[i].supported(plugin_reg);
+    i++;
+    }
+  }
+
+const filter_t * filter_find(int protocol,
+                             const gavf_program_header_t * ph,
+                             const gavl_metadata_t * req)
+  {
+  int i = 0;
+  const char * var;
+  
+  /* bgplug applications will always get a gavf stream */
+  if((var = gavl_metadata_get(req, "User-Agent")) &&
+     !strcmp(var, bg_plug_app_id))
+    return &filter_bgplug;
+  
+  while(filters[i].supported)
+    {
+    if(filters[i].is_supported &&
+       filters[i].probe(protocol, ph, req))
+      return &filters[i];
+    i++;
+    }
+  
+  /* Fallback */
+  return &filter_bgplug;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/gmerlin-server.c Added

@@ -0,0 +1,241 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+
+#include <signal.h>
+#include <string.h>
+
+#define LOG_DOMAIN "gmerlin-server"
+
+static int got_sigint = 0;
+struct sigaction old_int_sigaction;
+struct sigaction old_term_sigaction;
+
+const bg_parameter_info_t * s_params;
+bg_cfg_section_t * s_section = NULL;
+
+char * save_config = NULL;
+
+static void sigint_handler(int sig)
+  {
+  got_sigint = 1;
+  sigaction(SIGINT, &old_int_sigaction, 0);
+  sigaction(SIGTERM, &old_term_sigaction, 0);
+  
+  switch(sig)
+    {
+    case SIGINT:
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Caught SIGINT, terminating");
+      break;
+    case SIGTERM:
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Caught SIGTERM, terminating");
+      break;
+    }
+  }
+
+static void set_sigint_handler()
+  {
+  struct sigaction sa;
+  sa.sa_flags = 0;
+  sigemptyset(&sa.sa_mask);
+  sa.sa_handler = sigint_handler;
+  if (sigaction(SIGINT, &sa, &old_int_sigaction) == -1)
+    fprintf(stderr, "sigaction failed\n");
+  if (sigaction(SIGTERM, &sa, &old_term_sigaction) == -1)
+    fprintf(stderr, "sigaction failed\n");
+  }
+
+static bg_cfg_section_t * load_config_file(const char * name)
+  {
+  xmlNodePtr node;
+  xmlDocPtr xml_doc;
+  bg_cfg_section_t * ret;
+  
+  xml_doc = bg_xml_parse_file(name, 1);
+
+  if(!xml_doc)
+    return NULL;
+  
+  node = xml_doc->children;
+  
+  if(BG_XML_STRCMP(node->name, "SERVERCONFIG"))
+    {
+    xmlFreeDoc(xml_doc);
+    return NULL;
+    }
+  ret = bg_cfg_section_create(NULL);
+  bg_cfg_xml_2_section(xml_doc, node, ret);
+  xmlFreeDoc(xml_doc);
+  return ret;
+  }
+
+static void save_config_file(const bg_cfg_section_t * s)
+  {
+  xmlDocPtr  xml_doc;
+  xmlNodePtr node;
+  xml_doc = xmlNewDoc((xmlChar*)"1.0");
+  node = xmlNewDocRawNode(xml_doc, NULL, (xmlChar*)"SERVERCONFIG", NULL);
+  
+  xmlDocSetRootElement(xml_doc, node);
+
+  bg_cfg_section_2_xml(s, node);
+
+  bg_xml_save_file(xml_doc, save_config, 1);
+  xmlFreeDoc(xml_doc);
+  }
+
+
+static void opt_c(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -c requires an argument\n");
+    exit(-1);
+    }
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using config file %s", (*_argv)[arg]);
+  
+  if(!s_section)
+    s_section = load_config_file((*_argv)[arg]);
+  else
+    {
+    bg_cfg_section_t * tmp = load_config_file((*_argv)[arg]);
+    bg_cfg_section_transfer(tmp, s_section);
+    bg_cfg_section_destroy(tmp);
+    }
+  }
+
+static void opt_s(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -s requires an argument\n");
+    exit(-1);
+    }
+
+  if(!s_section)
+    s_section =
+      bg_cfg_section_create_from_parameters("server", s_params);
+  
+  if(!bg_cmdline_apply_options(s_section,
+                               NULL,
+                               NULL,
+                               s_params,
+                               (*_argv)[arg]))
+    exit(-1);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-s",
+      .help_arg =    "<options>",
+      .help_string = "Server options",
+      .callback =    opt_s,
+    },
+    {
+      .arg = "-sc",
+      .help_arg = "<file>",
+      .help_string = TRS("Save config to file"),
+      .argv = &save_config,
+    },
+    {
+      .arg = "-c",
+      .help_arg = "<file>",
+      .help_string = TRS("Load config from file"),
+      .callback =    opt_c,
+    },
+    { /* End */ }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gmerlin-server",
+    .long_name = TRS("Gmerlin media server"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gmerlin db editor\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+
+int main(int argc, char ** argv)
+  {
+  server_t s;
+  int ret = EXIT_FAILURE;
+
+  set_sigint_handler();
+  signal(SIGPIPE, SIG_IGN);
+
+  server_init(&s);
+
+  s_params = server_get_parameters();
+  
+  bg_cmdline_arg_set_parameters(global_options, "-s",
+                                s_params);
+ 
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+
+  if(!s_section)
+    s_section =
+      bg_cfg_section_create_from_parameters("server", s_params);
+  
+  bg_cfg_section_apply(s_section,
+                       s_params,
+                       server_set_parameter,
+                       &s);
+ 
+  if(!server_start(&s))
+    goto fail;
+
+  filter_init(s.plugin_reg);
+  
+  if(save_config)
+    {
+    bg_cfg_section_get(s_section, s_params, server_get_parameter, &s);
+    save_config_file(s_section);
+    }
+  
+  while(server_iteration(&s))
+    {
+    if(got_sigint)
+      break;
+    }
+
+  ret = EXIT_SUCCESS;  
+  fail:
+  server_cleanup(&s);
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/icy.c Added

@@ -0,0 +1,212 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <gavl/metatags.h>
+// #include <gmerlin/bgplug.h>
+// #include <gmerlin/http.h>
+
+#include "server.h"
+
+void icy_update_metadata(icy_t * m, const gavl_metadata_t * met)
+  {
+  int len;
+  const char * artist;
+  const char * title;
+  const char * label;
+  const char * station;
+  char * tmp_string;
+  char * stream_title;
+
+  artist  = gavl_metadata_get(met, GAVL_META_ARTIST);
+  title   = gavl_metadata_get(met, GAVL_META_TITLE);
+  label   = gavl_metadata_get(met, GAVL_META_LABEL);
+  station = gavl_metadata_get(met, GAVL_META_STATION);
+
+  //  fprintf(stderr, "Update metadata:\n");
+  //  gavl_metadata_dump(met, 0);
+  
+  if(artist && title)
+    stream_title = bg_sprintf("%s - %s", artist, title);
+  else if(label)
+    stream_title = gavl_strdup(label);
+  else if(title)
+    stream_title = gavl_strdup(title);
+  else if(station)
+    stream_title = gavl_strdup(station);
+  else
+    stream_title = gavl_strdup("Stream title");
+
+  /* Convert charset */
+  tmp_string = bg_convert_string(m->cnv, stream_title, -1, NULL);
+  free(stream_title);
+  stream_title = tmp_string;
+
+  /* Escape */
+  //  stream_title = gavl_escape_string(stream_title, ";'");
+
+  /* Create buffer */
+  len = 14 + // <len>StreamTitle='
+    strlen(stream_title) +
+    3;       // ';\0
+
+  len = ((len + 15) / 16) * 16;
+
+  m->buffer_len = len+1;
+
+  if(m->buffer_alloc < m->buffer_len)
+    {
+    m->buffer_alloc = m->buffer_len + 32;
+    m->buffer = realloc(m->buffer, m->buffer_alloc);
+    }
+
+  memset(m->buffer, 0, m->buffer_len);
+  snprintf(m->buffer, m->buffer_len, "%cStreamTitle='%s';", len/16, stream_title);
+
+//  gavl_hexdump((uint8_t*)m->buffer, m->buffer_len, 16);
+
+  free(stream_title);
+  }
+
+void icy_init(icy_t * m,
+              const gavf_program_header_t * ph,
+              const gavl_metadata_t * req,
+              const gavl_metadata_t * inline_metadata,
+              gavl_metadata_t * res)
+  {
+  const char * val;
+  int send_metadata = 0;
+  const gavl_compression_info_t * ci;
+  
+  m->cnv = bg_charset_converter_create("UTF-8", "ISO_8859-1");
+  
+  gavl_metadata_get_int(req, "Icy-MetaData", &send_metadata);
+
+  //  if(!send_metadata)
+  //    return;
+  
+  //  bg_http_response_set_protocol(res, "ICY");
+  
+  /* Set ICY-specific header fields */
+#if 0
+  gavl_metadata_set(res, "icy-notice1",
+                    "<BR>This stream requires <a href=\"http://www.winamp.com/\">Winamp</a><BR>");
+  gavl_metadata_set(res, "icy-notice2",
+                    "SHOUTcast Distributed Network Audio Server/Linux v1.9.5<BR>");
+#endif
+  if((val = gavl_metadata_get(&ph->m, GAVL_META_STATION)))
+    gavl_metadata_set_nocpy(res, "icy-name",
+                            bg_convert_string(m->cnv, val, -1, NULL));
+
+  if((val = gavl_metadata_get(&ph->m, GAVL_META_GENRE)))
+    gavl_metadata_set_nocpy(res, "icy-genre",
+                            bg_convert_string(m->cnv, val, -1, NULL));
+
+  if((val = gavl_metadata_get(&ph->m, GAVL_META_URL)))
+    gavl_metadata_set(res, "icy-url", val);
+
+  ci = &ph->streams[0].ci;
+
+  gavl_metadata_set(res, "Content-Type", NULL);
+  
+  if(ci->id == GAVL_CODEC_ID_MP3)
+    gavl_metadata_set(res, "content-type", "audio/mpeg");
+  else if(ci->id == GAVL_CODEC_ID_AAC)
+    {
+    if(ci->flags & GAVL_COMPRESSION_SBR)
+      gavl_metadata_set(res, "content-type", "audio/aacp");
+    else
+      gavl_metadata_set(res, "content-type", "audio/aac");
+    }
+  
+  gavl_metadata_set(res, "icy-pub", "1");
+  
+  if(ph->streams[0].ci.bitrate > 0)
+    gavl_metadata_set_int(res, "icy-br", ph->streams[0].ci.bitrate / 1000);
+
+  if((val = gavl_metadata_get(&ph->m, GAVL_META_COMMENT)))
+    gavl_metadata_set(res, "icy-description",
+                      bg_convert_string(m->cnv, val, -1, NULL));
+
+  if(inline_metadata && (send_metadata > 0))
+    {
+    m->metaint = 16000;
+    gavl_metadata_set_int(res, "icy-metaint", m->metaint);
+    icy_update_metadata(m, inline_metadata);
+    }
+  else
+    {
+    bg_charset_converter_destroy(m->cnv);
+    m->cnv = NULL;
+    }
+  }
+
+int icy_write(icy_t * m,
+              const uint8_t * data, int len,
+              gavf_io_t * io)
+  {
+  int bytes_written;
+  int bytes;
+  
+  if(!m->metaint)
+    return (gavf_io_write_data(io, data, len) == len);
+
+  // fprintf(stderr, "icy_write\n");
+  
+  bytes_written = 0;
+  while(bytes_written < len)
+    {
+    bytes = len - bytes_written;
+    
+    if(m->byte_counter + bytes > m->metaint)
+      {
+      /* Write data */
+      bytes = m->metaint - m->byte_counter;
+      }
+
+    if(bytes &&
+       (gavf_io_write_data(io, data + bytes_written, bytes) < bytes))
+      return 0;
+    
+    m->byte_counter += bytes;
+    bytes_written += bytes;
+    
+    if(m->byte_counter == m->metaint)
+      {
+      /* Write metadata */
+      if(gavf_io_write_data(io, (uint8_t*)m->buffer, m->buffer_len) < m->buffer_len)
+        return 0;
+      /* Reset */
+      m->byte_counter = 0;
+      m->buffer[0] = 0;
+      m->buffer_len = 1;
+      }
+    }
+  return len;
+  }
+
+void icy_free(icy_t * m)
+  {
+  if(m->buffer)
+    free(m->buffer);
+  if(m->cnv)
+    bg_charset_converter_destroy(m->cnv);
+  }

gmerlin-4256.tar.gz/apps/mediaserver/id3gen.c Added

@@ -0,0 +1,307 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <gavl/numptr.h>
+
+#include <string.h>
+#include <stdio.h>
+
+#if 0
+#define CHARSET "UTF-16"
+#define BYTES_PER_CHAR 2
+#else
+#define CHARSET "ISO_8859-1"
+#define BYTES_PER_CHAR 1
+#endif
+
+static void write_data(id3v2_t * ret, const void * data, int len)
+  {
+  if(ret->len + len > ret->alloc)
+    {
+    ret->alloc = ret->len + len + 1024;
+    ret->data = realloc(ret->data, ret->alloc);
+    }
+  memcpy(ret->data + ret->len, data, len);
+  ret->len += len;
+  }
+
+static void write_32_syncsave(uint8_t * dst, uint32_t num)
+  {
+  dst[0] = (num >> 21) & 0x7f;
+  dst[1] = (num >> 14) & 0x7f;
+  dst[2] = (num >> 7) & 0x7f;
+  dst[3] = num & 0x7f;
+  }
+
+static void add_text_frame(id3v2_t * ret, char * fourcc, const char * string, bg_charset_converter_t * cnv)
+  {
+  char buf[4] = { 0, 0, 0, 0 };
+  char * converted;
+  int converted_len;
+  int old_len = ret->len;
+  int frame_len;
+  if(!string)
+    return;
+
+  converted = bg_convert_string(cnv, string, -1, &converted_len);
+
+  write_data(ret, fourcc, 4);
+  write_data(ret, buf, 4); // Size (not syncsave)
+  write_data(ret, buf, 2); // Flags
+  write_data(ret, buf, 1); // Encoding
+  write_data(ret, converted, converted_len+1); // text + '\0'
+ 
+  frame_len = ret->len - old_len - 10;
+  GAVL_32BE_2_PTR(frame_len, ret->data + old_len + 4);
+  free(converted);
+  }
+
+static void add_int_frame(id3v2_t * ret, char * fourcc, int64_t val)
+  {
+  char buf[64];
+  int old_len = ret->len;
+  int frame_len;
+  if(!val || (val == 9999))
+    return;
+
+  memset(buf, 0, 4);
+  
+  write_data(ret, fourcc, 4);
+  write_data(ret, buf, 4); // Size (not syncsave)
+  write_data(ret, buf, 2); // Flags
+  write_data(ret, buf, 1); // Encoding
+
+  sprintf(buf, "%"PRId64, val);
+  write_data(ret, buf, strlen(buf)+1); // text + '\0'
+  frame_len = ret->len - old_len - 10;
+  GAVL_32BE_2_PTR(frame_len, ret->data + old_len + 4);
+  }
+
+static void add_cover(id3v2_t * ret, const char * image_file)
+  {
+  char buf[4] = { 0, 0, 0, 0 };
+  int file_len;
+  int frame_len;
+  int old_len = ret->len;
+  void * file_buf = bg_read_file(image_file, &file_len);
+  
+  if(!file_buf)
+    return;
+
+  write_data(ret, "APIC", 4);
+  write_data(ret, buf, 4); // Size (not syncsave)
+  write_data(ret, buf, 2); // Flags
+  buf[0] = 0x00;
+  write_data(ret, buf, 1); // Encoding
+  
+  write_data(ret, "image/jpeg", 11);
+  buf[0] = 0x03; /* front cover */
+  write_data(ret, buf, 1);
+  buf[0] = 0;
+  write_data(ret, buf, 1); // Description
+  write_data(ret, file_buf, file_len); // Image
+
+  frame_len = ret->len - old_len - 10;
+  GAVL_32BE_2_PTR(frame_len, ret->data + old_len + 4);
+  free(file_buf);
+  }
+
+#define SIZE_OFFSET 6
+
+static int id3v2_generate_by_file(bg_db_t * db, bg_db_audio_file_t * song, id3v2_t * ret)
+  {
+  // Sig (3) + version (2) + flags (1) + size(4)
+  uint8_t header[10] = { 'I', 'D', '3', 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };  
+
+  bg_db_audio_album_t * album = NULL;
+  bg_db_file_t * cover = NULL;
+  bg_charset_converter_t * cnv;
+
+  if(bg_db_object_get_type(song) != BG_DB_OBJECT_AUDIO_FILE)
+    return 0;
+
+  if(song->album_id > 0)
+    {
+    album = bg_db_object_query(db, song->album_id);
+    if(album->cover_id > 0)
+      cover = bg_db_get_thumbnail(db, album->cover_id,
+                                  600, 600, 60000, "image/jpeg");
+    }
+  /* Create tag */
+  ret->len = 0;
+  write_data(ret, header, 10);
+
+  /* Add text Frames */
+  cnv = bg_charset_converter_create("UTF-8", CHARSET);
+
+  add_text_frame(ret, "TPE1", song->artist, cnv);
+  add_text_frame(ret, "TIT2", song->title, cnv);
+  add_text_frame(ret, "TCON", song->genre, cnv);
+  add_int_frame(ret, "TYER", song->date.year);
+  add_int_frame(ret, "TRCK", song->track);
+  add_int_frame(ret, "TLEN", song->file.obj.duration / 1000);
+
+  if(album)
+    {
+    add_text_frame(ret, "TALB", album->title, cnv);
+    add_text_frame(ret, "TPE2", album->artist, cnv);
+    }
+
+  if(cover)
+    {
+    /* add cover */
+    add_cover(ret, cover->path);
+    }
+
+  bg_charset_converter_destroy(cnv);
+
+  /* Write size */
+  write_32_syncsave(ret->data + SIZE_OFFSET, ret->len - 10);
+  ret->id = bg_db_object_get_id(song);
+  
+  /* Unref objects */
+  if(album)
+    bg_db_object_unref(album);
+  if(cover)
+    bg_db_object_unref(cover);
+  return 1;
+  }
+
+static int id3v2_generate_by_id(bg_db_t * db, int64_t id, id3v2_t * ret)
+  {
+  int result;
+  // Sig (3) + version (2) + flags (1) + size(4)
+  
+  bg_db_audio_file_t * song = NULL;
+  
+  /* Query objects */
+  song = bg_db_object_query(db, id);
+  if(!song)
+    return 0;
+
+  result = id3v2_generate_by_file(db, song, ret);
+  bg_db_object_unref(song);
+  return result;
+  }
+
+static id3v2_t * lookup_cache(server_t * s, int64_t id)
+  {
+  int i;
+  /* Check for cached value */
+  for(i = 0; i < s->id3_cache_size; i++)
+    {
+    if(s->id3_cache[i].id == id)
+      {
+      s->id3_cache[i].last_used = s->current_time;
+      return &s->id3_cache[i];
+      }
+    }
+  return NULL;
+  }
+
+static id3v2_t * get_cache_slot(server_t * s)
+  {
+  int i;
+  gavl_time_t min_time = GAVL_TIME_UNDEFINED;
+  int min_index;
+  
+  /* Check for empty slot */
+  for(i = 0; i < s->id3_cache_size; i++)
+    {
+    if(s->id3_cache[i].last_used == GAVL_TIME_UNDEFINED)
+      {
+      min_index = i;
+      break;
+      }
+    else if((min_time == GAVL_TIME_UNDEFINED) ||
+            (s->id3_cache[i].last_used < min_time))
+      {
+      min_index = i;
+      min_time = s->id3_cache[i].last_used;
+      }
+    }
+  return &s->id3_cache[min_index];
+  }
+
+id3v2_t * server_get_id3(server_t * s, int64_t id)
+  { 
+  id3v2_t * ret;
+
+  if((ret = lookup_cache(s, id)))
+    return ret;
+  
+  ret = get_cache_slot(s);
+  
+  if(!id3v2_generate_by_id(s->db, id, ret))
+    return NULL;
+  
+  ret->last_used = s->current_time;
+  return ret;
+  }
+
+
+
+id3v2_t * server_get_id3_for_file(server_t * s, bg_db_file_t * f,
+                                  int * offset)
+  {
+  id3v2_t * ret;
+  uint8_t buf[10];
+  FILE * file;
+  
+  /* Check if the file is an mp3 */
+  if(strcmp(f->mimetype, "audio/mpeg"))
+    return NULL;
+
+  if(!(ret = lookup_cache(s, bg_db_object_get_id(f))))
+    {
+    ret = get_cache_slot(s);
+    if(!id3v2_generate_by_file(s->db, (bg_db_audio_file_t*)f, ret))
+      return NULL;
+    }
+
+  /* Check whether to skip an ID3 tag already in the file */
+  file = fopen(f->path, "rb");
+  if(!file)
+    return NULL;
+  if(fread(buf, 1, 10, file) < 10)
+    {
+    fclose(file);
+    return NULL;
+    }
+
+  *offset = 0;
+  if((buf[0] == 'I') &&
+     (buf[1] == 'D') &&
+     (buf[2] == '3'))
+    {
+    *offset = (uint32_t)buf[6] << 24;
+    *offset >>= 1;
+    *offset |= (uint32_t)buf[7] << 16;
+    *offset >>= 1;
+    *offset |= (uint32_t)buf[8] << 8;
+    *offset >>= 1;
+    *offset |= (uint32_t)buf[9];
+    *offset += 10;
+    }
+  fclose(file);
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/keepalive.c Added

@@ -0,0 +1,98 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <unistd.h>
+#include <string.h>
+
+int ka_push(server_t * s, int * fd)
+  {
+  //  fprintf(stderr, "ka_push\n");
+
+  pthread_mutex_lock(&s->ka_mutex);
+  
+  if((s->max_ka_sockets > 0) &&
+     (s->num_ka_sockets >= s->max_ka_sockets))
+    {
+    pthread_mutex_unlock(&s->ka_mutex);
+    return 0;
+    }
+  if(s->ka_sockets_alloc < s->num_ka_sockets + 1)
+    {
+    s->ka_sockets_alloc = s->num_ka_sockets + 128;
+    s->ka_sockets = realloc(s->ka_sockets,
+                            s->ka_sockets_alloc * sizeof(*s->ka_sockets));
+    memset(s->ka_sockets + s->num_ka_sockets, 0,
+           (s->ka_sockets_alloc - s->num_ka_sockets) * sizeof(*s->ka_sockets));
+    }
+  
+  s->ka_sockets[s->num_ka_sockets].fd = *fd;
+  s->ka_sockets[s->num_ka_sockets].last_active = s->current_time;
+  *fd = -1;
+  s->num_ka_sockets++;
+  pthread_mutex_unlock(&s->ka_mutex);
+  return 1;
+  }
+
+int ka_accept(server_t * s, int * idx)
+  {
+  int ret;
+
+  pthread_mutex_lock(&s->ka_mutex);
+    
+  while(*idx < s->num_ka_sockets)
+    {
+    //    fprintf(stderr, "ka_accept %d %d %d\n", *idx, s->num_ka_sockets, s->ka_sockets[*idx].fd);
+    if(bg_socket_can_read(s->ka_sockets[*idx].fd, 0))
+      {
+      ret = s->ka_sockets[*idx].fd;
+      
+      if(*idx < s->num_ka_sockets - 1)
+        memmove(s->ka_sockets + (*idx), s->ka_sockets + (*idx) + 1,
+                sizeof(*s->ka_sockets) * (s->num_ka_sockets - 1 - (*idx)));
+      s->num_ka_sockets--;
+      pthread_mutex_unlock(&s->ka_mutex);
+      return ret;
+      }
+    else if(s->current_time - s->ka_sockets[*idx].last_active > KA_TIMEOUT)
+      {
+      close(s->ka_sockets[*idx].fd);
+      if(*idx < s->num_ka_sockets - 1)
+        memmove(s->ka_sockets + (*idx), s->ka_sockets + (*idx) + 1,
+                sizeof(*s->ka_sockets) * (s->num_ka_sockets - 1 - (*idx)));
+      s->num_ka_sockets--;
+      }
+    else
+      (*idx)++;
+    }
+  pthread_mutex_unlock(&s->ka_mutex);
+  return -1;
+  }
+
+void ka_cleanup(server_t * s)
+  {
+  int i;
+  for(i = 0; i < s->num_ka_sockets; i++)
+    close(s->ka_sockets[i].fd);
+  if(s->ka_sockets)
+    free(s->ka_sockets);
+  }
+

gmerlin-4256.tar.gz/apps/mediaserver/mediahandler.c Added

@@ -0,0 +1,319 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <string.h>
+#include <gmerlin/http.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "mediahandler"
+
+#include <unistd.h> // access
+#include <errno.h> 
+
+#define THREAD_THRESHOLD (1024*1024) // 1 M
+
+typedef struct
+  {
+  char * path;
+  int64_t offset;
+  int64_t length;
+  } send_file_t;
+
+static void send_file_func(client_t * c)
+  {
+  send_file_t * s = c->data;
+  if(!bg_socket_send_file(c->fd, s->path, s->offset, s->length))
+    c->keep_alive = 0;
+  }
+
+static void cleanup_func(void * data)
+  {
+  send_file_t * s = data;
+  free(s->path);
+  free(s);
+  }
+
+int server_handle_media(server_t * s, int * fd,
+                        const char * method,
+                        const char * path_orig,
+                        const gavl_metadata_t * req)
+  {
+  int result = 0;
+  bg_db_object_t * o = NULL;
+  bg_db_file_t * f;
+  int64_t id = 0;
+  char * path = NULL;
+  gavl_metadata_t res;
+  int type;
+  int launch_thread = 0;
+  char * pos;
+  const char * range;
+  int64_t start, end;
+  id3v2_t * id3;
+  int id3_offset = 0;
+  int64_t file_size;
+  int keep_alive = 0;
+  const bg_upnp_client_t * cl;
+  
+  gavl_metadata_init(&res);
+
+#if 0  // Handled by core
+  if((protocol != PROTOCOL_HTTP) ||
+     strncmp(path_orig, "/media/", 7))
+    return 0;
+  path_orig += 7;
+#endif
+  
+  if(strcmp(method, "GET") && strcmp(method, "HEAD"))
+    {
+    /* Method not allowed */
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          405, "Method Not Allowed");
+    goto go_on;
+    }
+  
+  path = gavl_strdup(path_orig);
+
+  /* Some clients append bullshit to the path */
+  if((pos = strchr(path, '#')))
+    *pos = '\0';
+
+  id = strtoll(path, &pos, 10);
+  
+  if((*pos != '\0') && (*pos != '/'))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          400, "Bad Request");
+    goto go_on;
+    }
+
+  cl = bg_upnp_detect_client(req);
+  
+  /* Get the object from the db */
+  if(!s->db)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          404, "Not Found");
+    goto go_on;
+    }
+  
+  o = bg_db_object_query(s->db, id);
+
+  type = bg_db_object_get_type(o);
+  
+  if(!(bg_db_object_get_type(o) & BG_DB_FLAG_FILE))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          404, "Not Found");
+    goto go_on;
+    }
+
+  f = (bg_db_file_t*)o;
+  
+  if(access(f->path, R_OK))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Could not access file %s (database out of date?)", f->path);
+
+    if(errno == EACCES)
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            401, "Forbidden");
+      goto go_on;
+      }
+    else
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            404, "Not Found");
+      goto go_on;
+      }
+    }
+
+  /* Decide whether to send an ID3 tag */
+  
+  id3 = server_get_id3_for_file(s, f, &id3_offset);
+
+  if(id3)
+    {
+    //    fprintf(stderr, "Size: %"PRId64", id3_offset: %d, id3_len: %d\n",
+    //            o->size, id3_offset, id3->len);
+    file_size = o->size - id3_offset + id3->len;
+    }
+  else
+    file_size = o->size;
+  
+  /* Figure out byte range */
+  
+  range = gavl_metadata_get_i(req, "Range");
+  if(range)
+    {
+    if(gavl_string_starts_with(range, "bytes="))
+      {
+      range += 6;
+
+      if(sscanf(range, "%"PRId64"-%"PRId64, &start, &end) < 2)
+        {
+        if(sscanf(range, "%"PRId64"-", &start) == 1)
+          end = file_size - 1;
+        else
+          {
+          bg_http_response_init(&res, "HTTP/1.1", 
+                                400, "Bad Request");
+          goto go_on;
+          }
+        }
+      else
+        {
+        if(end >= file_size)
+          {
+          bg_http_response_init(&res, "HTTP/1.1", 
+                                416, "Requested range not satisfiable");
+          goto go_on;
+          }
+        }
+      }
+    else
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            400, "Bad Request");
+      goto go_on;
+      }
+    // fprintf(stderr, "Got range: %"PRId64"-%"PRId64"\n", start, end);
+    }
+  else
+    {
+    start = 0;
+    end = file_size - 1;
+    }
+  
+  /* Decide whether to launch a thread */
+
+  if((type == BG_DB_OBJECT_AUDIO_FILE) ||
+     (type == BG_DB_OBJECT_VIDEO_FILE) ||
+     (o->size > THREAD_THRESHOLD))
+    {
+    launch_thread = 1;
+    }
+  
+  result = 1;
+  
+  /* Set up header for transmission */
+
+  if(range)
+    bg_http_response_init(&res, "HTTP/1.1", 206, "Partial Content");
+  else
+    bg_http_response_init(&res, "HTTP/1.1", 200, "OK");
+  
+  if(s->server_string)
+    gavl_metadata_set(&res, "Server", s->server_string);
+  bg_http_header_set_date(&res, "Date");
+  gavl_metadata_set(&res, "Content-Type", bg_upnp_client_translate_mimetype(cl, f->mimetype));
+  gavl_metadata_set(&res, "Accept-Ranges", "bytes");
+  
+  if(range)
+    {
+    char * tmp_string;
+    gavl_metadata_set_long(&res, "Content-Length", end - start + 1);
+    tmp_string = bg_sprintf("bytes %"PRId64"-%"PRId64"/%"PRId64, start, end, file_size);
+    gavl_metadata_set(&res, "Content-Range", tmp_string);
+    free(tmp_string);
+    }
+  else
+    gavl_metadata_set_long(&res, "Content-Length", file_size);
+
+  keep_alive = bg_http_check_keepalive(req, &res);
+  gavl_metadata_set(&res, "Cache-control", "no-cache");
+    
+  if(gavl_metadata_get(req, "transferMode.dlna.org"))
+    {
+    if(launch_thread)
+      gavl_metadata_set(&res, "transferMode.dlna.org", "Streaming");
+    else
+      gavl_metadata_set(&res, "transferMode.dlna.org", "Interactive");
+    }
+  
+  //  fprintf(stderr, "Sending file:\n");
+  //  gavl_metadata_dump(&res, 0);
+
+  if(!strcmp(method, "HEAD"))
+    result = 0;
+  
+  go_on:
+  
+  if(!bg_http_response_write(*fd, &res) ||
+     !result)
+    goto cleanup;
+
+  /* Send ID3 tag */
+
+  end++; // http -> C
+  
+  if(id3)
+    {
+    int delta = id3->len - start;
+    end -= (id3->len - id3_offset);
+    if(delta > 0) // | ID3   |<-delta->||                MP3    |
+      {
+      // fprintf(stderr, "Sending data\n");
+      // gavl_hexdump(id3->data + start, 176, 16);
+      
+      if(!bg_socket_write_data(*fd, id3->data + start, delta))
+        goto cleanup;
+      start = id3_offset;
+      }
+    else          // | ID3             ||<- -delta-> |   MP3    |
+      {
+      start -= delta;
+      start += id3_offset;
+      }
+    }
+  
+  if(!launch_thread)
+    {
+    if(!bg_socket_send_file(*fd, f->path, start, end))
+      keep_alive = 0;
+
+    if(keep_alive)
+      ka_push(s, fd);
+    }
+  else
+    {
+    client_t * c;
+    send_file_t * sf = calloc(1, sizeof(*s));
+    sf->path = gavl_strdup(f->path);
+    sf->offset = start;
+    sf->length = end - start;
+    c = client_create(CLIENT_TYPE_MEDIA, *fd, sf, cleanup_func, send_file_func);
+    c->keep_alive = keep_alive;
+    server_attach_client(s, c);
+    *fd = -1;
+    }
+  
+  cleanup:
+
+  gavl_metadata_free(&res);
+  if(path)
+    free(path);
+  if(o)
+    bg_db_object_unref(o);
+  
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/ondemand.c Added

@@ -0,0 +1,269 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include "server.h"
+#include <gmerlin/http.h>
+
+#define LOG_DOMAIN "ondemand"
+
+// #define CLIENT_TIMEOUT 5000
+
+static void query_callback(void * priv, void * obj)
+  {
+  FILE * m3u = priv;
+
+  switch(bg_db_object_get_type(obj))
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      {
+      bg_db_audio_file_t * af = obj;
+      if(af->title && af->artist)
+        fprintf(m3u, "#EXTINF:%d, %s - %s\r\n",
+                (int)(af->file.obj.duration/GAVL_TIME_SCALE), af->artist, af->title);
+      else
+        fprintf(m3u, "#EXTINF:%d, %s\r\n",
+                (int)(af->file.obj.duration/GAVL_TIME_SCALE), bg_db_object_get_label(obj));
+      fprintf(m3u, "%s\r\n", af->file.path);
+      }
+      break;
+    default:
+      break;
+    }
+  }
+
+static int open_ondemand_fd(const char * command, bg_subprocess_t ** proc)
+  {
+  int ret;
+  int listen_fd = -1;
+  bg_socket_address_t * addr;
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+  char * full_command = NULL;
+  
+  addr = bg_socket_address_create();
+  bg_socket_address_set(addr, "127.0.0.1", 0, SOCK_STREAM);
+
+  listen_fd = bg_listen_socket_create_inet(addr, 0, 1, 0);
+  bg_socket_get_address(listen_fd, addr, NULL);
+
+  bg_socket_address_to_string(addr, addr_str);
+  
+  full_command = bg_sprintf("%s -o http://%s", command, addr_str);
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Command: %s",
+         full_command);
+  
+  *proc = bg_subprocess_create(full_command, 0, 0, 0);
+
+  /* Wait until the process connects */
+  ret = bg_listen_socket_accept(listen_fd, 5000, NULL);
+  if(ret < 0)
+    goto fail;
+  
+  if(!bg_plug_io_server_handshake(ret, BG_PLUG_IO_METHOD_READ, CLIENT_TIMEOUT))
+    {
+    close(ret);
+    ret = -1;
+    }
+  
+  fail:
+
+  close(listen_fd);
+  bg_socket_address_destroy(addr);
+  if(full_command)
+    free(full_command);
+
+  if(ret < 0)
+    {
+    if(*proc)
+      {
+      bg_subprocess_kill(*proc, SIGTERM);
+      bg_subprocess_close(*proc);
+      *proc = NULL;
+      }
+    }
+  
+  return ret;
+  }
+
+static client_t * create_source(server_t * s, int64_t id, gavl_metadata_t * res)
+  {
+  FILE * m3u;
+  bg_db_object_t * obj;
+  char * m3u_name = NULL;
+  char * command = NULL;
+  bg_subprocess_t * proc = NULL;
+  int fd;
+  client_t * ret;
+  gavf_io_t * io = NULL; 
+  bg_plug_t * plug = NULL;
+  int flags = 0;
+  const char * syslog;
+  int log_level;
+
+  char * log_opt = NULL;
+  
+  syslog = bg_log_syslog_name();
+  log_level = bg_log_get_verbose_level();
+
+  if(syslog)
+    log_opt = bg_sprintf("-v %d -syslog %s", log_level, syslog);
+  else
+    log_opt = bg_sprintf("-v %d", log_level);
+  
+  obj = bg_db_object_query(s->db, id);
+
+  if(!obj)
+    {
+    bg_http_response_init(res, "HTTP/1.1", 404, "Not Found");
+    goto fail;
+    }
+  
+  switch(bg_db_object_get_type(obj))
+    {
+    case BG_DB_OBJECT_PLAYLIST:
+      m3u_name = bg_create_unique_filename("/tmp/gmerlin-%d.m3u");
+      m3u = fopen(m3u_name, "w");
+      fprintf(m3u, "#EXTM3U\r\n");
+      bg_db_query_children(s->db, id, query_callback, m3u, 0, 0, NULL);
+      fclose(m3u);
+
+      command = bg_sprintf("gavf-decode %s -loop -shuffle -m3u %s -m 'Station=%s %s' | "
+                           "gavf-recompress %s -ac 'codec=c_lame{cbr_bitrate=320}'",
+                           log_opt, m3u_name, s->upnp_name, obj->label, log_opt);
+      
+      break;
+    case BG_DB_OBJECT_RADIO_URL:
+      {
+      bg_db_url_t * u = (bg_db_url_t *)obj;
+      command = bg_sprintf("gavf-decode %s -i %s | "
+                           "gavf-recompress %s -ac 'codec=c_lame{cbr_bitrate=320}'",
+                           log_opt, u->stream_url, log_opt);
+      break;
+      }
+    default:
+      bg_http_response_init(res, "HTTP/1.1", 404, "Not Found");
+      goto fail;
+      break;
+    }
+
+  /* Open plug */
+  fd = open_ondemand_fd(command, &proc);
+
+  io = bg_plug_io_open_socket(fd, BG_PLUG_IO_METHOD_READ, &flags, CLIENT_TIMEOUT);
+  if(!io)
+    goto fail;
+  
+  plug = bg_plug_create_reader(s->plugin_reg);
+
+  if(!plug)
+    goto fail;
+  
+  if(!bg_plug_open(plug, io, NULL, NULL, flags))
+    goto fail;
+  io = NULL;
+  ret = source_client_create(&fd, s->plugin_reg, plug, CLIENT_TYPE_SOURCE_ONDEMAND, proc);
+  
+  fail:
+
+  if(m3u_name)
+    {
+    remove(m3u_name);
+    free(m3u_name);
+    }
+  if(command)
+    free(command);
+
+  if(log_opt)
+    free(log_opt);
+  
+  if(obj)
+    bg_db_object_unref(obj);
+  
+  return ret;
+  
+  }
+
+int server_handle_ondemand(server_t * s, int * fd,
+                           const char * method,
+                           const char * path_orig,
+                           const gavl_metadata_t * req)
+  {
+  int i;
+  client_t * source = NULL;
+  client_t * sink;
+  int64_t id;
+  gavl_metadata_t res;
+  int protocol_i = server_get_protocol(req);
+  
+  gavl_metadata_init(&res);
+  
+  if(protocol_i == PROTOCOL_HTTP)
+    {
+    if(strcmp(method, "GET") && strcmp(method, "HEAD"))
+      {
+      // Bad request actually
+      bg_http_response_init(&res, "HTTP/1.1", 400, "Bad Request");
+      bg_http_response_write(*fd, &res);
+      gavl_metadata_free(&res);
+      return 1;
+      }
+    }
+  
+  id = strtoll(path_orig, NULL, 10);
+
+  for(i = 0; i < s->num_clients; i++)
+    {
+    if((s->clients[i]->type == CLIENT_TYPE_SOURCE_ONDEMAND) &&
+       s->clients[i]->id == id)
+      {
+      source = s->clients[i];
+      break;
+      }
+    }
+
+  if(!source)
+    {
+    /* Create ondemand source */
+    source = create_source(s, id, &res);
+    if(!source)
+      {
+      bg_http_response_init(&res, bg_http_request_get_protocol(req),
+                            404, "Not found");
+      bg_http_response_write(*fd, &res);
+      gavl_metadata_free(&res);
+      goto fail;
+      }
+    source->id = id;
+    server_attach_client(s, source);
+    }
+  
+  sink = sink_create_from_source(s, fd, source, req, method, protocol_i);
+  
+  if(sink)
+    server_attach_client(s, sink);
+  
+  fail:
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/pls.c Added

@@ -0,0 +1,345 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <gmerlin/http.h>
+
+#include <string.h>
+#include <signal.h>
+#include <ctype.h>
+
+#define LOG_DOMAIN "server.pls"
+
+static int64_t get_duration(bg_db_object_t * obj)
+  {
+  if(obj->duration > 0)
+    return obj->duration / GAVL_TIME_SCALE;
+  else
+    return -1;
+  }
+
+static int do_browse_children(bg_db_object_t * obj)
+  {
+  int ret = 0;
+  switch(obj->type)
+    {
+    case BG_DB_OBJECT_AUDIO_ALBUM:
+    case BG_DB_OBJECT_PLAYLIST:
+    case BG_DB_OBJECT_SEASON:
+      ret = 1;
+      break;
+    default:
+      break;
+    }
+  return ret;
+  }
+
+typedef struct
+  {
+  const server_t * s;
+  char * ret;
+  int index;
+  } browse_t;
+
+static char * get_object_name(void * o)
+  {
+  switch(bg_db_object_get_type(o))
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      {
+      bg_db_audio_file_t * af = o;
+      if(af->title && af->artist)
+        return bg_sprintf("%s - %s", af->artist, af->title);
+      break;
+      }
+    default:
+      break;
+    }
+  return gavl_strdup(bg_db_object_get_label(o));
+  }
+
+static void query_child_pls(void * priv, void * o)
+  {
+  char * str = NULL;
+  char * name;
+  
+  bg_db_object_t * obj = o;
+  browse_t * b = priv;
+  b->index++;
+
+  name = get_object_name(o);
+  
+  str = bg_sprintf("File%d=%s/media/%"PRId64"\r\n"
+                   "Title%d=%s\r\n"
+                   "Length%d=%"PRId64"\r\n",
+                   b->index,
+                   b->s->root_url, obj->id, b->index, name, b->index,
+                   get_duration(obj));
+  b->ret = gavl_strcat(b->ret, str);
+  free(str);
+  free(name);
+  }
+
+static void query_child_m3u(void * priv, void * o)
+  {
+  char * str = NULL;
+  browse_t * b = priv;
+  bg_db_object_t * obj = o;
+  char * name;
+  
+  name = get_object_name(o);
+  
+  if(!str)
+    str = bg_sprintf("#EXTINF:%"PRId64", %s\r\n"
+                     "%s/media/%"PRId64"\r\n",
+                     get_duration(obj), name, b->s->root_url, obj->id);
+  
+  b->ret = gavl_strcat(b->ret, str);
+  free(str);
+  free(name);
+  }
+
+char *
+generate_pls(server_t * s, const char * path, bg_db_object_t * obj)
+  {
+  if(!obj && !path)
+    return NULL;
+  
+  if(obj)
+    {
+    if(!path)
+      {
+      browse_t b;
+      b.ret = bg_sprintf("[playlist]\r\n"
+                         "numberofentries=%d\r\n", obj->children);
+      b.s = s;
+      b.index = 0;
+
+      if(do_browse_children(obj)) 
+        bg_db_query_children(s->db, obj->id, query_child_pls, &b,
+                             0, 0, NULL);
+      else
+        query_child_pls(&b, obj);
+      
+      b.ret = gavl_strcat(b.ret, "Version=2\r\n");    
+      return b.ret;
+      }
+    else // path
+      {
+      char * name;
+      char * ret;
+      name = get_object_name(obj);
+      
+      ret = bg_sprintf("[playlist]\r\n"
+                       "numberofentries=1\r\n"
+                       "File1=%s/%s\r\n"
+                       "Title1=%s\r\n"
+                       "Length1=%"PRId64"\r\n"
+                       "Version=2\r\n",
+                       s->root_url, path, name, get_duration(obj));
+      free(name);
+      return ret;
+      }
+    }
+  else
+    return bg_sprintf("[playlist]\r\n"
+                      "numberofentries=1\r\n"
+                      "File1=%s/%s\r\n"
+                      "Length1=%"PRId64"\r\n"
+                      "Version=2\r\n",
+                      s->root_url, path, get_duration(obj));
+  }
+
+char *
+generate_m3u(server_t * s,
+             const char * path,
+             bg_db_object_t * obj)
+  {
+  if(!obj && !path)
+    return NULL;
+  
+  if(obj)
+    {
+    if(!path)
+      {
+      browse_t b;
+      b.ret = bg_sprintf("#EXTM3U\r\n");
+      b.s = s;
+
+      if(do_browse_children(obj))
+        bg_db_query_children(s->db, obj->id, query_child_m3u, &b,
+                             0, 0, NULL);
+      else
+        query_child_m3u(&b, obj);
+      return b.ret;
+      }
+     else
+      {
+      char * name;
+      char * ret;
+      name = get_object_name(obj);
+
+      ret = bg_sprintf("#EXTM3U\r\n"
+                       "#EXTINF:%"PRId64", %s\r\n"
+                       "%s/%s\r\n",
+                       get_duration(obj), obj->label, s->root_url, path);
+      
+      free(name);
+      return ret;
+      }
+    }
+  else
+    return bg_sprintf("#EXTM3U\r\n"
+                      "#EXTINF:%"PRId64",\r\n"
+                      "%s/%s\r\n",
+                      get_duration(obj), s->root_url, path);
+  }
+
+// http://host:port/[pls|m3u]/id[/filename.ext]
+
+#define FORMAT_M3U 1
+#define FORMAT_PLS 2
+
+static int handle_pls(server_t * s, int * fd,
+               const char * method,
+               const char * path_orig,
+               const gavl_metadata_t * req, int pls)
+  {
+  gavl_metadata_t res;
+  bg_db_object_t * o = NULL;
+  char * rest;
+  int64_t id;
+  char * ret = NULL;
+  int len = 0;
+  int keep_alive = 0;
+  int format = 0;
+  const bg_upnp_client_t * cl;
+  const char * mimetype;
+  
+  gavl_metadata_init(&res);
+
+  if(*path_orig != '/')
+    return 0;
+
+  path_orig++;
+  
+
+  if(pls)
+    {
+    format = FORMAT_PLS;
+    mimetype = "audio/x-scpls";
+    }
+  else
+    {
+    format = FORMAT_M3U;
+    mimetype = "audio/x-mpegurl";
+    }
+  
+  if(!s->db)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          404, "Not Found");
+    goto fail;
+    }
+
+  /* Get the ID from the path */
+
+  if(isdigit(*path_orig))
+    {
+    id = strtoll(path_orig, &rest, 10);
+
+    if((*rest != '/') && (*rest != '\0'))
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            404, "Not Found");
+      goto fail;
+      }
+    o = bg_db_object_query(s->db, id);
+
+    if(!o)
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            404, "Not Found");
+      goto fail;
+      }
+    path_orig = NULL;
+    }
+  
+  switch(format)
+    {
+    case FORMAT_PLS:
+      ret = generate_pls(s, path_orig, o);
+      break;
+    case FORMAT_M3U:
+      ret = generate_m3u(s, path_orig, o);
+      break;
+    }
+  
+  bg_http_response_init(&res, "HTTP/1.1", 
+                        200, "OK");
+
+  cl = bg_upnp_detect_client(req);
+
+  gavl_metadata_set(&res, "Content-Type", bg_upnp_client_translate_mimetype(cl, mimetype));
+  
+  fail:
+  
+  if(o)
+    bg_db_object_unref(o);
+  
+  if(ret)
+    {
+    len = strlen(ret);
+    gavl_metadata_set_int(&res, "Content-Length", len);
+    }
+  
+  keep_alive = bg_http_check_keepalive(req, &res);
+  bg_http_response_write(*fd, &res);
+  gavl_metadata_free(&res);
+
+  if(ret)
+    {
+    if(!bg_socket_write_data(*fd, (const uint8_t*)ret, len))
+      keep_alive = 0;
+    free(ret);
+    }
+  
+  if(keep_alive)
+    ka_push(s, fd);
+  
+  return 1;
+  }
+
+int server_handle_pls(server_t * s, int * fd,
+                      const char * method,
+                      const char * path_orig,
+                      const gavl_metadata_t * req)
+  {
+  return handle_pls(s, fd, method, path_orig, req, 1);
+  }
+
+int server_handle_m3u(server_t * s, int * fd,
+                      const char * method,
+                      const char * path_orig,
+                      const gavl_metadata_t * req)
+  {
+  return handle_pls(s, fd, method, path_orig, req, 0);
+  }

gmerlin-4256.tar.gz/apps/mediaserver/rtp.c Added

@@ -0,0 +1,243 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include "rtp.h"
+#include <gmerlin/http.h>
+#include <string.h>
+#include <unistd.h>
+
+int rtp_supported()
+  {
+  return 1;
+  }
+  
+int rtp_probe(int protocol,
+              const gavf_program_header_t * ph,
+              const gavl_metadata_t * request)
+  {
+  if(protocol == PROTOCOL_RTSP)
+    return 1;
+  else
+    return 0;
+  }
+  
+void * rtp_create(server_t * s,
+                  const gavf_program_header_t * ph,
+                  const gavl_metadata_t * req,
+                  const gavl_metadata_t * vars,
+                  gavl_metadata_t * res)
+  {
+  int i;
+  rtp_context_t * ret = calloc(1, sizeof(*ret));
+
+  ret->session = ++s->rtsp_session_max;
+  
+  ret->num_streams = ph->num_streams;
+  ret->streams = calloc(ret->num_streams, sizeof(*ret->streams));
+
+  for(i = 0; i < ret->num_streams; i++)
+    {
+    ret->streams[i].sh = ph->streams + i;
+    
+    }
+  
+  return ret;
+  }
+
+int rtp_start(void * priv,
+              const gavf_program_header_t * ph,
+              const gavl_metadata_t * req,
+              const gavl_metadata_t * inline_metadata,
+              int fd)
+  {
+  rtp_context_t * ctx = priv;
+  ctx->fd = fd;
+  return 1;
+  }
+
+int rtp_put_buffer(void * priv, buffer_element_t * buf)
+  {
+  return 0;
+  }
+
+void rtp_destroy(void * priv)
+  {
+  int i;
+  rtp_context_t * ctx = priv;
+  for(i = 0; i < ctx->num_streams; i++)
+    rtp_packet_free(&ctx->streams[i].p);
+  free(ctx->streams);
+  }
+
+rtsp_status_t
+rtp_stream_setup(const server_t * srv,
+                 rtp_context_t * ctx,
+                 rtp_stream_t * s,
+                 const gavl_metadata_t * req,
+                 gavl_metadata_t * res)
+  {
+  int i = 0;
+  unsigned int client_ports[2] = { 0, 0 };
+  unsigned int server_ports[2] = { 0, 0 };
+  const char * transport;
+  char ** transport_params;
+  rtsp_status_t result = RTSP_STATUS_ERROR;
+  bg_socket_address_t * addr = NULL;
+  
+  transport = gavl_metadata_get_i(req, "Transport");
+  if(!transport)
+    {
+    bg_http_response_init(res, "RTSP/1.0", 400, "Bad Request");
+    goto end;
+    }
+
+  transport_params = bg_strbreak(transport, ';');
+
+  /* RTP over UDP */
+  if(!strcasecmp(transport_params[0], "RTP/AVP") ||
+     !strcasecmp(transport_params[0], "RTP/AVP/UDP"))
+    {
+    addr = bg_socket_address_create();
+    
+    i = 1;
+    while(transport_params[i])
+      {
+      if(!strncmp(transport_params[i], "client_port=", 12))
+        {
+        if((sscanf(transport_params[i] + 12,
+                  "%u-%u", &client_ports[0], &client_ports[1]) < 2) ||
+           (client_ports[1] - client_ports[0] > 1))
+          {
+          bg_http_response_init(res, "RTSP/1.0", 461, "Unsupported Transport");
+          result = RTSP_STATUS_AGAIN;
+          goto end;
+          }
+        fprintf(stderr, "Got UDP ports: %d %d\n",
+                client_ports[0], client_ports[1]);
+        break;
+        }
+      i++;
+      }
+    
+    if(client_ports[0] == 0)
+      {
+      bg_http_response_init(res, "RTSP/1.0", 461, "Unsupported Transport");
+      result = RTSP_STATUS_AGAIN;
+      goto end;
+      }
+
+    /* Figure out local ports and create UDP sockets */
+    
+    bg_socket_address_copy(addr, srv->addr);
+
+    s->udp_fds[0] = -1;
+    s->udp_fds[1] = -1;
+
+    while(1)
+      {
+      bg_socket_address_set_port(addr, 0);
+
+      s->udp_fds[0] = bg_udp_socket_create(addr);
+      
+      if(s->udp_fds[0] < 0) // failed
+        break;
+  
+      server_ports[0] = bg_socket_address_get_port(addr);
+    
+      if(server_ports[0] % 2) // Got the higher port
+        {
+        server_ports[1] = server_ports[0];
+        s->udp_fds[1]   = s->udp_fds[0];
+        s->udp_fds[0] = -1;
+        server_ports[0] = server_ports[1]-1;
+
+        bg_socket_address_set_port(addr, server_ports[0]);
+        s->udp_fds[0] = bg_udp_socket_create(addr);
+         
+        if(s->udp_fds[0] < 0) // failed
+          {
+          close(s->udp_fds[1]);
+          s->udp_fds[1] = -1;
+          continue;
+          }
+        break;
+        }
+      else
+        {
+        server_ports[1] = server_ports[0]+1;
+        bg_socket_address_set_port(addr, server_ports[1]);
+        s->udp_fds[1] = bg_udp_socket_create(addr);
+
+        if(s->udp_fds[1] < 0) // failed
+          {
+          close(s->udp_fds[0]);
+          s->udp_fds[0] = -1;
+          continue;
+          }
+        break;
+        }
+      }
+    if((s->udp_fds[0] >= 0) && (s->udp_fds[1] >= 0))
+      {
+      /* Connect the UDP sockets */
+      bg_socket_address_copy(addr, srv->remote_addr);
+      bg_socket_address_set_port(addr, client_ports[0]);
+      bg_udp_socket_connect(s->udp_fds[0], addr);
+      bg_socket_address_set_port(addr, client_ports[1]);
+      bg_udp_socket_connect(s->udp_fds[1], addr);
+
+      bg_http_response_init(res, "RTSP/1.0", 200, "OK");
+      gavl_metadata_set_int(res, "Session", ctx->session);
+      gavl_metadata_set_nocpy(res, "Transport", bg_sprintf("%s;server_port=%d-%d", 
+                              transport, server_ports[0], server_ports[1]));
+      }
+    }
+  
+  /* RTP over TCP */
+  else if(!strcasecmp(transport_params[0], "RTP/AVP/TCP"))
+    {
+    bg_http_response_init(res, "RTSP/1.0", 200, "OK");
+    gavl_metadata_set(res, "Transport", transport);
+    gavl_metadata_set_int(res, "Session", ctx->session);
+    result = RTSP_STATUS_SETUP;
+    }
+  else
+    {
+    bg_http_response_init(res, "RTSP/1.0", 461, "Unsupported Transport");
+    result = RTSP_STATUS_AGAIN;
+    }
+
+  end:
+
+  if(addr)
+    bg_socket_address_destroy(addr);
+  
+  bg_strbreak_free(transport_params);
+  return result;
+  }
+
+int rtp_sync(void * priv, int64_t * pts)
+  {
+  // rtp_context_t * ctx = priv;
+  
+  return 0;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/rtp.h Added

@@ -0,0 +1,107 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+
+/* RTP packet */
+
+#define RTP_HEADER_BYTES 12
+#define RTP_PACKET_BYTES 1500 // TODO: Get MTU??
+
+typedef struct
+  {
+  int m;
+  int pt;
+  int seq;
+  uint32_t pts;
+  uint32_t ssrc;
+
+  uint8_t * buffer;
+  int buffer_alloc;
+  int len;
+  } rtp_packet_t;
+
+void rtp_packet_init(rtp_packet_t * p);
+void rtp_packet_free(rtp_packet_t * p);
+
+/* Create packet header */
+void rtp_packet_init_header(rtp_packet_t * p);
+
+
+typedef struct rtp_context_s rtp_context_t;
+
+typedef struct
+  {
+  gavl_packet_sink_t * sink_int;
+  gavl_packet_sink_t * sink_ext;
+  
+  rtp_context_t * ctx;
+  int udp_fds[2];
+  int rtp_id;
+
+  const gavf_stream_header_t * sh;
+  rtp_packet_t p;
+  } rtp_stream_t;
+
+struct rtp_context_s
+  {
+  int num_streams;
+  rtp_stream_t * streams;
+  
+  int session;
+  int fd; // Control FD
+
+  gavl_metadata_t play_response;
+  };
+
+/* Filter methods */
+
+int rtp_supported();
+  
+int rtp_probe(int protocol,
+              const gavf_program_header_t * ph,
+              const gavl_metadata_t * request);
+  
+void * rtp_create(server_t * s,
+                  const gavf_program_header_t * ph,
+                  const gavl_metadata_t * req,
+                  const gavl_metadata_t * vars,
+                  gavl_metadata_t * res);
+
+int rtp_start(void * priv,
+              const gavf_program_header_t * ph,
+              const gavl_metadata_t * req,
+              const gavl_metadata_t * inline_metadata,
+              int fd);
+
+int rtp_sync(void * priv, int64_t * pts);
+
+int rtp_put_buffer(void * priv, buffer_element_t *);
+void rtp_destroy(void * priv);
+
+/* */
+
+rtsp_status_t
+rtp_stream_setup(const server_t * srv,
+                 rtp_context_t * ctx,
+                 rtp_stream_t * s,
+                 const gavl_metadata_t * req,
+                 gavl_metadata_t * res);
+

gmerlin-4256.tar.gz/apps/mediaserver/rtppacket.c Added

@@ -0,0 +1,57 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include "rtp.h"
+#include <gavl/numptr.h>
+
+#define RTP_VERSION 0x02
+
+void rtp_packet_init(rtp_packet_t * p)
+  {
+  p->buffer_alloc = RTP_PACKET_BYTES;
+  p->buffer = malloc(p->buffer_alloc);
+  p->seq = rand() & 0x7fff;
+  }
+
+void rtp_packet_free(rtp_packet_t * p)
+  {
+  if(p->buffer)
+    free(p->buffer);
+  }
+
+/* Create packet header */
+void rtp_packet_init_header(rtp_packet_t * p)
+  {
+  uint8_t * ptr = p->buffer;
+
+  *ptr = RTP_VERSION << 6;                      ptr++;
+  *ptr = (p->pt & 0x7f) | ((p->m & 0x01) << 7); ptr++;
+
+  GAVL_16BE_2_PTR(p->seq, ptr);                 ptr+=2;
+  GAVL_32BE_2_PTR(p->pts, ptr);                 ptr+=4;
+  GAVL_32BE_2_PTR(p->ssrc, ptr);                ptr+=4;
+
+  p->len = (int)(ptr - p->buffer);
+  p->seq = (p->seq + 1) & 0xffff;
+  
+  
+  }

gmerlin-4256.tar.gz/apps/mediaserver/rtsp.c Added

@@ -0,0 +1,268 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+
+
+#include "server.h"
+#include "rtp.h"
+
+#include <gmerlin/http.h>
+#define LOG_DOMAIN "rtsp"
+
+static rtsp_status_t
+server_handle_rtsp(const server_t * s, int fd,
+                   const gavl_metadata_t * req,
+                   const gavf_program_header_t * ph,
+                   rtp_context_t * rtp)
+  {
+  rtsp_status_t  result = RTSP_STATUS_ERROR;
+  int cseq;
+  int i;
+  gavl_metadata_t res;
+  const char * method = bg_http_request_get_method(req);
+
+  gavl_metadata_init(&res);
+  
+  if(!gavl_metadata_get_int_i(req, "CSeq", &cseq))
+    {
+    bg_http_response_init(&res, "RTSP/1.0", 400, "Bad Request");
+    bg_http_response_write(fd, &res);
+    goto end;
+    }
+  
+  if(!strcmp(method, "OPTIONS"))
+    {
+    bg_http_response_init(&res, "RTSP/1.0", 200, "OK");
+    gavl_metadata_set_int(&res, "CSeq", cseq);
+    gavl_metadata_set(&res, "Public", "DESCRIBE, SETUP, PLAY, TEARDOWN");
+    bg_http_response_write(fd, &res);
+    result = RTSP_STATUS_AGAIN;
+    }
+  else if(!strcmp(method, "DESCRIBE"))
+    {
+    /* Generate sdp */
+    int sdp_len;
+    char * sdp = create_sdp(s, ph, req);
+    
+    if(!sdp)
+      {
+      bg_http_response_init(&res, "RTSP/1.0", 404, "Not Found");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      bg_http_response_write(fd, &res);
+      }
+    else
+      {
+      sdp_len = strlen(sdp);
+      bg_http_response_init(&res, "RTSP/1.0", 200, "OK");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      gavl_metadata_set(&res, "Content-Type", "application/sdp");
+      gavl_metadata_set_int(&res, "Content-Length", sdp_len);
+
+      gavl_metadata_set_nocpy(&res, "Content-base",
+                              bg_sprintf("%s/",
+                                         bg_http_request_get_path(req))); 
+      
+      if(bg_http_response_write(fd, &res) &&
+         (bg_http_write_data(fd, (const uint8_t *)sdp, sdp_len, 0) == sdp_len))
+        result = RTSP_STATUS_SDP;
+      free(sdp);
+      }
+    
+    }
+  else if(!strcmp(method, "SETUP"))
+    {
+    /* Negotiate transport */
+    rtp_stream_t * st = NULL;
+    int stream_id;
+    const char * var;
+    const char * pos;
+    
+    if(!rtp)
+      {
+      bg_http_response_init(&res, "RTSP/1.0", 400, "Bad Request");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      bg_http_response_write(fd, &res);
+      goto end;
+      }
+
+    /* Get the stream */
+    if(!(var = bg_http_request_get_path(req)) ||
+       !(pos = strrchr(var, '=')))
+      {
+      bg_http_response_init(&res, "RTSP/1.0", 459,
+                            "Aggregate Operation not Allowed");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      bg_http_response_write(fd, &res);
+      goto end;
+      }
+
+    pos++;
+    stream_id = atoi(pos);
+
+    for(i = 0; i < rtp->num_streams; i++)
+      {
+      if(rtp->streams[i].sh->id == stream_id)
+        {
+        st = &rtp->streams[i];
+        break;
+        }
+      }
+
+    if(!st)
+      {
+      bg_http_response_init(&res, "RTSP/1.0", 400, "Bad Request");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      bg_http_response_write(fd, &res);
+      goto end;
+      }
+    result = rtp_stream_setup(s, rtp, st, req, &res);
+    gavl_metadata_set_int(&res, "CSeq", cseq);
+    bg_http_response_write(fd, &res);
+    }
+  else if(!strcmp(method, "PLAY"))
+    {
+    /* Start sending packets */
+    const char * var;
+    
+    if(!(var = bg_http_request_get_path(req)) ||
+       (strrchr(var, '=')))
+      {
+      bg_http_response_init(&res, "RTSP/1.0", 460,
+                            "Only Aggregate Operation Allowed");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      bg_http_response_write(fd, &res);
+      goto end;
+      }
+    else if(!rtp)
+      {
+      bg_http_response_init(&res, "RTSP/1.0", 400, "Bad Request");
+      gavl_metadata_set_int(&res, "CSeq", cseq);
+      bg_http_response_write(fd, &res);
+      goto end;
+      }
+    else
+      {
+      bg_http_response_init(&rtp->play_response, "RTSP/1.0", 200, "OK");
+      gavl_metadata_set_int(&rtp->play_response, "CSeq", cseq);
+      gavl_metadata_set_int(&rtp->play_response, "Session",
+                            rtp->session);
+      // RTP-Info is missing at this point (missing timestamps). We'll
+      // Complete this in rtp_sync()
+      result = RTSP_STATUS_PLAY;
+      }
+    }
+
+  end:
+  
+  gavl_metadata_free(&res);
+  return result;
+  }
+
+/* Called before the filter is created */
+rtsp_status_t rtsp_handshake_1(const server_t * s, int fd,
+                                const gavl_metadata_t * first_req,
+                                const gavf_program_header_t * ph)
+  {
+  int done = 0;
+  rtsp_status_t result;
+  gavl_metadata_t req;
+  gavl_metadata_init(&req);
+  gavl_metadata_copy(&req, first_req);
+
+  while(!done)
+    {
+    result = server_handle_rtsp(s, fd, &req, ph, NULL);
+    
+    switch(result)
+      {
+      case RTSP_STATUS_ERROR:
+        done = 1;
+        break;
+      case RTSP_STATUS_AGAIN:
+        break;
+      case RTSP_STATUS_SDP:
+        done = 1;
+        break;
+      case RTSP_STATUS_SETUP:
+        break;
+      case RTSP_STATUS_PLAY:
+        result = RTSP_STATUS_ERROR; // Can't be yet
+        done = 1;
+        break;
+      }
+
+    if(done)
+      break;
+    
+    gavl_metadata_free(&req);
+    gavl_metadata_init(&req);
+
+    if(!bg_http_request_read(fd, &req, CLIENT_TIMEOUT))
+      {
+      result = RTSP_STATUS_ERROR;
+      break;
+      }
+    }
+  gavl_metadata_free(&req);
+  return !!result;
+  }
+
+/* Called after the filter is created */
+rtsp_status_t rtsp_handshake_2(const server_t * s, void * ctx, int fd,
+                               const gavf_program_header_t * ph)
+  {
+  int done = 0;
+  rtsp_status_t result = RTSP_STATUS_ERROR;
+  gavl_metadata_t req;
+  rtp_context_t * rtp = ctx;
+
+  gavl_metadata_init(&req);
+  
+  while(!done)
+    {
+    if(!bg_http_request_read(fd, &req, CLIENT_TIMEOUT))
+      break;
+    
+    result = server_handle_rtsp(s, fd, &req, ph, rtp);
+
+    switch(result)
+      {
+      case RTSP_STATUS_ERROR:
+        break;
+      case RTSP_STATUS_AGAIN:
+        break;
+      case RTSP_STATUS_SDP:
+        break;
+      case RTSP_STATUS_SETUP:
+        break;
+      case RTSP_STATUS_PLAY:
+        done = 1;
+        break;
+      }
+    
+    gavl_metadata_free(&req);
+    gavl_metadata_init(&req);
+    }
+  
+  gavl_metadata_free(&req);
+  return !!result;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/sdp.c Added

@@ -0,0 +1,257 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include "server.h"
+#include <gmerlin/http.h>
+
+#include <gavl/metatags.h>
+// #include <gavl/compression.h>
+
+#if 0
+/* Table taken from ffmpeg (rtp.c) and adapted */
+static const struct 
+  {
+  int pt;
+  const char enc_name[6];
+  gavf_stream_type_t type;
+  gavl_codec_id_t codec_id;
+  int clock_rate;
+  int audio_channels;
+  } 
+payload_types[] = 
+  {
+    {0, "PCMU",     GAVF_STREAM_AUDIO,   GAVL_CODEC_ID_ULAW, 8000, 1},
+//    {3, "GSM",      GAVF_STREAM_AUDIO,   GAVL_CODEC_ID_NONE, 8000, 1},
+//    {4, "G723",     GAVF_STREAM_AUDIO,   AV_CODEC_ID_G723_1, 8000, 1},
+//    {5, "DVI4",     GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 8000, 1},
+//    {6, "DVI4",     GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 16000, 1},
+//    {7, "LPC",      GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 8000, 1},
+    {8, "PCMA",     GAVF_STREAM_AUDIO,   GAVL_CODEC_ID_ALAW, 8000, 1},
+//    {9, "G722",     GAVF_STREAM_AUDIO,   AV_CODEC_ID_ADPCM_G722, 8000, 1},
+//    {10, "L16",     GAVF_STREAM_AUDIO,   AV_CODEC_ID_PCM_S16BE, 44100, 2},
+//    {11, "L16",     GAVF_STREAM_AUDIO,   AV_CODEC_ID_PCM_S16BE, 44100, 1},
+//    {12, "QCELP",   GAVF_STREAM_AUDIO,   AV_CODEC_ID_QCELP, 8000, 1},
+//    {13, "CN",      GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 8000, 1},
+    {14, "MPA",     GAVF_STREAM_AUDIO,   GAVL_CODEC_ID_MP2, -1, -1},
+    {14, "MPA",     GAVF_STREAM_AUDIO,   GAVL_CODEC_ID_MP3, -1, -1},
+//    {15, "G728",    GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 8000, 1},
+//    {16, "DVI4",    GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 11025, 1},
+//    {17, "DVI4",    GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 22050, 1},
+//    {18, "G729",    GAVF_STREAM_AUDIO,   AV_CODEC_ID_NONE, 8000, 1},
+//    {25, "CelB",    GAVF_STREAM_VIDEO,   AV_CODEC_ID_NONE, 90000, -1},
+    {26, "JPEG",    GAVF_STREAM_VIDEO,   GAVL_CODEC_ID_JPEG, 90000, -1},
+//    {28, "nv",      GAVF_STREAM_VIDEO,   AV_CODEC_ID_NONE, 90000, -1},
+//    {31, "H261",    GAVF_STREAM_VIDEO,   AV_CODEC_ID_H261, 90000, -1},
+    {32, "MPV",     GAVF_STREAM_VIDEO,   GAVL_CODEC_ID_MPEG1, 90000, -1},
+    {32, "MPV",     GAVF_STREAM_VIDEO,   GAVL_CODEC_ID_MPEG2, 90000, -1},
+//    {33, "MP2T",    _DATA,    AV_CODEC_ID_MPEG2TS, 90000, -1},
+//    {34, "H263",    _VIDEO,   AV_CODEC_ID_H263, 90000, -1},
+    {-1 },
+};
+
+#define PT_PRIVATE 96
+
+static int codec_id_2_pt(const gavf_stream_header_t * h, int idx)
+  {
+  int i = 0;
+  while(payload_types[i].pt)
+    {
+    if((h->type == payload_types[i].type) &&
+       (h->ci.id == payload_types[i].codec_id))
+      {
+      if(h->type == GAVF_STREAM_VIDEO)
+        return payload_types[i].pt;
+      else if(h->type == GAVF_STREAM_AUDIO)
+        {
+        if(((payload_types[i].clock_rate < 0) || (payload_types[i].clock_rate == h->format.audio.samplerate)) &&
+           ((payload_types[i].audio_channels < 0) || (payload_types[i].audio_channels == h->format.audio.num_channels)))
+          return payload_types[i].pt;
+        }
+      }
+    }
+  return PT_PRIVATE + idx;
+  }
+#endif // 0
+
+static char * create_sdp_stream(const server_t * s,
+                                const gavf_stream_header_t * h, int idx)
+  {
+  int success = 0;
+  char * tmp_string;
+  char * ret = NULL;
+  
+  switch(h->ci.id)
+    {
+    /* Audio */
+    case GAVL_CODEC_ID_ALAW: //!< alaw 2:1
+      if((h->format.audio.samplerate == 8000) &&
+         (h->format.audio.num_channels == 1))
+        {
+        ret = bg_sprintf("m=audio 0 RTP/AVP 8\r\n"
+                         "a=rtpmap:8 PCMA/8000/1\r\n");
+        }
+      break;
+    case GAVL_CODEC_ID_ULAW:      //!< mu-law 2:1
+      if((h->format.audio.samplerate == 8000) &&
+         (h->format.audio.num_channels == 1))
+        {
+        ret = bg_sprintf("m=audio 0 RTP/AVP 0\r\n"
+                         "a=rtpmap:0 PCMU/8000/1\r\n");
+        }
+      goto fail;
+      break;
+    case GAVL_CODEC_ID_MP2:       //!< MPEG-1 audio layer II
+    case GAVL_CODEC_ID_MP3:       //!< MPEG-1/2 audio layer 3 CBR/VBR
+      ret = bg_sprintf("m=audio 0 RTP/AVP 14\r\n"
+                       "a=rtpmap:14 MPA/%d/%d\r\n",
+                       h->format.audio.samplerate, h->format.audio.num_channels);
+      break;
+    case GAVL_CODEC_ID_AC3:       //!< AC3
+    case GAVL_CODEC_ID_AAC:       //!< AAC as stored in quicktime/mp4
+    case GAVL_CODEC_ID_VORBIS:    //!< Vorbis (segmented extradata and packets)
+    case GAVL_CODEC_ID_FLAC:      //!< Flac (extradata contain a file header without comment and seektable)
+    case GAVL_CODEC_ID_OPUS:      //!< Opus
+    case GAVL_CODEC_ID_SPEEX:     //!< Speex
+    case GAVL_CODEC_ID_DTS:
+      goto fail;
+      break;
+    
+    /* Video */
+    case GAVL_CODEC_ID_JPEG: //!< JPEG image
+    case GAVL_CODEC_ID_PNG:            //!< PNG image
+    case GAVL_CODEC_ID_TIFF:           //!< TIFF image
+    case GAVL_CODEC_ID_TGA:            //!< TGA image
+    case GAVL_CODEC_ID_MPEG1:          //!< MPEG-1 video
+    case GAVL_CODEC_ID_MPEG2:          //!< MPEG-2 video
+    case GAVL_CODEC_ID_MPEG4_ASP:      //!< MPEG-4 ASP (a.k.a. Divx4)
+    case GAVL_CODEC_ID_H264:           //!< H.264 (Annex B)
+    case GAVL_CODEC_ID_THEORA:         //!< Theora (segmented extradata)
+    case GAVL_CODEC_ID_DIRAC:          //!< Complete DIRAC frames, sequence end code appended to last packet
+    case GAVL_CODEC_ID_DV:             //!< DV (several variants)
+    case GAVL_CODEC_ID_VP8:            //!< VP8 (as used in webm)
+    case GAVL_CODEC_ID_DIV3:
+
+    /* Subtitle (some video codecs can handle subtitles also */
+    case GAVL_CODEC_ID_DVDSUB: //!< DVD subtitles, palette is in header
+      goto fail;
+      break;
+    case GAVL_CODEC_ID_NONE:
+      goto fail;
+      break;
+    }
+  
+  success = 1;
+  fail:
+  if(!success)
+    {
+    if(ret)
+      {
+      free(ret);
+      ret = NULL;
+      }
+    }
+
+  if(ret)
+    {
+    tmp_string = bg_sprintf("a=control:streamid=%d\r\n", h->id);
+    ret = gavl_strcat(ret, tmp_string);
+    free(tmp_string);
+    }
+  return ret;
+  }
+
+char * create_sdp(const server_t * s, const gavf_program_header_t * ph,
+                  const gavl_metadata_t * req)
+  {
+  char host[BG_SOCKET_ADDR_STR_LEN];
+  char * pos;
+  char * tmp_string;
+  char * ret = NULL;
+  const char * addr_format = "IP4";
+  const char * var;
+  int version = 0;
+  int session_id = 0;
+  int num_sdp_streams = 0;
+  int i;
+
+  /* Obtain host address */
+  bg_socket_address_to_string(s->addr, host);
+  pos = strrchr(host, ':');
+  if(pos)
+    *pos = '\0';
+
+  // Build sdp
+  ret = gavl_strcat(ret, "v=0\r\n");
+  
+  // o=
+  tmp_string = bg_sprintf("o=- %d %d IN %s %s\r\n",
+                          session_id, version, addr_format, host);
+  ret = gavl_strcat(ret, tmp_string);
+  free(tmp_string);
+
+  // s=
+  var = gavl_metadata_get(&ph->m, GAVL_META_STATION);
+  if(!var)
+    var = gavl_metadata_get(&ph->m, GAVL_META_LABEL);
+  if(!var)
+    var = gavl_metadata_get(&ph->m, GAVL_META_TITLE);
+  if(!var)
+    var = "";
+   
+  tmp_string = bg_sprintf("s=%s\r\n", var);
+  ret = gavl_strcat(ret, tmp_string);
+  free(tmp_string);
+
+  // i=
+  var = gavl_metadata_get(&ph->m, GAVL_META_COMMENT);
+  if(var)
+    {
+    tmp_string = bg_sprintf("i=%s\r\n", var);
+    ret = gavl_strcat(ret, tmp_string);
+    free(tmp_string);
+    }
+
+  // t=
+  var = gavl_metadata_get(&ph->m, GAVL_META_APPROX_DURATION);
+  if(!var)
+    ret = gavl_strcat(ret, "t=0 0\r\na=range:ntp=0-\r\n");
+
+  tmp_string = bg_sprintf("a=control:%s\r\n", bg_http_request_get_path(req));
+  ret = gavl_strcat(ret, tmp_string);
+  free(tmp_string);
+    
+  // m=
+  for(i = 0; i < ph->num_streams; i++)
+    {
+    tmp_string = create_sdp_stream(s, ph->streams + i, i);
+    if(tmp_string)
+      {
+      ret = gavl_strcat(ret, tmp_string);
+      free(tmp_string);
+      num_sdp_streams++;
+      }
+    }
+  
+  fprintf(stderr, "Created sdp:\n%s", ret);
+  
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/server.c Added

@@ -0,0 +1,681 @@
+/*****************************************************************
+ * Gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+
+#include <string.h>
+#include <gmerlin/bgsocket.h>
+#include <gmerlin/http.h>
+
+#include <unistd.h>
+
+#define LOG_DOMAIN "server"
+
+#define TIMEOUT GAVL_TIME_SCALE/2000
+#define ID3_CACHE_SIZE 50
+
+#define ONDEMAND_IDLE_TIME (30*GAVL_TIME_SCALE)
+
+// #define DUMP_REQUESTS
+
+static const bg_upnp_icon_t icons[] =
+  {
+    {
+    .mimetype = "image/png",
+    .width  = 16,
+    .height = 16,
+    .depth = 32,
+    .location = "/static/icons/server_16.png"
+    },
+    {
+    .mimetype = "image/png",
+    .width  = 48,
+    .height = 48,
+    .depth = 32,
+    .location = "/static/icons/server_48.png"
+    },
+    {
+    .mimetype = "image/bmp",
+    .width  = 48,
+    .height = 48,
+    .depth = 24,
+    .location = "/static/icons/server_48.bmp"
+    },
+    {
+    .mimetype = "image/jpeg",
+    .width  = 48,
+    .height = 48,
+    .depth = 24,
+    .location = "/static/icons/server_48.jpg"
+    },
+    {
+    .mimetype = "image/png",
+    .width  = 96,
+    .height = 96,
+    .depth = 32,
+    .location = "/static/icons/server_96.png"
+    },
+    {
+    .mimetype = "image/bmp",
+    .width  = 96,
+    .height = 96,
+    .depth = 24,
+    .location = "/static/icons/server_96.bmp"
+    },
+    {
+    .mimetype = "image/jpeg",
+    .width  = 96,
+    .height = 96,
+    .depth = 24,
+    .location = "/static/icons/server_96.jpg"
+    },
+    { /* End */ },
+  };
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name =      "loglevel",
+      .type = BG_PARAMETER_INT,
+      .long_name =  TRS("Log level"),
+      .val_min = { .val_i = 0 },
+      .val_max = { .val_i = 4 },
+      .val_default = { .val_i = 3 },
+    },
+    {
+      .name =      "syslog",
+      .long_name = TRS("Syslog name"),
+      .type = BG_PARAMETER_STRING,
+    },
+    {
+      .name =      "name",
+      .long_name = TRS("upnp name"),
+      .type = BG_PARAMETER_STRING,
+      .val_default = { .val_str = "Gmerlin server" },
+    },
+    {
+      .name =      "db",
+      .long_name = TRS("Database path"),
+      .type = BG_PARAMETER_DIRECTORY,
+      .val_default = { .val_str = "." },
+    },
+    {
+      .name =      "port",
+      .type = BG_PARAMETER_INT,
+      .long_name =  TRS("Listen port"),
+      .val_default = { .val_i = 0 },
+      .val_min     = { .val_i = 0 },
+      .val_max     = { .val_i = 65535 },
+    },
+    {
+      .name =      "addr",
+      .type = BG_PARAMETER_STRING,
+      .long_name =  TRS("Address to bind to"),
+    },
+    {
+      .name =      "uuid",
+      .type = BG_PARAMETER_STRING,
+      .flags = BG_PARAMETER_HIDE_DIALOG,
+      .long_name =  TRS("UUID"),
+    },
+    {
+      .name =      "max_keepalive_sockets",
+      .type = BG_PARAMETER_INT,
+      .long_name =  TRS("Maximum number of keep-alive sockets"),
+      .val_default = { .val_i = 16    },
+      .val_min     = { .val_i = 0     },
+      .val_max     = { .val_i = 65535 },
+    },
+    { /* End */ },
+  };
+
+const bg_parameter_info_t * server_get_parameters()
+  {
+  return parameters;
+  }
+
+void server_set_parameter(void * priv, const char * name,
+                          const bg_parameter_value_t * val)
+  {
+  server_t * s = priv;
+  if(!name)
+    return;
+  if(!strcmp(name, "db"))
+    s->dbpath = gavl_strrep(s->dbpath, val->val_str);
+  else if(!strcmp(name, "port"))
+    s->port = val->val_i;
+  else if(!strcmp(name, "addr"))
+    s->bind_addr = val->val_str;
+  else if(!strcmp(name, "max_keepalive_sockets"))
+    s->max_ka_sockets = val->val_i;
+  else if(!strcmp(name, "uuid"))
+    s->uuid_str = gavl_strrep(s->uuid_str, val->val_str);
+  else if(!strcmp(name, "name"))
+    s->upnp_name = gavl_strrep(s->upnp_name, val->val_str);
+  else if(!strcmp(name, "syslog"))
+    {
+    if(val->val_str)
+      bg_log_syslog_init(val->val_str);
+    }
+  else if(!strcmp(name, "loglevel"))
+    bg_log_set_verbose_level(val->val_i);
+  }
+
+int server_get_parameter(void * priv, const char * name,
+                          bg_parameter_value_t * val)
+  {
+  server_t * s = priv;
+  if(!name)
+    return 0;
+  if(!strcmp(name, "uuid"))
+    {
+    val->val_str = gavl_strrep(val->val_str, s->uuid_str);
+    return 1;
+    }
+  else if(!strcmp(name, "port"))
+    {
+    val->val_i = s->port;
+    return 1;
+    }
+  return 0;
+  }
+
+void server_init(server_t * s)
+  {
+  memset(s, 0, sizeof(*s));
+  pthread_mutex_init(&s->clients_mutex, NULL);
+  pthread_mutex_init(&s->ka_mutex, NULL);
+  s->timer = gavl_timer_create();
+  s->remote_addr = bg_socket_address_create(); 
+  }
+
+static int server_handle_upnp(server_t * s, int * fd,
+                              const char * method, const char * path,
+                              const gavl_metadata_t * req)
+  {
+  if(bg_upnp_device_handle_request(s->dev, *fd, method, path, req))
+    {
+    if(bg_http_check_keepalive(req, NULL))
+      ka_push(s, fd);
+    return 1;
+    }
+  return 0;
+  }
+
+static void append_handler(server_t * s, int protocol,
+                           const char * prefix,
+                           handler_func_t func)
+  {
+  s->handlers[s->num_handlers].protocol = protocol;
+  s->handlers[s->num_handlers].prefix   = prefix;
+  s->handlers[s->num_handlers].func     = func;
+  s->num_handlers++;
+  }
+
+int server_start(server_t * s)
+  {
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+  char * tmp_path;
+  bg_cfg_section_t * cfg_section;
+  int i;
+
+  /* Create plugin registry */
+
+  s->cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(s->cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+
+  cfg_section = bg_cfg_registry_find_section(s->cfg_reg, "plugins");
+  s->plugin_reg = bg_plugin_registry_create(cfg_section);
+  
+  /* Create listen socket: After that we'll have the root URL we can
+     advertise */
+  
+  s->addr = bg_socket_address_create();
+
+  if(s->bind_addr)
+    {
+    if(!bg_socket_address_set(s->addr, s->bind_addr,
+                              s->port, SOCK_STREAM))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid interface address %s",
+             s->bind_addr);
+      return 0;
+      }
+    }
+  else
+    {
+    if(!bg_socket_address_set_local(s->addr, s->port))
+      return 0;
+    }
+  
+  s->fd = bg_listen_socket_create_inet(s->addr, 0 /* Port */,
+                                       10 /* queue_size */,
+                                       BG_SOCKET_REUSEADDR /* flags */);
+
+  if(s->fd < 0)
+    return 0;
+
+  if(!bg_socket_get_address(s->fd, s->addr, NULL))
+    return 0;
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Socket listening on %s",
+         bg_socket_address_to_string(s->addr, addr_str));
+
+  /* get_parameter() might need that */
+  s->port = bg_socket_address_get_port(s->addr);
+  
+  s->root_url = bg_sprintf("http://%s", addr_str);
+
+  /* Remember UUID */
+
+  if(s->uuid_str)
+    uuid_parse(s->uuid_str, s->uuid);
+  else
+    {
+    uuid_clear(s->uuid);
+    uuid_generate(s->uuid);
+    s->uuid_str = calloc(37, 1);
+    uuid_unparse(s->uuid, s->uuid_str);
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Generated UUID: %s",
+           s->uuid_str);
+    }
+  
+  /* Create DB */
+
+  if(s->dbpath)
+    {
+    s->db = bg_db_create(s->dbpath, s->plugin_reg, 0);
+
+    if(!s->db)
+      bg_log(BG_LOG_INFO, LOG_DOMAIN,
+             "Database in %s couldn't be opened, disabling upnp", s->dbpath);
+    }
+  else
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "No database given, disabling upnp");
+
+
+  if(s->db) 
+    {
+    /* Create UPNP device(s) */
+    s->dev = bg_upnp_create_media_server(s->addr,
+                                         s->uuid,
+                                         s->upnp_name,
+                                         icons,
+                                         s->db);
+    s->server_string = bg_upnp_device_get_server_string(s->dev);
+    s->id3_cache = calloc(ID3_CACHE_SIZE, sizeof(*s->id3_cache));
+    s->id3_cache_size = ID3_CACHE_SIZE;
+
+    for(i = 0; i < ID3_CACHE_SIZE; i++)
+      {
+      s->id3_cache[i].last_used = GAVL_TIME_UNDEFINED;
+      s->id3_cache[i].id = -1;
+      }
+
+    append_handler(s, PROTOCOL_HTTP, "/upnp/", server_handle_upnp);
+    append_handler(s, PROTOCOL_HTTP, "/media/", server_handle_media);
+    append_handler(s, PROTOCOL_HTTP, "/transcode/", server_handle_transcode);
+    append_handler(s, PROTOCOL_HTTP|PROTOCOL_RTSP, "/ondemand/", server_handle_ondemand);
+    append_handler(s, PROTOCOL_HTTP, "/pls/", server_handle_pls);
+    append_handler(s, PROTOCOL_HTTP, "/m3u/", server_handle_m3u);
+    }
+  
+  append_handler(s, PROTOCOL_HTTP, NULL, server_handle_source);
+  append_handler(s, PROTOCOL_HTTP|PROTOCOL_RTSP, NULL, server_handle_stream);
+  
+  append_handler(s, PROTOCOL_HTTP, "/static/", server_handle_static);
+  //  s->handlers[s->num_handlers++] = server_handle_static;
+
+  gavl_timer_start(s->timer);
+  return 1;
+  }
+
+static void send_404(int fd, const char * protocol)
+  {
+  gavl_metadata_t res;
+  gavl_metadata_init(&res);
+  bg_http_response_init(&res, protocol, 404, "Not Found");
+  bg_http_response_write(fd, &res);
+  gavl_metadata_free(&res);
+  }
+
+
+
+static void handle_client_connection(server_t * s, int fd)
+  {
+  const char * method;
+  const char * path;
+  const char * protocol;
+  int protocol_i;
+  
+  int i, done;
+
+  gavl_metadata_t req;
+  gavl_metadata_init(&req);
+  if(!bg_http_request_read(fd, &req, TIMEOUT))
+    goto fail;
+
+#ifdef DUMP_REQUESTS
+  gavl_dprintf("Got request\n");
+  gavl_metadata_dump(&req, 2);
+#endif
+
+  method = bg_http_request_get_method(&req);
+  path = bg_http_request_get_path(&req);
+  protocol = bg_http_request_get_protocol(&req);
+
+  protocol_i = server_get_protocol(&req);
+  
+  if(protocol_i == PROTOCOL_RTSP)
+    {
+    const char * pos;
+    if(!strncasecmp(path, "rtsp://", 7))
+      {
+      if((pos = strchr(path + 7, '/')))
+        path = pos;
+      }
+    }
+
+  /* Can happen */
+  while(!strncmp(path, "//", 2))
+    path++;
+
+  if(!strcmp(path, "/"))
+    path = "/static/index.html";
+  
+  /* Try to handle things */
+  done = 0;
+  i = 0;
+  while(i < s->num_handlers)
+    {
+    if(!(s->handlers[i].protocol & protocol_i))
+      {
+      i++;
+      continue;
+      }
+    
+    if(s->handlers[i].prefix)
+      {
+      int len = strlen(s->handlers[i].prefix);
+      if(!strncmp(s->handlers[i].prefix, path, len))
+        {
+        if(s->handlers[i].func(s, &fd, method, path + len, &req))
+          {
+          done = 1;
+          break;
+          }
+        }
+      }
+    else if(s->handlers[i].func(s, &fd, method, path, &req))
+      {
+      done = 1;
+      break;
+      }
+    i++;
+    }
+  
+  if(!done)
+    send_404(fd, protocol);
+  
+  fail:
+  if(fd >= 0)
+    {
+//    fprintf(stderr, "Closing socket\n");
+    close(fd);
+    }
+  gavl_metadata_free(&req);
+  }
+
+void server_attach_client(server_t * s, client_t*cl)
+  {
+  pthread_mutex_lock(&s->clients_mutex);
+  if(s->num_clients + 1 >= s->clients_alloc)
+    {
+    s->clients_alloc += 16;
+    s->clients = realloc(s->clients, s->clients_alloc * sizeof(*s->clients));
+    memset(s->clients + s->num_clients, 0,
+           (s->clients_alloc - s->num_clients) * sizeof(*s->clients));
+    }
+  s->clients[s->num_clients] = cl;
+  s->num_clients++;
+  pthread_mutex_unlock(&s->clients_mutex);
+  }
+
+void server_detach_client(server_t * s, client_t*cl)
+  {
+  pthread_mutex_lock(&s->clients_mutex);
+  
+  pthread_mutex_unlock(&s->clients_mutex);
+  }
+
+static void server_destroy_client(server_t * s, int idx)
+  {
+  int i = idx+1;
+  // We assume that sinks always come after their source
+  while(i < s->num_clients) 
+    {
+    if(s->clients[i]->source == s->clients[idx])
+      server_destroy_client(s, i);
+    else
+      i++;
+    }
+  client_destroy(s, s->clients[idx]);
+
+  if(idx < s->num_clients - 1)
+    {
+    memmove(s->clients + idx,
+            s->clients + idx + 1,
+           (s->num_clients - 1 - idx) * sizeof(*s->clients));
+    }
+  s->num_clients--;
+  }
+
+int server_iteration(server_t * s)
+  {
+  int ret = 0;
+  int fd;
+  int i, j;
+  int ka_idx;
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+  
+  gavl_time_t delay_time = GAVL_TIME_SCALE / 100; // 10 ms
+
+  s->current_time = gavl_timer_get(s->timer);  
+  /* Remove dead clients */
+
+  i = 0;
+  while(i < s->num_clients)
+    {
+    if(client_get_status(s->clients[i]) == CLIENT_STATUS_DONE)
+      server_destroy_client(s, i);
+    else
+      i++;
+    }
+
+  /* Remove on-demand sources with zero sinks */
+
+  i = 0;
+  while(i < s->num_clients)
+    {
+    if(s->clients[i]->type == CLIENT_TYPE_SOURCE_ONDEMAND)
+      {
+      int have_clients = 0;
+      j = 0;
+      
+      while(j < s->num_clients)
+        {
+        if(s->clients[j]->source == s->clients[i])
+          {
+          have_clients = 1;
+          break;
+          }
+        j++;
+        }
+      if(!have_clients)
+        {
+        if(s->clients[i]->idle_time == GAVL_TIME_UNDEFINED)
+          s->clients[i]->idle_time = s->current_time;
+        else if(s->current_time - s->clients[i]->idle_time > ONDEMAND_IDLE_TIME)
+          {
+          bg_log(BG_LOG_INFO, LOG_DOMAIN, "Shutting down ondemand stream (idle timeout)");
+          server_destroy_client(s, i);
+          continue;
+          }
+        }
+      else
+        s->clients[i]->idle_time = GAVL_TIME_UNDEFINED;
+      }
+    i++;
+    }
+
+  /* Handle keepalive connections */
+
+  ka_idx = 0;
+  
+  while((fd = ka_accept(s, &ka_idx)) >= 0)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Reusing keep-alive connection");
+    handle_client_connection(s, fd);
+    ret++;
+    }
+  
+  /* Handle incoming connections */
+  while((fd = bg_listen_socket_accept(s->fd, 0, s->remote_addr)) >= 0)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Got connection from %s",
+           bg_socket_address_to_string(s->remote_addr, addr_str));
+    handle_client_connection(s, fd);
+    ret++;
+    }
+  
+  /* Ping upnp device so it can do it's ssdp stuff */
+
+  if(s->dev)
+    ret += bg_upnp_device_ping(s->dev);
+
+  if(!ret)
+    gavl_time_delay(&delay_time);
+  
+  return 1;
+  }
+
+void server_cleanup(server_t * s)
+  {
+  int i;
+  if(s->dev)
+    bg_upnp_device_destroy(s->dev);
+  if(s->db)
+    bg_db_destroy(s->db);
+  if(s->dbpath)
+    free(s->dbpath);
+  if(s->root_url)
+    free(s->root_url);
+  if(s->bind_addr)
+    free(s->bind_addr);
+  
+  bg_socket_address_destroy(s->remote_addr);
+  
+  if(s->addr)
+    bg_socket_address_destroy(s->addr);
+  
+  for(i = 0; i < s->num_clients; i++)
+    {
+    if((s->clients[i]->type != CLIENT_TYPE_SOURCE_ONDEMAND) &&
+       (s->clients[i]->type != CLIENT_TYPE_SOURCE_STREAM))
+      {
+      client_destroy(s, s->clients[i]);
+      s->clients[i] = NULL;
+      }
+    }
+  for(i = 0; i < s->num_clients; i++)
+    {
+    if(s->clients[i])
+      client_destroy(s, s->clients[i]);
+    }
+  
+  if(s->clients)
+    free(s->clients);
+  if(s->timer)
+    gavl_timer_destroy(s->timer);
+
+  if(s->id3_cache)
+    {
+    for(i = 0; i < s->id3_cache_size; i++)
+      {
+      if(s->id3_cache[i].data)
+        free(s->id3_cache[i].data);
+      }
+    free(s->id3_cache);
+    }
+
+  ka_cleanup(s);
+  
+  if(s->uuid_str)
+    free(s->uuid_str);
+  if(s->upnp_name)
+    free(s->upnp_name);
+
+  
+  bg_plugin_registry_destroy(s->plugin_reg);
+  bg_cfg_registry_destroy(s->cfg_reg);
+
+  pthread_mutex_destroy(&s->ka_mutex);
+  pthread_mutex_destroy(&s->clients_mutex);
+
+  }
+
+char * server_extract_mimetype(const char * pos)
+  {
+  const char * pos2;
+  if(*pos == '/')
+    {
+    pos++;
+    pos2 = strchr(pos, '/');
+    
+    if(pos2) // Have mimetype at pos
+      {
+      pos2 = strchr(pos2 + 1, '/');
+      if(pos2)
+        return gavl_strndup(pos, pos2);
+      else
+        return gavl_strdup(pos);
+      }
+    }
+  return NULL;
+  }
+
+int server_get_protocol(const gavl_metadata_t * req)
+  {
+  const char * protocol = bg_http_request_get_protocol(req);
+  
+  if(!protocol)
+    return 0;
+  
+  if(!strncmp(protocol, "HTTP/", 5))
+    return PROTOCOL_HTTP;
+  else if(!strncmp(protocol, "RTSP/", 5))
+    return PROTOCOL_RTSP;
+  return 0;
+  }
+

gmerlin-4256.tar.gz/apps/mediaserver/server.h Added

@@ -0,0 +1,410 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/mediadb.h>
+#include <gmerlin/cmdline.h>
+#include <gmerlin/bgplug.h>
+#include <gmerlin/subprocess.h>
+#include <gmerlin/charset.h>
+
+#include <gmerlin/upnp/device.h>
+
+#define CLIENT_STATUS_STARTING     0
+#define CLIENT_STATUS_WAIT_SYNC    1
+#define CLIENT_STATUS_RUNNING      2
+#define CLIENT_STATUS_DONE         3
+#define CLIENT_STATUS_STOP         4
+
+#define CLIENT_TYPE_MEDIA           0 // Media file for upnp devices
+#define CLIENT_TYPE_SOURCE_ONDEMAND 1 // Ondemand upstream source (bgplug)
+#define CLIENT_TYPE_SOURCE_STREAM   2 // Upstream source (bgplug)
+#define CLIENT_TYPE_SINK            3 // Sink (bgplug or filtered)
+
+#define PROTOCOL_HTTP               (1<<0)
+#define PROTOCOL_RTSP               (1<<1)
+
+#define CLIENT_TIMEOUT              1000
+
+typedef struct server_s server_t;
+
+/*
+ *  URL structure:
+ *  http://<root>/                      -> http interface
+ *  http://<root>/static                -> Static files
+ *  http://<root>/upnp/<dev>/desc.xml   -> Device description
+ *  http://<root>/upnp/<dev>/<serv>.xml -> Service description
+ *  http://<root>/media?id=<id>         -> Media files
+ *
+ */
+
+typedef struct client_s
+  {
+  int type;
+  pthread_mutex_t status_mutex;
+  int status;
+  pthread_t thread;
+  int fd;
+
+  char * name;
+  int64_t id;
+  gavl_time_t idle_time;
+  
+  void *data;
+  void (*free_data)(void*);
+  void (*func)(struct client_s * client);
+
+  struct client_s * source;
+
+  int keep_alive;
+  } client_t;
+
+client_t * client_create(int type, int fd, void * data,
+                         void (*free_data)(void*), void (*func)(client_t*));
+
+int client_get_status(client_t *);
+void client_destroy(server_t * s, client_t * c);
+
+/* Buffer: Passes data from a program source to listeners in a thread save way */
+
+#define BUFFER_TYPE_PACKET      0
+#define BUFFER_TYPE_METADATA    1
+#define BUFFER_TYPE_SYNC_HEADER 2
+
+typedef struct buffer_element_s
+  {
+  int type;
+  gavl_packet_t p;
+  gavl_metadata_t m;
+
+  int64_t * sh;
+  
+  int64_t seq; // Sequence number
+
+  struct buffer_element_s * next;
+  } buffer_element_t;
+
+void buffer_element_set_sync_header(buffer_element_t * el,
+                                    const int64_t * sh, int num);
+
+void buffer_element_set_packet(buffer_element_t * el,
+                               const gavl_packet_t * p);
+
+void buffer_element_set_metadata(buffer_element_t * el,
+                                 const gavl_metadata_t * m);
+
+typedef struct buffer_s buffer_t;
+
+buffer_t * buffer_create(int num_elements);
+
+void buffer_destroy(buffer_t *);
+
+buffer_element_t * buffer_get_write(buffer_t *);
+void buffer_done_write(buffer_t *);
+
+int buffer_get_read(buffer_t *, int64_t * seq, buffer_element_t ** el);
+void buffer_done_read(buffer_t *);
+
+void buffer_wait(buffer_t * b);
+
+void buffer_get_fullness(buffer_t * b, int * num_elements,
+                         int * max_elements);
+
+// void buffer_done_read(buffer_t *, buffer_element_t *);
+
+buffer_element_t * buffer_get_first(buffer_t *);
+
+int64_t buffer_get_start_seq(buffer_t *);
+
+void buffer_stop(buffer_t * b);
+
+int buffer_get_free(buffer_t * b);
+
+/* On the fly ID3V2 generation for the more stupid clients */
+
+typedef struct
+  {
+  int64_t id;
+  int len;
+  int alloc;
+  uint8_t * data;
+  gavl_time_t last_used;
+  } id3v2_t;
+
+int id3v2_generate(bg_db_t * db, int64_t id, id3v2_t * ret);
+
+/* Filter: Sends data to the socket */
+
+typedef struct
+  {
+  int is_supported;
+  int (*supported)(bg_plugin_registry_t * plugin_reg);
+  
+  int (*probe)(int protocol,
+               const gavf_program_header_t * ph,
+               const gavl_metadata_t * request);
+  
+  void * (*create)(server_t * s,
+                   const gavf_program_header_t * ph,
+                   const gavl_metadata_t * req,
+                   const gavl_metadata_t * vars,
+                   gavl_metadata_t * res);
+
+  int (*start)(void * priv,
+               const gavf_program_header_t * ph,
+               const gavl_metadata_t * req,
+               const gavl_metadata_t * inline_metadata,
+               int fd);
+
+  void (*sync)(void * priv,
+               const int64_t * pts);
+  
+  int (*put_buffer)(void * priv, buffer_element_t *);
+  void (*destroy)(void * priv);
+  } filter_t;
+
+void filter_init();
+
+const filter_t * filter_find(int prpotocol,
+                             const gavf_program_header_t * ph,
+                             const gavl_metadata_t * request);
+
+/* Keepalive sockets */
+
+#define KA_TIMEOUT (10*GAVL_TIME_SCALE) // 10 Secs
+
+typedef struct
+  {
+  int fd;
+  gavl_time_t last_active;
+  } ka_socket_t;
+
+int ka_push(server_t * s, int * fd);
+int ka_accept(server_t * s, int * idx);
+void ka_cleanup(server_t * s);
+// int ka_check(const gavl_metadata_t * req, gavl_metadata_t * res);
+/* Client */
+
+
+client_t * source_client_create(int * fd,
+                                bg_plugin_registry_t * plugin_reg,
+                                bg_plug_t * plug, int type,
+                                bg_subprocess_t * proc);
+
+client_t * sink_client_create(server_t * s,
+                              int * fd, const gavl_metadata_t * req,
+                              const gavf_program_header_t * ph,
+                              const gavl_metadata_t * inline_metadata,
+                              buffer_t * buf, const char * method, int proto);
+
+client_t * sink_create_from_source(server_t * s,
+                                   int * fd, client_t * source,
+                                   const gavl_metadata_t * req,
+                                   const char * method, int proto);
+
+typedef int (*handler_func_t)(server_t * s, int * fd,
+                              const char * method, const char * path,
+                              const gavl_metadata_t * req);
+
+typedef struct
+  {
+  const char * prefix;
+  int protocol;
+  handler_func_t func;
+  } handler_t;
+
+/* Server */
+
+struct server_s
+  {
+  /* Config stuff */
+  char * dbpath;
+  bg_plugin_registry_t * plugin_reg; // Must be set manually
+  bg_cfg_registry_t * cfg_reg;
+  bg_socket_address_t * addr;
+  int fd;
+  int port;
+  char * bind_addr;
+  
+  /* Keep alive stuff */
+  ka_socket_t * ka_sockets;
+  int num_ka_sockets;
+  int max_ka_sockets;
+  int ka_sockets_alloc;
+  pthread_mutex_t ka_mutex;
+  
+  gavl_timer_t * timer;
+  gavl_time_t current_time;
+
+  pthread_mutex_t clients_mutex;
+  client_t ** clients;
+  int num_clients;
+  int clients_alloc;
+
+  char * root_url;
+
+  bg_upnp_device_t * dev;
+  bg_db_t * db;
+
+  uuid_t uuid;
+  char * uuid_str;
+
+  char * upnp_name;
+  
+  const char * server_string;
+
+  id3v2_t * id3_cache;
+  int id3_cache_size;
+
+  int num_handlers;
+  handler_t handlers[16]; // Increase when more are needed
+
+  bg_socket_address_t * remote_addr;
+  
+  int rtsp_session_max;
+  };
+
+void server_attach_client(server_t*, client_t*cl);
+void server_detach_client(server_t*, client_t*cl);
+
+void server_init(server_t*);
+
+int server_start(server_t*);
+
+int server_get_protocol(const gavl_metadata_t * req);
+
+id3v2_t * server_get_id3(server_t * s, int64_t id);
+id3v2_t * server_get_id3_for_file(server_t * s,
+                                  bg_db_file_t * f,
+                                  int * offset);
+
+
+const bg_parameter_info_t * server_get_parameters();
+void server_set_parameter(void * server, const char * name,
+                          const bg_parameter_value_t * val);
+
+int server_get_parameter(void * server, const char * name,
+                         bg_parameter_value_t * val);
+
+int server_iteration(server_t * s);
+
+void server_cleanup(server_t * s);
+
+/* Media handler (fd will be set to -1 if we launched a
+   thread for transferring the file) */
+
+int server_handle_media(server_t * s, int * fd,
+                        const char * method, const char * path,
+                        const gavl_metadata_t * req);
+
+int server_handle_pls(server_t * s, int * fd,
+                      const char * method,
+                      const char * path_orig,
+                      const gavl_metadata_t * req);
+
+int server_handle_m3u(server_t * s, int * fd,
+                      const char * method,
+                      const char * path_orig,
+                      const gavl_metadata_t * req);
+
+int server_handle_transcode(server_t * s, int * fd,
+                            const char * method,
+                            const char * path_orig,
+                            const gavl_metadata_t * req);
+
+int server_handle_source(server_t * s, int * fd,
+                         const char * method,
+                         const char * path_orig,
+                         const gavl_metadata_t * req);
+
+int server_handle_stream(server_t * s, int * fd,
+                         const char * method,
+                         const char * path_orig,
+                         const gavl_metadata_t * req);
+
+int server_handle_ondemand(server_t * s, int * fd,
+                           const char * method,
+                           const char * path_orig,
+                           const gavl_metadata_t * req);
+
+int server_handle_static(server_t * s, int * fd,
+                         const char * method,
+                         const char * path_orig,
+                         const gavl_metadata_t * req);
+
+char * server_extract_mimetype(const char * pos);
+
+char *
+generate_pls(server_t * s, const char * path, bg_db_object_t * obj);
+
+char *
+generate_m3u(server_t * s, const char * path, bg_db_object_t * obj);
+
+/* RTSP */
+
+typedef enum
+  {
+    RTSP_STATUS_ERROR = 0,
+    RTSP_STATUS_AGAIN = 1, // Call again
+    RTSP_STATUS_SDP   = 2, // Sent SDP
+    RTSP_STATUS_SETUP = 3, // Setup done
+    RTSP_STATUS_PLAY  = 4, // Sent play command
+  } rtsp_status_t;
+
+rtsp_status_t rtsp_handshake_1(const server_t * s, int fd,
+                     const gavl_metadata_t * first_req,
+                     const gavf_program_header_t * ph);
+
+rtsp_status_t rtsp_handshake_2(const server_t * s, void * ctx, int fd,
+                     const gavf_program_header_t * ph);
+
+char * create_sdp(const server_t * s, const gavf_program_header_t * ph,
+                  const gavl_metadata_t * req);
+
+/* Shoutcast metadata generator */
+
+typedef struct
+  {
+  int metaint;
+  int byte_counter;
+  bg_charset_converter_t * cnv;
+  char * buffer;
+  int buffer_alloc;
+  int buffer_len;
+  } icy_t;
+
+void icy_update_metadata(icy_t * m, const gavl_metadata_t * met);
+
+void icy_init(icy_t * m,
+              const gavf_program_header_t * ph,
+              const gavl_metadata_t * req,
+              const gavl_metadata_t * inline_metadata,
+              gavl_metadata_t * res);
+
+int icy_write(icy_t * m,
+              const uint8_t * data, int len,
+              gavf_io_t * io);
+
+void icy_free(icy_t * m);
+

gmerlin-4256.tar.gz/apps/mediaserver/sink.c Added

@@ -0,0 +1,231 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+
+
+#include <server.h>
+#include <gmerlin/http.h>
+#include <gmerlin/bgplug.h>
+
+#define LOG_DOMAIN "server.sink"
+
+// #define CLIENT_TIMEOUT 1000
+
+typedef struct
+  {
+  buffer_t * buf;
+  int64_t seq;
+  const filter_t * f;
+  void * filter_priv;
+  } sink_t;
+
+static void sink_destroy(void * data)
+  {
+  sink_t * s = data;
+  if(s->f->destroy && s->filter_priv)
+    s->f->destroy(s->filter_priv);  
+  free(s);
+  }
+
+static buffer_element_t * next_element(client_t * cl)
+  {
+  buffer_element_t * ret = NULL;
+  int result;
+  sink_t * s = cl->data;
+  
+  while(1)
+    {
+    if(client_get_status(cl) == CLIENT_STATUS_STOP)
+      return 0;
+    
+    result = buffer_get_read(s->buf, &s->seq, &ret);
+    
+    if(!result)
+      return NULL;
+
+    if(ret)
+      return ret;
+    buffer_wait(s->buf);
+    }
+  
+  return NULL;
+  }
+
+static void sink_func(client_t * cl)
+  {
+  buffer_element_t * el;
+  sink_t * priv = cl->data;
+
+  while(1)
+    {
+    el = next_element(cl);
+
+    if(!el)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not get data");
+      return;
+      }
+    if(el->type == BUFFER_TYPE_SYNC_HEADER)
+      {
+      buffer_done_read(priv->buf);
+      break;
+      }
+    buffer_done_read(priv->buf);
+    }
+  
+  /* Got sync header */
+
+  while(bg_socket_can_write(cl->fd, 1000))
+    {
+    if(!(el = next_element(cl)))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not get data");
+      return;
+      }
+    if(!priv->f->put_buffer(priv->filter_priv, el))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Sending data failed");
+      buffer_done_read(priv->buf);
+      return;
+      }
+    buffer_done_read(priv->buf);
+    }
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Remote end closed connection");
+  }
+
+static int http_handshake_1(gavl_metadata_t * res)
+  {
+  bg_http_response_init(res, "HTTP/1.1", 200, "OK");
+  return 1;
+  }
+
+static int http_handshake_2(int fd,
+                            const char * method,
+                            const gavl_metadata_t * req,
+                            gavl_metadata_t * res)
+  {
+  /* Set some specific fields */
+  gavl_metadata_set(res, "Connection", "close");
+  gavl_metadata_set(res, "Cache-control", "no-cache");
+  gavl_metadata_set(res, "Pragma", "no-cache");
+  gavl_metadata_set(res, "Accept-Ranges", "none");
+  if(!bg_http_response_write(fd, res))
+    return 0;
+
+  if(!strcmp(method, "HEAD"))
+    return 0;
+  
+  return 1;
+  }
+
+client_t * sink_client_create(server_t * s,
+                              int * fd, const gavl_metadata_t * req,
+                              const gavf_program_header_t * ph,
+                              const gavl_metadata_t * inline_metadata,
+                              buffer_t * buf, const char * method, int proto)
+  {
+  gavl_metadata_t res;
+  int write_response = 0;
+  client_t * ret = NULL;
+  gavf_io_t * io = NULL;
+  const char * protocol;
+  sink_t * priv = calloc(1, sizeof(*ret));
+
+  gavl_metadata_init(&res);
+  
+  priv->buf = buf;
+  priv->seq = -1;
+
+  protocol = bg_http_request_get_protocol(req);
+  
+  if(!(priv->f = filter_find(proto, ph, req)))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No filter found");
+    bg_http_response_init(&res, protocol, 406, "Not Acceptable");
+    write_response = 1;
+    goto end;
+    }
+
+  switch(proto)
+    {
+    case PROTOCOL_HTTP:
+      if(!http_handshake_1(&res))
+        goto end;
+      break;
+    case PROTOCOL_RTSP:
+      if(!rtsp_handshake_1(s, *fd, req, ph))
+        goto end;
+      break;
+    default:
+      goto end;
+    }
+  
+  if(!(priv->filter_priv = priv->f->create(s, ph, req, inline_metadata,
+                                           &res)))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Setting up filter failed");
+    gavl_metadata_free(&res);
+    bg_http_response_init(&res, protocol, 406, "Not Acceptable");
+    write_response = 1;
+    goto end;
+    }
+
+  switch(proto)
+    {
+    case PROTOCOL_HTTP:
+      if(!http_handshake_2(*fd, method, req, &res))
+        goto end;
+      break;
+    case PROTOCOL_RTSP:
+      if(!rtsp_handshake_2(s, priv->filter_priv, *fd, ph))
+        goto end;
+      break;
+    default:
+      goto end;
+    }
+  
+  /* Start filter */
+  
+  if(!priv->f->start(priv->filter_priv, ph, req, inline_metadata, *fd))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Starting filter failed");
+    goto end;
+    }
+  
+  ret = client_create(CLIENT_TYPE_SINK, *fd, priv,
+                      sink_destroy, sink_func);
+
+  *fd = -1;
+  
+  end:
+
+  if(io)
+    gavf_io_destroy(io);
+  
+  if(write_response)
+    bg_http_response_write(*fd, &res);
+  
+  gavl_metadata_free(&res);
+  if(!ret)
+    sink_destroy(priv);
+  return ret;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/source.c Added

@@ -0,0 +1,460 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <signal.h>
+
+#include <server.h>
+#include <gmerlin/http.h>
+
+#include <gavl/metatags.h>
+
+// #define CLIENT_TIMEOUT 1000
+
+// #define BUF_ELEMENTS 100
+#define BUF_ELEMENTS 500
+
+#define HAVE_HEADER    (1<<0)
+
+#define LOG_DOMAIN "server.source"
+
+typedef struct
+  {
+  gavl_metadata_t m;
+  int have_m; // 1 if we received a metadata update yet
+  pthread_mutex_t metadata_mutex;
+  
+  bg_plug_t * in_plug;
+  bg_mediaconnector_t conn;
+  bg_plug_t * conn_plug;
+  
+  buffer_t * buf;
+  
+  int flags;
+  gavf_program_header_t h;
+  gavl_timer_t * timer;
+
+  gavf_program_header_t ph;
+
+  bg_subprocess_t * proc;
+  } source_t;
+
+static void enable_streams(bg_plug_t * plug, gavf_stream_type_t type)
+  {
+  gavf_t * g;
+  int num, i;
+  const gavf_stream_header_t * sh;
+
+  g = bg_plug_get_gavf(plug);
+
+  num = gavf_get_num_streams(g, type);
+
+  if(!num)
+    return;
+
+  for(i = 0; i < num; i++)
+    {
+    sh = gavf_get_stream(g, i, type);
+    bg_plug_set_stream_action(plug, sh, BG_STREAM_ACTION_READRAW);
+    }
+  
+  }
+
+static int write_func(void * priv, const uint8_t * data, int len)
+  {
+  return len;
+  }
+
+static int conn_cb_func(void * priv, int type, const void * data)
+  {
+  buffer_element_t * el;
+  source_t * p = priv;
+  
+  switch(type)
+    {
+    case GAVF_IO_CB_PROGRAM_HEADER_START:
+      //      fprintf(stderr, "Got program header:\n");
+      //      gavf_program_header_dump(data);
+
+      if(!(p->flags & HAVE_HEADER))
+        {
+        gavf_program_header_copy(&p->ph, data);
+        p->flags |= HAVE_HEADER;
+        }
+      break;
+    case GAVF_IO_CB_PROGRAM_HEADER_END:
+      break;
+    case GAVF_IO_CB_PACKET_START:
+      //      fprintf(stderr, "Got packet: %d\n", ((gavl_packet_t*)data)->id);
+      //      gavl_packet_dump(data);
+
+      el = buffer_get_write(p->buf);
+      if(!el)
+        return 0;
+      
+      buffer_element_set_packet(el, data);
+      buffer_done_write(p->buf);
+      
+      break;
+    case GAVF_IO_CB_PACKET_END:
+      break;
+    case GAVF_IO_CB_METADATA_START:
+      //      fprintf(stderr, "Got metadata:\n");
+      //      gavl_metadata_dump(data, 2);
+
+      pthread_mutex_lock(&p->metadata_mutex);
+      gavl_metadata_free(&p->m);
+      gavl_metadata_init(&p->m);
+      gavl_metadata_copy(&p->m, data);
+      p->have_m = 1;
+      pthread_mutex_unlock(&p->metadata_mutex);
+
+      el = buffer_get_write(p->buf);
+      if(!el)
+        return 0;
+
+      buffer_element_set_metadata(el, data);
+      buffer_done_write(p->buf);
+
+      break;
+    case GAVF_IO_CB_METADATA_END:
+      break;
+    case GAVF_IO_CB_SYNC_HEADER_START:
+      //      fprintf(stderr, "Got sync_header\n");
+
+      if(!gavl_timer_is_running(p->timer))
+        gavl_timer_start(p->timer);
+      
+      el = buffer_get_write(p->buf);
+      if(!el)
+        return 0;
+
+      buffer_element_set_sync_header(el, data, p->ph.num_streams);
+      buffer_done_write(p->buf);
+      
+      break;
+    case GAVF_IO_CB_SYNC_HEADER_END:
+      break;
+    }
+  
+  return 1;
+  }
+
+static void source_destroy(void * data)
+  {
+  source_t * p = data;
+
+  if(p->in_plug)
+    bg_plug_destroy(p->in_plug);
+
+  if(p->conn_plug)
+    bg_plug_destroy(p->conn_plug);
+
+  bg_mediaconnector_free(&p->conn);
+    
+  if(p->buf)
+    buffer_stop(p->buf);
+
+  if(p->timer)
+    gavl_timer_destroy(p->timer);
+
+  if(p->buf)
+    buffer_destroy(p->buf);
+
+  gavf_program_header_free(&p->ph);
+
+  gavl_metadata_free(&p->m);
+
+  if(p->proc)
+    {
+    bg_subprocess_kill(p->proc, SIGTERM);
+    bg_subprocess_close(p->proc);
+    }
+  pthread_mutex_destroy(&p->metadata_mutex);
+  free(p);
+  }
+
+static void source_func(client_t * cl)
+  {
+  int num, max;
+  gavl_time_t conn_time;
+  gavl_time_t program_time;
+  gavl_time_t buffer_time;
+  
+  source_t * p = cl->data;
+
+  int buffering = 1;
+  
+  while(1)
+    {
+    /* Read packet from source */
+    if(!bg_mediaconnector_iteration(&p->conn))
+      break;
+
+    conn_time = bg_mediaconnector_get_min_time(&p->conn);
+    program_time = gavl_timer_get(p->timer);
+    
+    if(buffering)
+      {
+      buffer_get_fullness(p->buf, &num, &max);
+      if(num == max)
+        {
+        buffer_time = conn_time - program_time;
+        buffering = 0;
+        }
+      }
+    
+    if(!buffering)
+      {
+      if((conn_time != GAVL_TIME_UNDEFINED) &&
+        (conn_time - program_time - buffer_time > GAVL_TIME_SCALE/2))
+        {
+        gavl_time_t delay_time;
+        delay_time = conn_time - program_time -
+          buffer_time - GAVL_TIME_SCALE/2;
+        gavl_time_delay(&delay_time);
+        //        fprintf(stderr, "Delay time: %f\n", gavl_time_to_seconds(delay_time));
+        }
+      }
+    }
+  }
+
+client_t * source_client_create(int * fd,
+                                bg_plugin_registry_t * plugin_reg,
+                                bg_plug_t * plug, int type,
+                                bg_subprocess_t * proc)
+  {
+  gavf_io_t * io = NULL; 
+  source_t * priv;
+  client_t * ret;
+  
+  priv = calloc(1, sizeof(*priv));
+
+  pthread_mutex_init(&priv->metadata_mutex, NULL);
+
+  priv->in_plug = plug;
+  priv->proc = proc;
+  
+  enable_streams(priv->in_plug, GAVF_STREAM_AUDIO);
+  enable_streams(priv->in_plug, GAVF_STREAM_VIDEO);
+  enable_streams(priv->in_plug, GAVF_STREAM_TEXT);
+  enable_streams(priv->in_plug, GAVF_STREAM_OVERLAY);
+
+  if(!bg_plug_start(priv->in_plug))
+    goto fail;
+
+  priv->buf = buffer_create(BUF_ELEMENTS);
+  priv->timer = gavl_timer_create();
+
+  /* Set up media connector */
+  bg_plug_setup_reader(priv->in_plug, &priv->conn);
+  bg_mediaconnector_create_conn(&priv->conn);
+
+  /* Setup connection plug */
+  io = gavf_io_create(NULL,
+                      write_func,
+                      NULL,
+                      NULL,
+                      NULL,
+                      priv);
+
+  gavf_io_set_cb(io, conn_cb_func, priv);
+
+  priv->conn_plug = bg_plug_create_writer(plugin_reg);
+  
+  bg_plug_open(priv->conn_plug, io,
+               bg_plug_get_metadata(priv->in_plug), NULL, 0);
+
+  bg_plug_transfer_metadata(priv->in_plug, priv->conn_plug);
+  
+  if(!bg_plug_setup_writer(priv->conn_plug, &priv->conn))
+    goto fail;
+
+  bg_mediaconnector_start(&priv->conn);
+  
+  ret = client_create(type, *fd, priv, source_destroy, source_func);
+
+  /* Copy at least the station name */
+  gavl_metadata_set(&priv->m, GAVL_META_STATION,
+                    gavl_metadata_get(bg_plug_get_metadata(priv->conn_plug), GAVL_META_STATION));
+  
+  *fd = -1;
+
+  return ret;
+  
+  fail:
+
+  source_destroy(priv);  
+  return NULL;
+  }
+
+int server_handle_source(server_t * s, int * fd,
+                         const char * method,
+                         const char * path_orig,
+                         const gavl_metadata_t * req)
+  {
+  const char * var;
+  int i;
+  int flags;
+  gavl_metadata_t res;
+  client_t * cl;
+  gavf_io_t * io = NULL; 
+  bg_plug_t * plug = NULL;
+  
+  if(strcmp(method, "PUT") ||
+     !(var = gavl_metadata_get(req, "Content-Type")) ||
+     strcmp(var, bg_plug_mimetype))
+    return 0;
+
+  /* Check if a stream of that name already exists */
+  
+  gavl_metadata_init(&res);
+  
+  if(!strcmp(path_orig, "/") || (path_orig[0] != '/'))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid path \"%s\"", path_orig);
+    bg_http_response_init(&res, "HTTP/1.1", 404, "Not Found");
+    goto fail;
+    }
+
+  for(i = 0; i < s->num_handlers; i++)
+    {
+    if(s->handlers[i].prefix &&
+       !strncmp(path_orig, s->handlers[i].prefix,
+                strlen(s->handlers[i].prefix)))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid path \"%s\"", path_orig);
+      bg_http_response_init(&res, "HTTP/1.1", 404, "Not Found");
+      goto fail;
+      }
+    }
+  
+  for(i = 0; i < s->num_clients; i++)
+    {
+    if((s->clients[i]->type == CLIENT_TYPE_SOURCE_STREAM) &&
+       !strcmp(s->clients[i]->name, path_orig + 1))
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 423, "Locked");
+      goto fail;
+      }
+    }
+  
+  /* Send ok if everything is fine */
+
+  if((var = gavl_metadata_get(req, "Expect")) &&
+     !strcmp(var, "100-continue"))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 100, "Continue");
+    if(!bg_http_response_write(*fd, &res))
+      goto fail;
+    }
+
+  io = bg_plug_io_open_socket(*fd, BG_PLUG_IO_METHOD_READ, &flags, CLIENT_TIMEOUT);
+  if(!io)
+    goto fail;
+  
+  plug = bg_plug_create_reader(s->plugin_reg);
+
+  if(!plug)
+    goto fail;
+  
+  if(!bg_plug_open(plug, io, NULL, NULL, flags))
+    goto fail;
+  io = NULL;
+  
+  cl = source_client_create(fd, s->plugin_reg, plug, CLIENT_TYPE_SOURCE_STREAM, NULL);
+  cl->name = gavl_strdup(path_orig);
+
+  gavl_metadata_free(&res);
+
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Created source %s", path_orig);
+  
+  server_attach_client(s, cl);
+  return 1;
+  
+  fail:
+
+  gavl_metadata_free(&res);
+
+  if(plug)
+    bg_plug_destroy(plug);
+
+  if(io)
+    gavf_io_destroy(io);
+  
+  return 1;
+  }
+
+client_t * sink_create_from_source(server_t * s,
+                                   int * fd, client_t * source,
+                                   const gavl_metadata_t * req,
+                                   const char * method, int proto)
+  {
+  source_t * sp;
+  client_t * sink;
+  
+  sp = source->data;
+  pthread_mutex_lock(&sp->metadata_mutex);
+  sink = sink_client_create(s, fd, req, 
+                            &sp->ph,
+                            &sp->m,
+                            sp->buf, method, proto);
+  if(sink)
+    sink->source = source;
+  pthread_mutex_unlock(&sp->metadata_mutex);
+  return sink;
+  }
+
+int server_handle_stream(server_t * s, int * fd,
+                         const char * method,
+                         const char * path_orig,
+                         const gavl_metadata_t * req)
+  {
+  int i;
+  client_t * source = NULL;
+  client_t * sink;
+  int protocol = server_get_protocol(req);
+  
+  if(protocol == PROTOCOL_HTTP)
+    {
+    if(strcmp(method, "GET") && strcmp(method, "HEAD"))
+      return 0;
+    }
+  
+  for(i = 0; i < s->num_clients; i++)
+    {
+    if((s->clients[i]->type == CLIENT_TYPE_SOURCE_STREAM) &&
+       s->clients[i]->name &&
+       !strcmp(s->clients[i]->name, path_orig))
+      {
+      source = s->clients[i];
+      break;
+      }
+    }
+  if(!source)
+    return 0; // 404
+
+  sink = sink_create_from_source(s, fd, source, req, method, protocol);
+  
+  if(sink)
+    server_attach_client(s, sink);
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/statichandler.c Added

@@ -0,0 +1,165 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+
+#include <gmerlin/http.h>
+#include <unistd.h> // access
+#include <errno.h> 
+#include <string.h> 
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#define WEB_ROOT DATA_DIR"/server/"
+
+/* Mimetypes of the statically served files */
+
+static struct
+  {
+  const char * ext;
+  const char * mimetype;
+  }
+mimetypes[] =
+  {
+    { "html", "text/html" },
+    { "png", "image/png" },
+    { "js", "text/javascript" },
+    { "css", "text/css" },
+    { /* End */ },
+  };
+  
+static void send_file(server_t * s, int * fd, const char * method,
+                      const char * file, const gavl_metadata_t * req)
+  {
+  gavl_metadata_t res;
+  struct stat st;
+  char * real_file = NULL;
+  int i;
+  char * ext;
+  int result = 0;
+  int keep_alive = 0;
+  const bg_upnp_client_t * cl;
+  
+  real_file = bg_canonical_filename(file);
+  gavl_metadata_init(&res);
+  
+  if(strcmp(method, "GET") && strcmp(method, "HEAD"))
+    {
+    /* Method not allowed */
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          405, "Method Not Allowed");
+    goto go_on;
+    }
+
+  /* Check if we are outside of the tree */
+  if(!real_file)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 404, "Not Found");
+    goto go_on;
+    }
+  
+  /* Check if we are outside of the tree */
+  if(strncmp(real_file, WEB_ROOT, strlen(WEB_ROOT)))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          401, "Forbidden");
+    goto go_on;
+    }
+  
+  if(stat(real_file, &st))
+    {
+    if(errno == EACCES)
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            401, "Forbidden");
+      goto go_on;
+      }
+    else
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 
+                            404, "Not Found");
+      goto go_on;
+      }
+    }
+
+  /* Check if the file is world wide readable */
+  if(!(st.st_mode & S_IROTH))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          401, "Forbidden");
+    goto go_on;
+    }
+  
+  bg_http_response_init(&res, "HTTP/1.1", 200, "OK");
+
+  keep_alive = bg_http_check_keepalive(req, &res);
+  gavl_metadata_set_long(&res, "Content-Length", st.st_size);
+
+  ext = strrchr(real_file, '.');
+  if(ext)
+    {
+    ext++;
+
+    i = 0;
+    while(mimetypes[i].mimetype)
+      {
+      if(!strcmp(mimetypes[i].ext, ext))
+        {
+        cl = bg_upnp_detect_client(req);
+        gavl_metadata_set(&res, "Content-Type",
+                          bg_upnp_client_translate_mimetype(cl, mimetypes[i].mimetype));
+        break;
+        }
+      i++;
+      }
+    }
+
+  if(!strcmp(method, "GET"))
+    result = 1;
+  
+  go_on:
+  if(!bg_http_response_write(*fd, &res) ||
+     !result)
+    goto cleanup;
+
+  if(!bg_socket_send_file(*fd, real_file, 0, 0))
+    keep_alive = 0;
+  
+  if(keep_alive)
+    ka_push(s, fd);
+  
+  cleanup:
+
+  gavl_metadata_free(&res);
+  if(real_file)
+    free(real_file);
+  }
+
+int server_handle_static(server_t * s, int * fd,
+                         const char * method,
+                         const char * path_orig,
+                         const gavl_metadata_t * req)
+  {
+  char * filename = bg_sprintf("%s%s", WEB_ROOT, path_orig);
+  send_file(s, fd, method, filename, req);
+  free(filename);
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/transcode.c Added

@@ -0,0 +1,237 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include "server.h"
+#include <gmerlin/http.h>
+
+#include <string.h>
+#include <signal.h>
+
+#define LOG_DOMAIN "server.transcode"
+
+typedef struct
+  {
+  bg_subprocess_t * proc;
+  int chunked;
+  } transcode_t;
+
+static void transcode_func(client_t * c)
+  {
+  int len;
+  uint8_t buf[1024];
+  
+  transcode_t * s = c->data;
+  
+  while(1)
+    {
+    len = bg_subprocess_read_data(s->proc->stdout_fd, buf, 1024);
+    if(len)
+      {
+      if(!bg_http_write_data(c->fd, buf, len, s->chunked))
+        break;
+      }
+    if(len < 1024)
+      break;
+    }
+  bg_http_flush(c->fd, s->chunked);
+  }
+
+static void cleanup_func(void * data)
+  {
+  transcode_t * s = data;
+  bg_subprocess_kill(s->proc, SIGTERM);
+  //  fprintf(stderr, "Closing subprocess....\n");
+  bg_subprocess_close(s->proc);
+  //  fprintf(stderr, "Subprocess closed\n");
+  free(s);
+  }
+
+
+int server_handle_transcode(server_t * s, int * fd,
+                            const char * method,
+                            const char * path_orig,
+                            const gavl_metadata_t * req)
+  {
+  int result = 0;
+  bg_db_object_t * o = NULL;
+  bg_db_file_t * f;
+  int64_t id = 0;
+  char * path = NULL;
+  gavl_metadata_t res, vars;
+  client_t * c;
+  char * command;
+  bg_subprocess_t * sp;
+  transcode_t * t;
+  char * pos;
+  
+  const bg_upnp_transcoder_t * transcoder;
+  double seek = -1.0;
+  const char * var;  
+  int chunked = 0;
+  const bg_upnp_client_t * cl;
+  
+  gavl_metadata_init(&res);
+  gavl_metadata_init(&vars);  
+
+#if 0
+  if(strncmp(path_orig, "/transcode/", 11))
+    return 0;
+  path_orig += 11; 
+#endif
+  
+  if(strcmp(method, "GET") && strcmp(method, "HEAD"))
+    {
+    /* Method not allowed */
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          405, "Method Not Allowed");
+    goto go_on;
+    }
+  
+  path = gavl_strdup(path_orig);
+
+  /* Some clients append bullshit to the path */
+  if((pos = strchr(path, '#')))
+    *pos = '\0';
+
+  /* Parse url variables */
+  bg_url_get_vars(path, &vars);
+
+  id = strtoll(path, &pos, 10);
+  
+  if(*pos != '/')
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          400, "Bad Request");
+    goto go_on;
+    }
+  pos++;
+
+  transcoder = bg_upnp_transcoder_by_name(pos);
+
+  pos += strlen(transcoder->name);
+
+  /* Extract mimetype */
+  
+  if(!transcoder)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          404, "Not Found");
+    goto go_on;
+    }
+  
+  /* Get the object from the db */
+  if(!s->db)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          404, "Not Found");
+    goto go_on;
+    }
+  
+  o = bg_db_object_query(s->db, id);
+
+  if(!(bg_db_object_get_type(o) & BG_DB_FLAG_FILE))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 
+                          404, "Not Found");
+    goto go_on;
+    }
+
+  /* Seek time */
+  if((var = gavl_metadata_get(&vars, "seek")))
+    seek = strtod(var, NULL);
+
+  f = (bg_db_file_t*)o;
+
+  command = transcoder->make_command(f->path, seek);
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Command: %s", command);
+  sp = bg_subprocess_create(command, 0, 1, 0);
+  
+  if(!sp)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 500, "Internal Server Error");
+    goto go_on;
+    }
+  
+  result = 1;
+
+  /* TODO: Maybe not all clients can handle this? */
+  //  chunked = 1;
+  
+  /* Set up header for transmission */
+  bg_http_response_init(&res, "HTTP/1.1", 200, "OK");
+  if(s->server_string)
+    gavl_metadata_set(&res, "Server", s->server_string);
+  bg_http_header_set_date(&res, "Date");
+
+  /* Set Content-Type and probably other stuff too */
+  cl = bg_upnp_detect_client(req);
+  transcoder->set_header(o, req, &res, bg_upnp_client_translate_mimetype(cl, transcoder->out_mimetype));
+  
+  gavl_metadata_set(&res, "Connection", "close");
+  gavl_metadata_set(&res, "Cache-control", "no-cache");
+  gavl_metadata_set(&res, "Pragma", "no-cache");
+  gavl_metadata_set(&res, "Accept-Ranges", "none");
+  //  gavl_metadata_set(&res, "Content-Type", );
+  
+  if(chunked)
+    gavl_metadata_set(&res, "Transfer-Encoding", "chunked");
+
+  
+
+  if(!strcmp(method, "HEAD"))
+    result = 0;
+  
+  go_on:
+  if(!bg_http_response_write(*fd, &res) ||
+     !result)
+    goto cleanup;
+
+  t = calloc(1, sizeof(*t));
+  t->proc = sp;
+  t->chunked = chunked;
+  
+  if(!strcmp(transcoder->out_mimetype, "audio/mpeg"))
+    {
+    /* Send ID3 tag */
+    id3v2_t * id3 = server_get_id3(s, id);
+    if(id3)
+      {
+      if(!bg_http_write_data(*fd, id3->data, id3->len, t->chunked))
+        goto cleanup;
+      }
+    }
+  
+  c = client_create(CLIENT_TYPE_MEDIA, *fd, t, cleanup_func, transcode_func);
+  server_attach_client(s, c);
+  *fd = -1;
+ 
+  cleanup:
+
+  gavl_metadata_free(&res);
+  gavl_metadata_free(&vars);
+  if(path)
+    free(path);
+  
+  if(o)
+    bg_db_object_unref(o);
+  
+  return 1;
+  }

gmerlin-4256.tar.gz/apps/mediaserver/web Added

gmerlin-4256.tar.gz/apps/mediaserver/web/Makefile.am Added

gmerlin-4256.tar.gz/apps/mediaserver/web/audioplayer.html Added

@@ -0,0 +1,66 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<link rel="shortcut icon" href="/static/icons/server_16.png" type="image/png">
+<script src="/static/js/soap.js" type="text/javascript"></script>
+<script src="/static/js/utils.js" type="text/javascript"></script>
+<script src="/static/js/audioplayer.js" type="text/javascript"></script>
+
+<link rel="stylesheet" type="text/css" href="/static/css/player.css">
+<title>Audio player</title>
+</head>
+<body onload="audioplayer_init()">
+<input type="file" id="file_input" accept="audio/mpegurl"
+       onchange="handle_file(this.files)"
+       style="visibility:hidden;position:absolute;top:-50;left:-50" />
+  <div class="slider_outer">
+  <div class="slider" id="slider">
+    <div class="slider_inner" id="timeslider"></div>
+    <div class="trackdisplay" id="trackdisplay">
+      Bla
+    </div>
+  </div>
+</div>
+<div class="toolbar">
+<a class="button prev" href="javascript: previous_track();" ></a>
+<a class="button play" href="javascript: play();" id="play_button" ></a>
+<a class="button next" href="javascript: next_track();"></a>
+<a class="button straight" href="javascript: play_mode();" id="mode_button"></a>
+<a class="button hide" href="javascript: expand();" id="expand_button"></a>
+<div class="volume" id="volume">
+  <div class="volume_slider" id="volume-slider"></div>
+</div>
+<a class="button vol_50" href="javascript: mute();" id="volume_button"></a>
+
+<table class="timetable">
+  <tr>
+    <td id="timedisplay" class="timetable">0:00/0:00</td>
+  </tr>
+</table>
+
+
+</div>
+<div class="infobox" id="infobox">
+
+<div class="cover">
+  <img id="cover" width="160" height="160">
+</div>
+
+<div id="trackinfo" class="trackinfo">
+</div>
+
+</div>
+<audio id="audioplayer"></audio>
+<div class="playlist" id="playlist-div">
+  <table id="playlist" style="width: 100%;" cellspacing="0px">
+  </table>
+</div>
+<div class="plstoolbar">
+  <a class="plsbutton up" title="Move selected up" href="javascript: pls_up();"></a>
+  <a class="plsbutton down" title="Move selected down" href="javascript: pls_down();"></a>
+  <a class="plsbutton load" title="Load" href="javascript: pls_load();" ></a>
+  <a class="plsbutton save" title="Save" download="playlist.m3u" onclick="pls_save();return true;" href="#" id="pls_save_link"></a>
+  <a class="plsbutton delete" title="Delete selected" href="javascript: pls_delete();"></a>
+</div>
+</body>
+</html>

gmerlin-4256.tar.gz/apps/mediaserver/web/css Added

gmerlin-4256.tar.gz/apps/mediaserver/web/css/Makefile.am Added

gmerlin-4256.tar.gz/apps/mediaserver/web/css/player.css Added

@@ -0,0 +1,450 @@
+html, body
+  {
+  font-family: Helvetica, Arial, sans-serif;  
+  font-size: small;
+  overflow-y: hidden;
+  }
+
+a.button
+  {
+  position: absolute;
+  display: inline-block;
+  background: #4f4f4f;
+  width: 24px;
+  height: 24px;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #4f4f4f;
+  z-index:    2;
+  }
+
+a.button:hover
+  {
+  border-color: #ffffff;
+  }
+
+a.button:active
+  {
+  background: #f0f0f0;
+  border-color: #ffffff;
+  }
+
+a.prev
+  {
+  left: 130px;
+  background-image: url(/static/icons/prev_white_24.png);
+  }
+
+a.prev:active
+  {
+  background-image: url(/static/icons/prev_black_24.png);
+  }
+
+a.play
+  {
+  left: 156px;
+  background-image: url(/static/icons/play_white_24.png);
+  }
+
+a.play:active
+  {
+  background-image: url(/static/icons/play_black_24.png);
+  }
+
+a.stop
+  {
+  left: 156px;
+  background-image: url(/static/icons/stop_white_24.png);
+  }
+
+a.stop:active
+  {
+  background-image: url(/static/icons/stop_black_24.png);
+  }
+
+
+a.next
+  {
+  left: 182px;
+  background-image: url(/static/icons/next_white_24.png);
+  }
+
+a.next:active
+  {
+  background-image: url(/static/icons/next_black_24.png);
+  }
+
+a.repeat
+  {
+  left: 208px;
+  background-image: url(/static/icons/repeat_white_24.png);
+  }
+
+a.repeat:active
+  {
+  background-image: url(/static/icons/repeat_black_24.png);
+  }
+
+a.straight
+  {
+  left: 208px;
+  background-image: url(/static/icons/straight_white_24.png);
+  }
+
+a.straight:active
+  {
+  background-image: url(/static/icons/straight_black_24.png);
+  }
+
+a.shuffle
+  {
+  left: 208px;
+  background-image: url(/static/icons/shuffle_white_24.png);
+  }
+
+a.shuffle:active
+  {
+  background-image: url(/static/icons/shuffle_black_24.png);
+  }
+
+a.vol_mute
+  {
+  left: 0px;
+  background-image: url(/static/icons/vol_mute_white_24.png);
+  }
+
+a.vol_mute:active
+  {
+  background-image: url(/static/icons/vol_mute_black_24.png);
+  }
+
+a.vol_0
+  {
+  left: 0px;
+  background-image: url(/static/icons/vol_0_white_24.png);
+  }
+
+a.vol_0:active
+  {
+  background-image: url(/static/icons/vol_0_black_24.png);
+  }
+
+a.vol_25
+  {
+  left: 0px;
+  background-image: url(/static/icons/vol_25_white_24.png);
+  }
+
+a.vol_25:active
+  {
+ background-image: url(/static/icons/vol_25_black_24.png);
+  }
+
+a.vol_50
+  {
+  left: 0px;
+  background-image: url(/static/icons/vol_50_white_24.png);
+  }
+
+a.vol_50:active
+  {
+  background-image: url(/static/icons/vol_50_black_24.png);
+  }
+
+a.vol_75
+  {
+  left: 0px;
+  background-image: url(/static/icons/vol_75_white_24.png);
+  }
+
+a.vol_75:active
+  {
+  background-image: url(/static/icons/vol_75_black_24.png);
+  }
+
+a.show
+  {
+  right: 0px;
+  background-image: url(/static/icons/show_white_24.png);
+  }
+
+a.show:active
+  {
+  background-image: url(/static/icons/show_black_24.png);
+  }
+
+a.hide
+  {
+  right: 0px;
+  background-image: url(/static/icons/hide_white_24.png);
+  }
+
+a.hide:active
+  {
+  background-image: url(/static/icons/hide_black_24.png);
+  }
+
+div.volume
+  {
+  position: absolute;
+  display: inline-block;
+  background: #4f4f4f;
+  width: 102px;
+  height: 24px;
+  left:    26px;
+  top:     0px;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #4f4f4f;
+  z-index:    2;
+  }
+
+div.volume_slider
+  {
+  position: absolute;
+  display: inline-block;
+  background: #4f4f4f;
+  height: 24px;
+  left:    0px;
+  right:   50%;
+  top:     0px;
+  background-image: url(/static/icons/volume.png);
+  z-index:    3;
+  }
+
+div.slider_outer
+  {
+  background: #4f4f4f;
+  position:   absolute;
+  left:       0px;
+  top:        0px;
+  right:      0px;
+  height:     28px;
+  z-index:    2;
+  }
+
+div.slider
+  {
+  background: #4f4f4f;
+  position:   absolute;
+  left:       0px;
+  top:        0px;
+  right:      0px;
+  margin:     4px;
+  height:     20px;
+  z-index:    3;
+  overflow:   hidden;
+  }
+
+div.slider_inner
+  {
+  background: #8f8f8f;
+  position:   absolute;
+  left:       0px;
+  top:        0px;
+  right:      100%;
+  height:     20px;
+  margin:     0px;
+  z-index:    4;
+  }
+
+div.trackdisplay
+  {
+  position:   absolute;
+  left:       0px;
+  top:        0px;
+  margin:  0px;
+  padding: 0px;
+  border:  0px;
+  white-space: nowrap;
+  color:  #f8f8f8;
+  z-index:    5;
+  font-family: Helvetica, Arial, sans-serif;  
+  font-size:   small;
+  font-weight: bold;
+  }
+
+table.timetable
+  {
+  table-layout: fixed;
+  height:  26px;
+  position: absolute;
+  margin:  0;
+  padding: 0;
+  border:  0;
+  right:   26px;
+  width: auto;
+  }
+
+td.timetable
+  {
+  height: 100%;
+  vertical-align: middle;
+  text-align: right;
+  color:  #f8f8f8;
+  font-weight: bold;
+  z-index:    4;
+  }
+
+div.toolbar
+  {
+  background: #4f4f4f;
+  position:   absolute;
+  left:       0px;
+  top:        28px;
+  right:      0px;
+  height:     26px;
+  }
+
+div.infobox
+  {
+  left: 0px;
+  right: 0px;
+  position: absolute;
+  top: 54px;
+  height: 170px;
+  }
+
+div.cover
+  {
+  position: absolute;
+  width:    160px;
+  height:   160px;
+  padding:  5px;
+  left: 0px;
+  top:  0px;
+  }
+
+div.trackinfo
+  {
+  position: absolute;
+  height:   160px;
+  padding:  5px;
+  left:     170px;
+  right:    0px;
+  }
+
+div.playlist
+  {
+  position: absolute;
+  top: 224px;
+  bottom: 26px;
+  left: 1px;
+  right: 1px;
+  overflow-y: scroll;
+  border: inset;
+  border-width: 1px;
+  }
+
+tr.playlist
+  {
+  font-size: small;  
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  cursor: default;
+  }
+
+tr.current
+  {
+  font-weight: bold;
+  }
+
+tr.selected
+  {
+  background:   #000000;
+  color:        #ffffff;
+  border-color: #000000;
+  }
+
+div.plstoolbar
+  {
+  position: absolute;
+  left: 0px;
+  right: 0px;
+  height: 26px;
+  bottom: 0px;
+  margin:  0;
+  padding: 0;
+  }
+
+a.plsbutton
+  {
+  position: absolute;
+  display: inline-block;
+  background: #ffffff;
+  width: 24px;
+  height: 24px;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #ffffff;
+  z-index:      1
+  }
+
+a.plsbutton:hover
+  {
+  border-color: #000000;
+  }
+
+a.plsbutton:active
+  {
+  background:   #000000;
+  border-color: #000000;
+  }
+
+a.up
+  {
+  left: 0px;
+  background-image: url(/static/icons/up_black_24.png);
+  }
+
+a.up:active
+  {
+  background-image: url(/static/icons/up_white_24.png);
+  }
+
+a.down
+  {
+  left: 26px;
+  background-image: url(/static/icons/down_black_24.png);
+  }
+
+a.down:active
+  {
+  background-image: url(/static/icons/down_white_24.png);
+  }
+
+a.load
+  {
+  left: 52px;
+  background-image: url(/static/icons/load_black_24.png);
+  }
+
+a.load:active
+  {
+  background-image: url(/static/icons/load_white_24.png);
+  }
+
+a.save
+  {
+  left: 78px;
+  background-image: url(/static/icons/save_black_24.png);
+  }
+
+a.save:active
+  {
+  background-image: url(/static/icons/save_white_24.png);
+  }
+
+a.delete
+  {
+  left: 104px;
+  background-image: url(/static/icons/delete_black_24.png);
+  }
+
+a.delete:active
+  {
+  background-image: url(/static/icons/delete_white_24.png);
+  }

gmerlin-4256.tar.gz/apps/mediaserver/web/css/standard.css Added

@@ -0,0 +1,180 @@
+html, body
+  {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+  font-family: Helvetica, Arial, sans-serif;  
+  font-size: small;
+  }
+
+div.hidden
+  {
+  display: none;
+  }
+
+div.visible
+  {
+  display: block;
+  }
+
+div.main
+  {
+  position: fixed;
+  width: 100%;
+  top: 50px;
+  left: 0px;
+  bottom: 5px; 
+  }
+  
+div.browser
+  {
+  display: inline-block;
+  overflow-y: scroll;
+  border: inset;
+  border-width: 1px;
+  }
+
+div.tree_elem
+  {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  }
+
+div.handleopen
+  {
+  background-image:url(/static/icons/handle_open_16.png);
+  }
+
+div.handleclosed
+  {
+  background-image:url(/static/icons/handle_closed_16.png);
+  }
+
+div.folderopen
+  {
+  background-image:url(/static/icons/folder_open_16.png);
+  }
+
+div.folderclosed
+  {
+  background-image:url(/static/icons/folder_closed_16.png);
+  }
+
+div.treerow
+  {
+  width: 100%;
+  margin-top: 5px;
+  vertical-align: middle;
+  color: #000000;
+  background-color: #ffffff;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  cursor: default;
+  overflow: hidden;
+  white-space: nowrap;
+  }
+
+div.treerow_selected
+  {
+  color: #ffffff;
+  background-color: #000000;
+  }
+
+table.mediaitem
+  {
+  font-size: small;
+  width: 100%;
+  }
+
+.mediaitem_title
+  {
+  font-weight: bold;
+  }
+
+span.albumtitle
+  {
+  font-size: small;  
+  font-weight: bold;
+  white-space: normal;
+  }
+
+span.albuminfo
+  {
+  font-size: small;  
+  white-space: normal;
+  }
+
+img.albumcover
+  {
+  border: inset;
+  border-width: 1px;
+  }
+
+span.movietitle
+  {
+  font-size: small;  
+  font-weight: bold;
+  white-space: normal;
+  }
+
+span.movieinfo
+  {
+  font-size: small;  
+  white-space: normal;
+  }
+
+a.medialink
+  {
+  font-size: small;  
+  font-weight: bold;
+  }
+
+a.button
+  {
+  display: inline-block;
+  vertical-align: middle;
+  background: #ffffff;
+  width: 16px;
+  height: 16px;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #ffffff;
+  }
+
+a.button:hover
+  {
+  border-color: #000000;
+  }
+
+a.button:active
+  {
+  background: #000000;
+  border-color: #000000;
+  }
+
+a.play
+  {
+  background-image: url(/static/icons/play_black_16.png);
+  }
+
+a.play:active
+  {
+  background-image: url(/static/icons/play_white_16.png);
+  }
+
+a.add
+  {
+  background-image: url(/static/icons/add_black_16.png);
+  }
+
+a.add:active
+  {
+  background-image: url(/static/icons/add_white_16.png);
+  }
+

gmerlin-4256.tar.gz/apps/mediaserver/web/icons Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/Makefile.am Added

@@ -0,0 +1,64 @@
+pkgdatadir = $(datadir)/gmerlin/server/icons
+
+files = \
+add_black_16.png \
+add_white_16.png \
+server_16.png \
+server_48.png \
+server_96.png \
+server_48.bmp \
+server_48.jpg \
+server_96.bmp \
+server_96.jpg \
+folder_open_16.png \
+folder_closed_16.png \
+handle_open_16.png \
+handle_closed_16.png \
+play_black_16.png \
+play_white_16.png \
+hide_black_24.png \
+hide_white_24.png \
+next_black_24.png \
+next_white_24.png \
+play_black_24.png \
+play_white_24.png \
+prev_black_24.png \
+prev_white_24.png \
+show_black_24.png \
+show_white_24.png \
+stop_black_24.png \
+stop_white_24.png \
+load_black_24.png \
+load_white_24.png \
+save_black_24.png \
+save_white_24.png \
+delete_black_24.png \
+delete_white_24.png \
+repeat_black_24.png \
+repeat_white_24.png \
+up_black_24.png \
+up_white_24.png \
+down_black_24.png \
+down_white_24.png \
+shuffle_black_24.png \
+shuffle_white_24.png \
+straight_black_24.png \
+straight_white_24.png \
+volume.png \
+vol_0_black_24.png \
+vol_0_white_24.png \
+vol_25_black_24.png \
+vol_25_white_24.png \
+vol_50_black_24.png \
+vol_50_white_24.png \
+vol_75_black_24.png \
+vol_75_white_24.png \
+vol_mute_black_24.png \
+vol_mute_white_24.png \
+audio_black_16.png \
+video_black_16.png \
+image_black_16.png \
+cover_160.png
+
+pkgdata_DATA = $(files)
+dist_pkgdata_DATA = $(files)

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/add_black_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/add_white_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/audio_black_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/cover_160.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/delete_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/delete_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/down_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/down_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/folder_closed_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/folder_open_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/handle_closed_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/handle_open_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/hide_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/hide_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/image_black_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/load_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/load_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/next_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/next_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/play_black_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/play_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/play_white_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/play_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/prev_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/prev_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/repeat_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/repeat_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/save_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/save_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_48.bmp Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_48.jpg Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_48.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_96.bmp Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_96.jpg Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/server_96.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/show_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/show_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/shuffle_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/shuffle_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/stop_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/stop_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/straight_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/straight_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/up_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/up_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/video_black_16.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_0_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_0_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_25_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_25_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_50_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_50_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_75_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_75_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_mute_black_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/vol_mute_white_24.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/volume.png Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/volume.xcf Added

gmerlin-4256.tar.gz/apps/mediaserver/web/icons/volume_button.xcf Added

gmerlin-4256.tar.gz/apps/mediaserver/web/index.html Added

gmerlin-4256.tar.gz/apps/mediaserver/web/js Added

gmerlin-4256.tar.gz/apps/mediaserver/web/js/Makefile.am Added

gmerlin-4256.tar.gz/apps/mediaserver/web/js/audioplayer.js Added

@@ -0,0 +1,763 @@
+
+var current_track = -1;
+var playing = false;
+var current_duration = 0;
+var current_duration_str = "0:00";
+
+var last_clicked_row = -1;
+var current_play_mode = "straight";
+var expanded = true;
+var expanded_height = 0;
+
+var trackdisplay_x = 0;
+var trackdisplay_y = 0;
+var trackdisplay_dx = 1;
+
+var trackdisplay_x_min = 0;
+var trackdisplay_timeout = null;
+
+var shuffle_list  = null;
+var shuffle_index = 0;
+
+var current_location = null;
+var current_mimetype = null;
+
+var time_offset = 0.0;
+
+function play()
+  {
+  var i;
+  var canplay;
+  var protocol_info;
+  var ap = document.getElementById("audioplayer");
+  var playlist = document.getElementById("playlist");
+  var track = playlist.rows[current_track].didl;
+  var res = track.getElementsByTagName("res");
+  var play_button = document.getElementById("play_button");
+
+  time_offset = 0.0;
+
+  /* Get the res element from a didl item, which
+     we can play */
+  for(i = 0; i < res.length; i++)
+    {
+    protocol_info = res[i].getAttribute("protocolInfo").split(":");
+    if(protocol_info[0] != "http-get")
+      continue;
+    current_mimetype = protocol_info[2];
+    canplay = ap.canPlayType(current_mimetype);
+    if((canplay == "maybe") || (canplay == "probably"))
+      {
+      current_location = res[i].textContent;
+      ap.src = current_location;
+      ap.type = current_mimetype;
+      ap.play();
+      current_duration = get_duration_num(get_duration(track));
+      playing = true;
+      play_button.setAttribute("class", "button stop");
+      play_button.setAttribute("href", "javascript: stop();");
+      return;
+      }
+    }
+  }
+
+function trackdisplay_timeout_func()
+  {
+  var d = document.getElementById("trackdisplay");
+  trackdisplay_x += trackdisplay_dx;
+
+  if((trackdisplay_x >= 0) || (trackdisplay_x <= trackdisplay_x_min))
+    trackdisplay_dx = - trackdisplay_dx;
+
+  d.setAttribute("style",
+		 "left: " + trackdisplay_x + "px; " +
+		 "top: " + trackdisplay_y + "px;");
+
+  }
+
+function setup_track_display()
+  {
+  var d = document.getElementById("trackdisplay");
+
+  if(trackdisplay_timeout != null)
+    {
+    window.clearInterval(trackdisplay_timeout);
+    trackdisplay_timeout = null;
+    }
+
+  trackdisplay_x = (d.parentNode.clientWidth - d.clientWidth) / 2;
+  trackdisplay_x = trackdisplay_x.toFixed();
+
+  trackdisplay_y = (d.parentNode.clientHeight - d.clientHeight) / 2;
+  trackdisplay_y = trackdisplay_y.toFixed();
+
+  if(trackdisplay_x < 0) // Scroll
+    {
+    trackdisplay_x = 0;
+    trackdisplay_dx = -1;
+    trackdisplay_timeout =
+	window.setInterval("trackdisplay_timeout_func()", 100);
+    trackdisplay_x_min = d.parentNode.clientWidth - d.clientWidth;
+    }
+  d.setAttribute("style",
+		 "left: " + trackdisplay_x + "px; " +
+		 "top: " + trackdisplay_y + "px;");
+  }
+
+function play_mode()
+  {
+  var mode_button = document.getElementById("mode_button");
+  if(current_play_mode == "straight")
+    {
+    current_play_mode = "repeat";
+    }
+  else if(current_play_mode == "repeat")
+    {
+    current_play_mode = "shuffle";
+    }
+  else if(current_play_mode == "shuffle")
+    {
+    current_play_mode = "straight";
+    }
+  mode_button.setAttribute("class", "button " + current_play_mode);
+  }
+
+function set_volume_button()
+  {
+  var audio_player = document.getElementById("audioplayer");
+  var button = document.getElementById("volume_button");
+  if(audio_player.muted == true)
+    button.setAttribute("class", "button vol_mute");
+  else if(audio_player.volume < 0.25)
+    button.setAttribute("class", "button vol_0");
+  else if(audio_player.volume < 0.50)
+    button.setAttribute("class", "button vol_25");
+  else if(audio_player.volume < 0.75)
+    button.setAttribute("class", "button vol_50");
+  else
+    button.setAttribute("class", "button vol_75");
+  }
+
+function volume_click(event)
+  {
+  var volume;
+  var volume_slider;
+  var pos;
+  var percentage;
+  var audio_player = document.getElementById("audioplayer");
+
+  audio_player.muted = false;
+
+  volume_slider = document.getElementById("volume-slider");
+  volume = document.getElementById("volume");
+
+  pos = get_element_position(volume);
+
+  percentage = (event.clientX - pos.x) / volume.offsetWidth;
+
+  volume_slider.setAttribute("style",
+			     "right: " +
+			     (100 - percentage * 100).toString() + "%;");
+  audio_player.volume = percentage;
+  set_volume_button();
+
+//  alert("Percentage " + percentage.toString());
+  }
+
+function slider_click(event)
+  {
+  var slider;
+  var pos;
+  var seek_pos;
+  var percentage;
+  var audio_player = document.getElementById("audioplayer");
+
+  slider = document.getElementById("slider");
+
+  pos = get_element_position(slider);
+
+  percentage = (event.clientX - pos.x) / slider.offsetWidth;
+
+  if((playing != true) || (current_duration <= 0.0) ||
+     (current_location == null))
+    return;
+
+  seek_pos = current_duration * percentage;
+  /* Check if we are transcoding */
+  if(current_location.indexOf("transcode") != -1)
+    {
+    /* Use gmerlin server cheat code to seek */
+    time_offset = seek_pos;
+    audio_player.src = current_location + "?seek=" + seek_pos;
+    audio_player.type = current_mimetype;
+    audio_player.play();
+    }
+  else
+    {
+    /* Let the browser seek */
+    audio_player.currentTime = seek_pos;
+    audio_player.type = current_mimetype;
+    audio_player.play();
+    }
+
+
+  }
+
+function mute()
+  {
+  var audio_player = document.getElementById("audioplayer");
+  if(audio_player.muted == false)
+    audio_player.muted = true;
+  else
+    audio_player.muted = false;
+  set_volume_button();
+  }
+
+function expand()
+  {
+  var infobox = document.getElementById("infobox");
+  var playlist = document.getElementById("playlist-div");
+
+  var expand_button = document.getElementById("expand_button");
+  if(expanded == true) // Hide
+    {
+    expanded_height = window.innerHeight;
+    resize_window(window.innerWidth, 54);
+    expand_button.setAttribute("class", "button show");
+    expanded = false;
+
+    infobox.setAttribute("style", "visibility: hidden;");
+    playlist.setAttribute("style", "top: 54px;");
+    }
+  else // Show
+    {
+    resize_window(window.innerWidth, expanded_height);
+    expand_button.setAttribute("class", "button hide");
+    expanded = true;
+    infobox.setAttribute("style", "visibility: visible;");
+    playlist.setAttribute("style", "224px;");
+    }
+  }
+
+function set_track_class(row)
+  {
+  var klass = "playlist";
+  if(row.selected == true)
+    klass += " selected";
+  if(row.current == true)
+    klass += " current";
+  row.setAttribute("class", klass);
+  }
+
+function set_current_track(t)
+  {
+  var str;
+  var didl;
+  var el;
+  var span;
+  var text;
+  var trackdisplay;
+  var playlist = document.getElementById("playlist");
+  if(playlist.rows.length == 0)
+    return;
+  if(current_track >= 0)
+    {
+    playlist.rows[current_track].current = false;
+    set_track_class(playlist.rows[current_track]);
+    }
+  current_track = t;
+
+  trackdisplay = document.getElementById("trackdisplay");
+  trackdisplay.innerHTML =
+    playlist.rows[current_track].cells[1].innerHTML;
+  setup_track_display();
+
+  playlist.rows[current_track].current = true;
+  set_track_class(playlist.rows[current_track]);
+
+  didl = playlist.rows[current_track].didl;
+
+  /* Cover */
+  el = document.getElementById("cover");
+  str = get_didl_element(didl, "albumArtURI");
+  if(str != null)
+    el.setAttribute("src", str);
+  else
+    el.setAttribute("src", "/static/icons/cover_160.png");
+
+  el = document.getElementById("trackinfo");
+  while(el.firstChild)
+    el.removeChild(el.firstChild);
+
+  str = get_didl_element(didl, "title");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    span.setAttribute("style", "font-weight: bold;");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    el.appendChild(span);
+    el.appendChild(document.createElement("br"));
+    }
+
+  str = get_didl_element(didl, "artist");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    el.appendChild(span);
+    el.appendChild(document.createElement("br"));
+    }
+  str = get_didl_element(didl, "date");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    text = document.createTextNode(str.substring(0, 4));
+    span.appendChild(text);
+    el.appendChild(span);
+    el.appendChild(document.createElement("br"));
+    }
+  str = get_didl_element(didl, "album");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    span.setAttribute("style", "font-weight: bold;");
+    text = document.createTextNode("Album: ");
+    span.appendChild(text);
+    text = document.createElement("br");
+    span.appendChild(text);
+    el.appendChild(span);
+
+    span = document.createElement("span");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    el.appendChild(span);
+    el.appendChild(document.createElement("br"));
+    }
+  str = get_didl_element(didl, "genre");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    el.appendChild(span);
+    el.appendChild(document.createElement("br"));
+    }
+  current_duration_str = format_duration_str(get_duration(didl));
+  }
+
+function next_track()
+  {
+  var playlist = document.getElementById("playlist");
+  if(playlist.rows.length == 0)
+    return;
+
+  if(current_play_mode == "shuffle")
+    {
+    if(shuffle_index + 1 >= playlist.rows.length)
+      shuffle_index = 0;
+    else
+      shuffle_index++;
+    set_current_track(shuffle_list[shuffle_index]);
+    }
+  else
+    {
+    if(current_track + 1 >= playlist.rows.length)
+      set_current_track(0);
+    else
+      set_current_track(current_track + 1);
+    }
+
+
+  if(playing == true)
+    play();
+  }
+
+function previous_track()
+  {
+  var playlist = document.getElementById("playlist");
+  if(playlist.rows.length == 0)
+    return;
+
+  if(current_play_mode == "shuffle")
+    {
+    if(shuffle_index - 1 < 0)
+      shuffle_index = playlist.rows.length - 1;
+    else
+      shuffle_index--;
+    set_current_track(shuffle_list[shuffle_index]);
+    }
+  else
+    {
+    if(current_track == 0)
+      set_current_track(playlist.rows.length - 1);
+    else
+      set_current_track(current_track - 1);
+    }
+
+  if(playing == true)
+    play();
+  }
+
+function stop()
+  {
+  var ap;
+  var play_button;
+
+  if(playing == false)
+    return;
+
+  ap = document.getElementById("audioplayer");
+  ap.src = "";
+  play_button = document.getElementById("play_button");
+  play_button.setAttribute("class", "button play");
+  play_button.setAttribute("href", "javascript: play();");
+  playing = false;
+  }
+
+function playlist_dblclick()
+  {
+  set_current_track(this.row_index);
+  play();
+  }
+
+function playlist_mousedown(event)
+  {
+  var i;
+  var playlist = document.getElementById("playlist");
+
+  if(event.ctrlKey == true)
+    {
+    if(this.selected == true)
+      this.selected = false;
+    else
+      this.selected = true;
+    set_track_class(this);
+    }
+  else if((event.shiftKey == true) && (last_clicked_row >= 0))
+    {
+    if(this.row_index < last_clicked_row)
+      {
+      for(i = this.row_index; i <= last_clicked_row; i++)
+	{
+        playlist.rows[i].selected = true;
+        set_track_class(playlist.rows[i]);
+	}
+      }
+    else
+      {
+      for(i = last_clicked_row; i <= this.row_index; i++)
+        {
+        playlist.rows[i].selected = true;
+        set_track_class(playlist.rows[i]);
+	}
+      }
+
+    }
+  else
+    {
+    for(i = 0; i < playlist.rows.length; i++)
+      {
+      if(i != this.row_index)
+        {
+        if(playlist.rows[i].selected)
+	  {
+          playlist.rows[i].selected = false;
+          set_track_class(playlist.rows[i]);
+          }
+        }
+      this.selected = true;
+      set_track_class(this);
+      }
+    }
+  last_clicked_row = this.row_index;
+  }
+
+function add_track(track, do_play)
+  {
+  var text;
+  var row;
+  var cell;
+  var artist, title;
+  var ap = document.getElementById("audioplayer");
+  var playlist = document.getElementById("playlist");
+
+  row = document.createElement("tr");
+  row.setAttribute("class", "playlist");
+  row.ondblclick = playlist_dblclick;
+  row.onmousedown = playlist_mousedown;
+  row.didl = track;
+
+  playlist.appendChild(row);
+
+  /* Index */
+  cell = document.createElement("td");
+  cell.setAttribute("style", "margin-right: 3px; width: 26px; text-align: right;");
+
+  text = document.createTextNode(playlist.rows.length.toString() + ".");
+  cell.appendChild(text);
+  row.appendChild(cell);
+
+  /* Artist + title */
+  cell = document.createElement("td");
+  artist = get_didl_element(track, "artist");
+  title = get_didl_element(track, "title");
+
+  if(artist != null)
+    text = document.createTextNode(artist + ": " + title);
+  else
+    text = document.createTextNode(title);
+
+  cell.appendChild(text);
+  row.appendChild(cell);
+
+  /* Duration */
+  cell = document.createElement("td");
+  cell.setAttribute("style", "text-align: right;");
+
+  text = document.createTextNode(format_duration_str(get_duration(track)));
+  cell.appendChild(text);
+  row.appendChild(cell);
+
+  if(playlist.rows.length == 1)
+    set_current_track(0);
+  if(do_play == true)
+    {
+    set_current_track(playlist.rows.length - 1);
+    play();
+    }
+  pls_changed(playlist);
+  }
+
+function update_time(t)
+  {
+  var td = document.getElementById("timedisplay");
+  var sl = document.getElementById("timeslider");
+  if(current_duration > 0)
+    {
+    /* Update time display */
+    td.innerHTML = get_duration_str(t) + "/" + current_duration_str;
+
+    /* Update slider */
+    sl.setAttribute("style", "width: " +
+	            (t * 100 / current_duration).toString() + "%;");
+    }
+  else
+    {
+    /* Update time display */
+    td.innerHTML = get_duration_str(t) + "/" + "-:--";
+    /* Update slider */
+    sl.setAttribute("style", "width: 0px;");
+    }
+  }
+
+function ended_cb()
+  {
+  var old_current_track = current_track;
+
+  playing = false;
+  next_track();
+
+  if((current_play_mode != "straight") ||
+     (current_track > old_current_track))
+    play();
+  else
+    {
+    var play_button = document.getElementById("play_button");
+    play_button.setAttribute("class", "button play");
+    play_button.setAttribute("href", "javascript: play();");
+    update_time(0.0);
+    }
+  }
+
+function timeout_cb()
+  {
+  var ap = document.getElementById("audioplayer");
+  update_time(ap.currentTime + time_offset);
+  }
+
+function resize_callback()
+  {
+  setup_track_display();
+  }
+
+function audioplayer_init()
+  {
+  var volume, slider;
+  var audio_player = document.getElementById("audioplayer");
+  /* Set event handlers */
+  add_event_handler(audio_player, "ended", ended_cb);
+  add_event_handler(audio_player, "timeupdate", timeout_cb);
+  audio_player.volume = 0.5;
+
+  /* Set some callbacks */
+  volume =  document.getElementById("volume");
+  volume.onmousedown = volume_click;
+
+  slider =  document.getElementById("slider");
+  slider.onmousedown = slider_click;
+
+  window.onresize = resize_callback;
+  self.opener.player_created();
+  }
+
+/* Playlist operations */
+
+function pls_extract_selected(playlist)
+  {
+  var i, idx;
+  var ret = new Array();
+
+  i = 0;
+  idx = 0;
+
+  while(i < playlist.rows.length)
+    {
+    if(playlist.rows[i].selected == true)
+      {
+      if(idx == current_track)
+        current_track = -1;
+
+      ret[idx] = playlist.rows[i];
+
+      idx++;
+      playlist.deleteRow(i);
+      }
+    else
+      i++;
+    }
+  return ret;
+  }
+
+function pls_changed(playlist)
+  {
+  var i;
+  shuffle_list = new Array(playlist.rows.length);
+  current_track = -1;
+
+  for(i = 0; i < playlist.rows.length; i++)
+    {
+    playlist.rows[i].row_index = i;
+    shuffle_list[i] = i;
+    if(playlist.rows[i].current == true)
+      {
+      if(current_track < 0)
+        current_track = i;
+      else
+	playlist.rows[i].current = false;
+      }
+    }
+  /* Shuffle */
+  for(i = 0; i < playlist.rows.length; i++)
+    {
+    var tmp;
+    var idx = Math.floor(Math.random()*playlist.rows.length);
+    tmp = shuffle_list[idx];
+    shuffle_list[idx] = shuffle_list[i];
+    shuffle_list[i] = tmp;
+    }
+
+
+  }
+
+function pls_renumber(playlist)
+  {
+  var i;
+
+  for(i = 0; i < playlist.rows.length; i++)
+    {
+    shuffle_list[i] = i;
+    playlist.rows[i].cells[0].innerHTML = (i+1).toString() + ".";
+    }
+  pls_changed(playlist);
+  }
+
+function pls_load()
+  {
+  var input = document.getElementById("file_input");
+  input.click();
+  }
+
+var pls_blob = null;
+var pls_url = null;
+
+function pls_save()
+  {
+  var m3u;
+  var i;
+  var filename;
+  var didl;
+  var playlist = document.getElementById("playlist");
+
+  if(pls_url != null)
+    window.URL.revokeObjectURL(pls_url);
+  /* Create file */
+  m3u = "#EXTM3U\r\n";
+
+  for(i = 0; i < playlist.rows.length; i++)
+    {
+    didl = playlist.rows[i].didl;
+    filename = didl_get_filename(didl);
+    if(filename != null)
+      {
+      m3u += "#EXTINF:" + get_duration_num(get_duration(didl)).toFixed() + ", " +
+	playlist.rows[i].cells[1].innerHTML + "\r\n" + filename + "\r\n";
+      }
+    }
+
+  pls_blob = new Blob([ m3u ]);
+  pls_url = window.URL.createObjectURL(pls_blob);
+  document.getElementById("pls_save_link").setAttribute("href", pls_url);
+  }
+
+function pls_up()
+  {
+  var i;
+  var row0;
+  var playlist = document.getElementById("playlist");
+  var rows = pls_extract_selected(playlist);
+
+  row0 = playlist.rows[0];
+
+  for(i = 0; i < rows.length; i++)
+    playlist.insertBefore(rows[i], row0);
+
+  pls_renumber(playlist);
+  }
+
+function pls_down()
+  {
+  var i;
+  var playlist = document.getElementById("playlist");
+  var rows = pls_extract_selected(playlist);
+  for(i = 0; i < rows.length; i++)
+    playlist.appendChild(rows[i]);
+  pls_renumber(playlist);
+  }
+
+function pls_delete()
+  {
+  var playlist = document.getElementById("playlist");
+  pls_extract_selected(playlist);
+  pls_renumber(playlist);
+  }
+
+function add_m3u(m3u)
+  {
+  var i;
+  var items;
+  var didl = browse_metadata(m3u);
+  items = didl.getElementsByTagName("item");
+  for(i = 0; i < items.length; i++)
+    add_track(items[i], false);
+  }
+
+function handle_file(files)
+  {
+  var reader = new FileReader();
+  reader.onload = function(e) {
+    add_m3u(e.target.result);
+  };
+  reader.readAsText(files[0]);
+  }
\ No newline at end of file

gmerlin-4256.tar.gz/apps/mediaserver/web/js/mediaserver.js Added

@@ -0,0 +1,1818 @@
+var selected_tree_row = null;
+
+var audio_player = null;
+var audio_player_ready = false;
+var audio_player_queue;
+
+function tree_select_callback(el)
+  {
+  var didl;
+  var container = document.getElementById("list");
+
+  if(selected_tree_row == el)
+    return;
+
+  if(selected_tree_row != null)
+    selected_tree_row.setAttribute("class", "treerow");
+
+  el.setAttribute("class", "treerow treerow_selected");
+
+  while(container.firstChild != null)
+    container.removeChild(container.firstChild);
+
+  didl = browse_children(el.getAttribute("id"));
+  handle_didl_items(didl);
+
+  selected_tree_row = el;
+  }
+
+function tree_expand_callback(event, el)
+  {
+  var didl;
+  var parent = el.parentNode;
+  if(el.getAttribute("class") == "tree_elem handleclosed")
+    {
+    el.setAttribute("class", "tree_elem handleopen");
+    didl = browse_children(parent.getAttribute("id"));
+    handle_didl_containers(didl, parent);
+    }
+  else
+    {
+    var child;
+    el.setAttribute("class", "tree_elem handleclosed");
+    while(true)
+      {
+      child = parent.nextSibling;
+      if((child == null) || (child.depth <= parent.depth))
+	break;
+      parent.parentNode.removeChild(child);
+      }
+    }
+  stop_propagate(event);
+  }
+
+function player_created()
+  {
+  audio_player_ready = true;
+
+  /* Flush the queue */
+  while(audio_player_queue.length > 0)
+    {
+    audio_player.add_track(audio_player_queue[0].track,
+                           audio_player_queue[0].do_play);
+    audio_player_queue.shift();
+    }
+  }
+
+function add_audio_track(track, do_play)
+  {
+  if((audio_player == null) || (audio_player.closed == true))
+    {
+    audio_player_ready = false;
+    audio_player = window.open("/static/audioplayer.html",
+				"Audio player",
+			        "width=460,height=320,location=no,menubar=no");
+    }
+  if(audio_player_ready == false)
+    {
+    var queue = new Object;
+    queue.track = track;
+    queue.do_play = do_play;
+    /* Push to queue */
+    audio_player_queue.push(queue);
+    }
+  else
+    /* Send the didl data of the audio track to the player window */
+    audio_player.add_track(track, do_play);
+  }
+
+function play_song(id)
+  {
+  var didl;
+  didl = browse_metadata(id);
+  add_audio_track(didl.getElementsByTagName("item")[0], true);
+  }
+
+function add_song(id)
+  {
+  var didl;
+  didl = browse_metadata(id);
+  add_audio_track(didl.getElementsByTagName("item")[0], false);
+  }
+
+function play_album(id)
+  {
+  var didl;
+  var i;
+  var tracks;
+  var do_play;
+  do_play = true;
+
+  didl = browse_children(id);
+  tracks = didl.getElementsByTagName("DIDL-Lite")[0].childNodes;
+
+  for(i = 0; i < tracks.length; i++)
+    {
+    if(get_didl_element(tracks[i], "class") ==
+       "object.item.audioItem.musicTrack")
+      {
+      add_audio_track(tracks[i], do_play);
+      do_play = false;
+      }
+    }
+  }
+
+function add_album(id)
+  {
+  var didl;
+  var i;
+  var tracks;
+  didl = browse_children(id);
+  tracks = didl.getElementsByTagName("DIDL-Lite")[0].childNodes;
+
+  for(i = 0; i < tracks.length; i++)
+    {
+    if(get_didl_element(tracks[i], "class") == "object.item.audioItem.musicTrack")
+      add_audio_track(tracks[i], false);
+    }
+  }
+
+function create_play_button(func, id)
+  {
+  var ret = document.createElement("a");
+  ret.setAttribute("href", "javascript: " + func + "('" + id + "')" );
+  ret.setAttribute("class", "button play");
+  ret.setAttribute("title", "Play");
+/*
+  ret.onmousedown = function(evt) {
+    evt.preventDefault();
+    stop_propagate(evt);
+    };
+*/
+  return ret;
+  }
+
+function create_add_button(func, id)
+  {
+  var ret = document.createElement("a");
+  ret.setAttribute("href", "javascript: " + func + "('" + id + "')" );
+  ret.setAttribute("class", "button add");
+  ret.setAttribute("title", "Add to playlist");
+/*
+  ret.onmousedown = function(evt) {
+    evt.preventDefault();
+    stop_propagate(evt);
+    };
+*/
+  ret.ondragstart = function() {
+     return false;
+  };
+  return ret;
+  }
+
+function create_song_play_button(id)
+  {
+  return create_play_button("play_song", id);
+  }
+
+function create_album_play_button(id)
+  {
+  return create_play_button("play_album", id);
+  }
+
+function create_song_add_button(id)
+  {
+  return create_add_button("add_song", id);
+  }
+
+function create_album_add_button(id)
+  {
+  return create_add_button("add_album", id);
+  }
+
+function get_movie_poster(el)
+  {
+  var i;
+  var protocol_info;
+  var resolution;
+  var res_arr;
+  var res = el.getElementsByTagName("res");
+
+  if(res == null)
+    return null;
+
+  for(i = 0; i < res.length; i++)
+    {
+    protocol_info = res[i].getAttribute("protocolInfo").split(":");
+    if(protocol_info[0] != "http-get")
+      continue;
+    if(protocol_info[2].indexOf("image/") != 0)
+      continue;
+    resolution = res[i].getAttribute("resolution");
+    if(resolution == null)
+      continue;
+    res_arr = resolution.split("x");
+    if((parseInt(res_arr[0]) > 220) ||
+       (parseInt(res_arr[0]) > 330))
+      continue;
+    return res[i].textContent;
+    }
+  return null;
+  }
+
+function get_movie_poster_orig(el)
+  {
+  var i;
+  var protocol_info;
+  var resolution;
+  var res_arr;
+  var max_width = 0;
+  var max_index = 0;
+  var width;
+
+  var res = el.getElementsByTagName("res");
+
+  if(res == null)
+    return null;
+
+  for(i = 0; i < res.length; i++)
+    {
+    protocol_info = res[i].getAttribute("protocolInfo").split(":");
+    if(protocol_info[0] != "http-get")
+      continue;
+    if(protocol_info[2].indexOf("image/") != 0)
+      continue;
+    resolution = res[i].getAttribute("resolution");
+    if(resolution == null)
+      continue;
+    res_arr = resolution.split("x");
+    width = parseInt(res_arr[0]);
+
+    if(width > max_width)
+      {
+      max_width = width;
+      max_index = i;
+      }
+    continue;
+    }
+  return res[max_index].textContent;
+  }
+
+function create_movie_poster(el)
+  {
+  var str;
+  var img;
+
+  str =	get_movie_poster(el);
+  if(str == null)
+    return null;
+
+  if(str != null)
+    {
+    img = document.createElement("img");
+    img.setAttribute("src", str);
+    img.setAttribute("width", "220");
+    img.setAttribute("height", "330");
+    img.setAttribute("class", "albumcover");
+    }
+
+  str =	get_movie_poster_orig(el);
+
+  if(str != null)
+    {
+    var a = document.createElement("a");
+    a.setAttribute("href", str);
+    a.setAttribute("target", "_new");
+    a.appendChild(img);
+    return a;
+    }
+  else
+    {
+    return img;
+    }
+  }
+
+function get_album_cover(el)
+  {
+  var uris = get_didl_elements(el, "albumArtURI");
+  if(!uris)
+    return "/static/icons/cover_160.png";
+  return uris[0].textContent;
+  }
+
+function get_album_cover_orig(el)
+  {
+  var uris = get_didl_elements(el, "albumArtURI");
+  if(!uris)
+    return null;
+  return uris[uris.length-1].textContent;
+  }
+
+function create_album_cover(el)
+  {
+  var str;
+  var img;
+
+  str =	get_album_cover(el);
+
+  img = document.createElement("img");
+  img.setAttribute("src", str);
+  img.setAttribute("width", "160");
+  img.setAttribute("height", "160");
+  img.setAttribute("class", "albumcover");
+
+  str =	get_album_cover_orig(el);
+
+  if(str != null)
+    {
+    var a = document.createElement("a");
+    a.setAttribute("href", str);
+    a.setAttribute("target", "_new");
+    a.appendChild(img);
+    return a;
+    }
+  else
+    {
+    return img;
+    }
+  }
+
+
+function add_media_locations(el, parent)
+  {
+  var a;
+  var i;
+  var protocol_info;
+  var ext;
+  var idx;
+  var idx2;
+  var text;
+  var str;
+  var added = 0;
+  var res = el.getElementsByTagName("res");
+  var bitrate;
+  var isav = 0;
+
+  for(i = 0; i < res.length; i++)
+    {
+    protocol_info = res[i].getAttribute("protocolInfo").split(":");
+    if(protocol_info[0] != "http-get")
+      continue;
+
+    /* We only generate links for URLS with a file extension */
+
+    str = get_extension(res[i].textContent);
+    if(str == null)
+      continue;
+    str = str.toUpperCase();
+
+    if((protocol_info[2].indexOf("audio/") == 0) ||
+       (protocol_info[2].indexOf("video/") == 0))
+      isav = 1;
+
+    if((isav != 0) && (protocol_info[2].indexOf("image/") == 0))
+      continue;
+
+    bitrate = res[i].getAttribute("bitrate");
+    if(bitrate != null)
+      {
+      var bitrate_int;
+      bitrate_int = parseInt(bitrate);
+      // bitrate is actually byterate
+
+      if(bitrate_int > 0)
+	{
+        bitrate_int *= 8;
+        bitrate_int /= 1000;
+        str += " (" + bitrate_int + " kbps)";
+	}
+//      else if(protocol_info[2] == "audio/mpeg")
+//        str += " (VBR)";
+      }
+    else if(protocol_info[2] == "audio/mpeg")
+      str += " (VBR)";
+
+
+    text = document.createTextNode(str);
+
+    a = document.createElement("a");
+    a.setAttribute("href", res[i].textContent);
+    a.appendChild(text);
+    a.setAttribute("class", "medialink");
+
+//    a.setAttribute("title", "Play");
+
+    if(added > 0)
+      parent.appendChild(document.createTextNode(" "));
+
+    parent.appendChild(a);
+
+    added++;
+    }
+  }
+
+function add_music_info(el, parent)
+  {
+  var res = el.getElementsByTagName("res");
+  var v;
+  var str = "";
+  var text;
+
+  if(res == null)
+    return;
+  v =	res[0].getAttribute("sampleFrequency");
+  if(v != null)
+    str += v + " Hz ";
+
+  v = res[0].getAttribute("nrAudioChannels");
+  if(v != null)
+    {
+    if(v == "1")
+      str += "Mono ";
+    else if(v == "2")
+      str += "Stereo ";
+    else
+      str += v + " Channels";
+
+    }
+  text = document.createTextNode(str);
+  parent.appendChild(text);
+  }
+
+function add_video_info(el, parent)
+  {
+  var res = el.getElementsByTagName("res");
+  var str = "";
+  var v;
+  var text;
+  if(res == null)
+    return;
+
+  v = res[0].getAttribute("resolution");
+  if(v != null)
+    str += v;
+  text = document.createTextNode(str);
+  parent.appendChild(text);
+  }
+
+function create_type_cell(type)
+  {
+  var ret, cell;
+  ret = document.createElement("img");
+  ret.setAttribute("width", "16");
+  ret.setAttribute("height", "16");
+  if(type == "audio")
+    ret.setAttribute("src", "/static/icons/audio_black_16.png");
+  else if(type == "video")
+    ret.setAttribute("src", "/static/icons/video_black_16.png");
+  else if(type == "image")
+    ret.setAttribute("src", "/static/icons/image_black_16.png");
+
+  cell = document.createElement("td");
+  cell.setAttribute("style", "width: 16px;");
+  cell.appendChild(ret);
+  return cell;
+  }
+
+function append_audio_broadcast(parent, el)
+  {
+  var row1;
+  var cell;
+  var text;
+  var button;
+  var trackno;
+  var station_url;
+  var row = document.createElement("table");
+  row.setAttribute("id", el.getAttribute("id"));
+  row.setAttribute("class", "mediaitem");
+  row1 = document.createElement("tr");
+  row1.setAttribute("class", "mediaitem_title");
+  row.appendChild(row1);
+  row1.appendChild(create_type_cell("audio"));
+  cell = document.createElement("td");
+  text = document.createTextNode(get_didl_element(el, "title"));
+
+  station_url = get_didl_element(el, "stationURL");
+
+  if(station_url != null)
+    {
+    var a = document.createElement("a");
+    a.setAttribute("href", station_url);
+    a.setAttribute("target", "_new");
+    a.appendChild(text);
+    cell.appendChild(a);
+    }
+  else
+    cell.appendChild(text);
+  row1.appendChild(cell);
+
+  /* Play */
+  cell = document.createElement("td");
+  cell.setAttribute("style", "width: 16px;");
+  button = create_song_play_button(el.getAttribute('id'));
+  cell.appendChild(button);
+  row1.appendChild(cell);
+
+  /* Info */
+  row1 = document.createElement("tr");
+  row1.setAttribute("class", "mediaitem");
+
+  /* Empty cell */
+  cell = document.createElement("td");
+  row1.appendChild(cell);
+
+  /* Info cell */
+  cell = document.createElement("td");
+  add_music_info(el, cell);
+  text = document.createTextNode(" ");
+  cell.appendChild(text);
+  add_media_locations(el, cell);
+
+  row1.appendChild(cell);
+  row.appendChild(row1);
+
+
+  parent.appendChild(row);
+  row = document.createElement("hr");
+  row.setAttribute("style", "margin-top: 0px; margin-bottom: 0px;");
+  parent.appendChild(row);
+
+  }
+
+function append_music_track(parent, el)
+  {
+  var str1;
+  var str2;
+  var str3;
+  var str;
+  var row1;
+  var text;
+  var cell;
+  var button;
+  var trackno;
+  var row = document.createElement("table");
+  row.setAttribute("id", el.getAttribute("id"));
+  row.setAttribute("class", "mediaitem");
+  row1 = document.createElement("tr");
+  row1.setAttribute("class", "mediaitem_title");
+  row.appendChild(row1);
+
+  /* Artist, title */
+  str1 = get_didl_element(el, "title");
+  str2 = get_didl_element(el, "artist");
+
+  row1.appendChild(create_type_cell("audio"));
+
+  cell = document.createElement("td");
+  if((str1 != null) && (str2 != null))
+    text = document.createTextNode(str2 + ": " + str1);
+  else if(str2 != null)
+    text = document.createTextNode(str2);
+
+  cell.appendChild(text);
+
+  row1.appendChild(cell);
+
+  /* Duration */
+  str1 = get_duration(el);
+  cell = document.createElement("td");
+  cell.setAttribute("style", "text-align: right;");
+  text = document.createTextNode(format_duration_str(str1));
+
+  cell.appendChild(text);
+  row1.appendChild(cell);
+
+  /* Play */
+  cell = document.createElement("td");
+  cell.setAttribute("style", "width: 16px;");
+  button = create_song_play_button(el.getAttribute('id'));
+  cell.appendChild(button);
+  row1.appendChild(cell);
+
+  /* Add */
+  cell = document.createElement("td");
+  cell.setAttribute("style", "width: 16px;");
+  button = create_song_add_button(el.getAttribute('id'));
+  cell.appendChild(button);
+  row1.appendChild(cell);
+
+
+  str1 = get_didl_element(el, "album");
+  str2 = get_didl_element(el, "genre");
+  str3 = get_didl_element(el, "date");
+  trackno = get_didl_element(el, "originalTrackNumber");
+
+  str = null;
+  if(str1 != null)
+    {
+    str = str1;
+    if(trackno != null)
+      str += " (Track " + trackno + ")";
+    }
+
+  if(str2 != null)
+    {
+    if(str != null)
+      str += ", " + str2;
+    else
+      str = str2;
+    }
+  if(str3 != null)
+    {
+    if(str != null)
+      str += ", " + str3.substring(0, 4);
+    else
+      str = str3.substring(0, 4);
+    }
+
+  row1 = document.createElement("tr");
+  cell = document.createElement("td");
+  row1.appendChild(cell);
+
+  cell = document.createElement("td");
+
+  if(str != null)
+    {
+    text = document.createTextNode(str);
+    cell.appendChild(text);
+    }
+
+  row1.appendChild(cell);
+  row.appendChild(row1);
+
+  row1 = document.createElement("tr");
+  cell = document.createElement("td");
+  row1.appendChild(cell);
+  cell = document.createElement("td");
+
+  add_music_info(el, cell);
+  text = document.createTextNode(" ");
+  cell.appendChild(text);
+  add_media_locations(el, cell);
+
+  row1.appendChild(cell);
+  row.appendChild(row1);
+
+  parent.appendChild(row);
+
+  row = document.createElement("hr");
+  row.setAttribute("style", "margin-top: 0px; margin-bottom: 0px;");
+  parent.appendChild(row);
+  }
+
+function append_music_album(parent, el)
+  {
+  var play_button;
+  var tracks;
+  var i;
+  var didl;
+  var str;
+  var albumdiv;
+  var trackstable;
+  var albumcell;
+  var trackscell;
+  var span;
+  var text;
+  var row1;
+  var img;
+  var dur_total = 0;
+  var added = 0;
+  var use_artist = false;
+  var first_artist = null;
+  var has_year = false;
+  var row = document.createElement("table");
+  row.setAttribute("id", el.getAttribute("id"));
+  row.setAttribute("style", "width: 100%;");
+
+  row1 = document.createElement("tr");
+
+  row.appendChild(row1);
+
+  albumcell = document.createElement("td");
+  albumcell.setAttribute("style", "width: 162px; padding: 10px; vertical-align: top;");
+
+  /* Cover */
+  img = create_album_cover(el);
+  if(img != null)
+    albumcell.appendChild(img);
+  albumcell.appendChild(document.createElement("br"));
+
+  /* Title */
+
+  str = get_didl_element(el, "title");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    span.setAttribute("class", "albumtitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    albumcell.appendChild(span);
+    albumcell.appendChild(document.createElement("br"));
+    }
+
+  str = get_didl_element(el, "artist");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    span.setAttribute("class", "albuminfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    albumcell.appendChild(span);
+    albumcell.appendChild(document.createElement("br"));
+    }
+  str = get_didl_element(el, "date");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    span.setAttribute("class", "albuminfo");
+    text = document.createTextNode(str.substring(0, 4));
+    span.appendChild(text);
+    albumcell.appendChild(span);
+    albumcell.appendChild(document.createElement("br"));
+    has_year = true;
+    }
+  str = get_didl_element(el, "genre");
+  if(str != null)
+    {
+    span = document.createElement("span");
+    span.setAttribute("class", "albuminfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    albumcell.appendChild(span);
+    albumcell.appendChild(document.createElement("br"));
+    }
+  row1.appendChild(albumcell);
+
+  /* Tracks */
+
+  trackscell = document.createElement("td");
+  trackscell.setAttribute("style", "vertical-align: top; padding-right: 10px; padding-top: 10px; padding-bottom: 10px;");
+
+  didl = browse_children(el.getAttribute("id"));
+  tracks = didl.getElementsByTagName("DIDL-Lite")[0].childNodes;
+  trackstable = document.createElement("table");
+  trackstable.setAttribute("class", "mediaitem");
+
+  /* If all artists are the same, we omit it from the label */
+  for(i=0; i < tracks.length; i++)
+    {
+    if(get_didl_element(tracks[i], "class") ==
+       "object.item.audioItem.musicTrack")
+      {
+      if(first_artist == null)
+	first_artist = get_didl_element(tracks[i], "artist");
+      else if(get_didl_element(tracks[i], "artist") != first_artist)
+	{
+	use_artist = true;
+	break;
+	}
+      }
+    }
+
+  for(i=0; i < tracks.length; i++)
+    {
+    var track_row;
+    var track_cell;
+    var hr;
+    if(get_didl_element(tracks[i], "class") ==
+       "object.item.audioItem.musicTrack")
+      {
+      if(added > 0)
+	{
+        track_row = document.createElement("tr");
+        track_cell = document.createElement("td");
+
+        if(has_year == false)
+	  track_cell.setAttribute("colspan", "6");
+        else
+	  track_cell.setAttribute("colspan", "5");
+        hr = document.createElement("hr");
+        hr.setAttribute("style", "margin-top: 0px; margin-bottom: 0px;");
+        track_cell.appendChild(hr);
+        track_row.appendChild(track_cell);
+        trackstable.appendChild(track_row);
+	}
+
+      track_row = document.createElement("tr");
+//      track_row.setAttribute("class", "mediaitem_title");
+
+      /* Number */
+      str = get_didl_element(tracks[i], "originalTrackNumber");
+
+      track_cell = document.createElement("td");
+      track_cell.setAttribute("class", "mediaitem_title");
+      track_cell.setAttribute("style", "margin-right: 3px; width: 26px; text-align: right;");
+
+      text = document.createTextNode(str + ".");
+      track_cell.appendChild(text);
+      track_row.appendChild(track_cell);
+
+      /* Title */
+
+      if(use_artist)
+	str = get_didl_element(tracks[i], "artist") +
+	  ": " + get_didl_element(tracks[i], "title");
+      else
+	str = get_didl_element(tracks[i], "title");
+      track_cell = document.createElement("td");
+      track_cell.setAttribute("class", "mediaitem_title");
+      text = document.createTextNode(str);
+      track_cell.appendChild(text);
+      track_row.appendChild(track_cell);
+
+      /* Year (if available) */
+
+      if(has_year == false)
+	{
+        track_cell = document.createElement("td");
+        track_cell.setAttribute("style", "margin-right: 3px; width: 26px; text-align: right;");
+	str = get_didl_element(tracks[i], "date");
+        if(str != null)
+	  {
+          str = str.substring(0, 4);
+          text = document.createTextNode(str);
+          track_cell.appendChild(text);
+	  }
+        track_row.appendChild(track_cell);
+	}
+
+      /* Duration */
+      str = get_duration(tracks[i]);
+      if(str != null)
+        dur_total += get_duration_num(str);
+      track_cell = document.createElement("td");
+      track_cell.setAttribute("class", "mediaitem_title");
+
+      track_cell.setAttribute("style", "text-align: right; width: 30px;");
+      text = document.createTextNode(format_duration_str(str));
+      track_cell.appendChild(text);
+      track_row.appendChild(track_cell);
+
+      /* Play */
+      track_cell = document.createElement("td");
+      track_cell.setAttribute("style", "width: 16px;");
+      play_button = create_song_play_button(tracks[i].getAttribute('id'));
+      track_cell.appendChild(play_button);
+      track_row.appendChild(track_cell);
+
+      /* Add */
+      track_cell = document.createElement("td");
+      track_cell.setAttribute("style", "width: 16px;");
+      play_button = create_song_add_button(tracks[i].getAttribute('id'));
+      track_cell.appendChild(play_button);
+      track_row.appendChild(track_cell);
+      trackstable.appendChild(track_row);
+
+      /* URLs */
+      track_row = document.createElement("tr");
+      track_row.setAttribute("class", "mediaitem");
+
+      track_cell = document.createElement("td");
+      track_row.appendChild(track_cell);
+
+      track_cell = document.createElement("td");
+      track_cell.setAttribute("style", "text-align: left;");
+      track_cell.setAttribute("colspan", "4");
+
+      add_music_info(tracks[i], track_cell);
+      add_media_locations(tracks[i], track_cell);
+      track_row.appendChild(track_cell);
+      trackstable.appendChild(track_row);
+      added++;
+      }
+    }
+  /* Total duration */
+  str = get_duration_str(dur_total);
+
+  span = document.createElement("span");
+  span.setAttribute("class", "albuminfo");
+  text = document.createTextNode("Total: " + str + " ");
+  span.appendChild(text);
+  albumcell.appendChild(span);
+
+  play_button = create_album_play_button(el.getAttribute('id'));
+  albumcell.appendChild(play_button);
+
+  play_button = create_album_add_button(el.getAttribute('id'));
+  albumcell.appendChild(play_button);
+
+  albumcell.appendChild(document.createElement("br"));
+  add_media_locations(el, albumcell);
+
+  trackscell.appendChild(trackstable);
+  row1.appendChild(trackscell);
+
+  parent.appendChild(row);
+  parent.appendChild(document.createElement("hr"));
+  }
+
+
+//
+
+function get_movie_files(el)
+  {
+  var klass;
+  var children = new Array();
+
+  klass = get_didl_element(el, "class");
+  if(klass == "object.item.videoItem.movie")
+    children[0] = el;
+  else
+    {
+    var arr;
+    var parts;
+    var i;
+    var idx = 0;
+    arr = browse_children(el.getAttribute("id"));
+    parts = arr.getElementsByTagName("DIDL-Lite")[0].childNodes;
+
+    for(i = 0; i < parts.length; i++)
+      {
+      if(parts[i].getElementsByTagName)
+	{
+        children[idx] = parts[i];
+        idx++;
+        }
+      }
+    }
+  return children;
+  }
+
+function append_movie(parent, el)
+  {
+  var str;
+  var str1, str2;
+  var row1;
+  var img;
+  var postercell;
+  var textcell;
+  var span;
+  var text;
+  var arr;
+  var children;
+  var i;
+  var duration;
+  var duration_str;
+  var has_audio_language = false;
+  var row = document.createElement("table");
+  row.setAttribute("id", el.getAttribute("id"));
+  row.setAttribute("style", "width: 100%;");
+
+  children = get_movie_files(el);
+
+  row1 = document.createElement("tr");
+
+  postercell = document.createElement("td");
+  postercell.setAttribute("style",
+			  "width: 220px; padding: 10px; vertical-align: top;");
+
+  img = create_movie_poster(el);
+  if(img != null)
+    postercell.appendChild(img);
+
+  row1.appendChild(postercell);
+
+  textcell = document.createElement("td");
+  textcell.setAttribute("style", "vertical-align: top; padding-top: 10px; padding-right: 10px; padding-bottom: 10px;");
+
+  /* Title */
+  str = get_didl_element(el, "title");
+  span = document.createElement("span");
+  span.setAttribute("class", "movietitle");
+  text = document.createTextNode(str);
+  span.appendChild(text);
+  textcell.appendChild(span);
+
+  /* Original title */
+  str = get_didl_element(el, "originalTitle");
+  if(str != null)
+    {
+    textcell.appendChild(document.createElement("br"));
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode("(" + str + ")");
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+
+  /* Countries */
+  str1 = null;
+  arr = el.getElementsByTagNameNS("*", "productionCountry");
+  if((arr != null) && (arr.length > 0))
+    {
+    str1 = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str1 += ", ";
+      str1 += arr[i].textContent;
+      }
+    }
+  /* Year */
+  str2 = get_didl_element(el, "date");
+
+  if(str2 != null)
+    str2 = str2.substring(0, 4);
+
+  if((str1 != null) && (str2 != null))
+    str = str1 + ", " + str2;
+  else if(str1)
+    str = str1;
+  else if(str2)
+    str = str2;
+  else
+    str = null;
+
+  if(str != null)
+    {
+    textcell.appendChild(document.createElement("br"));
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+
+  /* Genres */
+  arr = el.getElementsByTagNameNS("*", "genre");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("br"));
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str += ", ";
+      str += arr[i].textContent;
+      }
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+
+  /* Duration */
+  duration = 0;
+  for(i = 0; i < children.length; i++)
+    {
+    duration_str = get_duration(children[i]);
+    duration += get_duration_num(duration_str);
+    }
+  duration_str = get_duration_str(duration);
+  textcell.appendChild(document.createElement("br"));
+  span = document.createElement("span");
+  span.setAttribute("class", "movieinfo");
+  text = document.createTextNode(duration_str);
+  span.appendChild(text);
+  textcell.appendChild(span);
+
+  /* Links */
+
+  if(children.length == 1) // Single part movie
+    {
+    textcell.appendChild(document.createElement("br"));
+
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    add_video_info(el, span);
+    textcell.appendChild(span);
+    textcell.appendChild(document.createTextNode(" "));
+    add_media_locations(el, textcell);
+    }
+  else // Multi part movie
+    {
+    for(i = 0; i < children.length; i++)
+      {
+      textcell.appendChild(document.createElement("br"));
+      span = document.createElement("span");
+      span.setAttribute("class", "movieinfo");
+      text = document.createTextNode("Part " + (i+1) + ": ");
+      span.appendChild(text);
+      add_video_info(children[i], span);
+      textcell.appendChild(span);
+      textcell.appendChild(document.createTextNode(" "));
+      add_media_locations(children[i], textcell);
+      }
+    }
+
+  /* Audio Language */      
+  arr = el.getElementsByTagNameNS("*", "audioLanguage");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("p"));
+    if(arr.length > 1)
+      str = "Spoken languages: ";
+    else
+      str = "Spoken language: ";
+	
+    span = document.createElement("span");
+    span.setAttribute("class", "movietitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str += ", ";
+      str += arr[i].textContent;
+      }
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    has_audio_language = true;
+    }
+
+  /* Subtitle language */      
+  arr = el.getElementsByTagNameNS("*", "subtitleLanguage");
+  if((arr != null) && (arr.length > 0))
+    {
+    if(has_audio_language == true)
+      textcell.appendChild(document.createElement("br"));
+    else
+      textcell.appendChild(document.createElement("p"));
+    if(arr.length > 1)
+      str = "Subtitle languages: ";
+    else
+      str = "Subtitle language: ";
+	
+    span = document.createElement("span");
+    span.setAttribute("class", "movietitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str += ", ";
+      str += arr[i].textContent;
+      }
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+      
+
+  /* Directors */
+  arr = el.getElementsByTagNameNS("*", "director");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("p"));
+    if(arr.length > 1)
+      str = "Directors: ";
+    else
+      str = "Director: ";
+
+    span = document.createElement("span");
+    span.setAttribute("class", "movietitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str += ", ";
+      str += arr[i].textContent;
+      }
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+      
+  /* Actors */
+  arr = el.getElementsByTagNameNS("*", "actor");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("p"));
+    str = "Cast:";
+    span = document.createElement("span");
+    span.setAttribute("class", "movietitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      textcell.appendChild(document.createElement("br"));
+      span = document.createElement("span");
+      span.setAttribute("class", "movieinfo");
+      text = document.createTextNode(arr[i].textContent);
+      span.appendChild(text);
+      textcell.appendChild(span);
+      }
+    }
+
+  row1.appendChild(textcell);
+  row.appendChild(row1);
+
+  /* Plot */
+  arr = el.getElementsByTagNameNS("*", "longDescription");
+  if((arr != null) && (arr.length > 0))
+    {
+    var lines = arr[0].textContent.replace(/\r\n/, "\n").split("\n");
+
+    row1 = document.createElement("tr");
+    textcell = document.createElement("td");
+    textcell.setAttribute("colspan", "2");
+    textcell.setAttribute("style", "padding: 10px;");
+
+    for(i = 0; i < lines.length; i++)
+      {
+      if(i > 0)
+        textcell.appendChild(document.createElement("br"));
+
+      span = document.createElement("span");
+      span.setAttribute("class", "movieinfo");
+      text = document.createTextNode(lines[i]);
+      span.appendChild(text);
+      textcell.appendChild(span);
+      }
+
+
+    row1.appendChild(textcell);
+    row.appendChild(row1);
+    }
+  parent.appendChild(row);
+
+  parent.appendChild(document.createElement("hr"));
+  }
+
+function append_series(parent, el)
+  {
+  var str;
+  var str1, str2;
+  var row1;
+  var img;
+  var postercell;
+  var textcell;
+  var span;
+  var text;
+  var arr;
+  var i;
+  var row = document.createElement("table");
+  row.setAttribute("id", "seriesinfo");
+  row.setAttribute("style", "width: 100%;");
+
+  row1 = document.createElement("tr");
+
+  postercell = document.createElement("td");
+  postercell.setAttribute("style",
+			  "width: 220px; padding: 10px; vertical-align: top;");
+
+  img = create_movie_poster(el);
+  if(img != null)
+    postercell.appendChild(img);
+
+  row1.appendChild(postercell);
+
+  textcell = document.createElement("td");
+  textcell.setAttribute("style", "vertical-align: top; padding-top: 10px; padding-right: 10px; padding-bottom: 10px;");
+
+  /* Title */
+  str = get_didl_element(el, "title");
+  span = document.createElement("span");
+  span.setAttribute("class", "movietitle");
+  text = document.createTextNode(str);
+  span.appendChild(text);
+  textcell.appendChild(span);
+
+  /* Original title */
+  str = get_didl_element(el, "originalTitle");
+  if(str != null)
+    {
+    textcell.appendChild(document.createElement("br"));
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode("(" + str + ")");
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+
+  /* Countries */
+  str1 = null;
+  arr = el.getElementsByTagNameNS("*", "productionCountry");
+  if((arr != null) && (arr.length > 0))
+    {
+    str1 = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str1 += ", ";
+      str1 += arr[i].textContent;
+      }
+    }
+  /* Year */
+  str2 = get_didl_element(el, "date");
+
+  if(str2 != null)
+    str2 = str2.substring(0, 4);
+
+  if((str1 != null) && (str2 != null))
+    str = str1 + ", " + str2;
+  else if(str1)
+    str = str1;
+  else if(str2)
+    str = str2;
+  else
+    str = null;
+
+  if(str != null)
+    {
+    textcell.appendChild(document.createElement("br"));
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+
+  /* Genres */
+  arr = el.getElementsByTagNameNS("*", "genre");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("br"));
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str += ", ";
+      str += arr[i].textContent;
+      }
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+
+  /* Directors */
+  arr = el.getElementsByTagNameNS("*", "director");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("p"));
+    if(arr.length > 1)
+      str = "Directors: ";
+    else
+      str = "Director: ";
+
+    span = document.createElement("span");
+    span.setAttribute("class", "movietitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      if(i > 0)
+	str += ", ";
+      str += arr[i].textContent;
+      }
+    span = document.createElement("span");
+    span.setAttribute("class", "movieinfo");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+    }
+  /* Actors */
+  arr = el.getElementsByTagNameNS("*", "actor");
+  if((arr != null) && (arr.length > 0))
+    {
+    textcell.appendChild(document.createElement("p"));
+    str = "Cast:";
+    span = document.createElement("span");
+    span.setAttribute("class", "movietitle");
+    text = document.createTextNode(str);
+    span.appendChild(text);
+    textcell.appendChild(span);
+
+    str = "";
+    for(i = 0; i < arr.length; i++)
+      {
+      textcell.appendChild(document.createElement("br"));
+      span = document.createElement("span");
+      span.setAttribute("class", "movieinfo");
+      text = document.createTextNode(arr[i].textContent);
+      span.appendChild(text);
+      textcell.appendChild(span);
+      }
+    }
+
+  row1.appendChild(textcell);
+  row.appendChild(row1);
+
+  /* Plot */
+  arr = el.getElementsByTagNameNS("*", "longDescription");
+  if((arr != null) && (arr.length > 0))
+    {
+    var lines = arr[0].textContent.replace(/\r\n/, "\n").split("\n");
+
+    row1 = document.createElement("tr");
+    textcell = document.createElement("td");
+    textcell.setAttribute("colspan", "2");
+    textcell.setAttribute("style", "padding: 10px;");
+
+    for(i = 0; i < lines.length; i++)
+      {
+      if(i > 0)
+        textcell.appendChild(document.createElement("br"));
+
+      span = document.createElement("span");
+      span.setAttribute("class", "movieinfo");
+      text = document.createTextNode(lines[i]);
+      span.appendChild(text);
+      textcell.appendChild(span);
+      }
+
+
+    row1.appendChild(textcell);
+    row.appendChild(row1);
+    }
+  parent.appendChild(row);
+
+  parent.appendChild(document.createElement("hr"));
+  }
+
+function append_season(parent, el)
+  {
+  var didl;
+  var episodes;
+  var str;
+  var span;
+  var text;
+  var table;
+  var i;
+  var row, cell;
+  var added = 0;
+  var season_table;
+  var season_row;
+  var season_info;
+  var season_ep;
+  var img;
+
+  if(!document.getElementById("seriesinfo"))
+    {
+    didl = browse_metadata(el.getAttribute("parentID"));
+    var series =  didl.getElementsByTagName("DIDL-Lite")[0].childNodes[0];
+    append_series(parent, series);
+    }
+
+  season_table = document.createElement("table");
+  season_table.setAttribute("class", "mediaitem");
+
+  parent.appendChild(season_table);
+
+  season_row = document.createElement("tr");
+  season_table.appendChild(season_row);
+
+  season_info = document.createElement("td");
+  season_info.setAttribute("style",
+			   "width: 240px; padding: 10px; vertical-align: top;");
+
+  season_row.appendChild(season_info);
+
+  season_ep = document.createElement("td");
+  season_ep.setAttribute("style",
+                         "padding: 10px; vertical-align: top;");
+  season_row.appendChild(season_ep);
+
+  // Season header
+  img = create_movie_poster(el);
+  if(img != null)
+    {
+    season_info.appendChild(img);
+    season_info.appendChild(document.createElement("br"));
+    }
+
+
+  str = get_didl_element(el, "title");
+  span = document.createElement("span");
+  span.setAttribute("class", "mediaitem_title");
+
+  text = document.createTextNode(str);
+  span.appendChild(text);
+  season_info.appendChild(span);
+  season_info.appendChild(document.createElement("br"));
+
+  add_media_locations(el, season_info);
+
+  didl = browse_children(el.getAttribute("id"));
+  episodes = didl.getElementsByTagName("DIDL-Lite")[0].childNodes;
+
+  table = document.createElement("table");
+  table.setAttribute("class", "mediaitem");
+
+  for(i=0; i < episodes.length; i++)
+    {
+    if(get_didl_element(episodes[i], "class") ==
+       "object.item.videoItem.movie")
+      {
+      if(added > 0)
+	{
+        var hr = document.createElement("hr");
+        hr.setAttribute("style", "margin-top: 0px; margin-bottom: 0px;");
+        row = document.createElement("tr");
+        cell = document.createElement("td");
+        cell.setAttribute("colspan", "3");
+
+        cell.appendChild(hr);
+        row.appendChild(cell);
+        table.appendChild(row);
+	}
+
+      row = document.createElement("tr");
+
+      /* Number */
+      str = get_didl_element(episodes[i], "episodeIndex");
+      cell = document.createElement("td");
+      cell.setAttribute("class",
+			"mediaitem_title");
+      cell.setAttribute("style",
+			"margin-right: 3px; width: 26px; text-align: right;");
+
+      text = document.createTextNode(str + ".");
+      cell.appendChild(text);
+      row.appendChild(cell);
+
+      /* Title */
+      str = get_didl_element(episodes[i], "title");
+      cell = document.createElement("td");
+      span = document.createElement("span");
+      span.setAttribute("class",
+			"mediaitem_title");
+      text = document.createTextNode(str);
+      span.appendChild(text);
+      cell.appendChild(span);
+
+      str = get_didl_element(episodes[i], "date");
+      if(str != null)
+    	{
+        span = document.createElement("span");
+        text = document.createTextNode(" (" + str + ")");
+        span.appendChild(text);
+        cell.appendChild(span);
+	}
+      row.appendChild(cell);
+
+      /* Duration */
+      str = get_duration(episodes[i]);
+      cell = document.createElement("td");
+      cell.setAttribute("class",
+			"mediaitem_title");
+
+      cell.setAttribute("style", "text-align: right; padding-right: 10px;");
+      text = document.createTextNode(format_duration_str(str));
+      cell.appendChild(text);
+      row.appendChild(cell);
+
+      table.appendChild(row);
+
+      /* Second row */
+      row = document.createElement("tr");
+      row.appendChild(document.createElement("td"));
+
+      cell = document.createElement("td");
+
+      add_video_info(episodes[i], cell);
+      text = document.createTextNode(" ");
+      cell.appendChild(text);
+
+      add_media_locations(episodes[i], cell);
+      row.appendChild(cell);
+      table.appendChild(row);
+      added++;
+      }
+    }
+  season_ep.appendChild(table);
+  row =	document.createElement("hr");
+  parent.appendChild(row);
+  }
+
+function add_song(id)
+  {
+  var didl;
+  didl = browse_metadata(id);
+  add_audio_track(didl.getElementsByTagName("item")[0], false);
+  }
+
+function handle_didl_item(el)
+  {
+  var container = document.getElementById("list");
+  var klass = get_didl_element(el, "class");
+
+  if(klass == "object.container.album.musicAlbum")
+    {
+    append_music_album(container, el);
+    }
+  else if(klass == "object.item.audioItem.musicTrack")
+    {
+    append_music_track(container, el);
+    }
+  else if(klass == "object.item.audioItem.audioBroadcast")
+    {
+    append_audio_broadcast(container, el);
+    }
+  else if((klass == "object.item.videoItem.movie") ||
+	  (((klass == "object.container.album.videoAlbum")) &&
+	   (get_didl_element(el, "subType") == "multifileMovie")))
+    {
+    append_movie(container, el);
+    }
+  else if((klass == "object.container.album.videoAlbum") &&
+	   (get_didl_element(el, "subType") == "season"))
+    {
+    append_season(container, el);
+    }
+  else
+    {
+    var text;
+    var row = document.createElement("div");
+    text = document.createTextNode(get_didl_element(el, "title"));
+    row.appendChild(text);
+    container.appendChild(row);
+    }
+
+  }
+
+function handle_didl_container(el, parent, after)
+  {
+  var button;
+  var element;
+  var text;
+  var i;
+  var title;
+  var container = document.getElementById("tree");
+  var row = document.createElement("div");
+
+  row.setAttribute("class", "treerow");
+  row.setAttribute("id", el.getAttribute("id"));
+  row.onmousedown = function() { tree_select_callback(this); };
+
+  if(parent != null)
+    {
+    row.depth = parent.depth + 1;
+
+    for(i = 0; i < row.depth; i++)
+      {
+      element = document.createElement("div");
+      element.setAttribute("class", "tree_elem");
+      row.appendChild(element);
+      }
+    }
+  else
+    row.depth = 0;
+
+  element = document.createElement("div");
+  element.setAttribute("class", "tree_elem handleclosed");
+  element.onmousedown = function(event) {
+  tree_expand_callback(event, this); };
+
+  row.appendChild(element);
+
+  element = document.createElement("div");
+  element.setAttribute("class", "tree_elem folderclosed");
+  row.appendChild(element);
+
+  element = document.createElement("span");
+//  element.setAttribute("class", "treerow");
+  title = get_didl_element(el, "title");
+  text = document.createTextNode(title);
+
+  element.appendChild(text);
+  row.setAttribute("title", title);
+
+  row.appendChild(element);
+
+  if(get_didl_element(el, "class") == "object.container.playlistContainer")
+    {
+    button = create_add_button("add_album", el.getAttribute("id"));
+    row.appendChild(button);
+    }
+
+  if(after == null)
+    container.appendChild(row);
+  else
+    container.insertBefore(row, after);
+
+  return row;
+  }
+
+function is_item(el)
+  {
+  var cl;
+
+  if(el.nodeName == "item")
+    return true;
+
+  cl = get_didl_element(el, "class");
+
+  if(cl == "object.container.album.musicAlbum")
+    return true;
+
+  if(cl == "object.container.album.videoAlbum")
+    {
+    var st = get_didl_element(el, "subType");
+    if((st == "multifileMovie") ||
+       (st == "season"))
+      return true;
+    }
+  return false;
+  }
+
+function is_container(el)
+  {
+  if(el.nodeType != 1)
+    return false;
+
+  if(is_item(el))
+    return false;
+  else
+    return true;
+  }
+
+
+function handle_didl_containers(didl, parent)
+  {
+  var elements, i;
+  var after;
+  if(parent != null)
+    after = parent.nextSibling;
+  else
+    after = null;
+
+  elements = didl.getElementsByTagName("DIDL-Lite")[0].childNodes;
+
+  for(i=0; i<elements.length; i++)
+    {
+    if(is_container(elements[i]))
+      handle_didl_container(elements[i], parent, after);
+    }
+  }
+
+var didl_items = null;
+var didl_index = 0;
+
+function didl_timeout()
+  {
+  var i;
+  for(i = 0; i < 5; i++)
+    {
+    if(is_item(didl_items[didl_index]))
+      handle_didl_item(didl_items[didl_index]);
+    didl_index++;
+    if(didl_index >= didl_items.length)
+      return;
+    }
+  if(didl_index < didl_items.length)
+    window.setTimeout(didl_timeout, 1);
+  else
+    didl_items = null;
+  }
+
+function handle_didl_items(didl)
+  {
+  didl_items = didl.getElementsByTagName("DIDL-Lite")[0].childNodes;
+  didl_index = 0;
+  didl_timeout();
+  }
+
+var device_desc = null;
+
+function global_init()
+  {
+  var didl;
+  /* Get device description */
+  var req = make_http_request();
+  req.open('GET', '/upnp/desc.xml', false);
+  req.send();
+
+  if(req.status != 200)
+    {
+    alert("Upnp initialization failed");
+    return;
+    }
+  else
+    {
+    var el;
+    var title = req.responseXML.getElementsByTagName("friendlyName")[0].textContent;
+    document.title = title;
+    el = document.getElementById("servername");
+    el.appendChild(document.createTextNode(title));
+    }
+  didl = browse_children("0");
+  handle_didl_containers(didl, null);
+  audio_player_queue = new Array();
+  }

gmerlin-4256.tar.gz/apps/mediaserver/web/js/soap.js Added

@@ -0,0 +1,95 @@
+
+function make_http_request()
+  {
+  var xmlHttp = null;
+  try
+    {
+      // Mozilla, Opera, Safari sowie Internet Explorer (ab v7)
+      xmlHttp = new XMLHttpRequest();
+    }
+  catch(e)
+    {
+    try
+      {
+      // MS Internet Explorer (ab v6)
+	xmlHttp  = new ActiveXObject("Microsoft.XMLHTTP");
+      }
+    catch(e)
+      {
+      try
+	{
+        // MS Internet Explorer (ab v5)
+        xmlHttp  = new ActiveXObject("Msxml2.XMLHTTP");
+        }
+      catch(e)
+	{
+        xmlHttp  = null;
+        }
+      }
+    }
+  return xmlHttp;
+  }
+
+function parse_xml(text)
+  {
+  if (window.ActiveXObject)
+    {
+      var doc=new ActiveXObject('Microsoft.XMLDOM');
+      doc.async='false';
+      doc.loadXML(text);
+    }
+  else
+    {
+      var parser=new DOMParser();
+      var doc=parser.parseFromString(text,'text/xml');
+    }
+    return doc;
+  }
+
+function browse(id, flag)
+  {
+  var ret;
+  var req = make_http_request();
+
+  var body = '<?xml version="1.0" encoding="utf-8"?>' +
+      '<s:Envelope ' +
+      's:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" ' +
+      'xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">' +
+      '<s:Body>' +
+      '<ns0:Browse xmlns:ns0="urn:schemas-upnp-org:service:ContentDirectory:1">' +
+      '<ObjectID>' + id + '</ObjectID>' +
+      '<BrowseFlag>' + flag + '</BrowseFlag>' +
+      '<Filter>*</Filter>' +
+      '<StartingIndex>0</StartingIndex>' +
+      '<RequestedCount>0</RequestedCount>' +
+      '<SortCriteria />' +
+      '</ns0:Browse>' +
+      '</s:Body>' +
+      '</s:Envelope>';
+
+  req.open('POST', '/upnp/cd/control', false);
+  req.setRequestHeader('Content-Type',   'text/xml; charset="utf-8"');
+  req.setRequestHeader('X-Gmerlin-Webclient', 'true');
+
+//  req.setRequestHeader('Content-Length', body.length);
+  req.setRequestHeader('SOAPACTION', '"urn:schemas-upnp-org:service:ContentDirectory:1#Browse"');
+  req.send(body);
+
+  if(req.status != 200)
+    {
+    alert("Browse media server failed");
+    return NULL;
+    }
+//  alert(req.responseXML.getElementsByTagName("Result")[0].textContent);
+  return parse_xml(req.responseXML.getElementsByTagName("Result")[0].textContent);
+  }
+
+function browse_metadata(id)
+  {
+  return browse(id, "BrowseMetadata");
+  }
+
+function browse_children(id)
+  {
+  return browse(id, "BrowseDirectChildren");
+  }

gmerlin-4256.tar.gz/apps/mediaserver/web/js/utils.js Added

@@ -0,0 +1,194 @@
+function get_element_position(element)
+  {
+  var xPosition = 0;
+  var yPosition = 0;
+
+  while(element &&
+	!isNaN( element.offsetLeft ) &&
+	!isNaN( element.offsetTop ))
+    {
+    xPosition += (element.offsetLeft - element.scrollLeft + element.clientLeft);
+    yPosition += (element.offsetTop - element.scrollTop + element.clientTop);
+    element = element.offsetParent;
+    }
+  return { x: xPosition, y: yPosition };
+  }
+
+function resize_window(w, h)
+  {
+  window.resizeTo(
+            w + (window.outerWidth - window.innerWidth),
+            h + (window.outerHeight - window.innerHeight));
+  }
+
+function stop_propagate(e)
+  {
+  var evt = e ? e:window.event;
+  if (evt.stopPropagation)
+    evt.stopPropagation();
+  if(evt.cancelBubble!=null)
+    evt.cancelBubble = true;
+  }
+
+/**
+ * John Resig, erklaert auf Flexible Javascript Events
+ */
+
+function add_event_handler( obj, type, fn )
+  {
+  if(obj.addEventListener)
+    {
+    obj.addEventListener( type, fn, false );
+    }
+  else if (obj.attachEvent)
+    {
+    obj["e"+type+fn] = fn;
+    obj[type+fn] = function() { obj["e"+type+fn]( window.event ); };
+    obj.attachEvent( "on"+type, obj[type+fn] );
+    }
+  }
+
+function get_didl_elements(el, name)
+  {
+  if(el.getElementsByTagNameNS)
+    return el.getElementsByTagNameNS("*", name);
+  else
+    return null;
+  }
+
+function get_didl_element(el, name)
+  {
+  if(el.getElementsByTagNameNS)
+    {
+    if(el.getElementsByTagNameNS("*", name)[0] != null)
+      return el.getElementsByTagNameNS("*", name)[0].textContent;
+    else
+      return null;
+    }
+  else
+    return null;
+  }
+
+
+/* Ge the upnp duration */
+function get_duration(el)
+  {
+  var res, ret, i;
+  res = el.getElementsByTagName("res");
+
+  for(i = 0; i  < res.length; i++)
+    {
+    ret = res[i].getAttribute("duration");
+    if(ret != null)
+      return ret;
+    }
+  return null;
+  }
+
+/* Ge the upnp duration */
+function didl_get_filename(el)
+  {
+  var res, i;
+  res = el.getElementsByTagName("res");
+  for(i = 0; i < res.length; i++)
+    {
+    if(res[i].textContent.indexOf("file://") == 0)
+      return res[i].textContent.substring(7);
+    }
+  return null;
+  }
+
+function format_duration_str(dur)
+  {
+  var idx;
+  if(dur == null)
+    return "-:--";
+  idx = dur.lastIndexOf(".");
+  if(idx >= 0)
+    dur = dur.substr(0, idx);
+  if(dur.charAt(0) == "0")
+    dur = dur.substr(1);
+  return dur;
+  }
+
+function get_duration_num(dur)
+  {
+  var i;
+  var ret = 0;
+  var split;
+
+  if(dur == null)
+    return 0.0;
+  split = dur.split(":");
+
+  for(i = 0; i < split.length; i++)
+    {
+    ret *= 60;
+    ret += parseFloat(split[i]);
+    }
+  return ret;
+  }
+
+function get_duration_str(dur)
+  {
+  var ret;
+  var hours;
+  var minutes;
+  var seconds;
+
+  hours = Math.floor(dur / 3600);
+  dur -= hours * 3600;
+
+  minutes = Math.floor(dur / 60);
+  dur -= minutes * 60;
+
+  seconds = Math.floor(dur);
+
+  if(hours > 0)
+    {
+    ret = hours.toString() + ':';
+
+    if(minutes < 10)
+      ret += "0";
+    ret += minutes.toString() + ':';
+
+    if(seconds < 10)
+      ret += "0";
+    ret += seconds.toString();
+    }
+  else
+    {
+    ret = minutes.toString() + ':';
+    if(seconds < 10)
+      ret += "0";
+    ret += seconds.toString();
+    }
+  return ret;
+  }
+
+function get_extension(str)
+  {
+  var ret = null;
+  var idx;
+  var idx2;
+  var rx;
+
+  idx = str.lastIndexOf(".");
+  if(idx < 0)
+    return null;
+
+  idx2 = str.lastIndexOf("/");
+  if((idx2 < 0) || (idx2 > idx))
+    return null;
+
+  ret = str.substr(idx+1);
+  if((ret.length < 1) || (ret.length > 4))
+    return null;
+
+  rx = new RegExp("^[a-z0-9]+$", "i");
+  if(rx.test(ret) != true)
+    return null;
+
+  return ret;
+  }
+

gmerlin-1.2.0.tar.gz/apps/player/Makefile.am -> gmerlin-4256.tar.gz/apps/player/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/player/cfgdialog.c -> gmerlin-4256.tar.gz/apps/player/cfgdialog.c Changed

gmerlin-1.2.0.tar.gz/apps/player/display.c -> gmerlin-4256.tar.gz/apps/player/display.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -486,7 +486,6 @@
 display_t * display_create(gmerlin_t * gmerlin)
   {
   display_t * ret;
-  bg_cfg_section_t * cfg_section;
   load_pixbufs();
   ret = calloc(1, sizeof(*ret));
     
@@ -602,8 +601,6 @@
                  26, 3);
   
   gtk_widget_show(ret->widget);
-
-  cfg_section = bg_cfg_registry_find_section(gmerlin->cfg_reg, "Display");
   return ret;
   }
 
@@ -748,7 +745,7 @@
       d->buffer_percentage = *((float*)arg);
       break;
     case BG_PLAYER_STATE_ERROR:
-      d->error_msg = bg_strdup(d->error_msg, (char*)arg);
+      d->error_msg = gavl_strrep(d->error_msg, (char*)arg);
       break;
     default: /* BG_PLAYER_STATE_PLAYING */
       break;
@@ -844,10 +841,11 @@
   *y = d->skin->y;
   }
 
-void display_set_track_name(display_t * d, char * name)
+void display_set_track_name(display_t * d, const char * name)
   {
-  d->track_name = bg_strdup(d->track_name, name);
+  d->track_name = gavl_strrep(d->track_name, name);
   d->error_active = 0;
+  
   bg_gtk_scrolltext_set_text(d->scrolltext,
                              d->track_name,
                              d->foreground_normal, d->background);

gmerlin-1.2.0.tar.gz/apps/player/display.h -> gmerlin-4256.tar.gz/apps/player/display.h Changed

gmerlin-1.2.0.tar.gz/apps/player/gmerlin.1 -> gmerlin-4256.tar.gz/apps/player/gmerlin.1 Changed

gmerlin-1.2.0.tar.gz/apps/player/gmerlin.c -> gmerlin-4256.tar.gz/apps/player/gmerlin.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -44,6 +44,15 @@
     { BG_KEY_LEFT,    BG_KEY_CONTROL_MASK,                     ACCEL_SEEK_BACKWARD           },
     { BG_KEY_RIGHT,   BG_KEY_CONTROL_MASK,                     ACCEL_SEEK_FORWARD            },
     { BG_KEY_0,       0,                                       ACCEL_SEEK_START              },
+    { BG_KEY_1,       0,                                       ACCEL_SEEK_10                 },
+    { BG_KEY_2,       0,                                       ACCEL_SEEK_20                 },
+    { BG_KEY_3,       0,                                       ACCEL_SEEK_30                 },
+    { BG_KEY_4,       0,                                       ACCEL_SEEK_40                 },
+    { BG_KEY_5,       0,                                       ACCEL_SEEK_50                 },
+    { BG_KEY_6,       0,                                       ACCEL_SEEK_60                 },
+    { BG_KEY_7,       0,                                       ACCEL_SEEK_70                 },
+    { BG_KEY_8,       0,                                       ACCEL_SEEK_80                 },
+    { BG_KEY_9,       0,                                       ACCEL_SEEK_90                 },
     { BG_KEY_SPACE,   0,                                       ACCEL_PAUSE                   },
     { BG_KEY_m,       BG_KEY_CONTROL_MASK,                     ACCEL_MUTE                    },
     { BG_KEY_PAGE_UP, BG_KEY_CONTROL_MASK|BG_KEY_SHIFT_MASK,   ACCEL_NEXT_CHAPTER            },
@@ -451,8 +460,6 @@
   
   free(g->skin_dir);
 
-  if(g->remote_data.name)
-    free(g->remote_data.name);
   gavl_metadata_free(&g->remote_data.metadata);
   
   free(g);
@@ -552,11 +559,9 @@
                              duration_before,
                              duration_current,
                              duration_after);
-
-  
   
   bg_player_play(g->player, handle, track_index,
-                flags, bg_media_tree_get_current_track_name(g->tree));
+                 flags, bg_media_tree_get_current_track_name(g->tree));
 
   /* Unref the handle, we don't need it any longer here */
   bg_plugin_unref(handle);
@@ -876,7 +881,7 @@
     }
   else if(!strcmp(name, "skin_dir"))
     {
-    g->skin_dir = bg_strdup(g->skin_dir, val->val_str);
+    g->skin_dir = gavl_strrep(g->skin_dir, val->val_str);
     g->skin_dir = gmerlin_skin_load(&g->skin, g->skin_dir);
     gmerlin_skin_set(g);
     }
@@ -916,7 +921,7 @@
     }
   else if(!strcmp(name, "skin_dir"))
     {
-    val->val_str = bg_strdup(val->val_str, g->skin_dir);
+    val->val_str = gavl_strrep(val->val_str, g->skin_dir);
     }
   
   return 0;
@@ -996,7 +1001,8 @@
   if(!bg_album_is_open(album))
     {
     bg_album_open(album);
-    bg_gtk_tree_window_update(g->tree_window, 1);
+    bg_gtk_tree_window_open_album_window(g->tree_window, album);
+    bg_gtk_tree_window_update(g->tree_window);
     }
   return album;
   }

gmerlin-1.2.0.tar.gz/apps/player/gmerlin.h -> gmerlin-4256.tar.gz/apps/player/gmerlin.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -74,6 +74,16 @@
 #define ACCEL_GOTO_CURRENT           15
 #define ACCEL_CURRENT_TO_FAVOURITES  16
 
+#define ACCEL_SEEK_10                21
+#define ACCEL_SEEK_20                22
+#define ACCEL_SEEK_30                23
+#define ACCEL_SEEK_40                24
+#define ACCEL_SEEK_50                25
+#define ACCEL_SEEK_60                26
+#define ACCEL_SEEK_70                27
+#define ACCEL_SEEK_80                28
+#define ACCEL_SEEK_90                29
+
 typedef struct
   {
   char * directory;
@@ -168,7 +178,6 @@
   struct
     {
     gavl_metadata_t metadata;
-    char * name;
     gavl_time_t time;
     gavl_time_t duration;
     } remote_data;

gmerlin-1.2.0.tar.gz/apps/player/gmerlin_remote.1 -> gmerlin-4256.tar.gz/apps/player/gmerlin_remote.1 Changed

@@ -1,6 +1,6 @@
-.TH GMERLIN_REMOTE 1 "March 2012" Gmerlin "User Manuals"
+.TH GMERLIN_REMOTE 1 "June 2012" Gmerlin "User Manuals"
 .SH NAME
-gmerlin_remote
+gmerlin_remote \- Remote control for the Gmerlin GUI Player
 .SH SYNOPSIS
 .B gmerlin_remote 
 .I [options]
@@ -11,21 +11,21 @@
 
 .SH GLOBAL OPTIONS
 
-.B -host
+.B \-host
 .I <hostname>
 
 .RS 2
 Host to connect to, default is localhost
 .RE
 
-.B -port
+.B \-port
 .I <port>
 
 .RS 2
 Port to connect to
 .RE
 
-.B -launch
+.B \-launch
 
 .RS 2
 Launch new player if necessary
@@ -33,64 +33,64 @@
 
 .SH COMMANDS
 
-.B -play
+.B \-play
 
 .RS 2
 Play current track
 .RE
 
-.B -next
+.B \-next
 
 .RS 2
 Switch to next track
 .RE
 
-.B -prev
+.B \-prev
 
 .RS 2
 Switch to previous track
 .RE
 
-.B -stop
+.B \-stop
 
 .RS 2
 Stop playback
 .RE
 
-.B -pause
+.B \-pause
 
 .RS 2
 Pause playback
 .RE
 
-.B -mute
+.B \-mute
 
 .RS 2
 Toggle mute
 .RE
 
-.B -add
+.B \-add
 .I <gml>
 
 .RS 2
 Add <gml> to the incoming album
 .RE
 
-.B -addplay
+.B \-addplay
 .I <gml>
 
 .RS 2
 Add <gml> to the incoming album and play it
 .RE
 
-.B -open
+.B \-open
 .I <device>
 
 .RS 2
 Open album for <device>. Device must be a GML (e.g. dvd:///dev/hdd).
 .RE
 
-.B -openplay
+.B \-openplay
 .I <device>
 
 .RS 2
@@ -98,28 +98,28 @@
 dvd:///dev/hdd).
 .RE
 
-.B -volume
+.B \-volume
 .I <volume>
 
 .RS 2
 Set player volume. <volume> is in dB, 0.0 is max
 .RE
 
-.B -volume-rel
+.B \-volume\-rel
 .I <diff>
 
 .RS 2
 In- or decrease player volume. <diff> is in dB
 .RE
 
-.B -seek-rel
+.B \-seek\-rel
 .I <diff>
 
 .RS 2
 Seek relative. <diff> is in seconds.
 .RE
 
-.B -chapter
+.B \-chapter
 .I [num|+|-]
 
 .RS 2
@@ -127,19 +127,19 @@
 chapter respectively
 .RE
 
-.B -get-name
+.B \-get\-name
 
 .RS 2
 Print name of the current track
 .RE
 
-.B -get-metadata
+.B \-get\-metadata
 
 .RS 2
 Print metadata of the current track
 .RE
 
-.B -get-time
+.B \-get\-time
 
 .RS 2
 Print time of the current track
@@ -148,25 +148,25 @@
 .SH GENERIC OPTIONS
 The following generic options are available for all gmerlin applications
 
-.B -help
+.B \-help
 
 .RS 2
 Print this help message and exit
 .RE
 
-.B -help-man
+.B \-help\-man
 
 .RS 2
 Print this help message as a manual page and exit
 .RE
 
-.B -help-texi
+.B \-help\-texi
 
 .RS 2
 Print this help message in texinfo format and exit
 .RE
 
-.B -version
+.B \-version
 
 .RS 2
 Print version info and exit

gmerlin-1.2.0.tar.gz/apps/player/gmerlin_remote.c -> gmerlin-4256.tar.gz/apps/player/gmerlin_remote.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,43 +22,47 @@
 #include <string.h>
 
 #include <config.h>
+
+#include <gavl/metatags.h>
+
+
 #include <gmerlin/cfg_registry.h>
 #include <gmerlin/cmdline.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/remote.h>
 #include <gmerlin/translation.h>
+#include <gmerlin/playermsg.h>
+
 #include "player_remote.h"
 
+#include <gmerlin/bggavl.h>
 #include <gmerlin/log.h>
+
 #define LOG_DOMAIN "gmerlin_remote"
 
-static void cmd_get_name(void * data, int * argc, char *** _argv, int arg)
+gavl_time_t duration = GAVL_TIME_UNDEFINED;
+
+static void dump_metadata(bg_msg_t * msg, int arg)
   {
-  bg_msg_t * msg;
-  bg_remote_client_t * remote;
   char * str;
-  
-  remote = (bg_remote_client_t *)data;
-  msg = bg_remote_client_get_msg_write(remote);
-  bg_msg_set_id(msg, PLAYER_COMMAND_GET_NAME);
-  bg_remote_client_done_msg_write(remote);
-
-  msg = bg_remote_client_get_msg_read(remote);
-  if(!msg)
-    return;
+  gavl_metadata_t m;
+  memset(&m, 0, sizeof(m));
+  bg_msg_get_arg_metadata(msg, arg, &m);
 
-  str = bg_msg_get_arg_string(msg, 0);
+  if(!gavl_metadata_get_long(&m, GAVL_META_APPROX_DURATION, &duration))
+    duration = GAVL_TIME_UNDEFINED;
+  
+  str = bg_metadata_to_string(&m, 0);
   if(str)
     {
-    printf("Name: %s\n", str);
+    printf("%s\n", str);
     free(str);
     }
+  gavl_metadata_free(&m);
   }
 
 static void cmd_get_metadata(void * data, int * argc, char *** _argv, int arg)
   {
-  char * str;
-  gavl_metadata_t m;
   bg_msg_t * msg;
   bg_remote_client_t * remote;
   remote = (bg_remote_client_t *)data;
@@ -66,23 +70,10 @@
   bg_msg_set_id(msg, PLAYER_COMMAND_GET_METADATA);
   bg_remote_client_done_msg_write(remote);
 
-  msg = bg_remote_client_get_msg_read(remote);
+  msg = bg_remote_client_get_msg_read(remote, 1000);
   if(!msg)
     return;
-
-  memset(&m, 0, sizeof(m));
-  bg_msg_get_arg_metadata(msg, 0, &m);
-
-  str = bg_metadata_to_string(&m, 0);
-
-  if(str)
-    {
-    printf("%s\n", str);
-    free(str);
-    }
-  
-  gavl_metadata_free(&m);
-  
+  dump_metadata(msg, 0);
   }
 
 static void cmd_get_time(void * data, int * argc, char *** _argv, int arg)
@@ -98,7 +89,7 @@
   bg_msg_set_id(msg, PLAYER_COMMAND_GET_TIME);
   bg_remote_client_done_msg_write(remote);
 
-  msg = bg_remote_client_get_msg_read(remote);
+  msg = bg_remote_client_get_msg_read(remote, 1000);
   if(!msg)
     return;
 
@@ -109,7 +100,6 @@
   printf("Time: %s\n", str);
   gavl_time_prettyprint(duration, str);
   printf("Duration: %s\n", str);
-  
   }
 
 static void cmd_play(void * data, int * argc, char *** _argv, int arg)
@@ -380,8 +370,46 @@
   bg_remote_client_done_msg_write(remote);
   }
 
+/* Stuff for messages */
 
 
+static void cmd_msg(void * data, int * argc, char *** _argv, int arg)
+  {
+  bg_msg_t * msg;
+  bg_remote_client_t * remote;
+  int id;
+  remote = (bg_remote_client_t *)data;
+  msg = bg_remote_client_get_msg_write(remote);
+  bg_msg_set_id(msg, PLAYER_COMMAND_STREAM_MSG);
+  bg_remote_client_done_msg_write(remote);
+
+  while(1)
+    {
+    msg = bg_remote_client_get_msg_read(remote, -1);
+    if(!msg)
+      break;
+    
+    id = bg_msg_get_id(msg);
+
+    switch(id)
+      {
+      case BG_PLAYER_MSG_TIME_CHANGED:
+        {
+        gavl_time_t t = bg_msg_get_arg_time(msg, 0);
+        bg_print_time(stderr, t, duration);
+        break;
+        }
+      case BG_PLAYER_MSG_METADATA:
+        bg_print_time_stop(stderr);
+        dump_metadata(msg, 0);
+        break;
+      default:
+        break;
+      }
+    }
+  
+  }
+
 bg_cmdline_arg_t commands[] =
   {
     {
@@ -463,11 +491,6 @@
       .callback =    cmd_chapter,
     },
     {
-      .arg =         "-get-name",
-      .help_string = TRS("Print name of the current track"),
-      .callback =    cmd_get_name,
-    },
-    {
       .arg =         "-get-metadata",
       .help_string = TRS("Print metadata of the current track"),
       .callback =    cmd_get_metadata,
@@ -477,6 +500,11 @@
       .help_string = TRS("Print time of the current track"),
       .callback =    cmd_get_time,
     },
+    {
+      .arg =         "-msg",
+      .help_string = TRS("Stream messages"),
+      .callback =    cmd_msg,
+    },
     { /* End of options */ }
   };
 
@@ -492,7 +520,7 @@
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Option -host requires an argument");
     exit(-1);
     }
-  host = bg_strdup(host, (*argv)[arg]);
+  host = gavl_strrep(host, (*argv)[arg]);
   bg_cmdline_remove_arg(argc, argv, arg);
   }
 
@@ -557,6 +585,7 @@
     .package =  PACKAGE,
     .version =  VERSION,
     .name =     "gmerlin_remote",
+    .long_name = TRS("Remote control for the Gmerlin GUI Player"),
     .synopsis = TRS("[options] command\n"),
     .help_before = TRS("Remote control command for the Gmerlin GUI Player\n"),
     .args = (bg_cmdline_arg_array_t[]) { { TRS("Global options"), global_options },
@@ -591,10 +620,10 @@
 
   bg_cmdline_parse(global_options, &argc, &argv, NULL);
 
-  remote = bg_remote_client_create(PLAYER_REMOTE_ID, 0);
+  remote = bg_remote_client_create(PLAYER_REMOTE_ID);
 
   if(!host)
-    host = bg_strdup(host, "localhost");
+    host = gavl_strrep(host, "localhost");
 
   if(!bg_remote_client_init(remote, host, port, 1000))
     {

gmerlin-1.2.0.tar.gz/apps/player/main.c -> gmerlin-4256.tar.gz/apps/player/main.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -49,6 +49,7 @@
     .package =  PACKAGE,
     .version =  VERSION,
     .name =     "gmerlin",
+    .long_name = TRS("Gmerlin GUI Player"),
     .synopsis = TRS("[options] [gmls ...]\n"),
     .help_before = TRS("Gmerlin GUI Player"),
     .args = (bg_cmdline_arg_array_t[]) { {  } },
@@ -60,7 +61,7 @@
     },
     .files = (bg_cmdline_ext_doc_t[])
     { { "~/.gmerlin/plugins.xml",
-        TRS("Cache of the plugin registry (shared by all applicatons)") },
+        TRS("Cache of the plugin registry (shared by all applications)") },
       { "~/.gmerlin/player/config.xml",
         TRS("Used for configuration data. Delete this file if you think you goofed something up.") },
       { "~/.gmerlin/player/tree/tree.xml",

gmerlin-1.2.0.tar.gz/apps/player/mainmenu.c -> gmerlin-4256.tar.gz/apps/player/mainmenu.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -118,6 +118,21 @@
   GtkWidget * menu;
   };
 
+struct seek_menu_s
+  {
+  GtkWidget * seek_00;
+  GtkWidget * seek_10;
+  GtkWidget * seek_20;
+  GtkWidget * seek_30;
+  GtkWidget * seek_40;
+  GtkWidget * seek_50;
+  GtkWidget * seek_60;
+  GtkWidget * seek_70;
+  GtkWidget * seek_80;
+  GtkWidget * seek_90;
+  GtkWidget * menu;
+  };
+
 struct command_menu_s
   {
   GtkWidget * inc_volume;
@@ -134,12 +149,13 @@
   GtkWidget * previous_chapter;
   GtkWidget * current_to_favourites;
   GtkWidget * goto_current;
-
   
-  GtkWidget * seek_start;
+  GtkWidget * seek_item;
   GtkWidget * pause;
   
   GtkWidget * quit;
+
+  struct seek_menu_s       seek_menu;
   
   GtkWidget * menu;
   };
@@ -488,8 +504,6 @@
     player_window_push_accel(g->player_window, ACCEL_SEEK_BACKWARD);
   else if(w == the_menu->command_menu.seek_forward)
     player_window_push_accel(g->player_window, ACCEL_SEEK_FORWARD);
-  else if(w == the_menu->command_menu.seek_start)
-    player_window_push_accel(g->player_window, ACCEL_SEEK_START);
   else if(w == the_menu->command_menu.pause)
     player_window_push_accel(g->player_window, ACCEL_PAUSE);
   else if(w == the_menu->command_menu.mute)
@@ -506,7 +520,27 @@
     player_window_push_accel(g->player_window, ACCEL_CURRENT_TO_FAVOURITES);
   else if(w == the_menu->command_menu.quit)
     player_window_push_accel(g->player_window, ACCEL_QUIT);
-  
+
+  else if(w == the_menu->command_menu.seek_menu.seek_00)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_START);
+  else if(w == the_menu->command_menu.seek_menu.seek_10)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_10);
+  else if(w == the_menu->command_menu.seek_menu.seek_20)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_20);
+  else if(w == the_menu->command_menu.seek_menu.seek_30)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_30);
+  else if(w == the_menu->command_menu.seek_menu.seek_40)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_40);
+  else if(w == the_menu->command_menu.seek_menu.seek_50)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_50);
+  else if(w == the_menu->command_menu.seek_menu.seek_60)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_60);
+  else if(w == the_menu->command_menu.seek_menu.seek_70)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_70);
+  else if(w == the_menu->command_menu.seek_menu.seek_80)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_80);
+  else if(w == the_menu->command_menu.seek_menu.seek_90)
+    player_window_push_accel(g->player_window, ACCEL_SEEK_90);
   
   /* Stream selection */
   else if(stream_menu_has_widget(&the_menu->audio_stream_menu, w, &i))
@@ -1124,14 +1158,7 @@
   gtk_widget_add_accelerator(ret->command_menu.current_to_favourites,
                              "activate", ret->g->accel_group,
                              GDK_F9, 0, GTK_ACCEL_VISIBLE);
-
-
   
-  ret->command_menu.seek_start =
-    create_item(TR("Seek to start"), gmerlin, ret->command_menu.menu);
-  gtk_widget_add_accelerator(ret->command_menu.seek_start, "activate", ret->g->player_window->accel_group,
-                             GDK_0, 0, GTK_ACCEL_VISIBLE);
-
   ret->command_menu.pause =
     create_item(TR("Pause"), gmerlin, ret->command_menu.menu);
   gtk_widget_add_accelerator(ret->command_menu.pause, "activate", ret->g->player_window->accel_group,
@@ -1142,6 +1169,70 @@
   gtk_widget_add_accelerator(ret->command_menu.quit, "activate",
                              ret->g->accel_group,
                              GDK_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+  /* Command -> Seek */
+
+  ret->command_menu.seek_menu.menu = create_menu();
+
+  
+  
+  ret->command_menu.seek_menu.seek_00 =
+    create_item(TR("Seek to start"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_00,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_0, 0, GTK_ACCEL_VISIBLE);
+
+  ret->command_menu.seek_menu.seek_10 =
+    create_item(TR("Seek to 10%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_10,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_1, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_20 =
+    create_item(TR("Seek to 20%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_20,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_2, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_30 =
+    create_item(TR("Seek to 30%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_30,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_3, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_40 =
+    create_item(TR("Seek to 40%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_40,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_4, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_50 =
+    create_item(TR("Seek to 50%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_50,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_5, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_60 =
+    create_item(TR("Seek to 60%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_60,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_6, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_70 =
+    create_item(TR("Seek to 70%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_70,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_7, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_80 =
+    create_item(TR("Seek to 80%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_80,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_8, 0, GTK_ACCEL_VISIBLE);
+  ret->command_menu.seek_menu.seek_90 =
+    create_item(TR("Seek to 90%"), gmerlin, ret->command_menu.seek_menu.menu);
+  gtk_widget_add_accelerator(ret->command_menu.seek_menu.seek_90,
+                             "activate", ret->g->player_window->accel_group,
+                             GDK_9, 0, GTK_ACCEL_VISIBLE);
+
+  ret->command_menu.seek_item =
+    create_submenu_item(TR("Seek..."),
+                        ret->command_menu.seek_menu.menu,
+                        ret->command_menu.menu);
+
   
   /* Accessories */

gmerlin-1.2.0.tar.gz/apps/player/player_remote.h -> gmerlin-4256.tar.gz/apps/player/player_remote.h Changed

gmerlin-1.2.0.tar.gz/apps/player/playerwindow.c -> gmerlin-4256.tar.gz/apps/player/playerwindow.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -25,6 +25,9 @@
 
 #include <config.h>
 
+#include <gavl/metatags.h>
+
+
 #include "gmerlin.h"
 #include <gmerlin/utils.h>
 #include <gmerlin/xmlutils.h>
@@ -375,6 +378,11 @@
   char * arg_str_1;
   gavl_time_t time;
 
+  /* First broadcast the message via remote. Later the arguments will be
+     destroyed */
+  
+  bg_remote_server_put_msg(win->gmerlin->remote, msg);
+
   id = bg_msg_get_id(msg);
   
   switch(id)
@@ -448,14 +456,6 @@
           break;
         }
       break;
-    case BG_PLAYER_MSG_TRACK_NAME:
-      arg_str_1 = bg_msg_get_arg_string(msg, 0);
-      display_set_track_name(win->display, arg_str_1);
-      win->gmerlin->remote_data.name =
-        bg_strdup(win->gmerlin->remote_data.name,
-                  arg_str_1);
-      free(arg_str_1);
-      break;
     case BG_PLAYER_MSG_TRACK_NUM_STREAMS:
       arg_i_1 = bg_msg_get_arg_int(msg, 0);
       arg_i_2 = bg_msg_get_arg_int(msg, 1);
@@ -496,6 +496,42 @@
         case ACCEL_SEEK_START:
           bg_player_seek(win->gmerlin->player,0, GAVL_TIME_SCALE );
           break;
+        case ACCEL_SEEK_10:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, win->duration / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_20:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (2 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_30:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (3 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_40:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (4 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_50:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (5 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_60:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (6 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_70:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (7 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_80:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (8 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
+        case ACCEL_SEEK_90:
+          if(win->duration != GAVL_TIME_UNDEFINED)
+            bg_player_seek(win->gmerlin->player, (9 * win->duration) / 10, GAVL_TIME_SCALE );
+          break;
         case ACCEL_PAUSE:
           bg_player_pause(win->gmerlin->player);
           break;
@@ -551,6 +587,9 @@
       gavl_metadata_free(&win->gmerlin->remote_data.metadata);
       bg_msg_get_arg_metadata(msg, 0,
                               &win->gmerlin->remote_data.metadata);
+      display_set_track_name(win->display,
+                             gavl_metadata_get(&win->gmerlin->remote_data.metadata,
+                                               GAVL_META_LABEL));
       break;
     case BG_PLAYER_MSG_AUDIO_STREAM:
       arg_i_1 = bg_msg_get_arg_int(msg, 0);
@@ -629,10 +668,8 @@
   /* Handle remote control */
 
   while((msg = bg_remote_server_get_msg(w->gmerlin->remote)))
-    {
     gmerlin_handle_remote(w->gmerlin, msg);
-
-    }
+  
   return TRUE;
   }
 
@@ -891,13 +928,13 @@
     else if(!BG_XML_STRCMP(child->name, "BACKGROUND"))
       {
       tmp_string = (char*)xmlNodeListGetString(doc, child->children, 1);
-      s->background = bg_strdup(s->background, tmp_string);
+      s->background = gavl_strrep(s->background, tmp_string);
       xmlFree(tmp_string);
       }
     else if(!BG_XML_STRCMP(child->name, "BACKGROUND_HIGHLIGHT"))
       {
       tmp_string = (char*)xmlNodeListGetString(doc, child->children, 1);
-      s->background_highlight = bg_strdup(s->background_highlight, tmp_string);
+      s->background_highlight = gavl_strrep(s->background_highlight, tmp_string);
       xmlFree(tmp_string);
       }

gmerlin-1.2.0.tar.gz/apps/player/playerwindow.h -> gmerlin-4256.tar.gz/apps/player/playerwindow.h Changed

gmerlin-1.2.0.tar.gz/apps/player/remote.c -> gmerlin-4256.tar.gz/apps/player/remote.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -115,13 +115,7 @@
       bg_player_prev_chapter(g->player);
       break;
 
-    case PLAYER_COMMAND_GET_NAME:
-      msg = bg_remote_server_get_msg_write(g->remote);
-      bg_msg_set_id(msg, PLAYER_RESPONSE_GET_NAME);
-      /* Set name */
-      bg_msg_set_arg_string(msg, 0, g->remote_data.name);
-      bg_remote_server_done_msg_write(g->remote);
-      break;
+/* Metadata */
     case PLAYER_COMMAND_GET_METADATA:
       msg = bg_remote_server_get_msg_write(g->remote);
       bg_msg_set_id(msg, PLAYER_RESPONSE_GET_METADATA);
@@ -130,6 +124,7 @@
                               &g->remote_data.metadata);
       bg_remote_server_done_msg_write(g->remote);
       break;
+/* Time */
     case PLAYER_COMMAND_GET_TIME:
       msg = bg_remote_server_get_msg_write(g->remote);
       bg_msg_set_id(msg, PLAYER_RESPONSE_GET_TIME);
@@ -138,5 +133,9 @@
       bg_msg_set_arg_time(msg, 1, g->remote_data.duration);
       bg_remote_server_done_msg_write(g->remote);
       break;
+    case PLAYER_COMMAND_STREAM_MSG:
+      fprintf(stderr, "Got message request via remote\n");
+      bg_remote_server_request_msg(g->remote);
+      break;
     }
   }

gmerlin-1.2.0.tar.gz/apps/player/skin.c -> gmerlin-4256.tar.gz/apps/player/skin.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,7 +34,6 @@
 char * gmerlin_skin_load(gmerlin_skin_t * s, char * directory)
   {
   xmlNodePtr node;
-  xmlNodePtr child;
   
   char * filename = NULL;
   xmlDocPtr doc = NULL;
@@ -46,7 +45,7 @@
     {
     free(filename);
 
-    directory = bg_strdup(directory, default_skin_directory);
+    directory = gavl_strrep(directory, default_skin_directory);
         
     filename = bg_sprintf("%s/skin.xml", directory);
     doc = xmlParseFile(filename);
@@ -57,7 +56,7 @@
     goto fail;
     }
     
-  s->directory = bg_strdup(s->directory, directory);
+  s->directory = gavl_strrep(s->directory, directory);
   
   node = doc->children;
   
@@ -74,8 +73,6 @@
       node = node->next;
       continue;
       }
-    child = node->children;
-
     /* Main window */
         
     if(!BG_XML_STRCMP(node->name, "PLAYERWIN"))

gmerlin-1.2.0.tar.gz/apps/player/skinbrowser.c -> gmerlin-4256.tar.gz/apps/player/skinbrowser.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -92,14 +92,14 @@
 
     /* Now, create the skin info */
     new_info = calloc(1, sizeof(*new_info));
-    new_info->directory = bg_strdup(new_info->directory, dir_filename);
+    new_info->directory = gavl_strrep(new_info->directory, dir_filename);
 
     start = strrchr(new_info->directory, '/');
     if(!start)
       continue;
     start++;
 
-    new_info->name = bg_strdup(new_info->name, start);
+    new_info->name = gavl_strrep(new_info->name, start);
     if(!ret)
       {
       ret = new_info;
@@ -260,7 +260,7 @@
   if(!strcmp(skin->directory, b->g->skin_dir))
     return;
 
-  b->g->skin_dir = bg_strdup(b->g->skin_dir, skin->directory);
+  b->g->skin_dir = gavl_strrep(b->g->skin_dir, skin->directory);
   gmerlin_skin_load(&b->g->skin, b->g->skin_dir);
   gmerlin_skin_set(b->g);

gmerlin-1.2.0.tar.gz/apps/plugincfg/Makefile.am -> gmerlin-4256.tar.gz/apps/plugincfg/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/plugincfg/gmerlin_plugincfg.c -> gmerlin-4256.tar.gz/apps/plugincfg/gmerlin_plugincfg.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -41,10 +41,15 @@
   bg_gtk_plugin_widget_single_t * audio_recorder_plugins;
   bg_gtk_plugin_widget_single_t * video_recorder_plugins;
 
+  bg_gtk_plugin_widget_multi_t  * decompressor_plugins;
+
+  bg_gtk_plugin_widget_single_t * audio_compressor_plugins;
+  bg_gtk_plugin_widget_single_t * video_compressor_plugins;
+  
   bg_gtk_plugin_widget_single_t * audio_encoder_plugins;
   bg_gtk_plugin_widget_single_t * video_encoder_plugins;
-  bg_gtk_plugin_widget_single_t * subtitle_text_encoder_plugins;
-  bg_gtk_plugin_widget_single_t * subtitle_overlay_encoder_plugins;
+  bg_gtk_plugin_widget_single_t * text_encoder_plugins;
+  bg_gtk_plugin_widget_single_t * overlay_encoder_plugins;
 
   bg_gtk_plugin_widget_multi_t  * audio_filters;
   bg_gtk_plugin_widget_multi_t  * video_filters;
@@ -56,8 +61,8 @@
   bg_gtk_plugin_widget_single_t  * image_writers;
 
   GtkWidget * audio_to_video;
-  GtkWidget * subtitle_text_to_video;
-  GtkWidget * subtitle_overlay_to_video;
+  GtkWidget * text_to_video;
+  GtkWidget * overlay_to_video;
   GtkWidget * use_pp;
     
   GtkWidget * window;
@@ -80,34 +85,34 @@
   bg_plugin_registry_set_encode_audio_to_video(win->plugin_reg, audio_to_video);
   }
 
-static void encode_subtitle_text_to_video_callback(GtkWidget * w, gpointer data)
+static void encode_text_to_video_callback(GtkWidget * w, gpointer data)
   {
   app_window * win;
-  int subtitle_text_to_video;
+  int text_to_video;
   
   win = (app_window*)data;
 
-  subtitle_text_to_video = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
+  text_to_video = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
 
-  bg_gtk_plugin_widget_single_set_sensitive(win->subtitle_text_encoder_plugins,
-                                            !subtitle_text_to_video);
+  bg_gtk_plugin_widget_single_set_sensitive(win->text_encoder_plugins,
+                                            !text_to_video);
   
-  bg_plugin_registry_set_encode_subtitle_text_to_video(win->plugin_reg, subtitle_text_to_video);
+  bg_plugin_registry_set_encode_text_to_video(win->plugin_reg, text_to_video);
   }
 
-static void encode_subtitle_overlay_to_video_callback(GtkWidget * w, gpointer data)
+static void encode_overlay_to_video_callback(GtkWidget * w, gpointer data)
   {
   app_window * win;
-  int subtitle_overlay_to_video;
+  int overlay_to_video;
   
   win = (app_window*)data;
 
-  subtitle_overlay_to_video = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
+  overlay_to_video = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
 
-  bg_gtk_plugin_widget_single_set_sensitive(win->subtitle_overlay_encoder_plugins,
-                                            !subtitle_overlay_to_video);
+  bg_gtk_plugin_widget_single_set_sensitive(win->overlay_encoder_plugins,
+                                            !overlay_to_video);
   
-  bg_plugin_registry_set_encode_subtitle_overlay_to_video(win->plugin_reg, subtitle_overlay_to_video);
+  bg_plugin_registry_set_encode_overlay_to_video(win->plugin_reg, overlay_to_video);
   }
 
 
@@ -156,30 +161,30 @@
                                               !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->audio_to_video)));
     }
 
-  if(!info->max_subtitle_text_streams)
+  if(!info->max_text_streams)
     {
-    gtk_widget_set_sensitive(win->subtitle_text_to_video, 0);
+    gtk_widget_set_sensitive(win->text_to_video, 0);
     
-    bg_gtk_plugin_widget_single_set_sensitive(win->subtitle_text_encoder_plugins, 1);
+    bg_gtk_plugin_widget_single_set_sensitive(win->text_encoder_plugins, 1);
     }
   else
     {
-    gtk_widget_set_sensitive(win->subtitle_text_to_video, 1);
-    bg_gtk_plugin_widget_single_set_sensitive(win->subtitle_text_encoder_plugins,
-                                              !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->subtitle_text_to_video)));
+    gtk_widget_set_sensitive(win->text_to_video, 1);
+    bg_gtk_plugin_widget_single_set_sensitive(win->text_encoder_plugins,
+                                              !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->text_to_video)));
     }
 
-  if(!info->max_subtitle_overlay_streams)
+  if(!info->max_overlay_streams)
     {
-    gtk_widget_set_sensitive(win->subtitle_overlay_to_video, 0);
+    gtk_widget_set_sensitive(win->overlay_to_video, 0);
     
-    bg_gtk_plugin_widget_single_set_sensitive(win->subtitle_overlay_encoder_plugins, 1);
+    bg_gtk_plugin_widget_single_set_sensitive(win->overlay_encoder_plugins, 1);
     }
   else
     {
-    gtk_widget_set_sensitive(win->subtitle_overlay_to_video, 1);
-    bg_gtk_plugin_widget_single_set_sensitive(win->subtitle_overlay_encoder_plugins,
-                                              !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->subtitle_overlay_to_video)));
+    gtk_widget_set_sensitive(win->overlay_to_video, 1);
+    bg_gtk_plugin_widget_single_set_sensitive(win->overlay_encoder_plugins,
+                                              !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->overlay_to_video)));
     }
 
   }
@@ -190,16 +195,16 @@
   bg_plugin_registry_set_default(win->plugin_reg, BG_PLUGIN_ENCODER_AUDIO, BG_PLUGIN_FILE, info->name);
   }
 
-static void set_subtitle_text_encoder(const bg_plugin_info_t * info, void * data)
+static void set_text_encoder(const bg_plugin_info_t * info, void * data)
   {
   app_window * win = (app_window *)data;
-  bg_plugin_registry_set_default(win->plugin_reg, BG_PLUGIN_ENCODER_SUBTITLE_TEXT, BG_PLUGIN_FILE, info->name);
+  bg_plugin_registry_set_default(win->plugin_reg, BG_PLUGIN_ENCODER_TEXT, BG_PLUGIN_FILE, info->name);
   }
 
-static void set_subtitle_overlay_encoder(const bg_plugin_info_t * info, void * data)
+static void set_overlay_encoder(const bg_plugin_info_t * info, void * data)
   {
   app_window * win = (app_window *)data;
-  bg_plugin_registry_set_default(win->plugin_reg, BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY, BG_PLUGIN_FILE, info->name);
+  bg_plugin_registry_set_default(win->plugin_reg, BG_PLUGIN_ENCODER_OVERLAY, BG_PLUGIN_FILE, info->name);
   }
 
 static void set_audio_recorder(const bg_plugin_info_t * info, void * data)
@@ -253,7 +258,7 @@
   
   ret->window = bg_gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_position(GTK_WINDOW(ret->window), GTK_WIN_POS_CENTER);
-  
+    
   g_signal_connect(G_OBJECT(ret->window), "delete_event",
                    G_CALLBACK(delete_callback), (gpointer)ret);
 
@@ -261,6 +266,9 @@
                        TR("Gmerlin Plugin Configurator"));
   
   notebook = gtk_notebook_new();
+
+  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_LEFT);
+
   
   ret->input_plugins =
     bg_gtk_plugin_widget_multi_create(reg,
@@ -289,6 +297,16 @@
                                        BG_PLUGIN_PLAYBACK);
   bg_gtk_plugin_widget_single_set_change_callback(ret->video_output_plugins, set_video_output, ret);
 
+  ret->audio_compressor_plugins =
+    bg_gtk_plugin_widget_single_create(TR("Audio"), reg,
+                                       BG_PLUGIN_CODEC,
+                                       BG_PLUGIN_AUDIO_COMPRESSOR);
+  
+  ret->video_compressor_plugins =
+    bg_gtk_plugin_widget_single_create("Video", reg,
+                                       BG_PLUGIN_CODEC,
+                                       BG_PLUGIN_VIDEO_COMPRESSOR);
+  
   
   ret->audio_recorder_plugins =
     bg_gtk_plugin_widget_single_create("Audio", reg,
@@ -322,41 +340,41 @@
 
   /* Text subtitle encoders */
   
-  ret->subtitle_text_encoder_plugins =
+  ret->text_encoder_plugins =
     bg_gtk_plugin_widget_single_create("Text subtitles", reg,
-                                       BG_PLUGIN_ENCODER_SUBTITLE_TEXT,
+                                       BG_PLUGIN_ENCODER_TEXT,
                                        BG_PLUGIN_FILE);
-  bg_gtk_plugin_widget_single_set_change_callback(ret->subtitle_text_encoder_plugins, set_subtitle_text_encoder, ret);
+  bg_gtk_plugin_widget_single_set_change_callback(ret->text_encoder_plugins, set_text_encoder, ret);
 
-  ret->subtitle_text_to_video = gtk_check_button_new_with_label(TR("Encode text subtitles into video file"));
+  ret->text_to_video = gtk_check_button_new_with_label(TR("Encode text subtitles into video file"));
   
-  g_signal_connect(G_OBJECT(ret->subtitle_text_to_video), "toggled",
-                   G_CALLBACK(encode_subtitle_text_to_video_callback), ret);
+  g_signal_connect(G_OBJECT(ret->text_to_video), "toggled",
+                   G_CALLBACK(encode_text_to_video_callback), ret);
   
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ret->subtitle_text_to_video),
-                              bg_plugin_registry_get_encode_subtitle_text_to_video(reg));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ret->text_to_video),
+                              bg_plugin_registry_get_encode_text_to_video(reg));
   
-  gtk_widget_show(ret->subtitle_text_to_video);
+  gtk_widget_show(ret->text_to_video);
   
   /* Overlay subtitle encoders */
   
-  ret->subtitle_overlay_encoder_plugins =
+  ret->overlay_encoder_plugins =
     bg_gtk_plugin_widget_single_create("Overlay subtitles", reg,
-                                       BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY,
+                                       BG_PLUGIN_ENCODER_OVERLAY,
                                        BG_PLUGIN_FILE);
-  bg_gtk_plugin_widget_single_set_change_callback(ret->subtitle_overlay_encoder_plugins, set_subtitle_overlay_encoder,
+  bg_gtk_plugin_widget_single_set_change_callback(ret->overlay_encoder_plugins, set_overlay_encoder,
                                                   ret);
 
-  ret->subtitle_overlay_to_video =
+  ret->overlay_to_video =
     gtk_check_button_new_with_label(TR("Encode overlay subtitles into video file"));
   
-  g_signal_connect(G_OBJECT(ret->subtitle_overlay_to_video), "toggled",
-                   G_CALLBACK(encode_subtitle_overlay_to_video_callback), ret);
+  g_signal_connect(G_OBJECT(ret->overlay_to_video), "toggled",
+                   G_CALLBACK(encode_overlay_to_video_callback), ret);
   
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ret->subtitle_overlay_to_video),
-                              bg_plugin_registry_get_encode_subtitle_overlay_to_video(reg));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ret->overlay_to_video),
+                              bg_plugin_registry_get_encode_overlay_to_video(reg));
   
-  gtk_widget_show(ret->subtitle_overlay_to_video);
+  gtk_widget_show(ret->overlay_to_video);
   
   /* Video encoders */
     
@@ -431,6 +449,45 @@
                            bg_gtk_plugin_widget_multi_get_widget(ret->visualizations),
                            label);
 
+  /* Compressors */
+  
+  table = gtk_table_new(1, 1, 0);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+  gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+  row = 0;
+  num_columns = 0;
+
+  bg_gtk_plugin_widget_single_attach(ret->audio_compressor_plugins,
+                                     table,
+                                     &row, &num_columns);
+  bg_gtk_plugin_widget_single_attach(ret->video_compressor_plugins,
+                                     table,
+                                     &row, &num_columns);
+
+  gtk_widget_show(table);
+  
+  label = gtk_label_new(TR("Compressors"));
+  gtk_widget_show(label);
+  
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                           table, label);
+  
+  /* Decompressors */
+
+  ret->decompressor_plugins =
+    bg_gtk_plugin_widget_multi_create(reg,
+                                      BG_PLUGIN_CODEC,
+                                      BG_PLUGIN_AUDIO_DECOMPRESSOR|
+                                      BG_PLUGIN_VIDEO_DECOMPRESSOR);
+  
+  label = gtk_label_new(TR("Decompressors"));
+  gtk_widget_show(label);
+  
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                           bg_gtk_plugin_widget_multi_get_widget(ret->decompressor_plugins),
+                           label);
+
   
   /* Pack */
   
@@ -483,12 +540,12 @@
   gtk_table_resize(GTK_TABLE(table), row+1, num_columns);
   
   gtk_table_attach(GTK_TABLE(table),
-                   ret->subtitle_text_to_video,
+                   ret->text_to_video,
                    0, num_columns, row, row+1,
                    GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
   row += 1;
 
-  bg_gtk_plugin_widget_single_attach(ret->subtitle_text_encoder_plugins,
+  bg_gtk_plugin_widget_single_attach(ret->text_encoder_plugins,
                                      table,
                                      &row, &num_columns);
   
@@ -497,12 +554,12 @@
   gtk_table_resize(GTK_TABLE(table), row+1, num_columns);
   
   gtk_table_attach(GTK_TABLE(table),
-                   ret->subtitle_overlay_to_video,
+                   ret->overlay_to_video,
                    0, num_columns, row, row+1,
                    GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
   row += 1;
 
-  bg_gtk_plugin_widget_single_attach(ret->subtitle_overlay_encoder_plugins,
+  bg_gtk_plugin_widget_single_attach(ret->overlay_encoder_plugins,
                                      table,
                                      &row, &num_columns);
   
@@ -632,8 +689,8 @@
   bg_gtk_plugin_widget_single_destroy(win->audio_encoder_plugins);
   bg_gtk_plugin_widget_single_destroy(win->video_encoder_plugins);
 
-  bg_gtk_plugin_widget_single_destroy(win->subtitle_text_encoder_plugins);
-  bg_gtk_plugin_widget_single_destroy(win->subtitle_overlay_encoder_plugins);
+  bg_gtk_plugin_widget_single_destroy(win->text_encoder_plugins);
+  bg_gtk_plugin_widget_single_destroy(win->overlay_encoder_plugins);
   bg_gtk_plugin_widget_single_destroy(win->encoder_pp_plugins);

gmerlin-4256.tar.gz/apps/plugincfg/out.txt Added

@@ -0,0 +1,118 @@
+==26259== Memcheck, a.k.a. Valgrind, a memory error detector for x86-linux.
+==26259== Copyright (C) 2002, and GNU GPL'd, by Julian Seward.
+==26259== Using valgrind-1.9.3, a program instrumentation system for x86-linux.
+==26259== Copyright (C) 2000-2002, and GNU GPL'd, by Julian Seward.
+==26259== Estimated CPU clock rate is 910 MHz
+==26259== For more details, rerun with: -v
+==26259== 
+bg_plugin_ref 0x42d0b9f0 oa_oss 1
+bg_plugin_ref 0x42d42770 ov_x11 1
+bg_plugin_ref 0x42d68d38 i_oss 1
+
+(lt-gmerlin_plugincfg:26259): Gtk-CRITICAL **: file gtkcombo.c: line 1116 (gtk_combo_set_popdown_strings): assertion `strings != NULL' failed
+Reading codec file ...done, found 9 audio codecs, 28 video codecs
+Scanning /home/pix/lib/libquicktime for plugins
+Found lqt_audiocodec.so...Already in database, registering all codecs
+Registering audio codec ima4
+Registering audio codec rawaudio
+Registering audio codec twos
+Registering audio codec ulaw
+Found lqt_videocodec.so...Already in database, registering all codecs
+Registering video codec raw
+Registering video codec v308
+Registering video codec v408
+Registering video codec v410
+Registering video codec yuv2
+Registering video codec yuv4
+Registering video codec yv12
+Found lqt_opendivx.so...Already in database, registering all codecs
+Registering video codec opendivx
+Found lqt_ferguson.so...Already in database, registering all codecs
+Registering video codec cinepak
+Found lqt_mjpeg.so...Already in database, registering all codecs
+Registering video codec jpeg
+Registering video codec mjpa
+Found lqt_png.so...Already in database, registering all codecs
+Registering video codec png
+Found lqt_vorbis.so...Already in database, registering all codecs
+Registering audio codec vorbis
+Found lqt_xanim.so...Already in database, registering all codecs
+Registering video codec xa_rle
+Registering video codec xa_raw
+Registering video codec xa_rpza
+Registering video codec xa_smc
+Found lqt_rtjpeg.so...Already in database, registering all codecs
+Registering video codec rtjpeg
+Found lqt_svq.so...Already in database, registering all codecs
+Registering video codec svq1
+Found lqt_ffmpeg.so...Already in database, registering all codecs
+Registering audio codec ffmpeg_ac3
+Registering audio codec ffmpeg_mp2
+Registering audio codec ffmpeg_mp3
+Registering video codec ffmpeg_mpg1
+Registering video codec ffmpeg_h263
+Registering video codec ffmpeg_h263p
+Registering video codec ffmpeg_mjpg
+Registering video codec ffmpeg_mpg4
+Registering video codec ffmpeg_msmpeg4v1
+Registering video codec ffmpeg_msmpeg4v2
+Registering video codec ffmpeg_msmpeg4v3
+Registering video codec ffmpeg_i263
+Found lqt_dv.so...Already in database, registering all codecs
+Registering video codec dv
+Found lqt_lame.so...Already in database, registering all codecs
+Registering audio codec lame
+Sorting codecs, sort string: ima4,rawaudio,twos,ulaw,vorbis,ffmpeg_ac3,ffmpeg_mp2,ffmpeg_mp3,lame
+Sorting codecs, sort string: raw,v308,v408,v410,yuv2,yuv4,yv12,opendivx,cinepak,jpeg,mjpa,png,xa_rle,xa_raw,xa_rpza,xa_smc,rtjpeg,svq1,ffmpeg_mpg1,ffmpeg_h263,ffmpeg_h263p,ffmpeg_mjpg,ffmpeg_mpg4,ffmpeg_msmpeg4v1,ffmpeg_msmpeg4v2,ffmpeg_msmpeg4v3,ffmpeg_i263,dv
+Writing codec file /home/pix/.libquicktime_codecs...done
+bg_plugin_ref 0x42239e7c e_lqt 1
+bg_plugin_ref 0x422bd8cc i_mpeg 1
+bg_plugin_unref 0x422bd8cc i_mpeg 0
+==26259== discard syms in /home/pix/lib/gmerlin/plugins/i_mpeg.so due to munmap()
+==26259== discard syms in /home/pix/lib/gmerlin/libgmerlin_mpeg.so.0.0.0 due to munmap()
+==26259== discard syms in /opt/gnome/lib/libesd.so.0.2.29 due to munmap()
+==26259== discard syms in /opt/gnome/lib/libaudiofile.so.0.0.2 due to munmap()
+bg_plugin_ref 0x422f3354 i_lqt 1
+==26259== Invalid read of size 1
+==26259==    at 0x4015DD7A: strcmp (vg_clientfuncs.c:470)
+==26259==    by 0x4020930F: get_value (cfg_decoder.c:158)
+==26259==    by 0x4020B9EE: create_section (cfg_dialog.c:192)
+==26259==    by 0x4020BBBC: bg_dialog_create (cfg_dialog.c:323)
+==26259==    Address 0x42D81BA8 is 0 bytes inside a block of size 64 free'd
+==26259==    at 0x4015D79D: free (vg_clientfuncs.c:182)
+==26259==    by 0x4020926E: get_value (cfg_decoder.c:135)
+==26259==    by 0x4020B9EE: create_section (cfg_dialog.c:192)
+==26259==    by 0x4020BBBC: bg_dialog_create (cfg_dialog.c:323)
+==26259== 
+==26259== Invalid read of size 1
+==26259==    at 0x4015DD7A: strcmp (vg_clientfuncs.c:470)
+==26259==    by 0x40209475: get_value (cfg_decoder.c:194)
+==26259==    by 0x4020B9EE: create_section (cfg_dialog.c:192)
+==26259==    by 0x4020BBBC: bg_dialog_create (cfg_dialog.c:323)
+==26259==    Address 0x42D81BA8 is 0 bytes inside a block of size 64 free'd
+==26259==    at 0x4015D79D: free (vg_clientfuncs.c:182)
+==26259==    by 0x4020926E: get_value (cfg_decoder.c:135)
+==26259==    by 0x4020B9EE: create_section (cfg_dialog.c:192)
+==26259==    by 0x4020BBBC: bg_dialog_create (cfg_dialog.c:323)
+==26259== 
+==26259== Invalid free() / delete / delete[]
+==26259==    at 0x4015D79D: free (vg_clientfuncs.c:182)
+==26259==    by 0x402091B1: bg_strbreak_free (cfg_decoder.c:113)
+==26259==    by 0x40209571: get_value (cfg_decoder.c:220)
+==26259==    by 0x4020B9EE: create_section (cfg_dialog.c:192)
+==26259==    Address 0x42D81BA8 is 0 bytes inside a block of size 64 free'd
+==26259==    at 0x4015D79D: free (vg_clientfuncs.c:182)
+==26259==    by 0x4020926E: get_value (cfg_decoder.c:135)
+==26259==    by 0x4020B9EE: create_section (cfg_dialog.c:192)
+==26259==    by 0x4020BBBC: bg_dialog_create (cfg_dialog.c:323)
+==26259== 
+==26259== Syscall param writev(vector[...]) contains uninitialised or unaddressable byte(s)
+==26259==    at 0x406DC41D: my_do_syscall3 (vg_libpthread.c:2389)
+==26259==    by 0x406DB6A0: vgIntercept_writev (vg_libpthread.c:94)
+==26259==    by 0x4016F368: __writev (vg_intercept.c:287)
+==26259==    by 0x407F188F: (within /usr/X11R6/lib/libX11.so.6.2)
+==26259==    Address 0x422798C1 is 137 bytes inside a block of size 2048 alloc'd
+==26259==    at 0x4015D978: calloc (vg_clientfuncs.c:242)
+==26259==    by 0x407C452B: XOpenDisplay (in /usr/X11R6/lib/libX11.so.6.2)
+==26259==    by 0x404572A4: gdk_display_open (gdkdisplay-x11.c:122)
+==26259==    by 0x4043CABF: gdk_display_open_default_libgtk_only (gdk.c:402)

gmerlin-1.2.0.tar.gz/apps/recorder/Makefile.am -> gmerlin-4256.tar.gz/apps/recorder/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/recorder/gmerlin-recorder.desktop -> gmerlin-4256.tar.gz/apps/recorder/gmerlin-recorder.desktop Changed

gmerlin-1.2.0.tar.gz/apps/recorder/gmerlin_recorder.c -> gmerlin-4256.tar.gz/apps/recorder/gmerlin_recorder.c Changed

gmerlin-1.2.0.tar.gz/apps/recorder/recorder_window.c -> gmerlin-4256.tar.gz/apps/recorder/recorder_window.c Changed

gmerlin-1.2.0.tar.gz/apps/recorder/recorder_window.h -> gmerlin-4256.tar.gz/apps/recorder/recorder_window.h Changed

gmerlin-1.2.0.tar.gz/apps/thumbnailer/Makefile.am -> gmerlin-4256.tar.gz/apps/thumbnailer/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/thumbnailer/gmerlin-video-thumbnailer.c -> gmerlin-4256.tar.gz/apps/thumbnailer/gmerlin-video-thumbnailer.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -89,13 +89,14 @@
     .package =  PACKAGE,
     .version =  VERSION,
     .name =     "gmerlin-video-thumbnailer",
+    .long_name = "Video thumbnailer",
     .synopsis = TRS("[options] video_file thumbnail_file...\n"),
     .help_before = TRS("Video thumbnailer\n"),
     .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
                                        {  } },
     .files = (bg_cmdline_ext_doc_t[])
     { { "~/.gmerlin/plugins.xml",
-        TRS("Cache of the plugin registry (shared by all applicatons)") },
+        TRS("Cache of the plugin registry (shared by all applications)") },
       { "~/.gmerlin/generic/config.xml",
         TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
       { /* End */ }
@@ -106,7 +107,6 @@
 int main(int argc, char ** argv)
   {
   char ** files = NULL;
-  
   char * in_file = NULL;
   char * out_file = NULL;
   
@@ -120,6 +120,7 @@
   bg_plugin_registry_t * plugin_reg;
   bg_track_info_t * info;
   char * tmp_string;
+  gavl_time_t duration;
 
   const bg_plugin_info_t * plugin_info;
   
@@ -144,6 +145,8 @@
   int do_convert, have_frame;
   struct stat st;
   bg_parameter_value_t val;
+
+  gavl_video_source_t * src;
   
   memset(&metadata, 0, sizeof(metadata));
   
@@ -223,6 +226,10 @@
   if(input_plugin->start)
     input_plugin->start(input_handle->priv);
 
+  src = input_plugin->get_video_source(input_handle->priv, 0);
+  
+  duration = bg_track_info_get_duration(info);
+  
   /* Get video format */
   memcpy(&input_format, &info->video_streams[0].format,
          sizeof(input_format));
@@ -282,22 +289,19 @@
   val.val_i = 1;
   output_plugin->common.set_parameter(output_handle->priv, "dont_force_extension", &val);
   
-  /* Create input frame */
-
-  input_frame = gavl_video_frame_create(&input_format);
   
   /* Seek to the time */
 
   if(seek_time == GAVL_TIME_UNDEFINED)
     {
-    if(info->duration == GAVL_TIME_UNDEFINED)
+    if(duration == GAVL_TIME_UNDEFINED)
       {
       seek_time = 10 * GAVL_TIME_SCALE;
       }
     else
       {
       seek_time =
-        (gavl_time_t)((seek_percentage / 100.0) * (double)(info->duration)+0.5);
+        (gavl_time_t)((seek_percentage / 100.0) * (double)(duration)+0.5);
       }
     }
 
@@ -306,7 +310,12 @@
   if(info->flags & BG_TRACK_SEEKABLE)
     {
     input_plugin->seek(input_handle->priv, &seek_time, GAVL_TIME_SCALE);
-    have_frame = input_plugin->read_video(input_handle->priv, input_frame, 0);
+
+    input_frame = NULL;
+    if(gavl_video_source_read_frame(src, &input_frame) == GAVL_SOURCE_OK)
+      have_frame = 1;
+    else
+      have_frame = 0;
 
     if(!have_frame) // Seeking failed, reset the stream and try without seeking
       {
@@ -325,14 +334,23 @@
       /* Start playback */
       if(input_plugin->start)
         input_plugin->start(input_handle->priv);
+      src = input_plugin->get_video_source(input_handle->priv, 0);
       }
     }
 
   if(!have_frame)
     {
-    while(input_plugin->read_video(input_handle->priv, input_frame, 0))
+    while(1)
       {
-      have_frame = 1;
+      input_frame = NULL;
+      if(gavl_video_source_read_frame(src, &input_frame) == GAVL_SOURCE_OK)
+        have_frame = 1;
+      else
+        have_frame = 0;
+
+      if(!have_frame)
+        break;
+      
       if(gavl_time_unscale(input_format.timescale,
                            input_frame->timestamp) >= seek_time)
         break;
@@ -360,9 +378,9 @@
   gavl_metadata_set(&metadata, "Thumb::Size", tmp_string);
   free(tmp_string);
 
-  if(info->duration != GAVL_TIME_UNDEFINED)
+  if(duration != GAVL_TIME_UNDEFINED)
     {
-    tmp_string = bg_sprintf("%d", (int)(gavl_time_to_seconds(info->duration)));
+    tmp_string = bg_sprintf("%d", (int)(gavl_time_to_seconds(duration)));
     gavl_metadata_set(&metadata, "Thumb::Movie::Length", tmp_string);
     free(tmp_string);
     }
@@ -408,8 +426,6 @@
   bg_plugin_unref(input_handle);
   bg_plugin_unref(output_handle);
 
-  gavl_video_frame_destroy(input_frame);
-
   gavl_video_converter_destroy(cnv);
   gavl_metadata_free(&metadata);

gmerlin-1.2.0.tar.gz/apps/transcoder/Makefile.am -> gmerlin-4256.tar.gz/apps/transcoder/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/gmerlin-transcoder.desktop -> gmerlin-4256.tar.gz/apps/transcoder/gmerlin-transcoder.desktop Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/gmerlin_transcoder.1 -> gmerlin-4256.tar.gz/apps/transcoder/gmerlin_transcoder.1 Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/gmerlin_transcoder_remote.1 -> gmerlin-4256.tar.gz/apps/transcoder/gmerlin_transcoder_remote.1 Changed

@@ -1,6 +1,7 @@
-.TH GMERLIN_TRANSCODER_REMOTE 1 "March 2012" Gmerlin "User Manuals"
+.TH GMERLIN_TRANSCODER_REMOTE 1 "June 2012" Gmerlin "User Manuals"
 .SH NAME
-gmerlin_transcoder_remote
+gmerlin_transcoder_remote \- Remote control command for the Gmerlin GUI transcoder
+
 .SH SYNOPSIS
 .B gmerlin_transcoder_remote 
 .I [options]
@@ -11,21 +12,21 @@
 
 .SH GLOBAL OPTIONS
 
-.B -host
+.B \-host
 .I <hostname>
 
 .RS 2
 Host to connect to, default is localhost
 .RE
 
-.B -port
+.B \-port
 .I <port>
 
 .RS 2
 Port to connect to
 .RE
 
-.B -launch
+.B \-launch
 
 .RS 2
 Launch new transcoder if necessary
@@ -33,14 +34,14 @@
 
 .SH COMMANDS
 
-.B -addalbum
+.B \-addalbum
 .I <album_file>
 
 .RS 2
 Add album to track list
 .RE
 
-.B -add
+.B \-add
 .I <location>
 
 .RS 2
@@ -50,25 +51,25 @@
 .SH GENERIC OPTIONS
 The following generic options are available for all gmerlin applications
 
-.B -help
+.B \-help
 
 .RS 2
 Print this help message and exit
 .RE
 
-.B -help-man
+.B \-help\-man
 
 .RS 2
 Print this help message as a manual page and exit
 .RE
 
-.B -help-texi
+.B \-help\-texi
 
 .RS 2
 Print this help message in texinfo format and exit
 .RE
 
-.B -version
+.B \-version
 
 .RS 2
 Print version info and exit

gmerlin-1.2.0.tar.gz/apps/transcoder/gmerlin_transcoder_remote.c -> gmerlin-4256.tar.gz/apps/transcoder/gmerlin_transcoder_remote.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -120,7 +120,7 @@
     fprintf(out, "Option -host requires an argument\n");
     exit(-1);
     }
-  host = bg_strdup(host, (*argv)[arg]);
+  host = gavl_strrep(host, (*argv)[arg]);
   bg_cmdline_remove_arg(argc, argv, arg);
   }
 
@@ -169,6 +169,7 @@
     .package =  PACKAGE,
     .version =  VERSION,
     .name =     "gmerlin_transcoder_remote",
+    .long_name = TRS("Remote control command for the Gmerlin GUI transcoder\n"),
     .synopsis = TRS("[options] command\n"),
     .help_before = TRS("Remote control command for the Gmerlin GUI transcoder\n"),
     .args = (bg_cmdline_arg_array_t[]) { { TRS("Global options"), global_options },
@@ -200,10 +201,10 @@
   
   bg_cmdline_parse(global_options, &argc, &argv, NULL);
 
-  remote = bg_remote_client_create(TRANSCODER_REMOTE_ID, 0);
+  remote = bg_remote_client_create(TRANSCODER_REMOTE_ID);
 
   if(!host)
-    host = bg_strdup(host, "localhost");
+    host = gavl_strrep(host, "localhost");
 
   if(!bg_remote_client_init(remote, host, port, 1000))
     {

gmerlin-1.2.0.tar.gz/apps/transcoder/main.c -> gmerlin-4256.tar.gz/apps/transcoder/main.c Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/ppwidget.c -> gmerlin-4256.tar.gz/apps/transcoder/ppwidget.c Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/ppwidget.h -> gmerlin-4256.tar.gz/apps/transcoder/ppwidget.h Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/trackdialog.c -> gmerlin-4256.tar.gz/apps/transcoder/trackdialog.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -46,7 +46,7 @@
   void * update_priv;
   };
 
-static void set_parameter_general(void * priv, const char * name, const bg_parameter_value_t * val)
+static void set_parameter(void * priv, const char * name, const bg_parameter_value_t * val)
   {
   track_dialog_t * d;
   d = (track_dialog_t *)priv;
@@ -86,7 +86,7 @@
   bg_dialog_add(ret->cfg_dialog,
                 TR("General"),
                 t->general_section,
-                set_parameter_general, NULL, ret,
+                set_parameter, NULL, ret,
                 t->general_parameters);
 
   
@@ -95,9 +95,9 @@
   bg_dialog_add(ret->cfg_dialog,
                 TR("Metadata"),
                 t->metadata_section,
+                set_parameter,
                 NULL,
-                NULL,
-                NULL,
+                ret,
                 t->metadata_parameters);
 
   /* Audio encoder */
@@ -141,9 +141,9 @@
     }
   /* Subtitle text encoder */
 
-  if(t->subtitle_text_encoder_section && t->num_subtitle_text_streams)
+  if(t->text_encoder_section && t->num_text_streams)
     {
-    plugin_name = bg_transcoder_track_get_subtitle_text_encoder(t);
+    plugin_name = bg_transcoder_track_get_text_encoder(t);
 
     if(plugin_name)
       {
@@ -154,7 +154,7 @@
         label = TRD(plugin_info->long_name, plugin_info->gettext_domain);
         bg_dialog_add(ret->cfg_dialog,
                       label,
-                      t->subtitle_text_encoder_section,
+                      t->text_encoder_section,
                       NULL,
                       NULL,
                       NULL,
@@ -165,10 +165,10 @@
 
   /* Subtitle overlay encoder */
 
-  if(t->subtitle_overlay_encoder_section &&
-     (t->num_subtitle_text_streams || t->num_subtitle_overlay_streams))
+  if(t->overlay_encoder_section &&
+     (t->num_text_streams || t->num_overlay_streams))
     {
-    plugin_name = bg_transcoder_track_get_subtitle_overlay_encoder(t);
+    plugin_name = bg_transcoder_track_get_overlay_encoder(t);
 
     if(plugin_name)
       {
@@ -178,7 +178,7 @@
         label = TRD(plugin_info->long_name, plugin_info->gettext_domain);
         bg_dialog_add(ret->cfg_dialog,
                       label,
-                      t->subtitle_overlay_encoder_section,
+                      t->overlay_encoder_section,
                       NULL,
                       NULL,
                       NULL,
@@ -339,7 +339,7 @@
   
   /* Subtitle streams */
 
-  plugin_name = bg_transcoder_track_get_subtitle_text_encoder(t);
+  plugin_name = bg_transcoder_track_get_text_encoder(t);
   if(!plugin_name)
     plugin_name = bg_transcoder_track_get_video_encoder(t);
   
@@ -348,7 +348,7 @@
   else
     plugin_info = NULL;
 
-  plugin_name1 = bg_transcoder_track_get_subtitle_overlay_encoder(t);
+  plugin_name1 = bg_transcoder_track_get_overlay_encoder(t);
   if(!plugin_name1)
     plugin_name1 = bg_transcoder_track_get_video_encoder(t);
   
@@ -357,19 +357,19 @@
   else
     plugin_info1 = NULL;
   
-  for(i = 0; i < t->num_subtitle_text_streams; i++)
+  for(i = 0; i < t->num_text_streams; i++)
     {
-    if(t->num_subtitle_text_streams > 1)
+    if(t->num_text_streams > 1)
       {
-      if(t->subtitle_text_streams[i].label)
-        label = bg_sprintf(TR("Subtitles #%d: %s"), i+1, t->subtitle_text_streams[i].label);
+      if(t->text_streams[i].label)
+        label = bg_sprintf(TR("Subtitles #%d: %s"), i+1, t->text_streams[i].label);
       else
         label = bg_sprintf(TR("Subtitles #%d"), i+1);
       }
     else
       {
-      if(t->subtitle_text_streams[i].label)
-        label = bg_sprintf(TR("Subtitles: %s"), t->subtitle_text_streams[i].label);
+      if(t->text_streams[i].label)
+        label = bg_sprintf(TR("Subtitles: %s"), t->text_streams[i].label);
       else
         label = bg_sprintf(TR("Subtitles"));
       }
@@ -380,64 +380,64 @@
     
     bg_dialog_add_child(ret->cfg_dialog, parent,
                         TR("General"),
-                        t->subtitle_text_streams[i].general_section,
+                        t->text_streams[i].general_section,
                         NULL,
                         NULL,
                         NULL,
-                        t->subtitle_text_streams[i].general_parameters);
+                        t->text_streams[i].general_parameters);
 
     bg_dialog_add_child(ret->cfg_dialog, parent,
                         TR("Textrenderer"),
-                        t->subtitle_text_streams[i].textrenderer_section,
+                        t->text_streams[i].textrenderer_section,
                         NULL,
                         NULL,
                         NULL,
                         bg_text_renderer_get_parameters());
 
-    if(plugin_info->subtitle_text_parameters)
+    if(plugin_info->text_parameters)
       {
       label = TR("Encode options (text)");
       
       bg_dialog_add_child(ret->cfg_dialog, parent,
                           label,
-                          t->subtitle_text_streams[i].encoder_section_text,
+                          t->text_streams[i].encoder_section_text,
                           NULL,
                           NULL,
                           NULL,
-                          plugin_info->subtitle_text_parameters);
+                          plugin_info->text_parameters);
       }
 
-    if(plugin_info1->subtitle_overlay_parameters)
+    if(plugin_info1->overlay_parameters)
       {
       label = TR("Encode options (overlay)");
       
       bg_dialog_add_child(ret->cfg_dialog, parent,
                           label,
-                          t->subtitle_text_streams[i].encoder_section_overlay,
+                          t->text_streams[i].encoder_section_overlay,
                           NULL,
                           NULL,
                           NULL,
-                          plugin_info1->subtitle_overlay_parameters);
+                          plugin_info1->overlay_parameters);
       }
     
     }
 
   
   
-  for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < t->num_overlay_streams; i++)
     {
-    if(t->num_subtitle_overlay_streams > 1)
+    if(t->num_overlay_streams > 1)
       {
-      if(t->subtitle_overlay_streams[i].label)
-        label = bg_sprintf(TR("Subtitles #%d: %s"), i+1+t->num_subtitle_text_streams,
-                           t->subtitle_overlay_streams[i].label);
+      if(t->overlay_streams[i].label)
+        label = bg_sprintf(TR("Subtitles #%d: %s"), i+1+t->num_text_streams,
+                           t->overlay_streams[i].label);
       else
-        label = bg_sprintf(TR("Subtitles #%d"), i+1+t->num_subtitle_text_streams);
+        label = bg_sprintf(TR("Subtitles #%d"), i+1+t->num_text_streams);
       }
     else
       {
-      if(t->subtitle_overlay_streams[i].label)
-        label = bg_sprintf(TR("Subtitles: %s"), t->subtitle_overlay_streams[i].label);
+      if(t->overlay_streams[i].label)
+        label = bg_sprintf(TR("Subtitles: %s"), t->overlay_streams[i].label);
       else
         label = bg_sprintf(TR("Subtitles"));
       }
@@ -448,22 +448,22 @@
     
     bg_dialog_add_child(ret->cfg_dialog, parent,
                         TR("General"),
-                        t->subtitle_overlay_streams[i].general_section,
+                        t->overlay_streams[i].general_section,
                         NULL,
                         NULL,
                         NULL,
-                        t->subtitle_overlay_streams[i].general_parameters);
+                        t->overlay_streams[i].general_parameters);
 
-    if(plugin_info1->subtitle_overlay_parameters)
+    if(plugin_info1->overlay_parameters)
       {
       label = TR("Encode options");
       bg_dialog_add_child(ret->cfg_dialog, parent,
                           label,
-                          t->subtitle_overlay_streams[i].encoder_section,
+                          t->overlay_streams[i].encoder_section,
                           NULL,
                           NULL,
                           NULL,
-                          plugin_info1->subtitle_overlay_parameters);
+                          plugin_info1->overlay_parameters);
       }
     }
   return ret;

gmerlin-1.2.0.tar.gz/apps/transcoder/trackdialog.h -> gmerlin-4256.tar.gz/apps/transcoder/trackdialog.h Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/tracklist.c -> gmerlin-4256.tar.gz/apps/transcoder/tracklist.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -166,6 +166,7 @@
   GtkWidget * encoder_item;
   GtkWidget * chapter_item;
   GtkWidget * mass_tag_item;
+  GtkWidget * split_chapters_item;
   GtkWidget * auto_number_item;
   GtkWidget * auto_rename_item;
   GtkWidget * menu;
@@ -337,6 +338,7 @@
     gtk_widget_set_sensitive(w->menu.selected_menu.encoder_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.chapter_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.mass_tag_item, 1);
+    gtk_widget_set_sensitive(w->menu.selected_menu.split_chapters_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.auto_number_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.auto_rename_item, 1);
 
@@ -364,6 +366,7 @@
     gtk_widget_set_sensitive(w->menu.selected_menu.encoder_item, 0);
     gtk_widget_set_sensitive(w->menu.selected_menu.chapter_item, 0);
     gtk_widget_set_sensitive(w->menu.selected_menu.mass_tag_item, 0);
+    gtk_widget_set_sensitive(w->menu.selected_menu.split_chapters_item, 0);
     gtk_widget_set_sensitive(w->menu.selected_menu.auto_number_item, 0);
     gtk_widget_set_sensitive(w->menu.selected_menu.auto_rename_item, 0);
 
@@ -389,6 +392,7 @@
     gtk_widget_set_sensitive(w->menu.selected_menu.encoder_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.chapter_item, 0);
     gtk_widget_set_sensitive(w->menu.selected_menu.mass_tag_item, 1);
+    gtk_widget_set_sensitive(w->menu.selected_menu.split_chapters_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.auto_number_item, 1);
     gtk_widget_set_sensitive(w->menu.selected_menu.auto_rename_item, 1);
     
@@ -437,7 +441,6 @@
 
     name = bg_transcoder_track_get_name(track);
     
-    
     /* Set index */
     sprintf(string_buffer, "%d.", i+1);
     
@@ -447,6 +450,7 @@
                        string_buffer, -1);
 
     /* Set name */
+    
     gtk_list_store_set(GTK_LIST_STORE(model),
                        &iter,
                        COLUMN_NAME,
@@ -749,7 +753,7 @@
 
   /* Remember open path */
   if(l->filesel)
-    l->open_path = bg_strdup(l->open_path,
+    l->open_path = gavl_strrep(l->open_path,
                              bg_gtk_filesel_get_directory(l->filesel));
   }
 
@@ -887,7 +891,7 @@
                                  &val);
     bg_parameter_value_free(&val, params[i].type);
 
-    params[i].help_string = bg_strdup(params[i].help_string,
+    params[i].help_string = gavl_strrep(params[i].help_string,
                                       TRS("Use \"-\" to clear this field for all tracks. Empty string means to leave it unchanged for all tracks"));
     
     i++;
@@ -944,6 +948,63 @@
   bg_parameter_info_destroy_array(params);
   }
 
+static void split_chapters(track_list_t * l)
+  {
+  bg_transcoder_track_t * first_selected;
+  bg_transcoder_track_t * before;
+  bg_transcoder_track_t * after;
+  bg_transcoder_track_t * new_track;
+  int changed = 0;
+  
+  first_selected = l->tracks;
+  while(first_selected && !first_selected->selected)
+    first_selected = first_selected->next;
+  
+  while(first_selected)
+    {
+    if(!first_selected->selected)
+      {
+      first_selected = first_selected->next;
+      continue;
+      }
+
+    /* Get track before */
+    if(first_selected == l->tracks)
+      before = NULL;
+    else
+      {
+      before = l->tracks;
+      while(before->next != first_selected)
+        before = before->next;
+      }
+    /* Get track after */
+    after = first_selected->next;
+
+    new_track = bg_transcoder_track_split_at_chapters(first_selected);
+
+    if(new_track != first_selected)
+      {
+      changed = 1;
+
+      if(before)
+        before->next = new_track;
+      else
+        l->tracks = new_track;
+
+      if(after)
+        l->tracks = bg_transcoder_tracks_append(l->tracks,
+                                                after);
+      first_selected = after;
+      }
+    else
+      /* Advance */
+      first_selected = first_selected->next;
+    }
+
+  if(changed)
+    track_list_update(l);
+  }
+
 static const bg_parameter_info_t auto_rename_parameters[] =
   {
     {
@@ -977,7 +1038,7 @@
   if(!name)
     return;
   if(!strcmp(name, "rename_mask"))
-    d->rename_mask = bg_strdup(d->rename_mask,
+    d->rename_mask = gavl_strrep(d->rename_mask,
                                val->val_str);
   }
 
@@ -993,7 +1054,7 @@
     bg_parameter_info_copy_array(auto_rename_parameters);
 
   auto_rename_params[0].val_default.val_str =
-    bg_strdup(NULL, l->rename_mask);
+    gavl_strdup(l->rename_mask);
 
   memset(&d, 0, sizeof(d));
   
@@ -1023,15 +1084,15 @@
                              bg_metadata_set_parameter,
                              &m);
         new_name = bg_create_track_name(&m, d.rename_mask);
-        bg_cfg_section_set_parameter_string(t->general_section,
-                                            "name", new_name);
+        bg_cfg_section_set_parameter_string(t->metadata_section,
+                                            "label", new_name);
         free(new_name);
         gavl_metadata_free(&m);
         }
       t = t->next;
       }
     /* Save for later use */
-    l->rename_mask = bg_strdup(l->rename_mask, d.rename_mask);
+    l->rename_mask = gavl_strrep(l->rename_mask, d.rename_mask);
     free(d.rename_mask);
     track_list_update(l);
     }
@@ -1163,6 +1224,10 @@
     {
     mass_tag(t);
     }
+  else if(w == t->menu.selected_menu.split_chapters_item)
+    {
+    split_chapters(t);
+    }
   else if(w == t->menu.selected_menu.auto_number_item)
     {
     auto_number(t);
@@ -1253,6 +1318,9 @@
     create_item(t, t->menu.selected_menu.menu, TR("Auto numbering"), NULL);
   t->menu.selected_menu.auto_rename_item =
     create_item(t, t->menu.selected_menu.menu, TR("Auto rename..."), NULL);
+  t->menu.selected_menu.split_chapters_item =
+    create_item(t, t->menu.selected_menu.menu, TR("Split into chapters"), NULL);
+
   t->menu.selected_menu.encoder_item =
     create_item(t, t->menu.selected_menu.menu, TR("Change encoders..."), "plugin_16.png");
 
@@ -1308,6 +1376,7 @@
   gtk_widget_set_sensitive(t->menu.selected_menu.encoder_item, 0);
   gtk_widget_set_sensitive(t->menu.selected_menu.chapter_item, 0);
   gtk_widget_set_sensitive(t->menu.selected_menu.mass_tag_item, 0);
+  gtk_widget_set_sensitive(t->menu.selected_menu.split_chapters_item, 0);
   gtk_widget_set_sensitive(t->menu.selected_menu.auto_number_item, 0);
   gtk_widget_set_sensitive(t->menu.selected_menu.auto_rename_item, 0);
   
@@ -1919,9 +1988,9 @@
   t = (track_list_t *)data;
   
   if(!strcmp(name, "open_path"))
-    t->open_path = bg_strdup(t->open_path, val->val_str);
+    t->open_path = gavl_strrep(t->open_path, val->val_str);
   if(!strcmp(name, "rename_mask"))
-    t->rename_mask = bg_strdup(t->rename_mask, val->val_str);
+    t->rename_mask = gavl_strrep(t->rename_mask, val->val_str);
   }
 
 int track_list_get_parameter(void * data, const char * name, bg_parameter_value_t * val)
@@ -1934,12 +2003,12 @@
   
   if(!strcmp(name, "open_path"))
     {
-    val->val_str = bg_strdup(val->val_str, t->open_path);
+    val->val_str = gavl_strrep(val->val_str, t->open_path);
     return 1;
     }
   else if(!strcmp(name, "rename_mask"))
     {
-    val->val_str = bg_strdup(val->val_str, t->rename_mask);
+    val->val_str = gavl_strrep(val->val_str, t->rename_mask);
     return 1;
     }
   return 0;

gmerlin-1.2.0.tar.gz/apps/transcoder/tracklist.h -> gmerlin-4256.tar.gz/apps/transcoder/tracklist.h Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/transcoder_remote.h -> gmerlin-4256.tar.gz/apps/transcoder/transcoder_remote.h Changed

gmerlin-1.2.0.tar.gz/apps/transcoder/transcoder_window.c -> gmerlin-4256.tar.gz/apps/transcoder/transcoder_window.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -57,8 +57,8 @@
 
 static const uint32_t stream_flags = BG_STREAM_AUDIO |
 BG_STREAM_VIDEO |
-BG_STREAM_SUBTITLE_TEXT |
-BG_STREAM_SUBTITLE_OVERLAY;
+BG_STREAM_TEXT |
+BG_STREAM_OVERLAY;
 
 static const uint32_t plugin_flags = BG_PLUGIN_FILE;
 
@@ -247,11 +247,11 @@
 
   if(!strcmp(name, "task_path"))
     {
-    win->task_path = bg_strdup(win->task_path, val->val_str);
+    win->task_path = gavl_strrep(win->task_path, val->val_str);
     }
   else if(!strcmp(name, "profile_path"))
     {
-    win->profile_path = bg_strdup(win->profile_path, val->val_str);
+    win->profile_path = gavl_strrep(win->profile_path, val->val_str);
     }
   else if(!strcmp(name, "display_foreground"))
     {
@@ -290,12 +290,12 @@
 
   if(!strcmp(name, "task_path"))
     {
-    val->val_str = bg_strdup(val->val_str, win->task_path);
+    val->val_str = gavl_strrep(val->val_str, win->task_path);
     return 1;
     }
   else if(!strcmp(name, "profile_path"))
     {
-    val->val_str = bg_strdup(val->val_str, win->profile_path);
+    val->val_str = gavl_strrep(val->val_str, win->profile_path);
     return 1;
     }
   else if(!strcmp(name, "show_logwindow"))
@@ -518,8 +518,7 @@
 
   if(w == filesel->ok_button)
     {
-    win->filesel_file = bg_strdup(NULL,
-                                   gtk_file_selection_get_filename(filesel));
+    win->filesel_file = gavl_strdup(gtk_file_selection_get_filename(filesel));
     gtk_widget_hide(win->filesel);
 
     end_pos = strrchr(win->filesel_file, '/');
@@ -668,7 +667,7 @@
     {
     tmp_string = bg_gtk_get_filename_write(TR("Save task list"),
                                            &win->task_path, 1,
-                                           win->save_button);
+                                           win->save_button, NULL);
     if(tmp_string)
       {
       track_list_save(win->tracklist, tmp_string);
@@ -688,7 +687,8 @@
   else if(w == win->options_menu.save_item)
     {
     tmp_string = bg_gtk_get_filename_write(TR("Save profile"),
-                                           &win->profile_path, 1, win->win);
+                                           &win->profile_path, 1,
+                                           win->win, NULL);
     if(tmp_string)
       {
       transcoder_window_save_profile(win, tmp_string);
@@ -919,7 +919,7 @@
 
   ret->encoder_parameters =
     bg_plugin_registry_create_encoder_parameters(ret->plugin_reg,
-                                                 stream_flags, plugin_flags);
+                                                 stream_flags, plugin_flags, 1);
 
   // bg_parameters_dump(ret->encoder_parameters, "encoder_params.xml");
   
@@ -1349,14 +1349,14 @@
                                 TR("Text subtitle defaults"));
     
   cfg_section = bg_cfg_section_find_subsection(w->track_defaults_section,
-                                               "subtitle_text");
+                                               "text");
 
   bg_dialog_add_child(dlg, parent, TR("General"),
                       cfg_section,
                       NULL,
                       NULL,
                       NULL,
-                      bg_transcoder_track_subtitle_text_get_general_parameters());
+                      bg_transcoder_track_text_get_general_parameters());
 
   cfg_section = bg_cfg_section_find_subsection(w->track_defaults_section,
                                                "textrenderer");
@@ -1369,7 +1369,7 @@
                       bg_text_renderer_get_parameters());
   
   cfg_section = bg_cfg_section_find_subsection(w->track_defaults_section,
-                                               "subtitle_overlay");
+                                               "overlay");
 
   bg_dialog_add(dlg,
                 TR("Overlay subtitle defaults"),
@@ -1377,7 +1377,7 @@
                 NULL,
                 NULL,
                 NULL,
-                bg_transcoder_track_subtitle_overlay_get_general_parameters());
+                bg_transcoder_track_overlay_get_general_parameters());
 
   bg_dialog_add(dlg,
                 TR("Encoders"),

gmerlin-1.2.0.tar.gz/apps/transcoder/transcoder_window.h -> gmerlin-4256.tar.gz/apps/transcoder/transcoder_window.h Changed

gmerlin-1.2.0.tar.gz/apps/visualizer/Makefile.am -> gmerlin-4256.tar.gz/apps/visualizer/Makefile.am Changed

gmerlin-1.2.0.tar.gz/apps/visualizer/gmerlin-visualizer.desktop -> gmerlin-4256.tar.gz/apps/visualizer/gmerlin-visualizer.desktop Changed

gmerlin-1.2.0.tar.gz/apps/visualizer/gmerlin_visualizer.c -> gmerlin-4256.tar.gz/apps/visualizer/gmerlin_visualizer.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -137,6 +137,8 @@
   bg_gtk_log_window_t * log_window;
 
   bg_ov_callbacks_t cb;
+
+  gavl_metadata_t m;
   } visualizer_t;
 
 static gboolean configure_callback(GtkWidget * w, GdkEventConfigure *event,
@@ -327,7 +329,7 @@
   /* The soundcard might be busy from last time,
      give the kernel some time to free the device */
   
-  if(!v->ra_plugin->open(v->ra_handle->priv, &v->audio_format, NULL))
+  if(!v->ra_plugin->open(v->ra_handle->priv, &v->audio_format, NULL, &v->m))
     {
     if(!was_open)
       {
@@ -340,7 +342,7 @@
       {
       gavl_time_delay(&delay_time);
       
-      if(v->ra_plugin->open(v->ra_handle->priv, &v->audio_format, NULL))
+      if(v->ra_plugin->open(v->ra_handle->priv, &v->audio_format, NULL, &v->m))
         {
         v->audio_open = 1;
         break;
@@ -1254,6 +1256,7 @@
   bg_cfg_registry_save(v->cfg_reg, tmp_path);
   if(tmp_path)
     free(tmp_path);
+  gavl_metadata_free(&v->m);
   free(v);
   }

gmerlin-1.2.0.tar.gz/config.rpath -> gmerlin-4256.tar.gz/config.rpath Changed

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2006 Free Software Foundation, Inc.
+#   Copyright 1996-2013 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -47,7 +47,7 @@
 done
 cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
 
 wl=
 if test "$GCC" = yes; then
@@ -57,14 +57,7 @@
     aix*)
       wl='-Wl,'
       ;;
-    darwin*)
-      case $cc_basename in
-        xlc*)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
       ;;
     hpux9* | hpux10* | hpux11*)
       wl='-Wl,'
@@ -72,24 +65,37 @@
     irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
-    newsos6)
-      ;;
-    linux*)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
-        icc* | ecc*)
+        ecc*)
           wl='-Wl,'
           ;;
-        pgcc | pgf77 | pgf90)
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
           wl='-Wl,'
           ;;
         ccc*)
           wl='-Wl,'
           ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
         como)
           wl='-lopt='
           ;;
         *)
           case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
             *Sun\ C*)
               wl='-Wl,'
               ;;
@@ -97,22 +103,36 @@
           ;;
       esac
       ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
-    sco3.2v5*)
+    rdos*)
       ;;
     solaris*)
-      wl='-Wl,'
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
       ;;
     sunos4*)
       wl='-Qoption ld '
       ;;
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       wl='-Wl,'
       ;;
     sysv4*MP*)
       ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
     unicos*)
       wl='-Wl,'
       ;;
@@ -121,7 +141,7 @@
   esac
 fi
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
 
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
@@ -129,7 +149,7 @@
 hardcode_minus_L=no
 
 case "$host_os" in
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
@@ -155,22 +175,21 @@
   # option of GNU ld is called -rpath, not --rpath.
   hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
         ld_shlibs=no
       fi
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we cannot use
-      # them.
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     beos*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -179,7 +198,7 @@
         ld_shlibs=no
       fi
       ;;
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
@@ -189,11 +208,13 @@
         ld_shlibs=no
       fi
       ;;
-    interix3*)
+    haiku*)
+      ;;
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    linux*)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
@@ -251,7 +272,7 @@
         hardcode_direct=unsupported
       fi
       ;;
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
         # On IA64, the linker does run time linking by default, so we don't
         # have to do anything special.
@@ -261,7 +282,7 @@
         # Test if we are trying to use run time linking or normal
         # AIX style linking. If -brtl is somewhere in LDFLAGS, we
         # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
           for ld_flag in $LDFLAGS; do
             if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
               aix_use_runtimelinking=yes
@@ -280,7 +301,7 @@
             strings "$collect2name" | grep resolve_lib_name >/dev/null
           then
             # We have reworked collect2
-            hardcode_direct=yes
+            :
           else
             # We have old collect2
             hardcode_direct=unsupported
@@ -316,14 +337,18 @@
       fi
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     bsdi[45]*)
       ;;
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -333,24 +358,15 @@
       ;;
     darwin* | rhapsody*)
       hardcode_direct=no
-      if test "$GCC" = yes ; then
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
         :
       else
-        case $cc_basename in
-          xlc*)
-            ;;
-          *)
-            ld_shlibs=no
-            ;;
-        esac
+        ld_shlibs=no
       fi
       ;;
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd1*)
-      ld_shlibs=no
-      ;;
     freebsd2.2*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -359,7 +375,7 @@
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -411,19 +427,25 @@
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
+    *nto* | *qnx*)
+      ;;
     openbsd*)
-      hardcode_direct=yes
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
       else
-        case "$host_os" in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-        esac
+        ld_shlibs=no
       fi
       ;;
     os2*)
@@ -471,7 +493,7 @@
         ld_shlibs=yes
       fi
       ;;
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       ;;
     sysv5* | sco3.2v5* | sco5v6*)
       hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
@@ -487,34 +509,58 @@
 fi
 
 # Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
 libname_spec='lib$name'
 case "$host_os" in
   aix3*)
+    library_names_spec='$libname.a'
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
     ;;
   amigaos*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
     ;;
   beos*)
+    library_names_spec='$libname$shrext'
     ;;
   bsdi[45]*)
+    library_names_spec='$libname$shrext'
     ;;
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
     shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
     ;;
   darwin* | rhapsody*)
     shrext=.dylib
+    library_names_spec='$libname$shrext'
     ;;
   dgux*)
-    ;;
-  freebsd1*)
-    ;;
-  kfreebsd*-gnu)
+    library_names_spec='$libname$shrext'
     ;;
   freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
     ;;
   gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
     ;;
   hpux9* | hpux10* | hpux11*)
     case $host_cpu in
@@ -528,10 +574,13 @@
         shrext=.sl
         ;;
     esac
+    library_names_spec='$libname$shrext'
     ;;
-  interix3*)
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
     ;;
   irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
     case "$host_os" in
       irix5* | nonstopux*)
         libsuff= shlibsuff=
@@ -548,41 +597,62 @@
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux*)
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    library_names_spec='$libname$shrext'
     ;;
   knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
     ;;
   netbsd*)
+    library_names_spec='$libname$shrext'
     ;;
   newsos6)
+    library_names_spec='$libname$shrext'
     ;;
-  nto-qnx*)
+  *nto* | *qnx*)
+    library_names_spec='$libname$shrext'
     ;;
   openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
     ;;
   os2*)
     libname_spec='$name'
     shrext=.dll
+    library_names_spec='$libname.a'
     ;;
   osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
     ;;
   solaris*)
+    library_names_spec='$libname$shrext'
     ;;
   sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
     ;;
   sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
     ;;
   sysv4*MP*)
+    library_names_spec='$libname$shrext'
     ;;
   sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
     ;;
   uts4*)
+    library_names_spec='$libname$shrext'
     ;;
 esac
 
 sed_quote_subst='s/$["`$\\]$/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
 LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF
@@ -596,6 +666,12 @@
 # Shared library suffix (normally "so").
 shlibext="$shlibext"
 
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

gmerlin-1.2.0.tar.gz/configure.ac -> gmerlin-4256.tar.gz/configure.ac Changed

@@ -1,10 +1,10 @@
 
-AC_INIT
+AC_INIT([gmerlin], [1.2.0])
 AC_CONFIG_SRCDIR([include/gmerlin/player.h])
 
-AM_CONFIG_HEADER(include/config.h)
+AM_INIT_AUTOMAKE
 
-AM_INIT_AUTOMAKE(gmerlin, 1.2.0)
+AM_CONFIG_HEADER(include/config.h)
 
 BG_VERSION=$VERSION
 
@@ -29,6 +29,7 @@
 AC_DISABLE_STATIC
 dnl AM_DISABLE_STATIC
 
+AC_LANG(C)
 AC_PROG_LIBTOOL
 
 CFLAGS=$SAVE_CFLAGS
@@ -42,15 +43,14 @@
 AC_CHECK_SIZEOF(float)
 AC_CHECK_SIZEOF(double)
 
-AC_CHECK_FUNCS(vasprintf)
+AC_CHECK_FUNCS(vasprintf isatty)
 AC_CHECK_FUNCS(canonicalize_file_name)
 AC_C99_FUNC_LRINT
 AC_C99_FUNC_LRINTF
 
 AC_C_BIGENDIAN(,,AC_MSG_ERROR("Cannot detect endianess"))
 
-AC_CHECK_HEADERS([sys/select.h])
-
+AC_CHECK_HEADERS([sys/select.h sys/sendfile.h ifaddrs.h])
 
 AC_CHECK_DECLS([MSG_NOSIGNAL, SO_NOSIGPIPE],,,
                [#include <sys/types.h>
@@ -68,7 +68,6 @@
 
 AM_GNU_GETTEXT([external])
 
-
 dnl
 dnl Check for Dependencies package
 dnl
@@ -123,6 +122,12 @@
 AM_CONDITIONAL(HAVE_DOXYGEN, test "x$have_doxygen" = "xtrue")
 
 dnl
+dnl Linker flags
+dnl
+
+GMERLIN_CHECK_LDFLAGS
+
+dnl
 dnl texinfo (now a build requirement)
 dnl
 
@@ -160,9 +165,21 @@
 AC_SUBST(ICONV_LIBS)
 
 SQLITE3_LIBS=""
-AC_CHECK_LIB(sqlite3, sqlite3_exec, [SQLITE3_LIBS="-lsqlite3"; have_sqlite3="true"], have_sqlite3="false")
+AC_CHECK_LIB(sqlite3, sqlite3_exec, [SQLITE3_LIBS="-lsqlite3"], AC_MSG_ERROR("sqlite not found"))
 AC_SUBST(SQLITE3_LIBS)
 
+PKG_CHECK_MODULES(UUID, uuid, , AC_MSG_ERROR("libuuid not found"))
+
+MQ_LIBS=""
+AC_CHECK_LIB(rt, mq_open, MQ_LIBS="-lrt")
+AC_SUBST(MQ_LIBS)
+
+AH_TEMPLATE([HAVE_MQ], [POSIX message queues])
+
+AM_CONDITIONAL(HAVE_MQ, test "x$MQ_LIBS" != "x")
+if test "x$MQ_LIBS" != "x"; then
+  AC_DEFINE(HAVE_MQ)
+fi
 
 dnl
 dnl Gtk
@@ -730,32 +747,6 @@
 AM_CONDITIONAL(HAVE_OSS, test x$have_oss = xtrue)
 
 dnl
-dnl Video4linux
-dnl
-
-AH_TEMPLATE([HAVE_V4L],
-            [Do we have v4l support?])
-
-have_v4l=false
-AC_ARG_ENABLE(v4l,
-              AC_HELP_STRING(--disable-v4l, [Disable Video4Linux (default: autodetect)]),
-              [case "${enableval}" in
-                 yes) test_v4l=true ;;
-                 no) test_v4l=false ;;
-               esac],
-	       test_v4l=true)
-
-if test x$test_v4l = xtrue; then
-AC_CHECK_HEADERS(linux/videodev.h, have_v4l=true)
-fi
-
-if test x$have_v4l = xtrue; then
-AC_DEFINE(HAVE_V4L)
-fi
-
-AM_CONDITIONAL(HAVE_V4L, test x$have_v4l = xtrue)
-
-dnl
 dnl Video4linux2
 dnl
 
@@ -935,27 +926,11 @@
 
 AM_CONDITIONAL(HAVE_THUMBNAILER, test x$have_thumbnailer = xtrue)
 
-dnl nmjedit
-
-AC_ARG_ENABLE(nmjedit,
-              AC_HELP_STRING(--enable-nmjedit, [Enable nmjedit (default: disabled)]),
-              [case "${enableval}" in
-                 yes) have_nmjedit=true ;;
-                 no) have_nmjedit=false ;;
-               esac],
-	       have_nmjedit=false)
-
-if test "x$have_sqlite3" = "xfalse"; then
-have_nmjedit="false"
-fi
-
-AM_CONDITIONAL(HAVE_NMJEDIT, test "x$have_nmjedit" = "xtrue")
-
 dnl
 dnl CFLAGS
 dnl
 
-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math"])
+LQT_OPT_CFLAGS(["-O3 -fomit-frame-pointer -ffast-math"])
 
 CFLAGS="$CFLAGS -D_REENTRANT -D_FILE_OFFSET_BITS=64 $GAVL_CFLAGS $OPT_CFLAGS"
 
@@ -988,8 +963,8 @@
 
 AC_DEFINE_UNQUOTED(PREFIX, "$prefix", Installation prefix)
 
-INCLUDES='-I$(top_builddir)/include'
-AC_SUBST(INCLUDES)
+AM_CPPFLAGS='-I$(top_builddir)/include'
+AC_SUBST(AM_CPPFLAGS)
 
 dnl Link all modules to libgmerlin so we can use them from within plugins
 MODULE_LIBADD='$(top_builddir)/lib/libgmerlin.la'
@@ -1011,6 +986,7 @@
 gmerlin.pc \
 gmerlin-gtk.pc \
 apps/Makefile \
+apps/gavftools/Makefile \
 apps/plugincfg/Makefile \
 apps/player/Makefile \
 apps/alsamixer/Makefile \
@@ -1022,6 +998,13 @@
 apps/kbd/Makefile \
 apps/thumbnailer/Makefile \
 apps/nmjedit/Makefile \
+apps/dbedit/Makefile \
+apps/mediaserver/Makefile \
+apps/mediaserver/web/Makefile \
+apps/mediaserver/web/js/Makefile \
+apps/mediaserver/web/icons/Makefile \
+apps/mediaserver/web/css/Makefile \
+apps/db2nmj/Makefile \
 doc/Makefile \
 doc/Doxyfile \
 icons/Makefile \
@@ -1031,10 +1014,13 @@
 include/Makefile \
 include/gmerlin/Makefile \
 include/gmerlin/bg_version.h \
+include/gmerlin/upnp/Makefile
 include/gui_gtk/Makefile \
+include/upnp/Makefile \
 include/x11/Makefile \
 lib/Makefile \
 lib/gtk/Makefile \
+lib/upnp/Makefile \
 lib/x11/Makefile \
 osd/Makefile \
 plugins/Makefile \
@@ -1056,7 +1042,7 @@
 plugins/subwriters/Makefile \
 plugins/image/Makefile \
 plugins/tiff/Makefile \
-plugins/v4l/Makefile \
+plugins/upnp/Makefile \
 plugins/v4l2/Makefile \
 plugins/videofilters/Makefile \
 plugins/visualization/Makefile \
@@ -1188,17 +1174,6 @@
 fi
 fi
 
-echo -n "Video4Linux:         "
-if test "x$have_v4l" = "xtrue"; then
-echo "Yes"
-else
-if test "x$test_v4l" = "xtrue"; then
-echo "Missing (Probably unsupported architecture)"
-else
-echo "Disabled"
-fi
-fi
-
 echo -n "Video4Linux2:        "
 if test "x$have_v4l2" = "xtrue"; then
 echo "Yes"

gmerlin-1.2.0.tar.gz/doc/Makefile.am -> gmerlin-4256.tar.gz/doc/Makefile.am Changed

gmerlin-1.2.0.tar.gz/doc/gmerlin.texi -> gmerlin-4256.tar.gz/doc/gmerlin.texi Changed

gmerlin-1.2.0.tar.gz/doc/gmerlin_play.texi -> gmerlin-4256.tar.gz/doc/gmerlin_play.texi Changed

gmerlin-4256.tar.gz/doc/usersguide.html Added

@@ -0,0 +1,327 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+  <title>Gmerlin users guide</title>
+  <link rel="stylesheet" href="css/style.css">
+  <script src="button.js" type="text/javascript"></script>
+
+</head>
+
+<body>
+<h1>Gmerlin Users Guide</h1>
+
+<a href="#basics">1 Basics</a><br>
+<a href="#introduction">1.1 Introduction</a><br>
+<a href="#installation">1.2 Installation</a><br>
+<a href="#requirements">1.2.1 Requirements</a><br>
+<a href="#compilation">1.2.2 Compilation</a><br>
+<a href="#binary_codecs>1.2.3 Binary codecs</a><br>
+<a href="#general_usage">2 General usage information</a><br>
+<a href="#configuration_data">2.1 Configuration data</a><br>
+<a href="#gui">2.2 GUI</a><br>
+<a href="#remote">2.3 Remote control</a><br>
+<a href="#applications">3 Applications</a><br>
+<a href="#player">3.1 Player</a><br>
+<a href="#media_tree">3.1.1 Media tree</a><br>
+<a href="#main_window">3.1.2 The main window</a><br>
+<a href="#video_window">3.1.3 The video window</a><br>
+<a href="#transcoder">3.2 Transcoder</a><br>
+<a href="#alsamixer">3.3 Alsamixer</a><br>
+<a href="#get_involved">4 Get involved</a><br>
+
+<a name="basics">
+<h1>1 Basics</h1>
+<a name="introduction">
+<h2>1.1 Introduction</h2>
+
+This manual should help you to get familiar with gmerlin software. The gmerlin
+software is quite modular, because it consists of multiple packages, most of which
+can be used independently. In this document, it is assumed, that you have
+all packages installed (See Installation below).
+
+<a name="installation">
+<h3>1.2 Installation</h3>
+
+<a name="requirements">
+<h4>1.2.1 Requirements</h4>
+
+<table border="1">
+
+Required libraries can be installed from source for from binary packages.
+In the latter case, you MUST install the development packages (e.g.
+libfoo-devel-1.2.3-4.i386.rpm) also. This is what you need:
+<p>
+
+<tr><td><a href="http://www.alsa-project.org" target="_top">Alsa </a></td><td>It's the recommended audio architecture</td></tr>
+
+<tr><td><a href="http://www.tux.org/~ricdude/EsounD.html" target="_top">esound</a></td><td>Only needed if
+neither Alsa nor OSS work for you.</td></tr>
+
+<tr><td><a href="http://flac.sourceforge.net/" target="_top">flac</a></td>
+<td>For decoding flac files (Optional).</td></tr>
+
+<tr><td><a href="http://www.gtk.org/" target="_top">gtk-2.4.x</a></td><td>This is needed for compiling
+the GUI applications. Without it you'll get just the core library, which won't be of much use.</td></tr>
+
+<tr><td><a href="http://www.ijg.org/" target="_top">libjpeg</a></td><td>For reading and writing single JPEG images
+(strongly recommended)</td></tr>
+
+<tr><td><a href="http://www.libpng.org/pub/png/libpng.html" target="_top">libpng</a></td><td>For reading and writing single PNG images (strongly recommended).
+Also for decoding png encoded Quicktime and AVI files</td></tr>
+
+<tr><td><a href="http://www.remotesensing.org/libtiff/" target="_top">libtiff</a></td><td> For reading and
+writing single TIFF images (Optional)</td></tr>
+
+<tr><td><a href="http://www.xmlsoft.org/" target="_top">libxml</a></td><td>Required. All kinds of configuration files
+as well as the media tree are xml based.</td></tr>
+
+<tr><td><a href="http://www.vorbis.com" target="_top">vorbis</a></td><td>Needed for Vorbis files
+</td></tr>
+</table>
+<p>
+
+From now on, there are 2 ways to proceed:
+<ul>
+<li>You can download and install the gmerlin-dependencies package, unpack it and install it using the
+instructions in the README file. A full dependencies install will provide you with the complete features,
+but some packages you already have might be installed a second time.
+Everything, however, gets into /opt/gmerlin, so there will be no conflicts.
+<li>To have more control over the process, download and install the libraries below
+</ul>
+
+<table border="1">
+<tr><td><a href="http://www.gnu.org/software/libcdio/">libcdio </a></td><td>Neccessary for the VCD and
+Audio CD plugins. You need the latest CVS version or the one in the gmerlin-dependencies package.</td></tr>
+
+<tr><td><a href="http://musicbrainz.org/products/client/index.html">libmusicbrainz </a></td>
+<td>Needed for getting Audio CD metadata using <a href="http://musicbrainz.org">musicbrainz</a></td>
+</tr>
+
+<tr><td><a href="http://www.audiocoding.com" target="_top">faad2</a></td><td>Needed for MPEG-4 audio
+support (mp4, aac files). The latest official faad-2.0 won't
+play some streams. The current CVS version or the rpms from
+<a href="http://freshrpms.net" target="_top">freshrpms</a> should be ok.</td></tr>
+
+<tr><td><a href="http://www.ffmpeg.org" target="_top">FFmpeg</a></td><td>Many other codecs,
+strongly recommended. You should get a sufficiently new version from
+<a href="http://ffmpeg.sourceforge.net/download.php" target="_top">ffmpeg CVS</a>
+and use --enable-shared when calling configure. If you are a beginner and are scared by things
+like CVS, go to <a href="http://www.acarlab.com/software/ffmpeg.html" target="_top">aCarLab (India)
+</a> for a simpler to install ffmpeg package.</td></tr>
+
+<tr><td><a href="http://www.mp3dev.org/" target="_top">lame</a></td><td>For encoding mp3s.</td></tr>
+
+<tr><td><a href="http://mad.sourceforge.net" target="_top">libmad</a></td><td>For playing MPEG-1/2 audio (e.g.
+for mp3)</td></tr>
+
+<tr><td><a href="http://libquicktime.sourceforge.net/" target="_top">libquicktime</a></td>
+    <td>Optional, for the libquicktime based encoding and decoding plugins. Mostly necessary if you
+    want to encode video. For decoding Quicktime, gmerlin_avdecoder is a lot better.</td></tr>
+
+<tr><td><a href="http://www.mega-nerd.com/SRC/" target="_top">libsamplerate</a></td><td>Required.</td></tr>
+
+<tr><td><a href="http://libmpeg2.sourceforge.net/" target="_top">libmpeg2</a></td><td>For decoding MPEG-1/2 Video (like .mpg files)</td></tr>
+
+<tr><td><a href="http://liba52.sourceforge.net/" target="_top">liba52</a></td><td>For playing AC3 (aka DVD audio) streams
+</td></tr>
+
+<tr><td><a href="http://www.musepack.net/" target="_top">libmusepack</a></td><td> For playing musepack files.</td></tr>
+</table>
+
+<a name="compilation">
+<h4>1.2.2 Compilation and installation</h4>
+
+If you downloaded a release, make sure, that you have the latest version of all packages.
+Alternatively, you can download the latest gmerlin-all-in-one package. It contains all
+source packages together with optional scripts to build and install them. Check the README file.<p>
+
+We always try to be compatible ther GNU build system. This means, thas all gmerlin
+packages are compiled using the usual <code>./configure; make; su; make install</code> prodecure.
+Type <code>./configure --help</code> to see the supported options.<p>
+The order is the following:
+
+<ul>
+<li><a href="http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=50349" target="_top">
+<b>gavl</b></a>
+<li><a href="http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=14511" target="_top"><b>gmerlin</b></a>
+
+<li><a href="http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124659" target="_top"><b>gmerlin_avdecoder</b></a>
+<li><b>gmerlin-encoders</b>
+</ul>
+
+<a name="binary_codecs">
+<h4>1.2.3 Binary codecs</h4>
+These must be downloaded from the
+<a href="http://www1.mplayerhq.hu/MPlayer/releases/codecs/" target="_top">MPlayer codec page</a>. 
+The savest way is to download the file all-YYYYMMDD.tar.bz2, where YYYYMMDD is some date.
+Unpack the .tar.bz2 and move the included files to a directory of your choice.<p>
+To tell gmerlin about the DLLs, set the environment variables GMERLIN_AVDEC_CODEC_PATH_XANIM,
+GMERLIN_AVDEC_CODEC_PATH_REAL and GMERLIN_AVDEC_CODEC_PATH_WIN32 to the directory. Alternativey,
+you can configure the paths in the config dialog of the avdecoder plugin. This must, however, be done
+for each application separately.<p>
+To check your setup, start gmerlin from a terminal and play e.g. an mp3 file. Whenever the gmerlin_avdecoder
+plugin is initialized, it prints messages for each missing binary codec.
+
+<a name="general_usage">
+<h1>2 General usage information</h1>
+<a name="configuration_data">
+<h2>2.1 Configuration data</h2>
+They are saved in the directory ~/.gmerlin, which has subdirectories for all applications. The directory
+"generic" stores common configuration data for applications, which have no config dialog. Plugins used by these
+programs can be configured with the <b>gmerlin_plugincfg</b> application.
+If a program misbehaves, especially after a version upgrade, delete the file
+<code>~/.gmerlin/application_dir/config.xml</code>, where <code>application_dir</code> corresponds to the
+application. Normally, this shouldn't be necessary<p>
+All applications except <b>gmerlin_visualizer</b> have their own configuration data. This means, that changes
+made to plugin configurations are not shared between these applications.
+
+Most applications have a configuration dialog, which lets you change some global settings.
+Then, there is a plugin dialog, which lets you select and configure plugins.
+
+It might be a bit tricky to find out if a special option can be set via the
+the plugin dialog or via the global config dialog. The general rule is:
+All features, which are supported independently from any plugins, are configured
+in the global dialog. You can expect them to be present on every gmerlin installation of the
+same version. The plugin dialog changes depending on what plugins are installed. That's the reason,
+why they are separated.
+
+
+<a name="gui">
+<h2>2.2 GUI</h2>
+
+We try to make this as consistent as possible across the applications. In many windows, you'll see context
+sensitive menus when you right click somewhere. Furthermore, tooltips are enabled in all programs by
+default. You can, however, switch them off if they bother you.
+Many dialogs behave exactly the same in all applications, because they share a lot of code.<p>
+The configuration dialogs for global and plugin related settings are strictly separated.
+There is one dialog, which lets you configure global settings. These are always there, no matter what
+plugins are installed. Then, there is a plugin dialog, which is built dynamically based on the available plugins.
+It lets you change plugins, which are not autodetected (e.g. the soundcard plugin). There is always a config button,
+which lets you configure the plugin.
+
+<a name="remote">
+<h2>2.3 Remote control</h2>
+The player and the transcoder are remotely controllable by the commandline programs <b>gmerlin_remote</b> and 
+<b>gmerlin_transcoder_remote</b> respectively. Call them with -help as argument to see the options. 
+These plugins listen at ports starting with 10101 by default. You can change these via environment variables:<p>
+
+    <table border="1">
+<tr><td><code>GMERLIN_PLAYER_REMOTE_PORT</code></td><td> Port for the player remote, default 10101.</td></tr>
+<tr><td><code>GMERLIN_TRANSCODER_REMOTE_PORT</code></td><td> Port for the transcoder remote, default 10102.</td></tr>
+</table><p>
+
+By default, remote enabled applications will listen on the localhost (127.0.0.1) only. If you want to
+control your gmerlin applications from other computers too, enable it in their config dialogs.<p>
+
+Finally there is a script <code>gmerlin_launcher</code>. It can be used as a Mime handler by filenamagers
+and webbrowsers. If <code>gmerlin_launcher</code> is called with a file or URL as argument, it will launch
+a gmerlin player if neccesary, add the location to the Incoming album and start playing it.
+
+<a name="applications">
+<h1>3 Applications</h1>
+
+<a name="player">
+<h2>3.1 Player</h2>
+Type <code>gmerlin</code> with any number of files or URLs to start this. If you omit any commandline
+arguments, the GUI will come.
+
+<a name="media_tree">
+<h3>3.1.1 Media tree</h3>
+The media tree can be used to store and organize your media collection. It consists of virtual folders
+called <b>albums</b>. You can create albums, subalbums and move stuff between them like you
+want. The media files always stay at the same place in the filesystem. The albums can be either in
+own windows (Windowed mode) or as tabs in the tree window (Tabbed mode).
+The tree- and album windows remember their screen positions.<p>
+You can create your own albums by right clicking onto the parent album in the tree and select Album->New.
+Whenever you doubleclick a track, it will be played immediately.
+In addition to the regular albums, there are a number of special albums:
+    <ul>
+      <li><b>Incoming: </b>It's the destination for tracks, which come from the comandline or from
+	the remote.
+	<li><b>Favourites: </b>Each regular album has a Favourites button, which lets you copy the selected
+	tracks to the Favourites.
+	<li><b>Plugin and device-albums: </b>Each plugin, which handles e.g. cdrom drives, will create a
+	plugin album. The available devices are then autoscanned and added as subalbums. Tracks from
+	decvice albums can never be mixed with files or URLs in one album.
+    </ul>
+Adding tracks to the media tree can happen in multiple ways:
+    <ul>
+      <li>Drag Files or URLs from filenanagers or webbrowsers into an album forlder in the tree or into
+	an album directly.
+      <li>Use the buttons in the album toolbar, or the right click menu
+      <li>Via the right-click menu (Album->New from directory...) of the tree window, you can import
+	entire directory trees. Subdirectories will be added as subalbums if you want.
+      <li>Configure <code>gmerlin_launcher</code> as a MIME Handler for the supported filetypes in your desktop
+          environment. <code>gmerlin_launcher</code> will then send all doubleclicked files into the
+          <b>Incoming</b>-album.
+    </ul>
+Drag and Drop is supported:
+    <ul>
+      <li>Inside the tree window to move albums (inclusive subalbums) around
+      <li>From one regular album to another
+      <li>Inside all albums to sort the tracks
+      <li>From an album window into the tree window to transfer tracks to another album
+    </ul>
+When dragging albums, they are always moved. When dragging tracks, the default action is move.
+If you hold the Ctrl-Key before you start dragging, the tracks will be copied.<p>
+
+If you close the currently played album during playback, the player will stop after the current track is
+finished. You can then select another album by doubleclicking a track inside it.
+
+<a name="main_window">
+<h3>3.1.2 The main window</h3>
+It's a usual player window, with self explanatory buttons. The menu button will show the main menu of the
+player. It lets you configure plugins and other global settings, show other windows, launch other
+applications and so on.
+
+<a name="video_window">
+<h3>3.1.3 The video window</h3>
+This comes only when gmerlin has to show some video. While the video plays, you can
+press the TAB key to toggle between windowd and fullscreen mode.
+
+<a name="transcoder">
+<h2>3.2 Transcoder</h2>
+Type <code>gmerlin_transcoder</code> to start this. It has only one window, which contains the tasklist.
+A tasklist stores ALL information necessary to transcode the track. This includes codec settings,
+bitrates etc. You can load and save tasklists, the current tasklist is remembered.
+Using the right-click-menu, you can change the encoding plugins for tracks, with the configure
+button at the lower toolbar, you can configure each track.
+
+New tracks can be added:
+    <ul>
+      <li>by dragging files or URLs from filenanagers or webbrowsers into the tasklist
+      <li>by using the buttons in lower toolbar or the right click menu
+      <li>From the player by right clicking into an album end select Selected->Transcode
+      <li>By dragging Tracks from a gmerlin album into the tasklist
+    </ul>
+
+The upper toolbar controls global things. Here you can select and configure plugins as defaults
+for newly added tracks. Moreover, you can load/save tasklists,
+start/stop transcoding, set some global options and track defauls and quit the program.
+
+<a name="alsamixer">
+<h2>3.3 Alsamixer</h2>
+This was written because available programs often don't support the full range of soundcard
+settings. By right clicking on a control, you can:
+<ul>
+<li>Move controls inside the window
+<li>Move controls to own windows. To move them back to main window, simply close the
+control-windows.
+<li>Pop up a dialog, where you can select which controls will be shown at all
+</ul>
+All window configurations and coordinates are remembered. The actual mixer settings are NOT
+remembered, since this is done globally by the startup scripts.
+
+<a name="get_involved">
+<h1>4 Get involved</h1>
+Contribution to gmerlin can happen at several skill levels:
+<ul>
+<li>Report bugs and installation problems, tell about features you'd like to see.
+<li>Tell us about files, which cannot be played. An URL and some infos (e.g. <i>MPlayer plays it fine</i>)
+    can help a lot.
+<li>Make skins. In /usr/local/gmerlin/skins/Default/skin.xml, you'll find an example skin description file.
+<li>Assembler gurus can write more speed optimized routines for gavl
+<li>Mathematics gurus can write more accurate routines for the higher quality levels of gavl.
+</ul>
+</body>
+</html>

gmerlin-1.2.0.tar.gz/icons/Makefile.am -> gmerlin-4256.tar.gz/icons/Makefile.am Changed

gmerlin-4256.tar.gz/icons/drive_16.xcf.bz2 Added

gmerlin-4256.tar.gz/icons/hardware_16.xcf.bz2 Added

gmerlin-4256.tar.gz/icons/icons.xcf.bz2 Added

gmerlin-4256.tar.gz/icons/mode.png Added

gmerlin-4256.tar.gz/icons/tracks_dnd_32.xcf.bz2 Added

gmerlin-1.2.0.tar.gz/include/Makefile.am -> gmerlin-4256.tar.gz/include/Makefile.am Changed

gmerlin-1.2.0.tar.gz/include/bgfreetype.h -> gmerlin-4256.tar.gz/include/bgfreetype.h Changed

gmerlin-1.2.0.tar.gz/include/bgfrei0r.h -> gmerlin-4256.tar.gz/include/bgfrei0r.h Changed

gmerlin-1.2.0.tar.gz/include/bgladspa.h -> gmerlin-4256.tar.gz/include/bgladspa.h Changed

gmerlin-1.2.0.tar.gz/include/bglv.h -> gmerlin-4256.tar.gz/include/bglv.h Changed

gmerlin-4256.tar.gz/include/bgshm.h Added

gmerlin-4256.tar.gz/include/bgsqlite.h Added

@@ -0,0 +1,89 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <inttypes.h>
+#include <sqlite3.h>
+
+int
+bg_sqlite_exec(sqlite3 * db,                              /* An open database */
+               const char *sql,                           /* SQL to be evaluated */
+               int (*callback)(void*,int,char**,char**),  /* Callback function */
+               void * data);                              /* 1st argument to callback */
+
+
+int64_t bg_sqlite_string_to_id(sqlite3 * db,
+                               const char * table,
+                               const char * id_row,
+                               const char * string_row,
+                               const char * str);
+
+int64_t bg_sqlite_string_to_id_add(sqlite3 * db,
+                                   const char * table,
+                                   const char * id_row,
+                                   const char * string_row,
+                                   const char * str);
+
+
+char * bg_sqlite_id_to_string(sqlite3 * db,
+                              const char * table,
+                              const char * string_row,
+                              const char * id_row,
+                              int64_t id);
+
+int64_t bg_sqlite_id_to_id(sqlite3 * db,
+                           const char * table,
+                           const char * dst_row,
+                           const char * src_row,
+                           int64_t id);
+
+void bg_sqlite_delete_by_id(sqlite3 * db,
+                            const char * table,
+                            int64_t id);
+
+int64_t bg_sqlite_get_next_id(sqlite3 * db, const char * table);
+
+/* Get an array of int's */
+
+typedef struct
+  {
+  int64_t * val;
+  int val_alloc;
+  int num_val;
+  } bg_sqlite_id_tab_t;
+
+void bg_sqlite_id_tab_init(bg_sqlite_id_tab_t * tab);
+void bg_sqlite_id_tab_free(bg_sqlite_id_tab_t * tab);
+void bg_sqlite_id_tab_reset(bg_sqlite_id_tab_t * tab);
+
+int bg_sqlite_append_id_callback(void * data, int argc, char **argv, char **azColName);
+
+int bg_sqlite_int_callback(void * data, int argc, char **argv, char **azColName);
+int bg_sqlite_string_callback(void * data, int argc, char **argv, char **azColName);
+
+int bg_sqlite_select_join(sqlite3 * db, bg_sqlite_id_tab_t * tab,
+                          const char * table_1,
+                          const char * col_1,
+                          int64_t val_1,
+                          const char * table_2,
+                          const char * col_2,
+                          int64_t val_2);
+
+char * bg_sqlite_get_col_str(sqlite3_stmt * st, int col);

gmerlin-4256.tar.gz/include/gavfenc.h Added

@@ -0,0 +1,30 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+
+bg_plugin_info_t * bg_gavfenc_info(bg_plugin_registry_t * reg);
+
+const bg_plugin_common_t * bg_gavfenc_get();
+
+void * bg_gavfenc_create(bg_plugin_registry_t * reg);
+
+#define bg_gavfenc_name        "e_gavf"
+

gmerlin-1.2.0.tar.gz/include/gmerlin/Makefile.am -> gmerlin-4256.tar.gz/include/gmerlin/Makefile.am Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/accelerator.h -> gmerlin-4256.tar.gz/include/gmerlin/accelerator.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/bg_sem.h -> gmerlin-4256.tar.gz/include/gmerlin/bg_sem.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/bggavl.h -> gmerlin-4256.tar.gz/include/gmerlin/bggavl.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -126,7 +126,7 @@
   {                                      \
   .name =        "conversion_quality",     \
   .long_name =   TRS("Conversion Quality"),          \
-    .opt =         "q", \
+  .opt =         "q", \
   .type =        BG_PARAMETER_SLIDER_INT,               \
   .flags =       BG_PARAMETER_SYNC,                     \
   .val_min =     { .val_i = GAVL_QUALITY_FASTEST },       \
@@ -649,6 +649,7 @@
 #define BG_GAVL_PARAM_AUDIO_DITHER_MODE \
     { \
       .name =      "dither_mode", \
+      .opt = "dm", \
       .long_name = TRS("Dither mode"), \
       .type =      BG_PARAMETER_STRINGLIST,\
       .flags =       BG_PARAMETER_SYNC,                     \
@@ -662,6 +663,7 @@
 #define BG_GAVL_PARAM_RESAMPLE_MODE \
     { \
       .name =      "resample_mode", \
+      .opt = "sm",                   \
       .long_name = TRS("Resample mode"), \
       .type =      BG_PARAMETER_STRINGLIST,\
       .flags =       BG_PARAMETER_SYNC,                     \
@@ -700,5 +702,14 @@
                         void * client_data, int thread);
 
 void bg_thread_pool_stop(void * client_data, int thread);
-  
+
+/* Print time */
+
+void bg_print_time_stop(FILE * out);
+
+void bg_print_time(FILE * out,
+                   gavl_time_t time, gavl_time_t total_time);
+
+
+
 #endif // __BG_GAVL_H_

gmerlin-4256.tar.gz/include/gmerlin/bgplug.h Added

@@ -0,0 +1,212 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __BGPLUG_H_
+#define __BGPLUG_H_
+
+#include <gavl/gavf.h>
+#include <gavl/connectors.h>
+
+#include <gmerlin/parameter.h>
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/mediaconnector.h>
+
+/* Reader */
+
+typedef struct bg_plug_s bg_plug_t;
+
+bg_plug_t * bg_plug_create_reader(bg_plugin_registry_t * plugin_reg);
+bg_plug_t * bg_plug_create_writer(bg_plugin_registry_t * plugin_reg);
+
+void bg_plug_destroy(bg_plug_t *);
+
+const bg_parameter_info_t *
+bg_plug_get_input_parameters();
+
+const bg_parameter_info_t *
+bg_plug_get_output_parameters();
+
+void bg_plug_set_parameter(void * data, const char * name,
+                           const bg_parameter_value_t * val);
+
+int bg_plug_open(bg_plug_t *, gavf_io_t * io,
+                 const gavl_metadata_t * m,
+                 const gavl_chapter_list_t * cl, int io_flags);
+
+int bg_plug_set_from_ph(bg_plug_t *,
+                        const gavf_program_header_t * ph);
+
+int bg_plug_open_location(bg_plug_t * p, const char * location,
+                          const gavl_metadata_t * m,
+                          const gavl_chapter_list_t * cl);
+
+
+gavf_t * bg_plug_get_gavf(bg_plug_t*);
+
+const gavl_metadata_t * bg_plug_get_metadata(bg_plug_t*);
+const gavl_chapter_list_t * bg_plug_get_chapter_list(bg_plug_t*);
+
+/* Initialization function for readers and writers */
+
+int bg_plug_add_mediaconnector_stream(bg_plug_t * p,
+                                      bg_mediaconnector_stream_t * s);
+
+int bg_plug_connect_mediaconnector_stream(bg_plug_t * p,
+                                          bg_mediaconnector_stream_t * s,
+                                          const gavf_stream_header_t * h);
+/* Set up a writer from a media connector */
+int bg_plug_setup_writer(bg_plug_t*, bg_mediaconnector_t * conn);
+
+/* Set up a media connector from a reader */
+int bg_plug_setup_reader(bg_plug_t*, bg_mediaconnector_t * conn);
+
+
+/* Needs to be called before any I/O is done */
+int bg_plug_start(bg_plug_t * p);
+
+/* Return the header of the stream the next packet belongs to */
+const gavf_stream_header_t * bg_plug_next_packet_header(bg_plug_t * p);
+
+/* Add streams for encoding, on the fly compression might get applied */
+
+int bg_plug_add_audio_stream(bg_plug_t * p,
+                             const gavl_compression_info_t * ci,
+                             const gavl_audio_format_t * format,
+                             const gavl_metadata_t * m,
+                             bg_cfg_section_t * encode_section);
+
+int bg_plug_add_video_stream(bg_plug_t * p,
+                             const gavl_compression_info_t * ci,
+                             const gavl_video_format_t * format,
+                             const gavl_metadata_t * m,
+                             bg_cfg_section_t * encode_section);
+
+int bg_plug_add_overlay_stream(bg_plug_t * p,
+                               const gavl_compression_info_t * ci,
+                               const gavl_video_format_t * format,
+                               const gavl_metadata_t * m,
+                               bg_cfg_section_t * encode_section);
+
+/* Proxy stuff */
+
+void bg_plug_set_audio_proxy(bg_plug_t * p, int stream,
+                             gavl_audio_source_t * asrc,
+                             gavl_packet_source_t * psrc);
+
+void bg_plug_set_video_proxy(bg_plug_t * p, int stream,
+                             gavl_video_source_t * vsrc,
+                             gavl_packet_source_t * psrc);
+
+void bg_plug_set_overlay_proxy(bg_plug_t * p, int stream,
+                               gavl_video_source_t * vsrc,
+                               gavl_packet_source_t * psrc);
+
+void bg_plug_set_text_proxy(bg_plug_t * p, int stream,
+                            gavl_video_source_t * vsrc,
+                            gavl_packet_source_t * psrc);
+                
+
+int bg_plug_add_text_stream(bg_plug_t * p,
+                            uint32_t timescale,
+                            const gavl_metadata_t * m);
+
+int bg_plug_get_stream_source(bg_plug_t * p,
+                              const gavf_stream_header_t * h,
+                              gavl_audio_source_t ** as,
+                              gavl_video_source_t ** vs,
+                              gavl_packet_source_t ** ps);
+
+int bg_plug_get_stream_sink(bg_plug_t * p,
+                            const gavf_stream_header_t * h,
+                            gavl_audio_sink_t ** as,
+                            gavl_video_sink_t ** vs,
+                            gavl_packet_sink_t ** ps);
+
+void bg_plug_set_stream_action(bg_plug_t * p,
+                               const gavf_stream_header_t * h,
+                               bg_stream_action_t action);
+
+gavl_sink_status_t bg_plug_put_packet(bg_plug_t * p,
+                                      gavl_packet_t * pkt);
+
+
+int bg_plug_got_error(bg_plug_t * p);
+
+const gavf_stream_header_t *
+bg_plug_header_from_index(bg_plug_t * p, int index);
+
+const gavf_stream_header_t *
+bg_plug_header_from_id(bg_plug_t * p, uint32_t id);
+
+void bg_plug_transfer_metadata(bg_plug_t * in_plug, bg_plug_t * out_plug);
+
+
+/* Set parameters */
+
+void
+bg_plug_set_compressor_config(bg_plug_t * p,
+                              const bg_parameter_info_t * ac_params,
+                              const bg_parameter_info_t * vc_params,
+                              const bg_parameter_info_t * oc_params);
+
+/* I/O Stuff */
+
+#define BG_PLUG_IO_IS_LOCAL   (1<<0)
+#define BG_PLUG_IO_IS_REGULAR (1<<1)
+
+#define BG_PLUG_IO_METHOD_READ  0
+#define BG_PLUG_IO_METHOD_WRITE 1
+#define BG_PLUG_IO_METHOD_HEAD  2 // Use only in the http protocol
+
+#define BG_PLUG_IO_STATUS_100 100 // Continue
+#define BG_PLUG_IO_STATUS_200 200 // OK
+#define BG_PLUG_IO_STATUS_400 400 // Bad Request
+#define BG_PLUG_IO_STATUS_404 404 // Not found
+#define BG_PLUG_IO_STATUS_405 405 // Method Not Allowed
+#define BG_PLUG_IO_STATUS_415 415 // Unsupported Media Type
+#define BG_PLUG_IO_STATUS_417 417 // Expectation Failed
+
+#define BG_PLUG_MIMETYPE "application/x-gavf"
+
+extern const char * bg_plug_app_id; // User-Agent and Server
+extern const char * bg_plug_mimetype;
+/* Called by bg_plug_open_location */
+
+
+gavf_io_t *
+bg_plug_io_open_location(const char * location,
+                         int method, int * flags, int timeout);
+
+int bg_plug_io_server_handshake(int fd, int method, int timeout);
+
+gavf_io_t *
+bg_plug_io_open_socket(int fd,
+                       int method, int * flags, int timeout);
+
+/* bgplug network protocol primitives */
+
+int bg_plug_request_read(int fd, gavl_metadata_t * req, int timeout);
+int bg_plug_response_write(int fd, gavl_metadata_t * res);
+
+int 
+bg_plug_request_get_method(const gavl_metadata_t * req, int * metod);
+
+#endif // __BGPLUG_H_

gmerlin-1.2.0.tar.gz/include/gmerlin/bgsocket.h -> gmerlin-4256.tar.gz/include/gmerlin/bgsocket.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -30,23 +30,36 @@
 
 /* Opaque address structure so we can support IPv6 in the future */
 
-typedef struct bg_host_address_s bg_host_address_t;
+#define BG_SOCKET_ADDR_STR_LEN (46+3+5+1) // INET6_ADDRSTRLEN + []: + port + \0
 
-bg_host_address_t * bg_host_address_create();
-void bg_host_address_destroy(bg_host_address_t *);
+typedef struct bg_socket_address_s bg_socket_address_t;
+
+bg_socket_address_t * bg_socket_address_create();
+void bg_socket_address_destroy(bg_socket_address_t *);
+
+void bg_socket_address_copy(bg_socket_address_t * dst,
+                            const bg_socket_address_t * src);
 
 
 /* Get address from hostname and port */
 
-int bg_host_address_set(bg_host_address_t *, const char * host,
-                        int port, int socktype);
+int bg_socket_address_set(bg_socket_address_t *, const char * host,
+                          int port, int socktype);
+
+void bg_socket_address_set_port(bg_socket_address_t * addr, int port);
+int bg_socket_address_get_port(bg_socket_address_t * addr);
+
+// str must be at least BG_SOCKET_ADDR_STR_LEN bytes long
+char * bg_socket_address_to_string(bg_socket_address_t * addr, char * str);
+
+int bg_socket_address_set_local(bg_socket_address_t * a, int port);
 
 /*
  *  Client connection (stream oriented)
  *  timeout is in milliseconds
  */
 
-int bg_socket_connect_inet(bg_host_address_t*, int timeout);
+int bg_socket_connect_inet(bg_socket_address_t*, int timeout);
 int bg_socket_connect_unix(const char *);
 
 void bg_socket_disconnect(int);
@@ -55,8 +68,10 @@
 
 // #define BG_SOCKET_IPV6     (1<<0)
 #define BG_SOCKET_LOOPBACK (1<<1)
+#define BG_SOCKET_REUSEADDR (1<<2)
 
-int bg_listen_socket_create_inet(int port,
+int bg_listen_socket_create_inet(bg_socket_address_t * addr,
+                                 int port,
                                  int queue_size,
                                  int flags);
 
@@ -65,14 +80,41 @@
 
 /* Accept a new client connection, return -1 if there is none */
 
-int bg_listen_socket_accept(int);
+int bg_listen_socket_accept(int sock, int milliseconds,
+                            bg_socket_address_t * from);
 
 void bg_listen_socket_destroy(int);
 
+int bg_socket_get_address(int sock, bg_socket_address_t * local, bg_socket_address_t * remote);
+
+/* UDP */
+
+int bg_udp_socket_create(bg_socket_address_t * addr);
+
+int bg_udp_socket_connect(int fd, bg_socket_address_t * dst);
+
+int bg_udp_socket_create_multicast(bg_socket_address_t * addr);
+
+int bg_udp_socket_receive(int fd, uint8_t * data, int data_size,
+                          bg_socket_address_t * addr);
+
+int bg_udp_socket_send(int fd, const uint8_t * data, int data_size,
+                       bg_socket_address_t * addr);
+
+/* I/0 functions */
+
 int bg_socket_read_data(int fd, uint8_t * data, int len, int milliseconds);
 int bg_socket_write_data(int fd, const uint8_t * data, int len);
 
 int bg_socket_read_line(int fd, char ** ret,
                         int * ret_alloc, int milliseconds);
 
+int bg_socket_is_local(int fd);
+
+int bg_socket_can_read(int fd, int milliseconds);
+int bg_socket_can_write(int fd, int milliseconds);
+
+int bg_socket_send_file(int fd, const char * filename,
+                        int64_t offset, int64_t len);
+
 #endif // __BG_SOCKET_H_

gmerlin-4256.tar.gz/include/gmerlin/bgthread.h Added

@@ -0,0 +1,56 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct bg_thread_common_s bg_thread_common_t;
+typedef struct bg_thread_s        bg_thread_t;
+
+
+bg_thread_common_t *
+bg_thread_common_create();
+
+void bg_thread_common_destroy(bg_thread_common_t * com);
+
+bg_thread_t *
+bg_thread_create(bg_thread_common_t * com);
+
+void bg_thread_destroy(bg_thread_t * th);
+
+void bg_thread_set_func(bg_thread_t * th,
+                        void * (*func)(void*), void * arg);
+
+void bg_threads_init(bg_thread_t ** th, int num);
+
+void bg_threads_start(bg_thread_t ** th, int num);
+
+/* Pause all threads, resume with bg_threads_start */
+void bg_threads_pause(bg_thread_t ** th, int num);
+
+/* Stop and join all threads, must call bg_threads_init() after */
+void bg_threads_join(bg_thread_t ** th, int num);
+
+/* Returns 1 if the thread should continue, 0 else.
+   If the thread was paused, this function blocks until we restart */
+   
+int bg_thread_check(bg_thread_t * th);
+int bg_thread_wait_for_start(bg_thread_t * th);
+void bg_thread_exit(bg_thread_t * th);
+
+

gmerlin-1.2.0.tar.gz/include/gmerlin/cfg_dialog.h -> gmerlin-4256.tar.gz/include/gmerlin/cfg_dialog.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/cfg_registry.h -> gmerlin-4256.tar.gz/include/gmerlin/cfg_registry.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/charset.h -> gmerlin-4256.tar.gz/include/gmerlin/charset.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/cmdline.h -> gmerlin-4256.tar.gz/include/gmerlin/cmdline.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -19,6 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * *****************************************************************/
 
+#include <gavl/metadata.h>
+
 /* Automatic generation of user documentation */
 
 typedef enum
@@ -42,11 +44,16 @@
   char * arg;
   char * help_arg; /* Something like <file> */
   char * help_string;
+  
   /* Callback will be called if present */
   void (*callback)(void * data, int * argc, char *** argv, int arg);
-  /* Parameter interface */
+
+  /* Parameters are used to generate a help string */
   const bg_parameter_info_t * parameters;
-  int param_single;
+
+  /* If non NULL, the argv will be placed here */
+  char ** argv;
+  
   } bg_cmdline_arg_t;
 
 typedef struct
@@ -61,11 +68,16 @@
   char * desc;
   } bg_cmdline_ext_doc_t;
 
+/* Static data for commandline interface. This
+   is important for generating the manual page */
+
 typedef struct
   {
   char * package;
   char * version;
   char * name;
+  char * long_name;
+
   char * synopsis;
   char * help_before;
   const bg_cmdline_arg_array_t * args; /* Null terminated */
@@ -81,9 +93,13 @@
 void bg_cmdline_parse(bg_cmdline_arg_t *,
                       int * argc, char *** argv, void * callback_data);
 
+void bg_cmdline_arg_set_parameters(bg_cmdline_arg_t * args, const char * opt,
+                                   const bg_parameter_info_t * params);
 
 char ** bg_cmdline_get_locations_from_args(int * argc, char *** argv);
 
+int bg_cmdline_check_unsupported(int argc, char ** argv);
+
 void bg_cmdline_print_help(char * argv0, bg_help_format_t);
 
 /* Commandline -> Config registry and parameters */
@@ -98,5 +114,11 @@
                              const bg_parameter_info_t * parameters,
                              const char * option_string);
 
+int bg_cmdline_set_stream_options(gavl_metadata_t * m,
+                                  const char * option_string);
+
+const char *
+bg_cmdline_get_stream_options(gavl_metadata_t * m, int stream);
+
 void bg_cmdline_print_version(const char * application);

gmerlin-4256.tar.gz/include/gmerlin/colormatrix.h Added

@@ -0,0 +1,43 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct bg_colormatrix_s bg_colormatrix_t;
+
+bg_colormatrix_t * bg_colormatrix_create();
+
+void bg_colormatrix_destroy(bg_colormatrix_t *);
+
+void bg_colormatrix_set_rgba(bg_colormatrix_t *, float coeffs[4][5]);
+void bg_colormatrix_set_yuva(bg_colormatrix_t *, float coeffs[4][5]);
+
+void bg_colormatrix_set_rgb(bg_colormatrix_t *, float coeffs[3][4]);
+void bg_colormatrix_set_yuv(bg_colormatrix_t *, float coeffs[3][4]);
+
+/* Constants for flags */
+#define BG_COLORMATRIX_FORCE_ALPHA (1<<0)
+
+void bg_colormatrix_init(bg_colormatrix_t *,
+                         gavl_video_format_t * format, int flags,
+                         gavl_video_options_t * opt);
+
+void bg_colormatrix_process(bg_colormatrix_t *,
+                            gavl_video_frame_t * frame);
+

gmerlin-1.2.0.tar.gz/include/gmerlin/converters.h -> gmerlin-4256.tar.gz/include/gmerlin/converters.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/edl.h -> gmerlin-4256.tar.gz/include/gmerlin/edl.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -24,6 +24,7 @@
 
 #include <gmerlin/parameter.h>
 #include <gmerlin/streaminfo.h>
+#include <gavl/edl.h>
 
 /** \defgroup edl EDL support
  *  \ingroup plugin_i
@@ -51,169 +52,27 @@
  * @{
  */
 
-/** \brief Forward declaration for the EDL
- */
-
-typedef struct bg_edl_s bg_edl_t;
-
-
-/** \brief One segment of a physical stream to appear in a logical stream
- */
-
-typedef struct
-  {
-  char * url;   //!< Location of that segment. If NULL, the "master url" in bg_edl_t is valid.
-
-  int track;        //!<  Track index for multitrack inputs
-  int stream;       //!<  Index of the A/V stream
-  int timescale;    //!<  Source timescale
-    
-  int64_t src_time; //!< Time within the source in source timescale
-  
-  /* Time and duration within the destination in destination
-     timescale */
-  int64_t dst_time;  //!< Time  within the destination in destination timescale
-  int64_t dst_duration; //!< Duration within the destination in destination timescale
-
-  /*  */
-  int32_t speed_num; //!< Playback speed numerator
-  int32_t speed_den; //!< Playback speed demoninator
-  } bg_edl_segment_t;
-
-/** \brief A locical stream
- */
-
-typedef struct
-  {
-  bg_edl_segment_t * segments; //!< Segments
-  int num_segments;              //!< Number of segments 
-  int timescale;                 //!< Destination timescale
-  } bg_edl_stream_t;
-
-/** \brief A locical track
- */
-
-typedef struct
-  {
-  char * name; //!< Optional name of that track
-
-  gavl_metadata_t metadata; //!< Metadata
-  
-  int num_audio_streams;             //!< Number of logical audio streams
-  bg_edl_stream_t * audio_streams; //!< Logical audio streams
-
-  int num_video_streams;             //!< Number of logical video streams
-  bg_edl_stream_t * video_streams; //!< Logical video streams
-
-  int num_subtitle_text_streams;     //!< Number of logical text subtitle streams
-  bg_edl_stream_t * subtitle_text_streams; //!< Logical text subtitle streams
-
-  int num_subtitle_overlay_streams;  //!< Number of logical overlay subtitle streams
-  bg_edl_stream_t * subtitle_overlay_streams; //!< Logical overlay subtitle streams
-  
-  } bg_edl_track_t;
-
-/** \brief EDL structure
- */
-
-struct bg_edl_s
-  {
-  int num_tracks;             //!< Number of logical tracks
-  bg_edl_track_t * tracks;  //!< Logical tracks
-  char * url;                 //!< Filename if all streams are from the same file
-  };
-
-/** \brief Create an empty EDL
- *  \returns A newly allocated EDL
- */
-
-bg_edl_t * bg_edl_create();
-
-/** \brief Append a track to the EDL
-    \param e An EDL
- *  \returns The new track
- */
-
-bg_edl_track_t * bg_edl_add_track(bg_edl_t * e);
-
-/** \brief Append an audio stream to an EDL track
-    \param t An EDL track
- *  \returns The new stream
- */
-
-bg_edl_stream_t * bg_edl_add_audio_stream(bg_edl_track_t * t);
-
-/** \brief Append a video stream to an EDL track
-    \param t An EDL track
- *  \returns The new stream
- */
-
-bg_edl_stream_t * bg_edl_add_video_stream(bg_edl_track_t * t);
-
-/** \brief Append a text subtitle stream to an EDL track
-    \param t An EDL track
- *  \returns The new stream
- */
-
-bg_edl_stream_t * bg_edl_add_subtitle_text_stream(bg_edl_track_t * t);
-
-/** \brief Append an overlay subtitle stream to an EDL track
-    \param t An EDL track
- *  \returns The new stream
- */
-
-bg_edl_stream_t * bg_edl_add_subtitle_overlay_stream(bg_edl_track_t * t);
-
-/** \brief Append a segment to an EDL stream
-    \param s An EDL stream
- *  \returns The new segment
- */
-
-bg_edl_segment_t * bg_edl_add_segment(bg_edl_stream_t * s);
-
-/** \brief Copy an entire EDL
-    \param e An EDL
- *  \returns Copy of the EDL
- */
-
-bg_edl_t * bg_edl_copy(const bg_edl_t * e);
-
-/** \brief Destroy an EDL and free all memory
-    \param e An EDL
- */
-
-void bg_edl_destroy(bg_edl_t * e);
-
-/** \brief Dump an EDL to stderr
-    \param e An EDL
-
-    Mainly used for debugging
- */
-
-void bg_edl_dump(const bg_edl_t * e);
-
 /** \brief Save an EDL to an xml file
     \param e An EDL
     \param filename Name of the file
-
  */
 
 
-void bg_edl_save(const bg_edl_t * e, const char * filename);
+void bg_edl_save(const gavl_edl_t * e, const char * filename);
 
 /** \brief Load an EDL from an xml file
     \param filename Name of the file
     \returns The EDL or NULL.
 */
 
-bg_edl_t * bg_edl_load(const char * filename);
+gavl_edl_t * bg_edl_load(const char * filename);
 
 /** \brief Append a \ref bg_track_info_t to the EDL
     \param e An EDL
     \param info A track info (see \ref bg_track_info_t)
     \param url The location of the track
     \param index The index of the track in the location
-    \param num_tracks The total number of the tracks in the location
+    \param total_tracks The total number of the tracks in the location
     \param name An optional name.
 
     This function takes a track info (e.g. from an opened input plugin)
@@ -225,10 +84,31 @@
  */
 
 
-void bg_edl_append_track_info(bg_edl_t * e,
+void bg_edl_append_track_info(gavl_edl_t * e,
                               const bg_track_info_t * info, const char * url,
                               int index, int num_tracks, const char * name);
 
+/** \brief Append a \ref bg_track_info_t to an EDL track
+    \param e An EDL
+    \param track An EDL track
+    \param info A track info (see \ref bg_track_info_t)
+    \param url The location of the track
+    \param index The index of the track in the location
+    \param total_tracks The total number of the tracks in the location
+    \param name An optional name.
+
+    This function takes a track info (e.g. from an opened input plugin)
+    and appends the contents to an EDL track.
+    
+ *
+ */
+
+void bg_edl_track_append_track_info(gavl_edl_t * e, gavl_edl_track_t * track,
+                                    const bg_track_info_t * info,
+                                    const char * url, int index, int total_tracks,
+                                    const char * name);
+
+
 /**
  * @}
  */

gmerlin-1.2.0.tar.gz/include/gmerlin/encoder.h -> gmerlin-4256.tar.gz/include/gmerlin/encoder.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -33,6 +33,12 @@
                                  bg_transcoder_track_t * tt,
                                  int stream_mask, int flag_mask);
 
+const bg_cfg_section_t * bg_encoder_get_stream_section(bg_encoder_t * enc,
+                                                       bg_stream_type_t type);
+
+const bg_parameter_info_t * bg_encoder_get_stream_parameters(bg_encoder_t * enc,
+                                                             bg_stream_type_t type);
+
 void
 bg_encoder_set_callbacks(bg_encoder_t * e, bg_encoder_callbacks_t * cb);
 
@@ -47,7 +53,7 @@
 
 int bg_encoder_open(bg_encoder_t * enc, const char * filename_base,
                     const gavl_metadata_t * metadata,
-                    const bg_chapter_list_t * chapter_list);
+                    const gavl_chapter_list_t * chapter_list);
 
 int bg_encoder_writes_compressed_audio(bg_encoder_t * enc,
                                        const gavl_audio_format_t * format,
@@ -57,15 +63,19 @@
                                        const gavl_video_format_t * format,
                                        const gavl_compression_info_t * info);
 
+int bg_encoder_writes_compressed_overlay(bg_encoder_t * enc,
+                                         const gavl_video_format_t * format,
+                                         const gavl_compression_info_t * info);
+
 /* Add streams */
 int bg_encoder_add_audio_stream(bg_encoder_t *, const gavl_metadata_t * m,
                                 const gavl_audio_format_t * format,
-                                int index);
+                                int index, const bg_cfg_section_t * s);
 
 int bg_encoder_add_video_stream(bg_encoder_t *,
                                 const gavl_metadata_t * m,
                                 const gavl_video_format_t * format,
-                                int index);
+                                int index, const bg_cfg_section_t * s);
 
 int bg_encoder_add_audio_stream_compressed(bg_encoder_t *,
                                            const gavl_metadata_t * m,
@@ -80,28 +90,33 @@
                                            int index);
 
 
-int bg_encoder_add_subtitle_text_stream(bg_encoder_t *,
-                                        const gavl_metadata_t * m,
-                                        int timescale,
-                                        int index);
+int bg_encoder_add_text_stream(bg_encoder_t *,
+                               const gavl_metadata_t * m,
+                               int timescale,
+                               int index, const bg_cfg_section_t * s);
 
-int bg_encoder_add_subtitle_overlay_stream(bg_encoder_t *,
-                                           const gavl_metadata_t * m,
-                                           const gavl_video_format_t * format,
-                                           int index,
-                                           bg_stream_type_t source_format);
+int bg_encoder_add_overlay_stream(bg_encoder_t *,
+                                  const gavl_metadata_t * m,
+                                  const gavl_video_format_t * format,
+                                  int index,
+                                  bg_stream_type_t source_format,
+                                  const bg_cfg_section_t * s);
 
+int bg_encoder_add_overlay_stream_compressed(bg_encoder_t *,
+                                             const gavl_metadata_t * m,
+                                             const gavl_video_format_t * format,
+                                             const gavl_compression_info_t * info,
+                                             int index);
 
 /* Get formats */
 void bg_encoder_get_audio_format(bg_encoder_t *, int stream,
                                  gavl_audio_format_t*ret);
 void bg_encoder_get_video_format(bg_encoder_t *, int stream,
                                  gavl_video_format_t*ret);
-void bg_encoder_get_subtitle_overlay_format(bg_encoder_t *, int stream,
+void bg_encoder_get_overlay_format(bg_encoder_t *, int stream,
                                             gavl_video_format_t*ret);
-void bg_encoder_get_subtitle_text_timescale(bg_encoder_t *, int stream,
-                                            int * ret);
-
+void bg_encoder_get_text_timescale(bg_encoder_t *, int stream,
+                                            uint32_t * ret);
 
 /* Start encoding */
 int bg_encoder_start(bg_encoder_t *);
@@ -113,10 +128,10 @@
 int bg_encoder_write_video_frame(bg_encoder_t *,
                                  gavl_video_frame_t * frame, int stream);
 
-int bg_encoder_write_subtitle_text(bg_encoder_t *,const char * text,
+int bg_encoder_write_text(bg_encoder_t *,const char * text,
                                    int64_t start, int64_t duration, int stream);
 
-int bg_encoder_write_subtitle_overlay(bg_encoder_t *,
+int bg_encoder_write_overlay(bg_encoder_t *,
                                       gavl_overlay_t * ovl, int stream);
 
 int bg_encoder_write_audio_packet(bg_encoder_t *,
@@ -125,8 +140,28 @@
 int bg_encoder_write_video_packet(bg_encoder_t *,
                                   gavl_packet_t * p, int stream);
 
+gavl_audio_sink_t *
+bg_encoder_get_audio_sink(bg_encoder_t *, int stream);
+
+gavl_video_sink_t *
+bg_encoder_get_video_sink(bg_encoder_t *, int stream);
+
+gavl_packet_sink_t *
+bg_encoder_get_audio_packet_sink(bg_encoder_t *, int stream);
+
+gavl_packet_sink_t *
+bg_encoder_get_video_packet_sink(bg_encoder_t *, int stream);
+
+gavl_packet_sink_t *
+bg_encoder_get_overlay_packet_sink(bg_encoder_t * enc, int stream);
+
+gavl_packet_sink_t *
+bg_encoder_get_text_sink(bg_encoder_t *, int stream);
+
+gavl_video_sink_t *
+bg_encoder_get_overlay_sink(bg_encoder_t *, int stream);
+
 /* Update metadata */
 
 void bg_encoder_update_metadata(bg_encoder_t *,
-                                const char * name,
                                 const gavl_metadata_t * m);

gmerlin-1.2.0.tar.gz/include/gmerlin/filters.h -> gmerlin-4256.tar.gz/include/gmerlin/filters.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -123,14 +123,6 @@
                                const gavl_audio_format_t * in_format,
                                gavl_audio_format_t * out_format);
 
-/** \brief Change the input format of an audio filter chain
- *  \param ch An audio filter chain
- *  \param in_format New input format
- */
-
-void bg_audio_filter_chain_set_input_format(bg_audio_filter_chain_t * ch,
-                                            const gavl_audio_format_t * in_format);
-
 /** \brief Set output format of an audio filter chain
  *  \param ch An audio filter chain
  *  \param out_format Output format
@@ -168,7 +160,7 @@
  *  \ref bg_audio_filter_chain_set_parameter and \ref bg_audio_filter_chain_read.
  */
 
-void bg_audio_filter_chain_lock(bg_audio_filter_chain_t * ch);
+void bg_audio_filter_chain_lock(void * ch);
 
 /** \brief Unlock an audio filter chain
  *  \param ch An audio filter chain
@@ -177,7 +169,7 @@
  *  \ref bg_audio_filter_chain_set_parameter and \ref bg_audio_filter_chain_read.
  */
 
-void bg_audio_filter_chain_unlock(bg_audio_filter_chain_t * ch);
+void bg_audio_filter_chain_unlock(void * ch);
 
 /** \brief Reset an audio filter chain
  *  \param ch An audio filter chain
@@ -187,6 +179,21 @@
 
 void bg_audio_filter_chain_reset(bg_audio_filter_chain_t * ch);
 
+/** \brief Connect using audio sources
+ *  \param ch A audio filter chain
+ *  \param src Audio source to get frames from
+ *  \returns Audio source for reading frames
+ *
+ *  This is a replacement for \ref bg_audio_filter_chain_connect_input,
+ *  \ref bg_audio_filter_chain_init and
+ *  \ref bg_audio_filter_chain_set_out_format
+ */
+
+gavl_audio_source_t *
+bg_audio_filter_chain_connect(bg_audio_filter_chain_t * ch,
+                              gavl_audio_source_t * src);
+
+
 /* Video */
 
 /** \brief Create a video filter chain
@@ -260,14 +267,6 @@
                                const gavl_video_format_t * in_format,
                                gavl_video_format_t * out_format);
 
-/** \brief Change the input format of a video filter chain
- *  \param ch An video filter chain
- *  \param in_format New input format
- */
-
-void bg_video_filter_chain_set_input_format(bg_video_filter_chain_t * ch,
-                                           const gavl_video_format_t * in_format);
-
 /** \brief Set output format of a video filter chain
  *  \param ch A video filter chain
  *  \param out_format Output format
@@ -290,6 +289,20 @@
 int bg_video_filter_chain_read(void * priv, gavl_video_frame_t* frame,
                                int stream);
 
+/** \brief Connect using video sources
+ *  \param ch A video filter chain
+ *  \param src Video source to get frames from
+ *  \returns Video source for reading frames
+ *
+ *  This is a replacement for \ref bg_video_filter_chain_connect_input,
+ *  \ref bg_video_filter_chain_init and
+ *  \ref bg_video_filter_chain_set_out_format
+ */
+
+gavl_video_source_t *
+bg_video_filter_chain_connect(bg_video_filter_chain_t * ch,
+                              gavl_video_source_t * src);
+
 /** \brief Destroy a video filter chain
  *  \param ch A video filter chain
  */
@@ -303,7 +316,7 @@
  *  \ref bg_video_filter_chain_set_parameter and \ref bg_video_filter_chain_read.
  */
 
-void bg_video_filter_chain_lock(bg_video_filter_chain_t * ch);
+void bg_video_filter_chain_lock(void * ch);
 
 /** \brief Unlock a video filter chain
  *  \param ch A video filter chain
@@ -312,7 +325,7 @@
  *  \ref bg_video_filter_chain_set_parameter and \ref bg_video_filter_chain_read.
  */
 
-void bg_video_filter_chain_unlock(bg_video_filter_chain_t * ch);
+void bg_video_filter_chain_unlock(void * ch);
 
 /** \brief Reset a video filter chain
  *  \param ch A video filter chain

gmerlin-4256.tar.gz/include/gmerlin/frametimer.h Added

@@ -0,0 +1,35 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct bg_frame_timer_s bg_frame_timer_t;
+
+bg_frame_timer_t * bg_frame_timer_create(float framerate,
+                                         uint32_t * timescale);
+
+void bg_frame_timer_destroy(bg_frame_timer_t *);
+
+void bg_frame_timer_update(bg_frame_timer_t *,
+                           gavl_video_frame_t * frame);
+
+/* Wait for the next frame to capture */
+void bg_frame_timer_wait(bg_frame_timer_t *);
+
+

gmerlin-4256.tar.gz/include/gmerlin/http.h Added

@@ -0,0 +1,80 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+/* Prepare and write a http request (client) */
+
+#include <gavl/metadata.h>
+
+void bg_http_request_init(gavl_metadata_t * req,
+                          const char * method,
+                          const char * path,
+                          const char * protocol);
+
+int bg_http_request_write(int socket, gavl_metadata_t * req);
+char * bg_http_request_to_string(const gavl_metadata_t * req, int * len);
+
+/* Read a http request (server) */
+
+int bg_http_request_read(int socket, gavl_metadata_t * req, int timeout);
+int bg_http_request_from_string(gavl_metadata_t * req, const char * str);
+
+const char * bg_http_request_get_protocol(const gavl_metadata_t * req);
+const char * bg_http_request_get_method(const gavl_metadata_t * req);
+const char * bg_http_request_get_path(const gavl_metadata_t * req);
+
+/* Prepare and write a response (server) */
+
+void bg_http_response_init(gavl_metadata_t * res,
+                           const char * protocol,
+                           int status_int, const char * status_str);
+
+void bg_http_response_set_protocol(gavl_metadata_t * res,
+                                   const char * protocol);
+
+
+int bg_http_response_write(int socket, gavl_metadata_t * res);
+char * bg_http_response_to_string(const gavl_metadata_t * res, int * len);
+
+/* Read a response (client) */
+
+int bg_http_response_read(int socket, gavl_metadata_t * res, int timeout);
+int bg_http_response_from_string(gavl_metadata_t * res, const char * str);
+
+const char * bg_http_response_get_protocol(gavl_metadata_t * res);
+const int bg_http_response_get_status_int(gavl_metadata_t * res);
+const char * bg_http_response_get_status_str(gavl_metadata_t * res);
+
+/* Generic utilities */
+
+void bg_http_header_set_empty_var(gavl_metadata_t * h, const char * name);
+void bg_http_header_set_date(gavl_metadata_t * h, const char * name);
+
+/* Get a file with redirection */
+
+uint8_t * bg_http_get(const char * url, int * len, char ** mimetype);
+
+/* Read a http body (chunked or not) */
+uint8_t * bg_http_read_body(int fd, const gavl_metadata_t * res, int *len);
+
+int bg_http_write_data(int fd, const uint8_t * data, int len, int chunked);
+void bg_http_flush(int fd, int chunked);
+
+int bg_http_check_keepalive(const gavl_metadata_t * req, gavl_metadata_t * res);

gmerlin-1.2.0.tar.gz/include/gmerlin/keycodes.h -> gmerlin-4256.tar.gz/include/gmerlin/keycodes.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/lcdproc.h -> gmerlin-4256.tar.gz/include/gmerlin/lcdproc.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/log.h -> gmerlin-4256.tar.gz/include/gmerlin/log.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -157,6 +157,22 @@
 void bg_log_set_verbose(int mask);
 
 /** \ingroup log
+ *  \brief Set verbosity level
+ *  \param level Value between 0 and 4
+ *
+ *  0: Disable logging
+ *  1: Errors
+ *  2: Errors+Warnings
+ *  3: Errors+Warnings+Infos
+ *  4: Errors+Warnings+Infos+Debug
+ */
+
+void bg_log_set_verbose_level(int level);
+
+int bg_log_get_verbose_level();
+
+
+/** \ingroup log
  *  \brief Get last error message
  *  \returns The last error message, must be freed
  *
@@ -174,11 +190,18 @@
 void bg_log_syslog_init(const char * name);
 
 /** \ingroup log
+ *  \brief Return the syslog name
+ *  \returns The name passed to \ref bg_log_syslog_init or NULL
+ */
+
+const char * bg_log_syslog_name();
+
+/** \ingroup log
  *  Flush the log queue, must be done periodically by the
  *  application
  */
 
-void bg_log_syslog_flush();
+// void bg_log_syslog_flush();

gmerlin-4256.tar.gz/include/gmerlin/mediaconnector.h Added

@@ -0,0 +1,181 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __MEDIACONNECTOR_H_
+#define __MEDIACONNECTOR_H_
+
+
+#include <config.h>
+#include <gavl/connectors.h>
+#include <gavl/gavf.h>
+
+#include <gmerlin/cfg_registry.h>
+#include <gmerlin/bgthread.h>
+
+
+#define BG_MEDIACONNECTOR_FLAG_EOF     (1<<0)
+#define BG_MEDIACONNECTOR_FLAG_DISCONT (1<<1)
+
+typedef struct bg_mediaconnector_s bg_mediaconnector_t;
+
+typedef struct bg_mediaconnector_stream_s
+  {
+  gavl_audio_source_t    * asrc;
+  gavl_audio_connector_t * aconn;
+
+  gavl_video_source_t    * vsrc;
+  gavl_video_connector_t * vconn;
+
+  gavl_packet_source_t    * psrc;
+  gavl_packet_connector_t * pconn;
+
+  int timescale;
+  gavf_stream_type_t type;        // GAVF_STREAM_*
+  
+  int flags;
+  
+  gavl_metadata_t m;
+  gavl_time_t time;
+
+  int64_t counter;
+  
+  bg_cfg_section_t * encode_section;
+
+  bg_thread_t * th;
+  bg_mediaconnector_t * conn;
+  
+  /* Discontinuous stream support: Don't output a packet
+     too early */
+  
+  gavl_video_frame_t * discont_vframe;
+  gavl_packet_t      * discont_packet;
+  
+  gavl_video_source_t * discont_vsrc;
+  gavl_packet_source_t * discont_psrc;
+
+  int src_index; // index in the primary source
+  int dst_index; // index in the destination
+
+  void * priv;
+  void (*free_priv)(struct bg_mediaconnector_stream_s *);
+
+  gavl_source_status_t last_status;
+  
+  } bg_mediaconnector_stream_t;
+
+struct bg_mediaconnector_s
+  {
+  bg_mediaconnector_stream_t ** streams;
+  int num_streams;
+  int num_threads; // Can be < num_streams
+  
+  bg_thread_common_t * tc;
+
+  bg_thread_t ** th;
+  
+  pthread_mutex_t time_mutex;
+  gavl_time_t time;
+
+  pthread_mutex_t running_threads_mutex;
+  int running_threads;
+  };
+
+void
+bg_mediaconnector_init(bg_mediaconnector_t * conn);
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_audio_stream(bg_mediaconnector_t * conn,
+                                   const gavl_metadata_t * m,
+                                   gavl_audio_source_t * asrc,
+                                   gavl_packet_source_t * psrc);
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_video_stream(bg_mediaconnector_t * conn,
+                                   const gavl_metadata_t * m,
+                                   gavl_video_source_t * vsrc,
+                                   gavl_packet_source_t * psrc);
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_overlay_stream(bg_mediaconnector_t * conn,
+                                     const gavl_metadata_t * m,
+                                     gavl_video_source_t * vsrc,
+                                     gavl_packet_source_t * psrc);
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_text_stream(bg_mediaconnector_t * conn,
+                                  const gavl_metadata_t * m,
+                                  gavl_packet_source_t * psrc,
+                                  int timescale);
+
+int bg_mediaconnector_get_num_streams(bg_mediaconnector_t * conn,
+                                      gavf_stream_type_t type);
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_get_stream(bg_mediaconnector_t * conn,
+                             gavf_stream_type_t type, int idx);
+
+
+void
+bg_mediaconnector_create_conn(bg_mediaconnector_t * conn);
+
+
+void
+bg_mediaconnector_update_time(bg_mediaconnector_t * conn,
+                              gavl_time_t time);
+
+gavl_time_t
+bg_mediaconnector_get_time(bg_mediaconnector_t * conn);
+
+gavl_time_t
+bg_mediaconnector_get_min_time(bg_mediaconnector_t * conn);
+
+void
+bg_mediaconnector_create_threads(bg_mediaconnector_t * conn, int all);
+
+void
+bg_mediaconnector_create_threads_common(bg_mediaconnector_t * conn);
+
+void
+bg_mediaconnector_create_thread(bg_mediaconnector_t * conn, int index, int all);
+
+void
+bg_mediaconnector_start(bg_mediaconnector_t * conn);
+
+void
+bg_mediaconnector_free(bg_mediaconnector_t * conn);
+
+int bg_mediaconnector_iteration(bg_mediaconnector_t * conn);
+
+void
+bg_mediaconnector_threads_init_separate(bg_mediaconnector_t * conn);
+
+
+
+void
+bg_mediaconnector_threads_start(bg_mediaconnector_t * conn);
+
+void
+bg_mediaconnector_threads_stop(bg_mediaconnector_t * conn);
+
+int bg_mediaconnector_done(bg_mediaconnector_t * conn);
+
+
+#endif // __MEDIACONNECTOR_H_

gmerlin-4256.tar.gz/include/gmerlin/mediadb.h Added

@@ -0,0 +1,454 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __MEDIADB_H_
+#define __MEDIADB_H_
+
+
+#include <time.h>
+#include <gmerlin/pluginregistry.h>
+
+/*
+ *   object.item.imageItem.photo
+ *   object.item.audioItem.musicTrack
+ *   object.item.audioItem.audioBroadcast
+ *   object.item.audioItem.audioBook
+ *   object.item.videoItem.movie
+ *   object.item.videoItem.videoBroadcast
+ *   object.item.videoItem.musicVideoClip
+ *   object.item.playlistItem
+ *   object.item.textItem
+ *   object.container
+ *   object.container.storageFolder
+ *   object.container.person
+ *   object.container.person.musicArtist
+ *   object.container.playlistContainer
+ *   object.container.album.musicAlbum
+ *   object.container.album.photoAlbum
+ *   object.container.genre.musicGenre
+ *   object.container.genre.movieGenre
+ */
+
+typedef struct bg_db_s bg_db_t;
+
+typedef enum
+  {
+  BG_DB_SCAN_AUDIO = (1<<0),
+  BG_DB_SCAN_VIDEO = (1<<1),
+  BG_DB_SCAN_PHOTO = (1<<2),
+  } bg_db_scan_type_t;
+
+/*
+ *  Date
+ */
+
+typedef struct
+  {
+  int day;   // 1 - 31 (0 = unknown)
+  int month; // 1 - 12 (0 = unknown)
+  int year;  // 2013, 9999 = unknown
+  } bg_db_date_t;
+
+int bg_db_date_equal(const bg_db_date_t * d1,
+                     const bg_db_date_t * d2);
+
+void bg_db_date_copy(bg_db_date_t * dst,
+                     const bg_db_date_t * src);
+
+#define BG_DB_DATE_STRING_LEN GAVL_METADATA_DATE_STRING_LEN
+
+char * bg_db_date_to_string(const bg_db_date_t * d, char * str);
+void bg_db_string_to_date(const char * str, bg_db_date_t * d);
+
+#define BG_DB_TIME_STRING_LEN 20
+time_t bg_db_string_to_time(const char * str);
+char * bg_db_time_to_string(time_t time, char * str);
+
+
+void bg_db_date_set_invalid(bg_db_date_t * d);
+int bg_db_date_is_invalid(bg_db_date_t * d);
+
+/*
+ *  Object definitions
+ */
+
+#define BG_DB_FLAG_CONTAINER  (1<<0) // Real container
+#define BG_DB_FLAG_NO_EMPTY   (1<<1) // Auto delete when empty
+#define BG_DB_FLAG_VCONTAINER (1<<2) // Virtual container (needs browse_children method)
+#define BG_DB_FLAG_FILE       (1<<3) // Derived from file
+#define BG_DB_FLAG_IMAGE      (1<<4) // Derived from image
+#define BG_DB_FLAG_VIDEO      (1<<5) // Derived from video
+
+typedef enum
+  {
+  BG_DB_OBJECT_OBJECT       = (0<<16),
+  BG_DB_OBJECT_FILE         = (1<<16) | BG_DB_FLAG_FILE,
+  // object.item.audioItem.musicTrack
+  BG_DB_OBJECT_AUDIO_FILE   = (2<<16) | BG_DB_FLAG_FILE,
+  BG_DB_OBJECT_VIDEO_FILE   = (3<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_VIDEO,
+  BG_DB_OBJECT_IMAGE_FILE   = (4<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_IMAGE,
+  // Several image types follow
+  BG_DB_OBJECT_PHOTO         = (5<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_IMAGE,
+  BG_DB_OBJECT_ALBUM_COVER   = (6<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_IMAGE,
+  BG_DB_OBJECT_VIDEO_PREVIEW = (7<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_IMAGE,
+  BG_DB_OBJECT_MOVIE_ART     = (8<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_IMAGE,
+  BG_DB_OBJECT_THUMBNAIL     = (9<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_IMAGE,
+
+  // Several video file types follow
+
+  // One episode of a series
+  BG_DB_OBJECT_VIDEO_EPISODE    = (10<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_VIDEO,
+  // One part of a multipart movie
+  BG_DB_OBJECT_MOVIE_PART       = (11<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_VIDEO,
+  // One movie in a single file
+  BG_DB_OBJECT_MOVIE            = (12<<16) | BG_DB_FLAG_FILE | BG_DB_FLAG_VIDEO,
+
+  BG_DB_OBJECT_VIDEO_NFO        = (13<<16) | BG_DB_FLAG_FILE, // .NFO file for video metadata
+  
+  BG_DB_OBJECT_RADIO_URL        = (14<<16),
+  
+  // Root container: Object ID 0, has all toplevel containers as children
+
+  BG_DB_OBJECT_ROOT          = (50<<16) | BG_DB_FLAG_CONTAINER,
+
+  // object.container.album.musicAlbum
+  // Audio albums are *no* containers for the internal database
+  // because they are referenced by their children not by the parent_id
+  // but by the album
+  BG_DB_OBJECT_AUDIO_ALBUM      = (51<<16) | BG_DB_FLAG_VCONTAINER,
+
+  BG_DB_OBJECT_CONTAINER        = (52<<16) | BG_DB_FLAG_CONTAINER,
+  // object.container.storageFolder
+  BG_DB_OBJECT_DIRECTORY        = (53<<16) | BG_DB_FLAG_CONTAINER, 
+  BG_DB_OBJECT_PLAYLIST         = (54<<16) | BG_DB_FLAG_VCONTAINER,
+  // Virtual Folder */
+  BG_DB_OBJECT_VFOLDER          = (55<<16) | BG_DB_FLAG_CONTAINER | BG_DB_FLAG_NO_EMPTY,
+  BG_DB_OBJECT_VFOLDER_LEAF     = (56<<16) | BG_DB_FLAG_VCONTAINER | BG_DB_FLAG_NO_EMPTY,
+
+  BG_DB_OBJECT_TVSERIES         = (57<<16) | BG_DB_FLAG_CONTAINER | BG_DB_FLAG_NO_EMPTY,
+  BG_DB_OBJECT_SEASON           = (58<<16) | BG_DB_FLAG_VCONTAINER | BG_DB_FLAG_NO_EMPTY,
+
+  // Movie consisting of multiple files
+  BG_DB_OBJECT_MOVIE_MULTIPART  = (59<<16) | BG_DB_FLAG_VCONTAINER | BG_DB_FLAG_NO_EMPTY,
+
+  } bg_db_object_type_t;
+
+typedef struct bg_db_object_class_s bg_db_object_class_t;
+
+typedef struct
+  {
+  int64_t id;
+  bg_db_object_type_t type;
+  
+  int64_t ref_id;    // Original ID
+  int64_t parent_id;  // ID of the real parent
+  int children;      // For containers only
+
+  int64_t size;
+  gavl_time_t duration;
+  char * label;
+
+  /* Internal stuff, do not touch */
+
+  int found;    // Used by sqlite
+  int flags;    // Used in-memory only
+  const bg_db_object_class_t * klass;
+
+  } bg_db_object_t;
+
+/* Directory on the file system */
+typedef struct
+  {
+  bg_db_object_t obj;
+  char * path;   // Relative to db file
+  int scan_flags; // ORed flags if BG_DB_* types
+  int update_id;
+  int64_t scan_dir_id;
+  } bg_db_dir_t;
+
+/* File in the file system */
+typedef struct
+  {
+  bg_db_object_t obj;
+  char * path;  // Relative to db file
+  time_t mtime;
+  char * mimetype;
+  int64_t mimetype_id;
+  int64_t scan_dir_id;
+  } bg_db_file_t;
+
+/* 
+ * Audio file 
+ */
+
+typedef struct
+  {
+  bg_db_file_t file;
+  
+  char * title;      // TITLE
+  char * search_title;
+
+  char * artist;     
+  int64_t artist_id; // ARTIST
+
+  char * genre;      // GENRE
+  int64_t genre_id;
+
+  bg_db_date_t date;
+
+  char * album;
+  int64_t album_id;
+
+  int track;
+  
+  char * bitrate;    // BITRATE
+  int samplerate;
+  int channels; 
+
+  char * albumartist;     // Not in db, set only while creating
+  int64_t albumartist_id; // Not in db, set only while creating  
+  } bg_db_audio_file_t;
+
+/*
+ *  Webradio/Webtv station
+ */
+
+typedef struct
+  {
+  bg_db_object_t obj;
+  char * stream_url;
+  char * station_url;
+  char * mimetype;
+  int64_t mimetype_id;
+  } bg_db_url_t;
+
+void bg_db_add_radio_album(bg_db_t * db, const char * album_file);
+
+/* 
+ * video file 
+ */
+
+typedef struct
+  {
+  bg_db_file_t file;
+
+  int width;
+  int height;
+  int timescale;
+  int frame_duration;
+
+  /* Display aspect ratio */
+  int aspect_num;
+  int aspect_den;
+  
+  char * video_codec;
+
+  int64_t collection; // Multipart movie or season
+  int index;          // Index within collection
+  
+  } bg_db_video_file_t;
+
+
+/* Audio Album */
+typedef struct
+  {
+  bg_db_object_t obj;
+
+  char * artist;
+  int64_t artist_id;
+  char * title;
+  char * search_title;
+  
+  char * genre;      // GENRE
+  int64_t genre_id;
+
+  bg_db_date_t date;
+
+  int64_t cover_id;
+  } bg_db_audio_album_t;
+
+/* Video info: Can be associated with a series, a season or a movie */
+
+typedef struct
+  {
+  int64_t id;
+
+  char * title;      // TITLE
+  char * search_title;
+
+  char * title_orig;
+
+  char * rating;           // 0 .. 10.0, probably arbitrary
+  char * parental_control;
+
+  bg_db_date_t date;
+
+  int64_t * director_ids; /* Director(s)           */
+  int64_t * actor_ids;    /* Actor(s)              */
+  int64_t * country_ids;  /* Production countries  */
+  int64_t * genre_ids;    /* Genre(s)              */
+  int64_t * audio_language_ids; /* Audio languages */
+  int64_t * subtitle_language_ids; /* Subtitle languages */
+  
+  char ** directors;
+  char ** actors;
+  char ** countries;
+  char ** genres;
+  char ** audio_languages;
+  char ** subtitle_languages;
+  
+  char * plot;
+
+  int64_t poster_id;
+  int64_t fanart_id;
+
+  /* Where we got this info */
+  int64_t nfo_file;
+  } bg_db_video_info_t;
+
+/* Movie or episode. In the latter case, the REF_ID points to the Season */
+
+typedef struct
+  {
+  bg_db_video_file_t file;
+  bg_db_video_info_t info;
+  } bg_db_movie_t;
+
+/* Video container. Can be a series, a season or a multipart movie */
+
+typedef struct
+  {
+  bg_db_object_t obj;
+  bg_db_video_info_t info;
+  } bg_db_video_container_t;
+
+/* Image */
+
+typedef struct
+  {
+  bg_db_file_t file;
+  int width;
+  int height;
+  int64_t context_id; // Context where this item belongs
+  bg_db_date_t date;  // Date from EXIF
+  } bg_db_image_file_t;
+
+/* Virtual folder */
+
+typedef enum
+  {
+    BG_DB_CAT_YEAR              = 1,
+    BG_DB_CAT_GROUP             = 2,
+    BG_DB_CAT_ARTIST            = 3,
+    BG_DB_CAT_GENRE             = 4,
+    BG_DB_CAT_ACTOR             = 5,
+    BG_DB_CAT_DIRECTOR          = 6,
+    BG_DB_CAT_COUNTRY           = 7,
+  } bg_db_category_t;
+
+#define BG_DB_VFOLDER_MAX_DEPTH 8
+
+typedef struct
+  {
+  bg_db_category_t cat;
+  int64_t val;
+  } bg_db_vfolder_path_t;
+
+typedef struct
+  {
+  bg_db_object_t obj;
+
+  int depth;
+  bg_db_object_type_t type;
+  
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+ 
+  } bg_db_vfolder_t;
+
+
+/* Playlist */
+typedef struct
+  {
+  
+  } bg_db_playlist_t;
+
+/*
+ *  Public entry points
+ */
+
+bg_db_object_type_t bg_db_object_get_type(void * obj);
+
+bg_db_t * bg_db_create(const char * file,
+                       bg_plugin_registry_t * plugin_reg, int create);
+
+void bg_db_flush(bg_db_t * db);
+
+void bg_db_destroy(bg_db_t *);
+
+void bg_db_start_transaction(bg_db_t *);
+void bg_db_end_transaction(bg_db_t *);
+
+/* Edit functions */
+void bg_db_add_directory(bg_db_t *, const char * dir, int scan_type);
+void bg_db_del_directory(bg_db_t *, const char * dir);
+
+void bg_db_add_album(bg_db_t *, const char * album);
+
+/* Query functions */
+
+typedef void (*bg_db_query_callback)(void * priv, void * obj);
+
+/* Query from DB  */
+void * bg_db_object_query(bg_db_t * db, int64_t id); 
+int64_t bg_db_object_get_id(void * obj);
+
+int
+bg_db_query_sql(bg_db_t *, const char * sql, bg_db_query_callback cb, void * priv);
+
+
+/* Get the id of a file from it's path */
+int64_t bg_db_file_by_path(bg_db_t * db, const char * path);
+
+
+
+void bg_db_object_dump(void * obj);
+void bg_db_object_unref(void * obj);
+void bg_db_object_ref(void * obj);
+
+const char * bg_db_object_get_label(void * obj);
+
+int
+bg_db_query_children(bg_db_t *, int64_t id, bg_db_query_callback cb, void * priv,
+                     int start, int num, int * total_matches);
+
+
+const char * bg_db_get_group(const char * str, int64_t * id);
+
+/* Get thumbnails */
+
+void bg_db_browse_thumbnails(bg_db_t * db, int64_t id, 
+                             bg_db_query_callback cb, void * data);
+
+void * bg_db_get_thumbnail(bg_db_t * db, int64_t id,
+                           int max_width, int max_height, int max_size,
+                           const char * mimetype);
+
+#endif //  __MEDIADB_H_

gmerlin-1.2.0.tar.gz/include/gmerlin/mediafiledevice.h -> gmerlin-4256.tar.gz/include/gmerlin/mediafiledevice.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/msgqueue.h -> gmerlin-4256.tar.gz/include/gmerlin/msgqueue.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -274,11 +274,10 @@
  *  \param msg A message
  *  \param arg Argument index (starting with 0)
  *  \param format Returns the audio format
- *  \param big_endian If non-null, returns 1 if multibyte numbers are in big endian
  */
 
 void bg_msg_get_arg_audio_format(bg_msg_t * msg, int arg,
-                                 gavl_audio_format_t * format, int * big_endian);
+                                 gavl_audio_format_t * format);
 
 
 /** \brief Set a video format argument
@@ -294,11 +293,10 @@
  *  \param msg A message
  *  \param arg Argument index (starting with 0)
  *  \param format Returns the video format
- *  \param big_endian If non-null, returns 1 if multibyte numbers are in big endian
  */
 
 void bg_msg_get_arg_video_format(bg_msg_t * msg, int arg,
-                                 gavl_video_format_t * format, int * big_endian);
+                                 gavl_video_format_t * format);
 
 
 /** \brief Set a matadata argument
@@ -397,12 +395,13 @@
  *  the endianess if necessary.
  */
 
-int bg_msg_read_audio_frame(gavl_dsp_context_t * ctx,
+int bg_msg_read_audio_frame(gavl_dsp_context_t ** ctx,
                             bg_msg_t * msg,
                             const gavl_audio_format_t * format,
+                            const gavl_metadata_t * m,
                             gavl_audio_frame_t * frame,
                             bg_msg_read_callback_t cb,
-                            void * cb_data, int big_endian);
+                            void * cb_data);
 
 /** \brief Set a parameter
  *  \param msg A message

gmerlin-1.2.0.tar.gz/include/gmerlin/ocr.h -> gmerlin-4256.tar.gz/include/gmerlin/ocr.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/osd.h -> gmerlin-4256.tar.gz/include/gmerlin/osd.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,16 +28,18 @@
 void bg_osd_set_parameter(void * data, const char * name,
                           const bg_parameter_value_t * val);
 
-void bg_osd_set_overlay(bg_osd_t*, gavl_overlay_t *);
+// void bg_osd_set_overlay(bg_osd_t*, gavl_overlay_t *);
 
-void bg_osd_init(bg_osd_t*,
-                 const gavl_video_format_t * format,
-                 gavl_video_format_t * overlay_format);
+void bg_osd_init(bg_osd_t * osd, gavl_video_sink_t * sink, 
+                 const gavl_video_format_t * frame_format);
 
-int bg_osd_overlay_valid(bg_osd_t*, gavl_time_t time);
+void bg_osd_update(bg_osd_t * osd);
 
-void bg_osd_set_volume_changed(bg_osd_t*, float val, gavl_time_t time);
-void bg_osd_set_brightness_changed(bg_osd_t*, float val, gavl_time_t time);
-void bg_osd_set_contrast_changed(bg_osd_t*, float val, gavl_time_t time);
-void bg_osd_set_saturation_changed(bg_osd_t*, float val, gavl_time_t time);
+// int bg_osd_overlay_valid(bg_osd_t*);
 
+void bg_osd_set_volume_changed(bg_osd_t*, float val);
+void bg_osd_set_brightness_changed(bg_osd_t*, float val);
+void bg_osd_set_contrast_changed(bg_osd_t*, float val);
+void bg_osd_set_saturation_changed(bg_osd_t*, float val);
+
+// int bg_osd_changed(bg_osd_t * osd);

gmerlin-1.2.0.tar.gz/include/gmerlin/ov.h -> gmerlin-4256.tar.gz/include/gmerlin/ov.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,35 +34,36 @@
   
 const char * bg_ov_get_window(bg_ov_t * ov);
 
-
 void bg_ov_set_window_options(bg_ov_t * ov, const char * name, 
-                           const char * klass, 
-                           const gavl_video_frame_t * icon,
-                           const gavl_video_format_t * icon_format);
+                              const char * klass, 
+                              const gavl_video_frame_t * icon,
+                              const gavl_video_format_t * icon_format);
 
 void bg_ov_set_window_title(bg_ov_t * ov, const char * title);
 
 void bg_ov_set_callbacks(bg_ov_t * ov, bg_ov_callbacks_t * callbacks);
   
 int  bg_ov_open(bg_ov_t * ov, gavl_video_format_t * format, int keep_aspect);
-  
+
+gavl_video_sink_t * bg_ov_get_sink(bg_ov_t * ov);
+
 gavl_video_frame_t * bg_ov_get_frame(bg_ov_t * ov);
   
-int bg_ov_add_overlay_stream(bg_ov_t * ov, gavl_video_format_t * format);
-  
+gavl_video_sink_t *
+bg_ov_add_overlay_stream(bg_ov_t * ov, gavl_video_format_t * format);
+
+#if 0
 gavl_overlay_t * bg_ov_create_overlay(bg_ov_t * ov, int id);
- 
 void bg_ov_set_overlay(bg_ov_t * ov, int stream, gavl_overlay_t * ovl);
+void bg_ov_destroy_overlay(bg_ov_t * ov, int id, gavl_overlay_t * ovl);
+#endif
 
-void bg_ov_put_video(bg_ov_t * ov, gavl_video_frame_t*frame);
-  
-void bg_ov_put_still(bg_ov_t * ov, gavl_video_frame_t*frame);
+void bg_ov_put_frame(bg_ov_t * ov, gavl_video_frame_t*frame);
 
 void bg_ov_handle_events(bg_ov_t * ov);
 
 void bg_ov_update_aspect(bg_ov_t * ov, int pixel_width, int pixel_height);
-  
-void bg_ov_destroy_overlay(bg_ov_t * ov, int id, gavl_overlay_t * ovl);
+
   
 void bg_ov_close(bg_ov_t * ov);

gmerlin-1.2.0.tar.gz/include/gmerlin/parameter.h -> gmerlin-4256.tar.gz/include/gmerlin/parameter.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/player.h -> gmerlin-4256.tar.gz/include/gmerlin/player.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/playermsg.h -> gmerlin-4256.tar.gz/include/gmerlin/playermsg.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/plugin.h -> gmerlin-4256.tar.gz/include/gmerlin/plugin.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -24,6 +24,12 @@
 
 #include <gavl/gavl.h>
 #include <gavl/compression.h>
+#include <gavl/connectors.h>
+#include <gavl/metadata.h>
+#include <gavl/edl.h>
+
+#include <gavl/gavf.h>
+
 #include <gmerlin/parameter.h>
 #include <gmerlin/streaminfo.h>
 #include <gmerlin/accelerator.h>
@@ -104,7 +110,7 @@
 #define BG_PLUGIN_RECORDER         (1<<2)  //!< Plugin does hardware recording
 #define BG_PLUGIN_URL              (1<<3)  //!< Plugin can load URLs
 #define BG_PLUGIN_PLAYBACK         (1<<4)  //!< Plugin is an audio or video driver for playback
-#define BG_PLUGIN_STDIN            (1<<8)  //!< Plugin can read from stdin ("-")
+#define BG_PLUGIN_PIPE             (1<<8)  //!< Plugin can do I/O from stdin or stdout ("-")
 #define BG_PLUGIN_TUNER            (1<<9)  //!< Plugin has some kind of tuner. Channels will be loaded as tracks.
 #define BG_PLUGIN_FILTER_1        (1<<10)  //!< Plugin acts as a filter with one input
 #define BG_PLUGIN_EMBED_WINDOW    (1<<11)  //!< Plugin can embed it's window into another application
@@ -114,8 +120,17 @@
 #define BG_PLUGIN_CALLBACKS       (1<<15)  //!< Plugin can be opened from callbacks
 #define BG_PLUGIN_BROADCAST       (1<<16)  //!< Plugin can broadcasts (e.g. webstreams)
 #define BG_PLUGIN_DEVPARAM        (1<<17)  //!< Plugin has pluggable devices as parameters, which must be updated regurarly
+#define BG_PLUGIN_OV_STILL        (1<<18)  //!< OV plugin supports still images
+#define BG_PLUGIN_GAVF_IO         (1<<19)  //!< Plugin can read/write to/from a gavf I/O handle
+
+#define BG_PLUGIN_AUDIO_COMPRESSOR    (1<<19)  //!< Plugin compresses audio
+#define BG_PLUGIN_VIDEO_COMPRESSOR    (1<<20)  //!< Plugin compresses video
+#define BG_PLUGIN_AUDIO_DECOMPRESSOR  (1<<21)  //!< Plugin decompresses audio
+#define BG_PLUGIN_VIDEO_DECOMPRESSOR  (1<<22)  //!< Plugin decompresses video
+#define BG_PLUGIN_OVERLAY_COMPRESSOR  (1<<23)  //!< Plugin compresses overlays
+#define BG_PLUGIN_OVERLAY_DECOMPRESSOR  (1<<24)  //!< Plugin decompresses overlays
 
-#define BG_PLUGIN_UNSUPPORTED     (1<<24)  //!< Plugin is not supported. Only for a foreign API plugins
+#define BG_PLUGIN_UNSUPPORTED     (1<<25)  //!< Plugin is not supported. Only for a foreign API plugins
 
 
 #define BG_PLUGIN_ALL 0xFFFFFFFF //!< Mask of all possible plugin flags
@@ -123,7 +138,7 @@
 /** @}
  */
 
-#define BG_PLUGIN_API_VERSION 26
+#define BG_PLUGIN_API_VERSION 27
 
 /* Include this into all plugin modules exactly once
    to let the plugin loader obtain the API version */
@@ -182,8 +197,8 @@
     BG_PLUGIN_RECORDER_VIDEO             = (1<<4), //!< Video recorder
     BG_PLUGIN_ENCODER_AUDIO              = (1<<5), //!< Encoder for audio only
     BG_PLUGIN_ENCODER_VIDEO              = (1<<6), //!< Encoder for video only
-    BG_PLUGIN_ENCODER_SUBTITLE_TEXT      = (1<<7), //!< Encoder for text subtitles only
-    BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY   = (1<<8), //!< Encoder for overlay subtitles only
+    BG_PLUGIN_ENCODER_TEXT               = (1<<7), //!< Encoder for text subtitles only
+    BG_PLUGIN_ENCODER_OVERLAY            = (1<<8), //!< Encoder for overlay subtitles only
     BG_PLUGIN_ENCODER                    = (1<<9), //!< Encoder for multiple kinds of streams
     BG_PLUGIN_ENCODER_PP                 = (1<<10),//!< Encoder postprocessor (e.g. CD burner)
     BG_PLUGIN_IMAGE_READER               = (1<<11),//!< Image reader
@@ -192,6 +207,7 @@
     BG_PLUGIN_FILTER_VIDEO               = (1<<14), //!< Video filter
     BG_PLUGIN_VISUALIZATION              = (1<<15), //!< Visualization
     BG_PLUGIN_AV_RECORDER                = (1<<16),  //!< Audio/Video recorder
+    BG_PLUGIN_CODEC                      = (1<<17),  //!< Audio/Video (de)compressor
   } bg_plugin_type_t;
 
 /** \ingroup plugin
@@ -252,7 +268,7 @@
   int              flags;  //!< Flags (see defines)
   
   char             * description; //!< Textual description 
-  
+
   /*
    *  If there might be more than one plugin for the same
    *  job, there is a priority (0..10) which is used for the
@@ -356,16 +372,7 @@
    */
   
   void (*duration_changed)(void * data, gavl_time_t duration);
-
-  /** \brief Name changed
-   *  \param data The data member of this bg_input_callbacks_s struct
-   *  \param time The new name
-   *
-   *  This is for web-radio stations, which send song-names.
-   */
   
-  void (*name_changed)(void * data, const char * name);
-
   /** \brief Metadata changed
    *  \param data The data member of this bg_input_callbacks_s struct
    *  \param m The new metadata
@@ -502,18 +509,14 @@
    *  \returns 1 on success, 0 on failure
    */
 
-  int (*open_callbacks)(void * priv,
-                        int (*read_callback)(void * priv, uint8_t * data, int len),
-                        int64_t (*seek_callback)(void * priv, uint64_t pos, int whence),
-                        void * cb_priv, const char * filename, const char * mimetype,
-                        int64_t total_bytes);
+  int (*open_io)(void * priv, gavf_io_t * io);
   
   /** \brief Get the edl (optional)
    *  \param priv The handle returned by the create() method
    *  \returns The edl if any
    */
 
-  const bg_edl_t * (*get_edl)(void * priv);
+  const gavl_edl_t * (*get_edl)(void * priv);
     
   /** \brief Get the disc name (optional)
    *  \param priv The handle returned by the create() method
@@ -598,6 +601,19 @@
 
   int (*get_video_compression_info)(void * priv, int stream,
                                     gavl_compression_info_t * info);
+
+  /** \brief Get the compression info of an overlay stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \param info Returns the compression info
+   *  \returns 1 if the compression info was returned, 0 if the stream cannot be output in compressed form
+   *
+   *  The returned compression info should be freed with
+   *  \ref gavl_compression_info_free
+   */
+
+  int (*get_overlay_compression_info)(void * priv, int stream,
+                                      gavl_compression_info_t * info);
   
   /*
    *  These functions set the audio- video- and subpicture streams
@@ -630,15 +646,24 @@
 
   int (*set_video_stream)(void * priv, int stream, bg_stream_action_t action);
   
-  /** \brief Setup subtitle stream
+  /** \brief Setup text stream
    *  \param priv The handle returned by the create() method
    *  \param stream Stream index starting with 0
    *  \param action What to do with the stream
    *  \returns 1 on success, 0 on failure
    */
 
-  int (*set_subtitle_stream)(void * priv, int stream, bg_stream_action_t action);
-  
+  int (*set_text_stream)(void * priv, int stream, bg_stream_action_t action);
+
+  /** \brief Setup overlay stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \param action What to do with the stream
+   *  \returns 1 on success, 0 on failure
+   */
+
+  int (*set_overlay_stream)(void * priv, int stream, bg_stream_action_t action);
+
   /** \brief Start decoding
    *  \param priv The handle returned by the create() method
    *  \returns 1 on success, 0 on error
@@ -675,7 +700,17 @@
    *  buffering mechanism.
    */
 
-  bg_read_audio_func_t read_audio;
+  //  bg_read_audio_func_t read_audio;
+
+  /** \brief Get the audio source for a stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The audio source for this stream
+   *
+   *  This is an alternative for \ref read_audio.
+   */
+
+  gavl_audio_source_t * (*get_audio_source)(void * priv, int stream);
 
   /** \brief Check is a still image is available
    *  \param priv The handle returned by the create() method
@@ -686,7 +721,7 @@
    *  1, but the subsequent call to read_video returns 0
    */
 
-  int (*has_still)(void * priv, int stream);
+  //  int (*has_still)(void * priv, int stream);
   
   /** \brief Read a video frame
    *  \param priv The handle returned by the create() method
@@ -695,8 +730,19 @@
    *  \returns 1 if a frame was decoded, 0 means EOF.
    */
   
-  bg_read_video_func_t read_video;
+  //  bg_read_video_func_t read_video;
+  
+  /** \brief Get the video source for a stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The video source for that stream
+   *
+   *  This is an alternative for \ref has_still and
+   *  \ref read_video. 
+   */
 
+  gavl_video_source_t * (*get_video_source)(void * priv, int stream);
+  
   /** \brief Read compressed audio packet
    *  \param priv The handle returned by the create() method
    *  \param stream Stream index (starting with 0)
@@ -707,7 +753,7 @@
    *  Use \ref gavl_packet_free when it's no longer used.
    */
 
-  int (*read_audio_packet)(void * priv, int stream, gavl_packet_t * p);
+  //  int (*read_audio_packet)(void * priv, int stream, gavl_packet_t * p);
 
   /** \brief Read compressed video packet
    *  \param priv The handle returned by the create() method
@@ -719,8 +765,37 @@
    *  Use \ref gavl_packet_free when it's no longer used.
    */
 
-  int (*read_video_packet)(void * priv, int stream, gavl_packet_t * p);
+  //  int (*read_video_packet)(void * priv, int stream, gavl_packet_t * p);
 
+    /** \brief Get the packet source for an audio stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The packet source for this stream
+   *
+   *  This is an alternative for \ref read_audio_packet
+   */
+
+  gavl_packet_source_t * (*get_audio_packet_source)(void * priv, int stream);
+
+  /** \brief Get the packet source for a video stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The packet source for this stream
+   *
+   *  This is an alternative for \ref read_video_packet
+   */
+
+  gavl_packet_source_t * (*get_video_packet_source)(void * priv, int stream);
+
+  /** \brief Get the packet source for an overlay stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The packet source for this stream
+   *
+   *  This is an alternative for \ref read_video_packet
+   */
+
+  gavl_packet_source_t * (*get_overlay_packet_source)(void * priv, int stream);
   
   /** \brief Skip frames in a video stream
       \param stream Stream index (starting with 0)
@@ -742,7 +817,7 @@
    *  \returns 1 if a subtitle is available, 0 else.
    */
   
-  int (*has_subtitle)(void * priv, int stream);
+  //  int (*has_subtitle)(void * priv, int stream);
     
   /** \brief Read one pixmap subtitle
    *  \param priv The handle returned by the create() method
@@ -755,8 +830,18 @@
    *  - read_subtitle_overlay() returned 0
    */
   
-  int (*read_subtitle_overlay)(void * priv,
-                               gavl_overlay_t*ovl, int stream);
+  //  int (*read_subtitle_overlay)(void * priv,
+  //                               gavl_overlay_t*ovl, int stream);
+
+  /** \brief Get the overlay source for a stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The overlay source for this stream
+   *
+   *  This is an alternative for \ref read_subtitle_overlay.
+   */
+  
+  gavl_video_source_t * (*get_overlay_source)(void * priv, int stream);
 
   /** \brief Read one text subtitle
    *  \param priv The handle returned by the create() method
@@ -776,10 +861,30 @@
    *  after the last call (if non-NULL).
    */
   
-  int (*read_subtitle_text)(void * priv,
-                            char ** text, int * text_alloc,
-                            int64_t * start_time,
-                            int64_t * duration, int stream);
+  //  int (*read_subtitle_text)(void * priv,
+  //                            char ** text, int * text_alloc,
+  //                            int64_t * start_time,
+  //                            int64_t * duration, int stream);
+
+  /** \brief Get the text source for a stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The text source for this stream
+   *
+   *  This is an alternative for \ref read_subtitle_text.
+   */
+  
+  gavl_packet_source_t * (*get_text_source)(void * priv, int stream);
+  
+  /** \brief Get the packet source for a text subtitle stream
+   *  \param priv The handle returned by the create() method
+   *  \param stream Stream index starting with 0
+   *  \returns The packet source for this stream
+   *
+   *  This is an alternative for \ref read_subtitle_text
+   */
+
+  gavl_packet_source_t * (*get_subtitle_packet_source)(void * priv, int stream);
   
   /** \brief Seek within a media track
    *  \param priv The handle returned by the create() method
@@ -852,14 +957,14 @@
    */
 
   int (*start)(void * priv);
-    
-  /** \brief Write audio samples
+  
+  /** \brief Get audio sink
    *  \param priv The handle returned by the create() method
-   *  \param frame The audio frame to write.
+   *  \returns Audio sink
    */
   
-  void (*write_audio)(void * priv, gavl_audio_frame_t* frame);
-
+  gavl_audio_sink_t * (*get_sink)(void * priv);
+  
   /** \brief Get the number of buffered audio samples
    *  \param priv The handle returned by the create() method
    *  \returns The number of buffered samples (both soft- and hardware)
@@ -889,7 +994,7 @@
   };
 
 /*******************************************
- * AUDIO RECORDER
+ * Recorder
  *******************************************/
 
 /** \defgroup plugin_r Recorder
@@ -911,14 +1016,12 @@
   {
   /** \brief Name changed
    *  \param data The data member of this bg_input_callbacks_s struct
-   *  \param name The new name
    *  \param metadata The new metadata
    *
    *  This is for web-radio stations, which send song-names.
    */
   
-  void (*metadata_changed)(void * data, const char * name,
-                           const gavl_metadata_t * m);
+  void (*metadata_changed)(void * data, const gavl_metadata_t * m);
   
   void * data; //!< Application specific data passed as the first argument to all callbacks.
   
@@ -963,15 +1066,25 @@
 
   
   int (*open)(void * priv, gavl_audio_format_t * audio_format,
-              gavl_video_format_t * video_format);
+              gavl_video_format_t * video_format, gavl_metadata_t * m);
   
   /** \brief Read audio samples
    */
   bg_read_audio_func_t read_audio;
 
+  /** \brief Get audio source
+   */
+
+  gavl_audio_source_t * (*get_audio_source)(void * priv);
+  
   /** \brief Read video frame
    */
   bg_read_video_func_t read_video;
+
+  /** \brief Get video source
+   */
+  
+  gavl_video_source_t * (*get_video_source)(void * priv);
   
   /** \brief Close plugin
    *  \param priv The handle returned by the create() method
@@ -1209,12 +1322,12 @@
    *  \param priv The handle returned by the create() method
    */
   
-  gavl_video_frame_t * (*get_frame)(void * priv);
+  //  gavl_video_frame_t * (*get_frame)(void * priv);
   
   /** \brief Add a stream for transparent overlays
    *  \param priv The handle returned by the create() method
    *  \param format Format of the overlays
-   *  \returns The index of the overlay stream
+   *  \returns The sink of the overlay stream
    *
    *  It's up to the plugin, if they are realized in hardware or
    *  with a gavl_overlay_blend_context_t, but they must be there.
@@ -1224,7 +1337,7 @@
    *  is one for subtitles and one for OSD.
    */
   
-  int (*add_overlay_stream)(void * priv, gavl_video_format_t * format);
+  gavl_video_sink_t * (*add_overlay_stream)(void * priv, gavl_video_format_t * format);
 
   /** \brief Allocate an overlay
    *  \param priv The handle returned by the create() method
@@ -1238,7 +1351,7 @@
    *  the destroy_overlay() method.
    */
   
-  gavl_overlay_t * (*create_overlay)(void * priv, int id);
+  //  gavl_overlay_t * (*create_overlay)(void * priv, int id);
   
   /** \brief Set an overlay for a specific stream
    *  \param priv The handle returned by the create() method
@@ -1246,28 +1359,15 @@
    *  \param ovl New overlay or NULL
    */
   
-  void (*set_overlay)(void * priv, int stream, gavl_overlay_t * ovl);
-  
-  /** \brief Display a frame of a video stream
-   *  \param priv The handle returned by the create() method
-   *  \param frame Frame to display
-   *  
-   *  This is for video playback
-   */
-
-  void (*put_video)(void * priv, gavl_video_frame_t*frame);
+  //  void (*set_overlay)(void * priv, int stream, gavl_overlay_t * ovl);
 
-  /** \brief Display a still image
+  /** \brief Return a video sink
    *  \param priv The handle returned by the create() method
-   *  \param frame Frame to display
-   *  
-   *  This function is like put_video() with the difference, that
-   *  the frame will be remembered and redisplayed, when an expose event
-   *  is received.
+   *  \returns The sink for this plugin
    */
   
-  void (*put_still)(void * priv, gavl_video_frame_t*frame);
-
+  gavl_video_sink_t * (*get_sink)(void * priv);
+  
   /** \brief Get all events from the queue and handle them
    *  \param priv The handle returned by the create() method
    *  
@@ -1285,20 +1385,14 @@
    */
   
   void (*update_aspect)(void * priv, int pixel_width, int pixel_height);
-    
-  /** \brief Free a frame created with the create_frame() method.
-   *  \param priv The handle returned by the create() method
-   *  \param frame The frame to be freed
-   */
-  //  void (*destroy_frame)(void * priv, gavl_video_frame_t * frame);
-
+  
   /** \brief Free an overlay created with the create_overlay() method.
    *  \param priv The handle returned by the create() method
    *  \param id The id returned by the add_overlay_stream() method
    *  \param ovl The overlay to be freed
    */
   
-  void (*destroy_overlay)(void * priv, int id, gavl_overlay_t * ovl);
+  //  void (*destroy_overlay)(void * priv, int id, gavl_overlay_t * ovl);
 
   /** \brief Close the plugin
    *  \param priv The handle returned by the create() method
@@ -1381,8 +1475,8 @@
   
   int max_audio_streams;  //!< Maximum number of audio streams. -1 means infinite
   int max_video_streams;  //!< Maximum number of video streams. -1 means infinite
-  int max_subtitle_text_streams;//!< Maximum number of text subtitle streams. -1 means infinite
-  int max_subtitle_overlay_streams;//!< Maximum number of overlay subtitle streams. -1 means infinite
+  int max_text_streams;//!< Maximum number of text subtitle streams. -1 means infinite
+  int max_overlay_streams;//!< Maximum number of overlay subtitle streams. -1 means infinite
   
   /** \brief Set callbacks
    *  \param priv The handle returned by the create() method
@@ -1416,7 +1510,20 @@
   int (*writes_compressed_video)(void * priv,
                                  const gavl_video_format_t * format,
                                  const gavl_compression_info_t * info);
+
+  /** \brief Query for writing compressed overlay packets
+   *  \param priv The handle returned by the create() method
+   *  \param format Format of the source
+   *  \param info Compression info
+   *  \returns 1 if stream compressed format can be written, 0 else
+   *  
+   *  Call this function after all global parameters are set.
+   */
   
+  int (*writes_compressed_overlay)(void * priv,
+                                   const gavl_video_format_t * format,
+                                   const gavl_compression_info_t * info);
+    
   /** \brief Open a file
    *  \param priv The handle returned by the create() method
    *  \param filename Name of the file to be opened (without extension!)
@@ -1429,8 +1536,21 @@
   
   int (*open)(void * data, const char * filename,
               const gavl_metadata_t * metadata,
-              const bg_chapter_list_t * chapter_list);
-  
+              const gavl_chapter_list_t * chapter_list);
+ 
+
+ /** \brief Open an encoder with a gavf IO handle
+   *  \param priv The handle returned by the create() method
+   *  \param io IO handle
+   *  \param metadata Metadata to be written to the file
+   *  \param chapter_list Chapter list (optional, can be NULL)
+   */
+
+  int (*open_io)(void * data, gavf_io_t * io,
+                 const gavl_metadata_t * metadata,
+                 const gavl_chapter_list_t * chapter_list);
+
+ 
   /* Return per stream parameters */
 
   /** \brief Get audio related parameters
@@ -1458,7 +1578,7 @@
    *  The returned parameters are owned by the plugin and must not be freed.
    */
 
-  const bg_parameter_info_t * (*get_subtitle_text_parameters)(void * priv);
+  const bg_parameter_info_t * (*get_text_parameters)(void * priv);
 
   /** \brief Get overlay subtitle related parameters
    *  \param priv The handle returned by the create() method
@@ -1467,7 +1587,7 @@
    *  The returned parameters are owned by the plugin and must not be freed.
    */
 
-  const bg_parameter_info_t * (*get_subtitle_overlay_parameters)(void * priv);
+  const bg_parameter_info_t * (*get_overlay_parameters)(void * priv);
   
   /* Add streams. The formats can be changed, be sure to get the
    * final formats with get_[audio|video]_format after starting the plugin
@@ -1540,9 +1660,26 @@
    *  \returns Index of this stream (starting with 0)
    */
   
-  int (*add_subtitle_text_stream)(void * priv,
+  int (*add_text_stream)(void * priv,
                                   const gavl_metadata_t * m,
-                                  int * timescale);
+                                  uint32_t * timescale);
+  
+  /** \brief Add an overlay subtitle stream
+   *  \param priv The handle returned by the create() method
+   *  \param m Metadata
+   *  \param format Format of the source
+   *  \returns Index of this stream (starting with 0)
+   *
+   *  The format might be changed to the nearest format supported by
+   *  the plugin. Use \ref get_subtitle_overlay_format
+   *  to get the actual format
+   *  needed by the plugin, after \ref start was called.
+   */
+  
+  int (*add_overlay_stream_compressed)(void * priv,
+                                       const gavl_metadata_t * m,
+                                       const gavl_video_format_t * format,
+                                       const gavl_compression_info_t * ci);
   
   /** \brief Add a text subtitle stream
    *  \param priv The handle returned by the create() method
@@ -1556,9 +1693,9 @@
    *  needed by the plugin, after \ref start was called.
    */
   
-  int (*add_subtitle_overlay_stream)(void * priv,
-                                     const gavl_metadata_t * m,
-                                     const gavl_video_format_t * format);
+  int (*add_overlay_stream)(void * priv,
+                            const gavl_metadata_t * m,
+                            const gavl_video_format_t * format);
   
   /* Set parameters for the streams */
 
@@ -1599,7 +1736,7 @@
    *  \ref get_subtitle_text_parameters.
    */
   
-  void (*set_subtitle_text_parameter)(void * priv, int stream,
+  void (*set_text_parameter)(void * priv, int stream,
                                       const char * name,
                                       const bg_parameter_value_t * v);
 
@@ -1613,9 +1750,9 @@
    *  \ref get_subtitle_overlay_parameters.
    */
   
-  void (*set_subtitle_overlay_parameter)(void * priv, int stream,
-                                         const char * name,
-                                         const bg_parameter_value_t * v);
+  void (*set_overlay_parameter)(void * priv, int stream,
+                                const char * name,
+                                const bg_parameter_value_t * v);
   
   /** \brief Setup multipass video encoding.
    *  \param priv The handle returned by the create() method
@@ -1638,122 +1775,64 @@
   
   int (*start)(void * priv);
   
-  /*
-   *  After setting the parameters, get the formats, you need to deliver the frames in
-   */
-
-  /** \brief Get audio format
+  /** \brief Get audio sink
    *  \param priv The handle returned by the create() method
-   *  \param stream Stream index (starting with 0)
-   *  \param ret Returns format
-   *
-   *  Call this after calling \ref start() if it's defined.
+   *  \returns The audio sink for this stream
    */
   
-  void (*get_audio_format)(void * priv, int stream, gavl_audio_format_t*ret);
-
-  /** \brief Get video format
-   *  \param priv The handle returned by the create() method
-   *  \param stream Stream index (starting with 0)
-   *  \param ret Returns format
-   *
-   *  Call this after calling \ref start() if it's defined.
-   */
-
-  void (*get_video_format)(void * priv, int stream, gavl_video_format_t*ret);
-
-  /** \brief Get video format of an overlay subtitle stream
-   *  \param priv The handle returned by the create() method
-   *  \param stream Stream index (starting with 0)
-   *  \param ret Returns format
-   *
-   *  Call this after calling \ref start() if it's defined.
-   */
-
-  void (*get_subtitle_overlay_format)(void * priv, int stream,
-                                      gavl_video_format_t*ret);
-
-  /*
-   *  Encode audio/video
-   */
-
-  /** \brief Write audio samples
+  gavl_audio_sink_t * (*get_audio_sink)(void * priv, int stream);
+  
+  /** \brief Get audio packet sink
    *  \param priv The handle returned by the create() method
-   *  \param frame Frame with samples
-   *  \param stream Stream index (starting with 0)
-   *  \returns 1 is the data was successfully written, 0 else
-   *
-   *  The actual number of samples must be stored in the valid_samples member of
-   *  the frame.
+   *  \returns The audio sink for this stream
    */
   
-  int (*write_audio_frame)(void * data, gavl_audio_frame_t * frame, int stream);
-
-  /** \brief Write audio packet
+  gavl_packet_sink_t * (*get_audio_packet_sink)(void * priv, int stream);
+  
+  /** \brief Get video sink
    *  \param priv The handle returned by the create() method
-   *  \param packet Packet with compressed data
-   *  \param stream Stream index (starting with 0)
-   *  \returns 1 is the data was successfully written, 0 else
-   *
-   *  The actual number of samples must be stored in the duration member of
-   *  the packet.
+   *  \returns The packet sink for this stream
    */
   
-  int (*write_audio_packet)(void * data, gavl_packet_t * packet, int stream);
+  gavl_video_sink_t * (*get_video_sink)(void * priv, int stream);
 
-  
-  /** \brief Write video frame
+  /** \brief Get video sink
    *  \param priv The handle returned by the create() method
-   *  \param frame Frame
-   *  \param stream Stream index (starting with 0)
-   *  \returns 1 is the data was successfully written, 0 else
+   *  \returns The packet sink for this stream
    */
+  
+  gavl_packet_sink_t * (*get_video_packet_sink)(void * priv, int stream);
 
-  int (*write_video_frame)(void * data, gavl_video_frame_t * frame, int stream);
-
-  /** \brief Write video packet
+  /** \brief Get text subtitle sink
    *  \param priv The handle returned by the create() method
-   *  \param packet Packet with compressed data
-   *  \param stream Stream index (starting with 0)
-   *  \returns 1 is the data was successfully written, 0 else
+   *  \returns The packet sink for this stream
    */
   
-  int (*write_video_packet)(void * data, gavl_packet_t * packet, int stream);
+  gavl_packet_sink_t * (*get_text_sink)(void * priv, int stream);
   
-  /** \brief Write a text subtitle
+  /** \brief Get overlay subtitle sink
    *  \param priv The handle returned by the create() method
-   *  \param frame The text
-   *  \param start Start of the subtitle
-   *  \param duration Duration of the subtitle
-   *  \param stream Stream index (starting with 0)
-   *  \returns 1 is the data was successfully written, 0 else
+   *  \returns The video sink for this stream
    */
   
-  int (*write_subtitle_text)(void * data,const char * text,
-                             int64_t start,
-                             int64_t duration, int stream);
-  
-  /** \brief Write an overlay subtitle
+  gavl_video_sink_t * (*get_overlay_sink)(void * priv, int stream);
+
+  /** \brief Get overlay subtitle sink
    *  \param priv The handle returned by the create() method
-   *  \param ovl An overlay
-   *  \param stream Stream index (starting with 0)
-   *  \returns 1 is the data was successfully written, 0 else
+   *  \returns The packet sink for this stream
    */
   
-  int (*write_subtitle_overlay)(void * data, gavl_overlay_t * ovl, int stream);
-
+  gavl_packet_sink_t * (*get_overlay_packet_sink)(void * priv, int stream);
+  
   /** \brief Update metadata
-   *  \param data The data member of this bg_input_callbacks_s struct
-   *  \param name Name
+   *  \param priv The handle returned by the create() method
    *  \param m Metadata
    *
    *  Update metadata for broadcasting plugins.
-   *  Either name or m can be NULL.
    */
   
-  void (*update_metadata)(void * data, const char * name,
-                          const gavl_metadata_t * m);
-
+  void (*update_metadata)(void * priv, const gavl_metadata_t * m);
+  
   /** \brief Close encoder
    *  \param priv The handle returned by the create() method
    *  \param do_delete Set this to 1 to delete all created files
@@ -1912,6 +1991,7 @@
   {
   bg_plugin_common_t common; //!< Infos and functions common to all plugin types
   const char * extensions; //!< Supported file extensions (space separated)
+  const char * mimetypes;  //!< Supported mimetypes
   
   /** \brief Read the file header
    *  \param priv The handle returned by the create() method
@@ -1990,7 +2070,8 @@
   {
   bg_plugin_common_t common; //!< Infos and functions common to all plugin types
   const char * extensions; //!< File extensions (space separated)
-  
+  const char * mimetypes;  //!< Supported mimetypes
+
   /** \brief Set callbacks
    *  \param priv The handle returned by the create() method
    *  \param cb Callback structure
@@ -2070,30 +2151,6 @@
   {
   bg_plugin_common_t common; //!< Infos and functions common to all plugin types
 
-  /** \brief Set input callback
-   *  \param priv The handle returned by the create() method
-   *  \param func The function to call
-   *  \param data The private handle to pass to func
-   *  \param stream The stream argument to pass to func
-   *  \param port The input port of the plugin
-   */
-  
-  void (*connect_input_port)(void * priv, bg_read_audio_func_t func,
-                             void * data,
-                             int stream, int port);
-
-  /** \brief Set input format
-   *  \param priv The handle returned by the create() method
-   *  \param format Format
-   *  \param port The input port of the plugin
-   *
-   *  The input format can be changed by the plugin. Make sure that you have a format
-   *  converter before the filter.
-   */
-  
-  void (*set_input_format)(void * priv, gavl_audio_format_t * format, int port);
-
-
   /** \brief Reset
    *  \param priv The handle returned by the create() method
    *
@@ -2102,15 +2159,18 @@
 
   void (*reset)(void * priv);
 
-  /** \brief Get output format
+  /** \brief Connect sources
    *  \param priv The handle returned by the create() method
-   *  \param format Returns the output format
+   *  \param src Video source where this filter gets it's frames from
+   *  \returns 1 The source to be passed to the subsequent filter
    *
-   *  These must be called after init().
+   *  This can be implemented as a replacement for \ref connect_input_port,
+   *  \ref set_input_format and \ref get_output_format \ref read_video.
    */
-
-  void (*get_output_format)(void * priv, gavl_audio_format_t * format);
-
+  
+  gavl_audio_source_t * (*connect)(void * priv, gavl_audio_source_t *,
+                                   const gavl_audio_options_t * opt);
+  
   /** \brief Report, if the plugin must be reinitialized
    *  \param priv The handle returned by the create() method
    *  \returns 1 if the plugin must be reinitialized, 0 else
@@ -2122,11 +2182,6 @@
   
   int (*need_restart)(void * priv);
 
-  /** \brief Read audio samples from the plugin
-   */
- 
-  bg_read_audio_func_t read_audio;
-    
   };
 
 /** \brief Typedef for video filter plugin
@@ -2143,36 +2198,6 @@
   {
   bg_plugin_common_t common; //!< Infos and functions common to all plugin types
 
-  /** \brief Get gavl options
-   *  \param priv The handle returned by the create() method
-   *  \returns Video conversion options
-   *
-   *  This optional function returns the gavl options. You can configure them
-   *  like you do it in plain gavl.
-   */
-  
-  gavl_video_options_t * (*get_options)(void * priv);
-  
-  /** \brief Set input callback
-   *  \param priv The handle returned by the create() method
-   *  \param func The function to call
-   *  \param data The private handle to pass to func
-   *  \param stream The stream argument to pass to func
-   *  \param port The input port of the plugin
-   */
-  
-  void (*connect_input_port)(void * priv,
-                             bg_read_video_func_t func,
-                             void * data, int stream, int port);
-
-  /** \brief Set input format
-   *  \param priv The handle returned by the create() method
-   *  \param format Format
-   *  \param port The input port of the plugin
-   */
-  
-  void (*set_input_format)(void * priv, gavl_video_format_t * format, int port);
-  
   /** \brief Reset
    *  \param priv The handle returned by the create() method
    *
@@ -2181,15 +2206,6 @@
 
   void (*reset)(void * priv);
 
-  /** \brief Get output format
-   *  \param priv The handle returned by the create() method
-   *  \param format Returns the output format
-   *
-   *  These must be called after init().
-   */
-  
-  void (*get_output_format)(void * priv, gavl_video_format_t * format);
-  
   /** \brief Report, if the plugin must be reinitialized
    *  \param priv The handle returned by the create() method
    *  \returns 1 if the plugin must be reinitialized, 0 else
@@ -2201,10 +2217,16 @@
   
   int (*need_restart)(void * priv);
 
-  /** \brief Read a video frame from the plugin
+  /** \brief Connect sources
+   *  \param priv The handle returned by the create() method
+   *  \param src Video source where this filter gets it's frames from
+   *  \param opt gavl Options for converting and filtering
+   *  \returns The source to be passed to the subsequent filter
    */
-
-  bg_read_video_func_t read_video;
+  
+  gavl_video_source_t * (*connect)(void * priv,
+                                   gavl_video_source_t * src,
+                                   const gavl_video_options_t * opt);
     
   };
 
@@ -2325,8 +2347,147 @@
   
   };
 
+/** \ingroup plugin_codec
+ *  \brief typedef for codec plugin
+ *
+ */
+
+typedef struct bg_codec_plugin_s bg_codec_plugin_t;
+
+
+/** \brief Codec plugin
+ *
+ *  Transform audio frames into compressed packets or back
+ */
+
+struct bg_codec_plugin_s
+  {
+  bg_plugin_common_t common; //!< Infos and functions common to all plugin types
+
+  /** \brief Get supported compressions
+   *  \param priv The handle returned by the create() method
+   *  \returns A list of compressions terminated with GAVL_COMPRESSION_NONE
+   */
+  
+  const gavl_codec_id_t * (*get_compressions)(void * priv);
+  
+  /** \brief Connect audio encoder
+   *  \param priv The handle returned by the create() method
+   *  \param ci Compression info (must be freed by the caller)
+   *  \param fmt Format of the source
+   *  \param m Stream metadata (might get changed by the call)
+   *  \returns An audio sink for sending uncompressed frames
+   */
+  
+  gavl_audio_sink_t * (*open_encode_audio)(void * priv,
+                                           gavl_compression_info_t * ci,
+                                           gavl_audio_format_t * fmt,
+                                           gavl_metadata_t * m);
+  
+  /** \brief Connect video encoder
+   *  \param priv The handle returned by the create() method
+   *  \param ci Compression info (must be freed by the caller)
+   *  \param fmt Format of the source
+   *  \param m Stream metadata (might get changed by the call)
+   *  \returns A video sink for sending uncompressed frames
+   */
+  
+  gavl_video_sink_t * (*open_encode_video)(void * priv,
+                                           gavl_compression_info_t * ci,
+                                           gavl_video_format_t * fmt,
+                                           gavl_metadata_t * m);
+
+  /** \brief Connect overlay encoder
+   *  \param priv The handle returned by the create() method
+   *  \param ci Compression info (must be freed by the caller)
+   *  \param fmt Format of the source
+   *  \param m Stream metadata (might get changed by the call)
+   *  \returns A video sink for sending uncompressed frames
+   */
+  
+  gavl_video_sink_t * (*open_encode_overlay)(void * priv,
+                                             gavl_compression_info_t * ci,
+                                             gavl_video_format_t * fmt,
+                                             gavl_metadata_t * m);
+  
+  /** \brief Set a packet sink
+   *  \param priv The handle returned by the create() method
+   *  \param sink A sink where the encoder can send completed packets
+   */
+  
+  void (*set_packet_sink)(void * priv, gavl_packet_sink_t * s);
+  
+  /** \brief Connect audio decoder
+   *  \param priv The handle returned by the create() method
+   *  \param sink Source where get the packets
+   *  \param fmt Format from the container (possibly incomplete)
+   *  \param m Stream metadata (might get changed by the call)
+   *  \returns An audio source for reading uncompressed frames
+   */
+  
+  gavl_audio_source_t * (*connect_decode_audio)(void * priv,
+                                                gavl_packet_source_t * src,
+                                                const gavl_compression_info_t * ci,
+                                                const gavl_audio_format_t * fmt,
+                                                gavl_metadata_t * m);
+
+  /** \brief Connect video decoder
+   *  \param priv The handle returned by the create() method
+   *  \param sink Source where get the packets
+   *  \param fmt Format from the container (possibly incomplete)
+   *  \param m Stream metadata (might get changed by the call)
+   *  \returns A video source for reading uncompressed frames
+   */
+  
+  gavl_video_source_t * (*connect_decode_video)(void * priv,
+                                                gavl_packet_source_t * src,
+                                                const gavl_compression_info_t * ci,
+                                                const gavl_video_format_t * fmt,
+                                                gavl_metadata_t * m);
+ 
+  /** \brief Connect overlay decoder
+   *  \param priv The handle returned by the create() method
+   *  \param sink Source where get the packets
+   *  \param fmt Format from the container (possibly incomplete)
+   *  \param m Stream metadata (might get changed by the call)
+   *  \returns A video source for reading uncompressed overlays
+   */
 
+  gavl_video_source_t * (*connect_decode_overlay)(void * priv,
+                                                gavl_packet_source_t * src,
+                                                const gavl_compression_info_t * ci,
+                                                const gavl_video_format_t * fmt,
+                                                gavl_metadata_t * m);
 
+ 
+  /** \brief Reset a decoder
+   *  \param priv The handle returned by the create() method
+   *
+   *  Call this after seeking
+   */
+  
+  void (*reset)(void * priv);
+
+  /** \brief Skip to a time
+   *  \param priv The handle returned by the create() method
+   *  \param t Time to skip to
+   *  \returns Actual time of the next frame/sample
+   */
+
+  int64_t (*skip)(void * priv, int64_t t);
+
+  /** \brief Set pass for an encoder
+   *  \param priv The handle returned by the create() method
+   *  \param pass Number of this pass (starting with 1)
+   *  \param total_passes Number of total passes
+   *  \param stats_file Name of a file, which can be used for multipass statistics
+   *  \returns 0 if multipass transcoding is not supported and can be ommitted, 1 else
+   */
+  int (*set_pass)(void * priv, int pass, int total_passes,
+                  const char * stats_file);
+  
+  };
+  
 /**
  *  @}
  */

gmerlin-1.2.0.tar.gz/include/gmerlin/pluginfuncs.h -> gmerlin-4256.tar.gz/include/gmerlin/pluginfuncs.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -61,3 +61,15 @@
 bg_encoder_set_framerate_nearest(const bg_encoder_framerate_t * rate_default,
                                  const bg_encoder_framerate_t * rates_supported,
                                  gavl_video_format_t * format);
+
+/* PTS cache for encoders, which reorder frames */
+
+typedef struct bg_encoder_pts_cache_s bg_encoder_pts_cache_t;
+
+bg_encoder_pts_cache_t * bg_encoder_pts_cache_create(void);
+void bg_encoder_pts_cache_destroy(bg_encoder_pts_cache_t*);
+
+int bg_encoder_pts_cache_push_frame(bg_encoder_pts_cache_t*, gavl_video_frame_t * f);
+
+int bg_encoder_pts_cache_pop_packet(bg_encoder_pts_cache_t*, gavl_packet_t * p,
+                                    int64_t frame_num, int64_t pts);

gmerlin-1.2.0.tar.gz/include/gmerlin/pluginregistry.h -> gmerlin-4256.tar.gz/include/gmerlin/pluginregistry.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -60,10 +60,10 @@
 
 typedef enum
   {
-    BG_STREAM_AUDIO             = (1<<0),
-    BG_STREAM_SUBTITLE_TEXT     = (1<<1),
-    BG_STREAM_SUBTITLE_OVERLAY  = (1<<2),
-    BG_STREAM_VIDEO             = (1<<3),
+    BG_STREAM_AUDIO    = (1<<0),
+    BG_STREAM_TEXT     = (1<<1),
+    BG_STREAM_OVERLAY  = (1<<2),
+    BG_STREAM_VIDEO    = (1<<3),
   } bg_stream_type_t;
 
 /** \ingroup plugin_registry
@@ -86,6 +86,7 @@
   char * mimetypes;       //!< Mimetypes, this plugin can handle
   char * extensions;      //!< Extensions, this plugin can handle
   char * protocols;       //!< Network protocols, this plugin can handle
+  gavl_codec_id_t * compressions; //!< Compressions, this plugin can handle
 
   char * description;     //!< Description of what the plugin does
 
@@ -104,17 +105,18 @@
   bg_plugin_info_t * next; //!< Used for chaining, never touch this
 
   bg_parameter_info_t * parameters; //!< Parameters, which can be passed to the plugin
+
   
   int max_audio_streams; //!< For encoders: Maximum number of audio streams (-1 means infinite)
   int max_video_streams; //!< For encoders: Maximum number of video streams (-1 means infinite)
-  int max_subtitle_text_streams;//!< For encoders: Maximum number of text subtitle streams (-1 means infinite)
-  int max_subtitle_overlay_streams;//!< For encoders: Maximum number of overlay subtitle streams (-1 means infinite)
+  int max_text_streams;//!< For encoders: Maximum number of text subtitle streams (-1 means infinite)
+  int max_overlay_streams;//!< For encoders: Maximum number of overlay subtitle streams (-1 means infinite)
 
   bg_parameter_info_t * audio_parameters; //!< Parameters, which can be passed to set_audio_parameter
   bg_parameter_info_t * video_parameters; //!< Parameters, which can be passed to set_video_parameter
 
-  bg_parameter_info_t * subtitle_text_parameters; //!< Parameters, which can be passed to set_subtitle_text_parameter
-  bg_parameter_info_t * subtitle_overlay_parameters; //!< Parameters, which can be passed to set_subtitle_overlay_parameter
+  bg_parameter_info_t * text_parameters; //!< Parameters, which can be passed to set_text_parameter
+  bg_parameter_info_t * overlay_parameters; //!< Parameters, which can be passed to set_overlay_parameter
   
   char * cmp_name; //!< Name used for alphabetical sorting. Not for external use.
   
@@ -170,8 +172,8 @@
   const bg_plugin_info_t * info; //!< Info about this plugin
   void * priv; //!< Private handle, passed as the first argument to most plugin functions
 
-  char * location; //!< Applications can save the argument of an open call here
-  bg_edl_t * edl; //!< EDL
+  //  char * location; //!< Applications can save the argument of an open call here
+  gavl_edl_t * edl; //!< EDL
   };
 
 /*
@@ -276,6 +278,35 @@
 bg_plugin_find_by_filename(bg_plugin_registry_t * reg,
                            const char * filename, int type_mask);
 
+/** \ingroup plugin_registry
+ *  \brief Find a plugin by the mime type
+ *  \param reg A plugin registry
+ *  \param mimetype Mimetype
+ *  \param type_mask Mask of plugin types to be returned
+ *  \returns A plugin info or NULL
+ *
+ *  This function returns the first plugin matching type_mask,
+ *  whose extensions match filename.
+ */
+const bg_plugin_info_t *
+bg_plugin_find_by_mimetype(bg_plugin_registry_t * reg,
+                           const char * mimetype, int type_mask);
+
+
+
+/** \ingroup plugin_registry
+ *  \brief Find a plugin by the compression ID
+ *  \param reg A plugin registry
+ *  \param typemask Mask of plugin types to be returned
+ *  \param flagmask Mask of plugin flags to be returned
+ *  \returns A plugin info or NULL
+ */
+
+const bg_plugin_info_t *
+bg_plugin_find_by_compression(bg_plugin_registry_t * reg,
+                              gavl_codec_id_t id,
+                              int typemask, int flagmask);
+
 
 /** \ingroup plugin_registry
  *  \brief Find an input plugin for a network protocol
@@ -346,6 +377,30 @@
                          bg_input_callbacks_t * callbacks, int prefer_edl);
 
 /** \ingroup plugin_registry
+ *  \brief Load and open an input plugin with URL redirection
+ *  \param reg A plugin registry
+ *  \param location Filename or URL
+ *  \param info Plugin to use (can be NULL for autodetection)
+ *  \param ret Will return the plugin handle.
+ *  \param callbacks Input callbacks (only for authentication)
+ *  \param prefer_edl If 1 EDLs are preferred over raw streams
+ *  \param track Track index (might get changed for redirectors)
+ *  \returns 1 on success, 0 on error.
+ *
+ *  Like \ref bg_input_plugin_load but it does URL redirection
+ *  e.g. for m3u or pls files.
+ */
+
+
+int bg_input_plugin_load_full(bg_plugin_registry_t * reg,
+                              const char * location,
+                              const bg_plugin_info_t * info,
+                              bg_plugin_handle_t ** ret,
+                              bg_input_callbacks_t * callbacks, int prefer_edl,
+                              int * track);
+
+
+/** \ingroup plugin_registry
  *  \brief Load and open an edl decoder
  *  \param reg A plugin registry
  *  \param edl The edl to open
@@ -360,7 +415,7 @@
  */
 
 int bg_input_plugin_load_edl(bg_plugin_registry_t * reg,
-                             const bg_edl_t * edl,
+                             const gavl_edl_t * edl,
                              const bg_plugin_info_t * info,
                              bg_plugin_handle_t ** ret,
                              bg_input_callbacks_t * callbacks);
@@ -480,7 +535,56 @@
 bg_parameter_info_t *
 bg_plugin_registry_create_encoder_parameters(bg_plugin_registry_t * reg,
                                              uint32_t stream_type_mask,
-                                             uint32_t flag_mask);
+                                             uint32_t flag_mask,
+                                             int stream_params);
+
+/** \ingroup plugin_registry
+ *  \brief Create a parameter array for compressors
+ *  \param plugin_reg A plugin registry
+ *  \param flag_mask Mask of all returned plugin flags
+ *  \returns Parameter array for setting up encoders
+ *
+ *  Free the returned parameters with
+ *  \ref bg_parameter_info_destroy_array
+ *
+ */
+
+bg_parameter_info_t *
+bg_plugin_registry_create_compressor_parameters(bg_plugin_registry_t * reg,
+                                                uint32_t flag_mask);
+
+/** \ingroup plugin_registry
+ *  \brief Set a compressor parameter
+ *  \param plugin_reg A plugin registry
+ *  \param plugin Address of a plugin handle
+ *  \param name Parameter name
+ *  \param val Value
+ *
+ *  Call this with the parameters returned by
+ *  \ref bg_plugin_registry_create_encoder_parameters and afterwards
+ *  *plugin will be a codec plugin with all parameters set.
+ */
+
+void
+bg_plugin_registry_set_compressor_parameter(bg_plugin_registry_t * plugin_reg,
+                                            bg_plugin_handle_t ** plugin,
+                                            const char * name,
+                                            const bg_parameter_value_t * val);
+
+/** \ingroup plugin_registry
+ *  \brief Get a compression ID from a compressor section
+ *  \param plugin_reg A plugin registry
+ *  \param section A section
+ *  \returns The codec ID
+ *
+ *  Call this with a section corrsponding to the parameters created by
+ *  \ref bg_plugin_registry_create_compressor_parameters
+ */
+
+gavl_codec_id_t
+bg_plugin_registry_get_compressor_id(bg_plugin_registry_t * plugin_reg,
+                                     bg_cfg_section_t * section);
+  
 
 /** \ingroup plugin_registry
  *  \brief Get the name for an encoding plugin
@@ -632,11 +736,11 @@
 /** \ingroup plugin_registry_defaults
  *  \brief Specify whether text subtitles should be encoded into the same file as the video if possible
  *  \param reg A plugin registry
- *  \param subtitle_text_to_video 0 if the text subtitles should always go to a separate file, 1 else
+ *  \param text_to_video 0 if the text subtitles should always go to a separate file, 1 else
  */
 
-void bg_plugin_registry_set_encode_subtitle_text_to_video(bg_plugin_registry_t * reg,
-                                                          int subtitle_text_to_video);
+void bg_plugin_registry_set_encode_text_to_video(bg_plugin_registry_t * reg,
+                                                          int text_to_video);
 
 /** \ingroup plugin_registry_defaults
  *  \brief Query whether text subtitles should be encoded into the same file as the video if possible
@@ -644,23 +748,23 @@
  *  \returns 0 if the text subtitles should always go to a separate file, 1 else
  */
 
-int bg_plugin_registry_get_encode_subtitle_text_to_video(bg_plugin_registry_t * reg);
+int bg_plugin_registry_get_encode_text_to_video(bg_plugin_registry_t * reg);
 
 /** \ingroup plugin_registry_defaults
  *  \brief Specify whether overlay subtitles should be encoded into the same file as the video if possible
  *  \param reg A plugin registry
- *  \param subtitle_overlay_to_video 0 if the overay subtitles should always go to a separate file, 1 else
+ *  \param overlay_to_video 0 if the overay subtitles should always go to a separate file, 1 else
  */
 
-void bg_plugin_registry_set_encode_subtitle_overlay_to_video(bg_plugin_registry_t * reg,
-                                                             int subtitle_overlay_to_video);
+void bg_plugin_registry_set_encode_overlay_to_video(bg_plugin_registry_t * reg,
+                                                             int overlay_to_video);
 
 /** \ingroup plugin_registry_defaults
  *  \brief Query whether overlay subtitles should be encoded into the same file as the video if possible
  *  \param reg A plugin registry
  *  \returns 0 if the overay subtitles should always go to a separate file, 1 else
  */
-int bg_plugin_registry_get_encode_subtitle_overlay_to_video(bg_plugin_registry_t * reg);
+int bg_plugin_registry_get_encode_overlay_to_video(bg_plugin_registry_t * reg);
 
 /** \ingroup plugin_registry_defaults
  *  \brief Specify whether postprocessing should be done after encoding
@@ -809,6 +913,24 @@
                      gavl_video_frame_t ** frame_ret,
                      gavl_video_format_t * format_ret);
 
+/** \brief Make a thumbnail of a video frame
+ *  \param plugin_reg Plugin registry
+ *  \param in_frame Input frame
+ *  \param input_format Format of the input frame
+ *  \param max_width Maximum width
+ *  \param max_height Maximum height
+ *  \param out_file_base Output filename without extension
+ *  \param mimetype Mimetype of the output file
+ *  \returns The filename of the generated thumbnail (to be freed by the caller) or NULL
+ */
+
+char * bg_make_thumbnail(bg_plugin_registry_t * plugin_reg,
+                         gavl_video_frame_t * in_frame,
+                         gavl_video_format_t * input_format,
+                         int max_width, int max_height,
+                         const char * out_file_base,
+                         const char * mimetype);
+
 
 /*
  *  These are the actual loading/unloading functions
@@ -846,13 +968,13 @@
  *  \brief Lock a plugin
  *  \param h A plugin handle
  */
-void bg_plugin_lock(bg_plugin_handle_t * h);
+void bg_plugin_lock(void * h);
 
 /** \ingroup plugin_registry
  *  \brief Unlock a plugin
  *  \param h A plugin handle
  */
-void bg_plugin_unlock(bg_plugin_handle_t * h);
+void bg_plugin_unlock(void * h);
 
 /* Reference counting for input plugins */
 
@@ -906,5 +1028,20 @@
 
 bg_plugin_handle_t * bg_plugin_handle_create();
 
+/** \ingroup plugin_registry
+ *  \brief Check if the plugin registry was changed
+ *  \returns 1 if the registry was changed, 0 else
+ *
+ *  If this function returns 1, you should save the associated
+ *  config registry also.
+ */
+
+int bg_plugin_registry_changed(bg_plugin_registry_t * reg);
+
+/** \ingroup plugin_registry
+ *  \brief Save the metadata to an xml file
+ */
+
+void bg_plugin_save_metadata(bg_plugin_handle_t * h);
 
 #endif // __BG_PLUGINREGISTRY_H_

gmerlin-1.2.0.tar.gz/include/gmerlin/preset.h -> gmerlin-4256.tar.gz/include/gmerlin/preset.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/recorder.h -> gmerlin-4256.tar.gz/include/gmerlin/recorder.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/remote.h -> gmerlin-4256.tar.gz/include/gmerlin/remote.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -54,6 +54,8 @@
 bg_msg_t * bg_remote_server_get_msg_write(bg_remote_server_t * s);
 int bg_remote_server_done_msg_write(bg_remote_server_t * s);
 
+void bg_remote_server_request_msg(bg_remote_server_t * s);
+
 
 /* Remote client */
 
@@ -61,8 +63,7 @@
 
 /* Create a remote client */
 
-bg_remote_client_t * bg_remote_client_create(const char * protocol_id,
-                                             int read_messages);
+bg_remote_client_t * bg_remote_client_create(const char * protocol_id);
 
 int bg_remote_client_init(bg_remote_client_t *,
                           const char * host, int port, int milliseconds);
@@ -74,6 +75,6 @@
 bg_msg_t * bg_remote_client_get_msg_write(bg_remote_client_t * c);
 int bg_remote_client_done_msg_write(bg_remote_client_t * c);
 
-bg_msg_t * bg_remote_client_get_msg_read(bg_remote_client_t * c);
+bg_msg_t * bg_remote_client_get_msg_read(bg_remote_client_t * c, int timeout);
 
 #endif // __BG_REMOTE_H_

gmerlin-1.2.0.tar.gz/include/gmerlin/serialize.h -> gmerlin-4256.tar.gz/include/gmerlin/serialize.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * *****************************************************************/
 
+#include <gavl/metadata.h>
 
 /** \brief Callback for \ref bg_msg_read
  *  \param priv The private data you passed to \ref bg_msg_read
@@ -94,11 +95,12 @@
 
 
 int
-bg_deserialize_audio_frame(gavl_dsp_context_t * ctx,
+bg_deserialize_audio_frame(gavl_dsp_context_t ** ctx,
                            const gavl_audio_format_t * format,
+                           const gavl_metadata_t * m,
                            gavl_audio_frame_t * frame,
                            bg_serialize_read_callback_t func,
-                           void * data, int big_endian);
+                           void * data);
 
 int
 bg_deserialize_video_frame(gavl_dsp_context_t * ctx,

gmerlin-1.2.0.tar.gz/include/gmerlin/singlepic.h -> gmerlin-4256.tar.gz/include/gmerlin/singlepic.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/streaminfo.h -> gmerlin-4256.tar.gz/include/gmerlin/streaminfo.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -24,6 +24,7 @@
 
 #include <gavl/gavl.h>
 #include <gavl/metadata.h>
+#include <gavl/chapterlist.h>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
@@ -73,7 +74,19 @@
   int64_t pts_offset; //!< First timestamp
   } bg_video_info_t;
 
-/** \brief Description of a subtitle stream
+/** \brief Description of a text stream
+ *
+ *  Unknown fields can be NULL.
+ */
+
+typedef struct
+  {
+  gavl_metadata_t m; //!< Metadata
+  int timescale;
+  int64_t duration;   //!< Duration in timescale tics
+  } bg_text_info_t;
+
+/** \brief Description of an overlay stream
  *
  *  Unknown fields can be NULL.
  */
@@ -81,10 +94,9 @@
 typedef struct
   {
   gavl_metadata_t m; //!< Metadata
-  int is_text; //!< 1 if subtitles are in text format (0 for overlay subtitles)
   gavl_video_format_t format; //!< Format of overlay subtitles
   int64_t duration;   //!< Duration in timescale tics
-  } bg_subtitle_info_t;
+  } bg_overlay_info_t;
 
 /** \brief Create trackname from metadata
  *  \param m Metadata
@@ -191,70 +203,6 @@
 void bg_metadata_set_parameter(void * data, const char * name,
                                const bg_parameter_value_t * v);
 
-/** \brief Check if 2 metadata structures are equal
- *  \param m1 Metadata 1
- *  \param m2 Metadata 2
- *  \return 1 if the metadata are equal, 0 else
- */
-
-//int bg_metadata_equal(const bg_metadata_t * m1,
-//                      const bg_metadata_t * m2);
-
-
-/** \brief Chapter list
- *
- *  Chapters in gmerlin are simply an array of
- *  seekpoints with (optionally) associated names.
- *  They are valid as soon as the file is opened
- */
-
-typedef struct
-  {
-  int num_chapters;       //!< Number of chapters
-  int timescale;          //!< Scale of the timestamps
-  struct
-    {
-    int64_t time;        //!< Start time (seekpoint) of this chapter
-    char * name;          //!< Name for this chapter (or NULL if unavailable)
-    } * chapters;         //!< Chapters
-  } bg_chapter_list_t;
-
-/** \brief Create chapter list
- *  \param num_chapters Initial number of chapters
- */
-
-
-bg_chapter_list_t * bg_chapter_list_create(int num_chapters);
-
-/** \brief Copy chapter list
- *  \param list Chapter list
- */
-
-bg_chapter_list_t * bg_chapter_list_copy(const bg_chapter_list_t * list);
-
-
-/** \brief Destroy chapter list
- *  \param list A chapter list
- */
-
-void bg_chapter_list_destroy(bg_chapter_list_t * list);
-/** \brief Insert a chapter into a chapter list
- *  \param list A chapter list
- *  \param index Position (starting with 0) where the new chapter will be placed
- *  \param time Start time of the chapter
- *  \param name Chapter name (or NULL)
- */
-
-void bg_chapter_list_insert(bg_chapter_list_t * list, int index,
-                            int64_t time, const char * name);
-
-/** \brief Delete a chapter from a chapter list
- *  \param list A chapter list
- *  \param index Position (starting with 0) of the chapter to delete
- */
-
-void bg_chapter_list_delete(bg_chapter_list_t * list, int index);
-
 /** \brief Set default chapter names
  *  \param list A chapter list
  *
@@ -262,33 +210,7 @@
  *  set them to "Chapter 1", "Chapter 2" etc.
  */
 
-void bg_chapter_list_set_default_names(bg_chapter_list_t * list);
-
-/** \brief Get current chapter
- *  \param list A chapter list
- *  \param time Playback time
- *  \returns The current chapter index
- *
- *  Use this function after seeking to signal a
- *  chapter change
- */
-
-int bg_chapter_list_get_current(bg_chapter_list_t * list,
-                                 gavl_time_t time);
-
-/** \brief Get current chapter
- *  \param list A chapter list
- *  \param time Playback time
- *  \param current_chapter Returns the current chapter
- *  \returns 1 if the chapter changed, 0 else
- *
- *  Use this function during linear playback to signal a
- *  chapter change
- */
-
-int bg_chapter_list_changed(bg_chapter_list_t * list,
-                            gavl_time_t time, int * current_chapter);
-
+void bg_chapter_list_set_default_names(gavl_chapter_list_t * list);
 
 /** \brief Convert a chapter list into a libxml2 node
  *  \param list Chapter list
@@ -297,7 +219,7 @@
  *  See the libxml2 documentation for more infos
  */
 
-void bg_chapter_list_2_xml(bg_chapter_list_t * list, xmlNodePtr xml_list);
+void bg_chapter_list_2_xml(gavl_chapter_list_t * list, xmlNodePtr xml_list);
 
 /** \brief Convert libxml2 node into a chapter list
  *  \param xml_doc Pointer to the xml document
@@ -307,7 +229,7 @@
  *  See the libxml2 documentation for more infos
  */
 
-bg_chapter_list_t *
+gavl_chapter_list_t *
 bg_xml_2_chapter_list(xmlDocPtr xml_doc, xmlNodePtr xml_list);
 
 /** \brief Save a chapter list to a file
@@ -315,14 +237,14 @@
  *  \param filename Where to save the list
  */
 
-void bg_chapter_list_save(bg_chapter_list_t * list, const char * filename);
+void bg_chapter_list_save(gavl_chapter_list_t * list, const char * filename);
 
 /** \brief Load a chapter list from a file
  *  \param filename From where to load the list
  *  \returns A newly created chapter list or NULL
  */
 
-bg_chapter_list_t * bg_chapter_list_load(const char * filename);
+gavl_chapter_list_t * bg_chapter_list_load(const char * filename);
 
 #define BG_TRACK_SEEKABLE (1<<0) //!< Track is seekable
 #define BG_TRACK_PAUSABLE (1<<1) //!< Track is pausable
@@ -332,25 +254,23 @@
 
 typedef struct
   {
-  int flags;             //!< 1 if track is seekable (duration must be > 0 then)
-  char * name;           //!< Name of the track (can be NULL)
-  int64_t duration;      //!< Duration
+  int flags;             //!< BG_TRACK_ flags defined above
   
   int num_audio_streams;   //!< Number of audio streams
   int num_video_streams;   //!< Number of video streams
-  int num_subtitle_streams;//!< Number of subtitle streams
+  int num_text_streams;    //!< Number of text streams
+  int num_overlay_streams; //!< Number of overlay streams
   
   bg_audio_info_t *    audio_streams; //!< Audio streams
   bg_video_info_t *    video_streams; //!< Video streams
-  bg_subtitle_info_t * subtitle_streams; //!< Subtitle streams
-
-  gavl_metadata_t metadata; //!< Metadata (optional)
+  bg_text_info_t *     text_streams; //!< Subtitle streams
+  bg_overlay_info_t *  overlay_streams; //!< Subtitle streams
   
-  /* The following are only meaningful for redirectors */
+  gavl_metadata_t metadata; //!< Metadata (optional)
   
-  char * url; //!< URL (needed if is_redirector field is nonzero)
+  //  char * url; //!< URL (denotes a redirector)
 
-  bg_chapter_list_t * chapter_list; //!< Chapter list (or NULL)
+  gavl_chapter_list_t * chapter_list; //!< Chapter list (or NULL)
   
   } bg_track_info_t;
 
@@ -390,6 +310,13 @@
 
 char * bg_get_track_name_default(const char * location, int track, int num_tracks);
 
+/** \brief Get the duration of a track
+ *  \param info A track info
+ *  \returns The approximate duration or GAVL_TIME_UNDEFINED
+ */
+
+gavl_time_t bg_track_info_get_duration(const bg_track_info_t * info);
+
 /**
  *  @}
  */

gmerlin-1.2.0.tar.gz/include/gmerlin/subprocess.h -> gmerlin-4256.tar.gz/include/gmerlin/subprocess.h Changed

gmerlin-4256.tar.gz/include/gmerlin/subtitle.h Added

@@ -0,0 +1,39 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct bg_subtitle_handler_s bg_subtitle_handler_t;
+
+bg_subtitle_handler_t * bg_subtitle_handler_create();
+void bg_subtitle_handler_destroy(bg_subtitle_handler_t *);
+
+void bg_subtitle_handler_init(bg_subtitle_handler_t * h,
+                              gavl_video_format_t * video_format,
+                              gavl_video_source_t * src,
+                              gavl_video_sink_t * sink);
+
+void bg_subtitle_handler_update(bg_subtitle_handler_t *,
+                                const gavl_video_frame_t * frame);
+
+void bg_subtitle_handler_reset(bg_subtitle_handler_t *);
+
+
+
+

gmerlin-1.2.0.tar.gz/include/gmerlin/textrenderer.h -> gmerlin-4256.tar.gz/include/gmerlin/textrenderer.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * *****************************************************************/
 
+#include <gavl/connectors.h>
 
 typedef struct bg_text_renderer_s bg_text_renderer_t;
 
@@ -42,3 +43,8 @@
 
 void bg_text_renderer_render(bg_text_renderer_t*,
                              const char * string, gavl_overlay_t * ovl);
+
+gavl_video_source_t * bg_text_renderer_connect(bg_text_renderer_t * r,
+                                               gavl_packet_source_t * src,
+                                               const gavl_video_format_t * frame_format,
+                                               gavl_video_format_t * overlay_format);

gmerlin-1.2.0.tar.gz/include/gmerlin/transcoder.h -> gmerlin-4256.tar.gz/include/gmerlin/transcoder.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/transcoder_track.h -> gmerlin-4256.tar.gz/include/gmerlin/transcoder_track.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,9 +35,12 @@
 
   bg_parameter_info_t * general_parameters;
   bg_parameter_info_t * filter_parameters;
-  bg_cfg_section_t * encoder_section;
+
   bg_cfg_section_t * general_section;
+  bg_cfg_section_t * encoder_section;
   bg_cfg_section_t * filter_section;
+
+  gavl_metadata_t m;
   } bg_transcoder_track_audio_t;
 
 typedef struct
@@ -47,10 +50,11 @@
   bg_parameter_info_t * general_parameters;
   bg_parameter_info_t * filter_parameters;
   
-  bg_cfg_section_t * encoder_section;
-
   bg_cfg_section_t * general_section;
+  bg_cfg_section_t * encoder_section;
   bg_cfg_section_t * filter_section;
+
+  gavl_metadata_t m;
   } bg_transcoder_track_video_t;
 
 typedef struct
@@ -59,13 +63,13 @@
   int in_index;
   
   bg_parameter_info_t * general_parameters;
+
   bg_cfg_section_t * general_section;
   bg_cfg_section_t * textrenderer_section;
-
   bg_cfg_section_t * encoder_section_text;
   bg_cfg_section_t * encoder_section_overlay;
-  
-  } bg_transcoder_track_subtitle_text_t;
+  gavl_metadata_t m;
+  } bg_transcoder_track_text_t;
 
 typedef struct
   {
@@ -76,7 +80,8 @@
   bg_cfg_section_t * general_section;
   bg_cfg_section_t * encoder_section;
   
-  } bg_transcoder_track_subtitle_overlay_t;
+  gavl_metadata_t m;
+  } bg_transcoder_track_overlay_t;
 
 
 struct bg_transcoder_track_s
@@ -91,18 +96,18 @@
 
   bg_cfg_section_t    * audio_encoder_section;
   bg_cfg_section_t    * video_encoder_section;
-  bg_cfg_section_t    * subtitle_text_encoder_section;
-  bg_cfg_section_t    * subtitle_overlay_encoder_section;
+  bg_cfg_section_t    * text_encoder_section;
+  bg_cfg_section_t    * overlay_encoder_section;
   
   int num_audio_streams;
   int num_video_streams;
-  int num_subtitle_text_streams;
-  int num_subtitle_overlay_streams;
+  int num_text_streams;
+  int num_overlay_streams;
 
   bg_transcoder_track_audio_t    * audio_streams;
   bg_transcoder_track_video_t    * video_streams;
-  bg_transcoder_track_subtitle_text_t    * subtitle_text_streams;
-  bg_transcoder_track_subtitle_overlay_t * subtitle_overlay_streams;
+  bg_transcoder_track_text_t    * text_streams;
+  bg_transcoder_track_overlay_t * overlay_streams;
   
   /* For chaining */
   struct bg_transcoder_track_s * next;
@@ -115,7 +120,7 @@
   char * url;
 
   /* Chapter list (can be NULL) */
-  bg_chapter_list_t * chapter_list;
+  gavl_chapter_list_t * chapter_list;
   };
 
 const bg_parameter_info_t *
@@ -128,10 +133,10 @@
 bg_transcoder_track_video_get_general_parameters();
 
 const bg_parameter_info_t *
-bg_transcoder_track_subtitle_text_get_general_parameters();
+bg_transcoder_track_text_get_general_parameters();
 
 const bg_parameter_info_t *
-bg_transcoder_track_subtitle_overlay_get_general_parameters();
+bg_transcoder_track_overlay_get_general_parameters();
 
 
 bg_transcoder_track_t *
@@ -166,8 +171,8 @@
 
 const char * bg_transcoder_track_get_audio_encoder(bg_transcoder_track_t * t);
 const char * bg_transcoder_track_get_video_encoder(bg_transcoder_track_t * t);
-const char * bg_transcoder_track_get_subtitle_text_encoder(bg_transcoder_track_t * t);
-const char * bg_transcoder_track_get_subtitle_overlay_encoder(bg_transcoder_track_t * t);
+const char * bg_transcoder_track_get_text_encoder(bg_transcoder_track_t * t);
+const char * bg_transcoder_track_get_overlay_encoder(bg_transcoder_track_t * t);
 
 void bg_transcoder_track_get_duration(bg_transcoder_track_t * t,
                                       gavl_time_t * ret, gavl_time_t * ret_total);
@@ -181,13 +186,6 @@
 bg_transcoder_track_create_parameters(bg_transcoder_track_t * track,
                                       bg_plugin_registry_t * plugin_reg);
 
-#if 0
-void
-bg_transcoder_track_set_encoders(bg_transcoder_track_t * track,
-                                 bg_plugin_registry_t * plugin_reg,
-                                 const bg_encoder_info_t * info);
-#endif
-
 void bg_transcoder_track_get_encoders(bg_transcoder_track_t * t,
                                       bg_plugin_registry_t * plugin_reg,
                                       bg_cfg_section_t * encoder_section);
@@ -195,12 +193,6 @@
 void bg_transcoder_track_set_encoders(bg_transcoder_track_t * t,
                                       bg_plugin_registry_t * plugin_reg,
                                       bg_cfg_section_t * encoder_section);
-  
-
-#if 0
-void bg_transcoder_track_create_encoder_sections(bg_transcoder_track_t * t,
-                                                 const bg_encoder_info_t * info);
-#endif
 
 /*
  *  Global options
@@ -251,6 +243,12 @@
 bg_transcoder_track_t *
 bg_transcoder_tracks_extract_selected(bg_transcoder_track_t ** t);
 
+bg_transcoder_track_t *
+bg_transcoder_track_copy(const bg_transcoder_track_t * t);
+
+bg_transcoder_track_t *
+bg_transcoder_track_split_at_chapters(bg_transcoder_track_t * t);
+
 
 /* transcoder_track_xml.c */

gmerlin-1.2.0.tar.gz/include/gmerlin/transcodermsg.h -> gmerlin-4256.tar.gz/include/gmerlin/transcodermsg.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/translation.h -> gmerlin-4256.tar.gz/include/gmerlin/translation.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/tree.h -> gmerlin-4256.tar.gz/include/gmerlin/tree.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -85,6 +85,9 @@
   time_t mtime;
   } bg_album_entry_t;
 
+void bg_album_entry_destroy(bg_album_entry_t * entry);
+
+
 typedef struct bg_album_s bg_album_t;
 typedef struct bg_mediatree_s bg_media_tree_t;
 
@@ -102,10 +105,25 @@
     BG_ALBUM_TYPE_FAVOURITES = 4,
     /* Tuner */
     BG_ALBUM_TYPE_TUNER      = 5,
+    
+    /* Upnp */
+    BG_ALBUM_TYPE_UPNP       = 6,
+    BG_ALBUM_TYPE_UPNP_ROOT  = 7,
+    
+    
   } bg_album_type_t;
 
 bg_album_type_t bg_album_get_type(bg_album_t *); 
 
+/* Metadata tags */
+
+#define BG_ALBUM_ICON_URL    "ICON"    // UPNP
+#define BG_ALBUM_CONTROL_URL "CONTROL" // UPNP
+#define BG_ALBUM_DESC_URL    "DESC"   // UPNP
+#define BG_ALBUM_UPNP_ID     "UPNP_ID" // UPNP
+
+const gavl_metadata_t * bg_album_get_metadata(bg_album_t *);
+
 /* Can return 0 if CD is missing or so */
 
 int bg_album_open(bg_album_t *);
@@ -163,11 +181,14 @@
                                                           int start, int num, void * data),
                                   void * insert_callback_data);
 
+void bg_album_set_destroy_callback(bg_album_t * a,
+                                   void (*destroy_callback)(bg_album_t * current_album, void * data),
+                                   void * data);
 
 void bg_album_move_selected_to_favourites(bg_album_t * a);
 void bg_album_copy_selected_to_favourites(bg_album_t * a);
 
-bg_edl_t * bg_album_selected_to_edl(bg_album_t * a);
+gavl_edl_t * bg_album_selected_to_edl(bg_album_t * a, int separate_tracks);
 
 
 /* Return the current entry (might be NULL) */
@@ -187,10 +208,10 @@
 int          bg_album_get_num_children(bg_album_t *);
 bg_album_t * bg_album_get_child(bg_album_t *, int);
 
-char * bg_album_get_name(bg_album_t * a);
+const char * bg_album_get_name(bg_album_t * a);
 
 /* This returns the disc name or the album name */
-char * bg_album_get_label(bg_album_t * a);
+const char * bg_album_get_label(bg_album_t * a);
 
 
 void bg_album_set_error(bg_album_t * a, int err);
@@ -514,6 +535,10 @@
 bg_media_tree_get_parameter(void * priv, const char * name,
                             bg_parameter_value_t * val);
 
+void bg_media_tree_foreach(bg_media_tree_t *,
+                           void (*func)(bg_album_t * a, void * data),
+                           void * data);
+
 
 /* Mark the current entry as error */

gmerlin-4256.tar.gz/include/gmerlin/upnp Added

gmerlin-4256.tar.gz/include/gmerlin/upnp/Makefile.am Added

gmerlin-4256.tar.gz/include/gmerlin/upnp/device.h Added

@@ -0,0 +1,135 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __BG_UPNP_DEVICE_H_
+#define __BG_UPNP_DEVICE_H_
+
+#include <uuid/uuid.h>
+#include <gmerlin/xmlutils.h>
+#include <gmerlin/bgsocket.h>
+#include <gmerlin/mediadb.h>
+
+typedef struct
+  {
+  const char * mimetype;
+  int width;
+  int height;
+  int depth;
+  const char * location;
+  } 
+bg_upnp_icon_t;
+
+typedef struct bg_upnp_device_s bg_upnp_device_t;
+
+int
+bg_upnp_device_handle_request(bg_upnp_device_t * dev, int fd,
+                              const char * method,
+                              const char * path,
+                              const gavl_metadata_t * header);
+
+void
+bg_upnp_device_destroy(bg_upnp_device_t * dev);
+
+/* Call this regularly to keep things up to date */
+
+int
+bg_upnp_device_ping(bg_upnp_device_t * dev);
+
+/* Creation routines for device types */
+
+typedef struct
+  {
+  const char * name;
+  const char * in_mimetype;
+  const char * out_mimetype;
+  const char * ext;
+  
+  int supported;
+
+  int (*is_supported)(bg_plugin_registry_t * plugin_reg);
+
+  char * (*make_command)(const char * source_file, double seek_time);
+  char * (*make_protocol_info)(bg_db_object_t * obj, const char * mimetype);
+  void (*set_header)(bg_db_object_t * obj,
+                     const gavl_metadata_t * req,
+                     gavl_metadata_t * res, const char * mimetype);
+  
+  int (*get_bitrate)(bg_db_object_t * obj);
+  } bg_upnp_transcoder_t;
+
+typedef struct bg_upnp_transcoder_ctx_s bg_upnp_transcoder_ctx_t;
+
+extern const bg_upnp_transcoder_t bg_upnp_transcoders[];
+
+const bg_upnp_transcoder_t *
+bg_upnp_transcoder_by_name(const char * name);
+
+int64_t bg_upnp_transcoder_get_size(const bg_upnp_transcoder_t * t,
+                                    bg_db_object_t * obj);
+
+bg_upnp_device_t *
+bg_upnp_create_media_server(bg_socket_address_t * addr,
+                            uuid_t uuid,
+                            const char * name,
+                            const bg_upnp_icon_t * icons,
+                            bg_db_t * db);
+
+const char * bg_upnp_device_get_server_string(bg_upnp_device_t *);
+
+/* Client info for media servers */
+
+/* Client understands multiple <res> elements */
+#define BG_UPNP_CLIENT_MULTIPLE_RES  (1<<0)
+
+/* Client wants the (non-standard) original location */
+#define BG_UPNP_CLIENT_ORIG_LOCATION (1<<1)  
+
+/* Client understands the gmerlin namespace */
+#define BG_UPNP_CLIENT_GMERLIN_NS    (1<<2)
+
+
+typedef struct
+  {
+  const char * gmerlin;
+  const char * client;
+  } bg_upnp_mimetype_translation_t;
+
+typedef struct
+  {
+  int (*check)(const gavl_metadata_t * m);
+  const char ** mimetypes;
+
+  bg_upnp_mimetype_translation_t * mt;
+  
+  int flags;
+  } bg_upnp_client_t;
+
+const bg_upnp_client_t * bg_upnp_detect_client(const gavl_metadata_t * m);
+int bg_upnp_client_supports_mimetype(const bg_upnp_client_t * cl,
+                                     const char * mimetype);
+const char *
+bg_upnp_client_translate_mimetype(const bg_upnp_client_t * cl,
+                                  const char * mimetype);
+
+char * bg_upnp_make_server_string(void);
+
+
+#endif // __BG_UPNP_DEVICE_H_

gmerlin-4256.tar.gz/include/gmerlin/upnp/devicedesc.h Added

@@ -0,0 +1,152 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __BG_UPNP_DEVICE_DESC_H_
+#define __BG_UPNP_DEVICE_DESC_H_
+
+#include <uuid/uuid.h>
+#include <gmerlin/xmlutils.h>
+#include <gmerlin/bgsocket.h>
+
+// #include <gmerlin/.h>
+
+xmlDocPtr bg_upnp_device_description_create(const char * url_base,
+                                            const char * type, int version);
+
+/*
+  Required. Short description for end user. Should be localized (cf. ACCEPT-LANGUAGE and CONTENT-
+  LANGUAGE headers). Specified by UPnP vendor. String. Should be < 64 characters.
+*/
+
+void bg_upnp_device_description_set_name(xmlDocPtr ptr, const char * name);
+
+/*
+  Required. Manufacturer's name. May be localized (cf. ACCEPT-LANGUAGE and CONTENT-LANGUAGE headers).
+  Specified by UPnP vendor. String. Should be < 64 characters.
+*/
+
+void bg_upnp_device_description_set_manufacturer(xmlDocPtr ptr, const char * name);
+
+/*
+  Optional. Web site for Manufacturer. May be localized (cf. ACCEPT-LANGUAGE and CONTENT-LANGUAGE
+  headers). May be relative to base URL. Specified by UPnP vendor. Single URL.
+*/
+
+void bg_upnp_device_description_set_manufacturer_url(xmlDocPtr ptr, const char * name);
+
+/*
+  Recommended. Long description for end user. Should be localized (cf. ACCEPT-LANGUAGE and CONTENT-
+  LANGUAGE headers). Specified by UPnP vendor. String. Should be < 128 characters.
+ */
+
+void bg_upnp_device_description_set_model_description(xmlDocPtr ptr, const char * name);
+
+/*
+  Required. Model name. May be localized (cf. ACCEPT-LANGUAGE and CONTENT-LANGUAGE headers).
+  Specified by UPnP vendor. String. Should be < 32 characters.
+ */
+
+void bg_upnp_device_description_set_model_name(xmlDocPtr ptr, const char * name);
+
+/*
+  Recommended. Model number. May be localized (cf. ACCEPT-LANGUAGE and CONTENT-LANGUAGE headers).
+  Specified by UPnP vendor. String. Should be < 32 characters.
+ */
+
+void bg_upnp_device_description_set_model_number(xmlDocPtr ptr, const char * name);
+
+/*
+  Optional. Web site for model. May be localized (cf. ACCEPT-LANGUAGE and CONTENT-LANGUAGE headers).
+  May be relative to base URL. Specified by UPnP vendor. Single URL.
+*/
+
+void bg_upnp_device_description_set_model_url(xmlDocPtr ptr, const char * name);
+
+/*
+  Recommended. Serial number. May be localized (cf. ACCEPT-LANGUAGE and CONTENT-LANGUAGE headers).
+  Specified by UPnP vendor. String. Should be < 64 characters.
+*/
+
+void bg_upnp_device_description_set_serial_number(xmlDocPtr ptr, const char * name);
+
+/*
+  Required. Unique Device Name. Universally-unique identifier for the device, whether root or
+  embedded. Must be the same over time for a specific device instance (i.e., must survive reboots).
+  Must match the value of the NT header in device discovery messages. Must match the prefix of the
+  USN header in all discovery messages. (The section on Discovery explains the NT and USN headers.)
+  Must begin with uuid: followed by a UUID suffix
+  specified by a UPnP vendor. Single URI.
+ */
+
+void bg_upnp_device_description_set_uuid(xmlDocPtr ptr, uuid_t uuid);
+
+/*
+  Optional. Universal Product Code. 12-digit, all-numeric code that identifies the consumer
+  package. Managed by the Uniform Code Council. Specified by UPnP vendor. Single UPC.
+ */
+
+void bg_upnp_device_description_set_upc(xmlDocPtr ptr, const char * name);
+
+void bg_upnp_device_description_add_icon(xmlDocPtr ptr,
+                                         const char * mimetype,
+                                         int width, int height, int depth, const char * url);
+
+/*
+ *  Add a service.
+ *  Description URL will be <root>/upnp/<name>/desc.xml
+ *  control URL will be     <root>/upnp/<name>/control
+ *  event URL will be       <root>/upnp/<name>/event
+ */
+
+void bg_upnp_device_description_add_service(xmlDocPtr ptr,
+                                            const char * type, int version, const char * name);
+
+
+
+char *
+bg_upnp_device_description_get_url_base(const char * desc_url,
+                                        xmlDocPtr doc);
+
+xmlNodePtr
+bg_upnp_device_description_get_device_node(xmlDocPtr doc,
+                                           const char * device,
+                                           int version);
+
+xmlNodePtr
+bg_upnp_device_description_get_service_node(xmlNodePtr node,
+                                            const char * service,
+                                            int version);
+
+char *
+bg_upnp_device_description_get_control_url(xmlNodePtr service_node,
+                                           const char * url_base);
+
+char *
+bg_upnp_device_description_get_service_description(xmlNodePtr service_node,
+                                                   const char * url_base);
+
+
+int bg_upnp_service_description_has_action(xmlDocPtr desc, const char * action);
+
+
+
+
+#endif // __BG_UPNP_DEVICE_DESC_H_

gmerlin-4256.tar.gz/include/gmerlin/upnp/servicedesc.h Added

@@ -0,0 +1,39 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/xmlutils.h>
+
+xmlDocPtr bg_upnp_service_description_create();
+xmlNodePtr bg_upnp_service_description_add_action(xmlDocPtr doc, const char * name);
+
+void bg_upnp_service_action_add_argument(xmlNodePtr node,
+                                         const char * name, int out, int retval,
+                                         const char * related_statevar);
+
+xmlNodePtr
+bg_upnp_service_description_add_statevar(xmlDocPtr doc,
+                                         const char * name,
+                                         int events,
+                                         char * data_type);
+
+void
+bg_upnp_service_statevar_add_allowed_value(xmlNodePtr node,
+                                           const char * name);

gmerlin-4256.tar.gz/include/gmerlin/upnp/soap.h Added

@@ -0,0 +1,77 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __BG_UPNP_SOAP_H_
+#define __BG_UPNP_SOAP_H_
+
+
+#include <gmerlin/xmlutils.h>
+
+xmlDocPtr bg_soap_create_request(const char * function, const char * service, int version);
+xmlDocPtr bg_soap_create_response(const char * function, const char * service, int version);
+
+/* return the first named node within the Body element */
+xmlNodePtr bg_soap_get_function(xmlDocPtr);
+
+xmlNodePtr bg_soap_request_add_argument(xmlDocPtr doc, const char * name,
+                                        const char * value);
+
+const char *
+bg_soap_response_get_argument(xmlDocPtr doc, const char * name);
+
+char * bg_soap_request_get_arg_string(xmlDocPtr doc, const char * name);
+int bg_soap_request_get_arg_int(xmlDocPtr doc, const char * name, int * ret);
+
+xmlNodePtr bg_soap_request_next_argument(xmlNodePtr function, xmlNodePtr arg);
+
+
+void bg_soap_request_add_arg_string(xmlDocPtr doc, const char * name, const char * val);
+
+int bg_soap_request_add_arg_int(xmlDocPtr doc, const char * name, int * ret);
+
+/* Soap context (for clients) */
+
+typedef struct
+  {
+  gavl_metadata_t req_hdr;
+  gavl_metadata_t res_hdr;
+  
+  xmlDocPtr req;
+  xmlDocPtr res;
+
+  xmlNodePtr res_node;
+  
+  char * host;
+  int port;
+  
+  const char * function;
+  } bg_soap_t;
+
+int bg_soap_init(bg_soap_t * s, const char * url, const char * service, int version, const char * function);
+
+/* Write request and get answer */
+int bg_soap_request(bg_soap_t * s);
+
+void bg_soap_free(bg_soap_t * s);
+
+
+
+#endif // __BG_UPNP_SOAP_H_

gmerlin-4256.tar.gz/include/gmerlin/upnp/ssdp.h Added

@@ -0,0 +1,117 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#ifndef __BG_UPNP_SSDP_H_
+#define __BG_UPNP_SSDP_H_
+
+typedef struct
+  {
+  char * type;
+  int version;
+  } bg_ssdp_service_t;
+
+void
+bg_ssdp_service_free(bg_ssdp_service_t * s);
+
+typedef struct
+  {
+  char * type;
+  char * uuid;
+  int version;
+
+  int num_services;
+  bg_ssdp_service_t * services;
+  } bg_ssdp_device_t;
+
+void
+bg_ssdp_device_free(bg_ssdp_device_t * dev);
+
+typedef struct
+  {
+  char * uuid;
+  char * url;
+
+  char * type;
+  int version;
+  
+  int num_devices;
+  bg_ssdp_device_t * devices;
+
+  int num_services;
+  bg_ssdp_service_t * services;
+
+  gavl_time_t expire_time;
+  } bg_ssdp_root_device_t;
+
+void
+bg_ssdp_root_device_free(bg_ssdp_root_device_t*);
+
+void
+bg_ssdp_root_device_dump(const bg_ssdp_root_device_t*);
+
+bg_ssdp_device_t *
+bg_ssdp_device_add_device(bg_ssdp_root_device_t*, const char * uuid);
+
+typedef struct bg_ssdp_s bg_ssdp_t;
+
+typedef void (*bg_ssdp_callback_t)(void * priv, int add, const char * type,
+                                   int version, const char * desc_url);
+
+
+bg_ssdp_t *
+bg_ssdp_create(bg_ssdp_root_device_t * local_dev, int discover_remote,
+               const char * server_string);
+
+void bg_ssdp_set_callback(bg_ssdp_t *, bg_ssdp_callback_t cb, void * data);
+
+int
+bg_ssdp_has_device(const bg_ssdp_root_device_t *,
+                   const char * type, int version, int * dev_index);
+
+int
+bg_ssdp_has_service(const bg_ssdp_root_device_t *,
+                    const char * type, int version, int * dev_index, int * srv_index);
+
+int
+bg_ssdp_has_device_str(const bg_ssdp_root_device_t *,
+                       const char * type_version, int * dev_index);
+
+int
+bg_ssdp_has_service_str(const bg_ssdp_root_device_t *,
+                        const char * type_version, int * dev_index, int * srv_index);
+
+
+char * bg_ssdp_get_service_type_usn(const bg_ssdp_root_device_t * d, int dev, int serv);
+char * bg_ssdp_get_device_type_usn(const bg_ssdp_root_device_t * d, int dev);
+char * bg_ssdp_get_device_uuid_usn(const bg_ssdp_root_device_t * d, int dev);
+char * bg_ssdp_get_root_usn(const bg_ssdp_root_device_t * d);
+
+char * bg_ssdp_get_service_type_nt(const bg_ssdp_root_device_t * d, int dev, int serv);
+char * bg_ssdp_get_device_type_nt(const bg_ssdp_root_device_t * d, int dev);
+char * bg_ssdp_get_device_uuid_nt(const bg_ssdp_root_device_t * d, int dev);
+char * bg_ssdp_get_root_nt(const bg_ssdp_root_device_t * d);
+
+
+
+int bg_ssdp_update(bg_ssdp_t *);
+void bg_ssdp_destroy(bg_ssdp_t *);
+
+#endif // __BG_UPNP_SSDP_H_

gmerlin-1.2.0.tar.gz/include/gmerlin/utils.h -> gmerlin-4256.tar.gz/include/gmerlin/utils.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,8 +22,12 @@
 #ifndef __BG_UTILS_H_
 #define __BG_UTILS_H_
 
+#include <stdio.h>
+#include <wchar.h>
+
 #include <gavl/gavl.h>
 #include <gavl/metadata.h>
+#include <gavl/utils.h>
 
 /** \defgroup utils Utilities
  *  \brief Utility functions
@@ -57,7 +61,7 @@
  *  Non-existing directories will be created if possible
  */
 
-int bg_ensure_directory(const char * dir);
+int bg_ensure_directory(const char * dir, int priv);
 
 
 /** \brief Search for a file for reading
@@ -149,6 +153,15 @@
 char * bg_filename_ensure_extension(const char * filename,
                                     const char * ext);
 
+/** \brief Get the base name of a path
+ *  \param path Path name
+ *  \returns A newly allocated label
+ *
+ *  This splits off leading directory names and the file extension
+ *  and returns a newly allocated string
+ */
+
+char * bg_path_to_label(const char * path);
 
 
 /** @} */
@@ -160,48 +173,6 @@
  * @{
  */
 
-/** \brief Duplicate a string
- *  \param old_string (will eventually be freed)
- *  \param new_string New string
- *
- *  Both old_string and new_string can be NULL. If
- *  new string is the empty string (""), if will be treated like
- *  NULL.
- */
-
-char * bg_strdup(char * old_string, const char * new_string);
-
-/** \brief Duplicate a string from a part of a source string
- *  \param old_string (will eventually be freed)
- *  \param new_start Start of the new string
- *  \param new_end Points to the first character after the end of the new string
- *
- *  Any combination of old_string, new_start and new_end can be NULL.
- *  If new_start is the empty string (""), if will be treated like
- *  NULL. If new_end is NULL, it will be obtained with strlen().
- */
-
-char * bg_strndup(char * old_string,
-                  const char * new_start,
-                  const char * new_end);
-
-/** \brief Concatenate two strings
- *  \param old_string Old string (will be freed)
- *  \param tail Will be appended to old_string
- *  \returns A newly allocated string.
- */
-
-char * bg_strcat(char * old_string, const char * tail);
-
-/** \brief Append a part of a string to another string
- *  \param old_string Old string (will be freed)
- *  \param start Start of the string to be appended
- *  \param end Points to the first character after the end of the string to be appended
- *  \returns A newly allocated string.
- */
-
-char * bg_strncat(char * old_string, const char * start, const char * end);
-
 /** \brief Convert an UTF-8 string to uppercase
  *  \param str String
  *  \returns A newly allocated string.
@@ -209,7 +180,6 @@
 
 char * bg_toupper(const char * str);
 
-
 /** \brief Check if a string looks like an URL.
  *  \param str A string
  *  \returns 1 if the string looks like an URL, 0 else
@@ -243,6 +213,21 @@
                  int * port,
                  char ** path);
 
+/*
+ *  \brief Split off URL variables
+ *  \param path Path component of an URL
+ *  \param vars Place to store the variables
+ *
+ *  This will split off variables
+ *  like path?var1=val1&var2=val2 and store them into the
+ *  metadata structure. 
+ *  
+ */
+ 
+void bg_url_get_vars(char * path,
+                     gavl_metadata_t * vars);
+
+
 /** \brief Get MD5 hash of a filename
  *  \param gml
  *  \param ret Returns the MD5 sum
@@ -377,6 +362,34 @@
 
 int bg_string_match(const char * str, const char * key_list);
 
+/** \brief Convert a multibyte string to a wide character string
+ *  \param str String
+ *  \returns A newly allocated wide character string
+ */
+
+wchar_t * bg_str_to_wchar(const char * str);
+
+/** \brief Convert a wide character string to a byte string
+ *  \param wstr String
+ *  \returns A newly allocated multibyte string
+ */
+
+char * bg_wchar_to_str(const wchar_t * wstr);
+
+/** \brief Capitalize the first character of each word in a string
+ *  \param str String
+ *  \returns A newly allocated capitalized string
+ */
+
+char * bg_capitalize(const char * str);
+
+/** \brief Strip leading and trailing whitespace from a string
+ *  \param str String
+ *  \returns The same string without whitespaces or NULL
+ */
+
+char * bg_strip_space(char * str);
+
 /* @} */
 
 /** \defgroup misc Misc stuff
@@ -451,6 +464,27 @@
 
 int bg_write_file(const char * filename, void * data, int len);
 
+/** \brief Lock a file for exclusive access
+ *  \param f An open file
+ *  \param wr An open file
+ *  \returns 1 on success, 0 on failure
+ */
+
+int bg_lock_file(FILE * f, int wr);
+
+/** \brief Unlock a file for exclusive access
+ *  \param f An open file
+ *  \returns 1 on success, 0 on failure
+ */
+
+int bg_unlock_file(FILE * f);
+
+/** \brief Get the size of an open file
+ *  \param f A file opened for reading
+ *  \returns File size in bytes
+ */
+
+size_t bg_file_size(FILE * f);
 
 /** \brief Convert a ISO 639-2/B language code to a ISO 639-2/T code
  *  \param code ISO 639-2/B
@@ -459,6 +493,26 @@
 
 const char * bg_iso639_b_to_t(const char * code);
 
+/** \brief Convert a ISO 639-2/T language code to a ISO 639-2/B code
+ *  \param code ISO 639-2/T
+ *  \returns ISO 639-2/B code
+ */
+
+const char * bg_iso639_t_to_b(const char * code);
+
+
+/** \brief Set a date and time field of the metadata from the lcoal time
+ *  \param m Metadata
+ *  \param field Field to set
+ */
+
+void bg_metadata_date_now(gavl_metadata_t * m, const char * key);
+
+/** \brief Make the current process become a daemon
+ */
+
+void bg_daemonize();
+
 
 /* @} */

gmerlin-1.2.0.tar.gz/include/gmerlin/visualize.h -> gmerlin-4256.tar.gz/include/gmerlin/visualize.h Changed

gmerlin-1.2.0.tar.gz/include/gmerlin/xmlutils.h -> gmerlin-4256.tar.gz/include/gmerlin/xmlutils.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -23,12 +23,15 @@
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
+#include <libxml/xmlsave.h>
+#include <gavl/gavf.h>
+
 
 /*  Macro, which calls strcmp, but casts the first argument to char*
  *  This is needed because libxml strings are uint8_t*
  */
 
-#define BG_XML_STRCMP(a, b) strcmp((char*)a, b)
+#define BG_XML_STRCMP(a, b) strcmp((const char*)a, b)
 #define BG_XML_GET_PROP(a, b) (char*)xmlGetProp(a, (xmlChar*)b)
 #define BG_XML_SET_PROP(a, b, c) xmlSetProp(a, (xmlChar*)b, (xmlChar*)c)
 #define BG_XML_NEW_TEXT(a) xmlNewText((xmlChar*)a)
@@ -37,17 +40,55 @@
  * memory writer for libxml
  */
 
-typedef struct bg_xml_output_mem_s
-  {
-  int bytes_written;
-  int bytes_allocated;
-  char * buffer;
-  } bg_xml_output_mem_t;
+char * bg_xml_save_to_memory(xmlDocPtr doc);
+
+/* Opt can be a combination of
+   XML_SAVE_FORMAT = 1 : format save output
+   XML_SAVE_NO_DECL = 2 : drop the xml declaration
+   XML_SAVE_NO_EMPTY = 4 : no empty tags
+   XML_SAVE_NO_XHTML = 8 : disable XHTML1 specific rules
+   XML_SAVE_XHTML = 16 : force XHTML1 specific rules
+   XML_SAVE_AS_XML = 32 : force XML serialization on HTML doc
+   XML_SAVE_AS_HTML = 64 : force HTML serialization on XML doc
+   XML_SAVE_WSNONSIG = 128 : format with non-significant whitespace
+*/
+
+char * bg_xml_save_to_memory_opt(xmlDocPtr doc, int opt);
+
+xmlDocPtr bg_xml_load_FILE(FILE * f);
+void bg_xml_save_FILE(xmlDocPtr doc, FILE * f);
+
+xmlDocPtr bg_xml_load_gavf_io(gavf_io_t* io);
+void bg_xml_save_io(xmlDocPtr doc, gavf_io_t* io);
+
+xmlDocPtr bg_xml_parse_file(const char * filename, int lock);
+void bg_xml_save_file(xmlDocPtr doc, const char * filename, int lock);
+
+xmlNodePtr bg_xml_find_node_child(xmlNodePtr parent, const char * child);
+xmlNodePtr bg_xml_find_doc_child(xmlDocPtr parent, const char * child);
+
+xmlNodePtr bg_xml_find_next_node_child(xmlNodePtr parent, xmlNodePtr child);
+xmlNodePtr bg_xml_find_next_node_child_by_name(xmlNodePtr parent, xmlNodePtr node,
+                                               const char * name);
+
+
+xmlNodePtr bg_xml_find_next_doc_child(xmlDocPtr parent, xmlNodePtr child);
+
+xmlNodePtr bg_xml_append_child_node(xmlNodePtr parent, const char * name,
+                                    const char * content);
+
+/* Get the contents of node like <node>content</node>.
+   Returns an empty string if the node has no children or
+   NULL
+ */
 
-int bg_xml_write_callback(void * context, const char * buffer,
-                          int len);
+const char * bg_xml_node_get_text_content(xmlNodePtr parent);
 
-int bg_xml_close_callback(void * context);
+/* Search all children of parent for one with the name child_name.
+   Return it's text content */
 
-xmlDocPtr bg_xml_parse_file(const char * filename);
+const char * bg_xml_node_get_child_content(xmlNodePtr parent,
+                                           const char * child_name);
 
+/* Load an xml document from a http URL */
+xmlDocPtr bg_xml_from_url(const char * url);

gmerlin-1.2.0.tar.gz/include/gui_gtk/aboutwindow.h -> gmerlin-4256.tar.gz/include/gui_gtk/aboutwindow.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/albumentry.h -> gmerlin-4256.tar.gz/include/gui_gtk/albumentry.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/audio.h -> gmerlin-4256.tar.gz/include/gui_gtk/audio.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/auth.h -> gmerlin-4256.tar.gz/include/gui_gtk/auth.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/button.h -> gmerlin-4256.tar.gz/include/gui_gtk/button.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/chapterdialog.h -> gmerlin-4256.tar.gz/include/gui_gtk/chapterdialog.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/display.h -> gmerlin-4256.tar.gz/include/gui_gtk/display.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/driveselect.h -> gmerlin-4256.tar.gz/include/gui_gtk/driveselect.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/fileentry.h -> gmerlin-4256.tar.gz/include/gui_gtk/fileentry.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/fileselect.h -> gmerlin-4256.tar.gz/include/gui_gtk/fileselect.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/gtkutils.h -> gmerlin-4256.tar.gz/include/gui_gtk/gtkutils.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/infowindow.h -> gmerlin-4256.tar.gz/include/gui_gtk/infowindow.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/logwindow.h -> gmerlin-4256.tar.gz/include/gui_gtk/logwindow.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/message.h -> gmerlin-4256.tar.gz/include/gui_gtk/message.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/multiinfo.h -> gmerlin-4256.tar.gz/include/gui_gtk/multiinfo.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/plugin.h -> gmerlin-4256.tar.gz/include/gui_gtk/plugin.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/presetmenu.h -> gmerlin-4256.tar.gz/include/gui_gtk/presetmenu.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/question.h -> gmerlin-4256.tar.gz/include/gui_gtk/question.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/scrolltext.h -> gmerlin-4256.tar.gz/include/gui_gtk/scrolltext.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/slider.h -> gmerlin-4256.tar.gz/include/gui_gtk/slider.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/textview.h -> gmerlin-4256.tar.gz/include/gui_gtk/textview.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/tree.h -> gmerlin-4256.tar.gz/include/gui_gtk/tree.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -65,6 +65,8 @@
 
 void bg_gtk_tree_widget_goto_current(bg_gtk_tree_widget_t * wid);
 
+void bg_gtk_tree_widget_open_album_window(bg_gtk_tree_widget_t * w, bg_album_t * a);
+
 /* Tree window */
 
 bg_gtk_tree_window_t *
@@ -83,9 +85,9 @@
 
 void bg_gtk_tree_window_goto_current(bg_gtk_tree_window_t * win);
 
-void bg_gtk_tree_window_update(bg_gtk_tree_window_t * w,
-                               int open_albums);
+void bg_gtk_tree_window_update(bg_gtk_tree_window_t * w);
 
+void bg_gtk_tree_window_open_album_window(bg_gtk_tree_window_t * w, bg_album_t * a);
 
 /* Album widget */
 
@@ -111,8 +113,7 @@
 bg_gtk_album_widget_set_close_callback(bg_gtk_album_widget_t * w,
                                        void (*callback)(bg_gtk_album_widget_t *, void*), void*);
 
-void bg_gtk_tree_widget_update(bg_gtk_tree_widget_t * w,
-                               int open_albums);
+void bg_gtk_tree_widget_update(bg_gtk_tree_widget_t * w);
 
 /* Album window */

gmerlin-1.2.0.tar.gz/include/gui_gtk/urllink.h -> gmerlin-4256.tar.gz/include/gui_gtk/urllink.h Changed

gmerlin-1.2.0.tar.gz/include/gui_gtk/urlselect.h -> gmerlin-4256.tar.gz/include/gui_gtk/urlselect.h Changed

gmerlin-1.2.0.tar.gz/include/language_table.h -> gmerlin-4256.tar.gz/include/language_table.h Changed

gmerlin-4256.tar.gz/include/mediadb_private.h Added

@@ -0,0 +1,449 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gavl/gavl.h>
+#include <gmerlin/mediadb.h>
+#include <gavl/metatags.h>
+
+#include <bgsqlite.h>
+
+#define BG_DB_OBJ_FLAG_DONT_PROPAGATE (1<<0)
+#define BG_DB_OBJ_FLAG_CHANGED        (1<<2)
+
+/*
+ *  Object creation:
+ *
+ *  - bg_db_object_init(bg_db_object_storage_t * obj);
+ *  - bg_db_object_create(db, void*);   // Set a unique ID
+ *  - bg_db_object_set_type();
+
+ *  - bg_db_object_set_size();
+ *  - bg_db_object_set_duration();
+ *
+ *  - bg_db_object_set_parent[_id](); // Set unique ID of parent
+ *
+ *  - bg_db_object_update();
+ */
+
+/*
+ *  Object querying
+ *  - bg_db_object_init(bg_db_object_storage_t * obj);
+ *  - bg_db_object_query(void*, id);
+ *
+ */
+
+typedef union
+  {
+  bg_db_object_t obj;
+  bg_db_dir_t dir;
+  bg_db_file_t file;
+  bg_db_audio_file_t audio_file;
+  bg_db_video_file_t video_file;
+  bg_db_audio_album_t audio_album;
+  bg_db_vfolder_t vfolder;
+  bg_db_movie_t movie;
+  bg_db_video_container_t videocontainer;
+  bg_db_url_t url;
+  } bg_db_object_storage_t;
+
+struct bg_db_object_class_s
+  {
+  const char * name;
+  void (*del)(bg_db_t * db, bg_db_object_t * obj);   // Delete from db
+  void (*free)(void * obj);                          // Free memory
+  int (*query)(bg_db_t * db, void * obj);  // Query from database
+  void (*update)(bg_db_t * db, void * obj);          // Update database with new settings
+  void (*dump)(void * obj);
+  void (*get_children)(bg_db_t * db, void * obj, bg_sqlite_id_tab_t * tab);
+  const struct bg_db_object_class_s * parent;
+  };
+
+/* string cache */
+
+typedef struct
+  {
+  int64_t id;
+  char * str;
+  } bg_db_string_cache_item_t;
+
+typedef struct
+  {
+  int size;
+  int alloc;
+  bg_db_string_cache_item_t * items;
+  char * table;
+  char * str_col;
+  char * id_col;
+  } bg_db_string_cache_t;
+
+bg_db_string_cache_t * bg_db_string_cache_create(int size,
+                                                 const char * table,
+                                                 const char * str_col,
+                                                 const char * id_col);
+
+void
+bg_db_string_cache_destroy(bg_db_string_cache_t *);
+
+char *
+bg_db_string_cache_get(bg_db_string_cache_t *, sqlite3 * db, int64_t id);
+
+/* Thumbnail cache */
+
+typedef struct
+  {
+  int max_width;
+  int max_height;
+  char * mimetype;
+  int max_size;
+
+  int64_t ref_id;
+  int64_t thumb_id;
+  } bg_db_thumbnail_cache_item_t;
+
+typedef struct
+  {
+  int size;
+  int alloc;
+  bg_db_thumbnail_cache_item_t *items;
+  } bg_db_thumbnail_cache_t;
+
+void bg_db_thumbnail_cache_init(bg_db_thumbnail_cache_t * c);
+void bg_db_thumbnail_cache_free(bg_db_thumbnail_cache_t * c);
+
+void 
+bg_db_make_thumbnail(bg_db_t * db, void * obj,
+                     int max_width, int max_height, const char * mimetype);
+
+
+#define BG_DB_CACHE_SIZE 128
+
+typedef struct
+  {
+  bg_db_object_storage_t obj; // Must be first
+  bg_db_object_storage_t orig;
+  int refcount;
+  int sync;
+  } bg_db_obj_cache_t;
+
+
+struct bg_db_s
+  {
+  sqlite3 * db;
+  char * base_dir;
+  int base_len;
+  bg_plugin_registry_t * plugin_reg;
+  
+  int cache_size;
+  bg_db_obj_cache_t * cache;
+
+  int num_added;
+  int num_deleted;
+
+  /* String caches */
+  bg_db_string_cache_t * audio_artists;
+  bg_db_string_cache_t * audio_genres;
+  bg_db_string_cache_t * audio_albums;
+
+  bg_db_string_cache_t * video_genres;
+  bg_db_string_cache_t * video_persons;
+  bg_db_string_cache_t * video_countries;
+  bg_db_string_cache_t * video_languages;
+  
+  bg_db_string_cache_t * mimetypes;
+  
+  /* Thumbnail cache */
+  bg_db_thumbnail_cache_t th_cache;
+  
+  /* Select statements for common tables */
+
+  sqlite3_stmt * q_objects;
+  sqlite3_stmt * q_files;
+  sqlite3_stmt * q_audio_files;
+  sqlite3_stmt * q_audio_albums;
+  sqlite3_stmt * q_directories;
+  sqlite3_stmt * q_video_files;
+  sqlite3_stmt * q_video_infos;
+  sqlite3_stmt * q_urls;
+  };
+
+/* File scanning */
+
+typedef enum
+  {
+  BG_DB_DIRENT_FILE,
+  BG_DB_DIRENT_DIRECTORY,
+  } bg_db_dirent_type_t;
+
+typedef struct
+  {
+  bg_db_dirent_type_t type;
+  char * path;
+  int parent_index;
+  
+  int64_t size;
+  time_t mtime;
+
+  int done;
+  } bg_db_scan_item_t;
+
+/* Get the parent album of an audio file */
+
+bg_db_audio_album_t *
+bg_db_get_audio_album(bg_db_t * db, bg_db_audio_file_t * file);
+
+bg_db_scan_item_t *
+bg_db_scan_directory(const char * directory, int * num);
+void bg_db_scan_items_free(bg_db_scan_item_t *, int num);
+
+void bg_db_scan_item_free(bg_db_scan_item_t * item);
+int bg_db_scan_item_set(bg_db_scan_item_t * ret, char * filename);
+
+/* Object */
+void * bg_db_object_create(bg_db_t * db); /* Create an object */
+void * bg_db_object_create_root(bg_db_t * db);
+
+void bg_db_object_add(bg_db_t * db, bg_db_object_t * obj);    /* Add to DB      */
+void bg_db_object_update(bg_db_t * db, void * obj, int children, int parent); /* Update in DB   */
+void bg_db_object_delete(bg_db_t * db, void * obj); /* Delete from DB */
+void bg_db_object_free(void * obj);
+
+int bg_db_object_is_valid(void * obj);
+
+const bg_db_object_class_t * bg_db_object_get_class(bg_db_object_type_t t);
+void bg_db_object_set_type(void * obj, bg_db_object_type_t t);
+
+void bg_db_object_set_parent_id(bg_db_t * db, void * obj, int64_t parent_id);
+void bg_db_object_set_parent(bg_db_t * db, void * obj, void * parent);
+
+int64_t bg_db_object_get_parent(void * obj);
+
+void bg_db_object_update_size(bg_db_t * db, void * obj, int64_t delta_size);
+void bg_db_object_update_duration(bg_db_t * db, void * obj, gavl_time_t delta_d);
+
+
+
+void bg_db_object_create_ref(void * obj, void * parent);
+void bg_db_object_set_label_nocpy(void * obj, char * label);
+void bg_db_object_set_label(void * obj1, const char * label);
+
+void bg_db_object_add_child(bg_db_t * db, void * obj1, void * child1);
+void bg_db_object_remove_child(bg_db_t * db, void * obj1, void * child1);
+
+void bg_db_object_init(void * obj1);
+
+void
+bg_db_get_children(bg_db_t * db, int64_t id, bg_sqlite_id_tab_t * tab);
+
+
+extern const bg_db_object_class_t bg_db_root_class;
+
+/* Container */
+void * bg_db_container_get(bg_db_t * db, void * parent, const char * path1);
+
+/* Directory */
+
+extern const bg_db_object_class_t bg_db_dir_class;
+
+int bg_db_dir_del(bg_db_t * db, bg_db_dir_t * dir);
+
+int64_t bg_dir_by_path(bg_db_t * db, const char * path);
+int64_t bg_parent_dir_by_path(bg_db_t * db, const char * path1);
+
+bg_db_dir_t *
+bg_db_dir_ensure_parent(bg_db_t * db,
+                        bg_db_dir_t * dir, const char * path);
+
+void bg_db_dir_create(bg_db_t * db, int scan_flags,
+                      bg_db_scan_item_t * item,
+                      bg_db_dir_t ** parent, int64_t * scan_dir_id);
+
+/* File */
+
+int bg_db_file_add(bg_db_t * db, bg_db_file_t * f);
+extern const bg_db_object_class_t bg_db_file_class;
+
+void bg_db_file_create(bg_db_t * db, int scan_flags,
+                       bg_db_scan_item_t * item,
+                       bg_db_dir_t ** parent, int64_t scan_dir_id);
+
+bg_db_file_t *
+bg_db_file_create_from_object(bg_db_t * db, bg_db_object_t * obj, int scan_flags,
+                              bg_db_scan_item_t * item,
+                              int64_t scan_dir_id);
+
+
+/* Create an internally generated files (e.g. a thumbnail) */
+bg_db_file_t * bg_db_file_create_internal(bg_db_t * db, const char * path_rel);
+
+
+/* Audio file */
+void bg_db_audio_file_create(bg_db_t * db, void * obj, bg_track_info_t * t);
+
+int bg_db_audio_file_add(bg_db_t * db, bg_db_audio_file_t * t);
+int bg_db_audio_file_query(bg_db_t * db, bg_db_audio_file_t * t, int full);
+extern const bg_db_object_class_t bg_db_audio_file_class;
+
+void bg_db_audio_file_create_refs(bg_db_t * db, void * obj);
+
+/* Remove empty audio genres and artists */
+void bg_db_cleanup_audio(bg_db_t * db);
+
+/* Video file */
+extern const bg_db_object_class_t bg_db_video_file_class;
+extern const bg_db_object_class_t bg_db_movie_class;
+extern const bg_db_object_class_t bg_db_episode_class;
+extern const bg_db_object_class_t bg_db_movie_part_class;
+
+void bg_db_video_file_create(bg_db_t * db, void * obj, bg_track_info_t * t);
+
+void bg_db_cleanup_video(bg_db_t * db);
+
+/* Audio album */
+
+void bg_db_audio_file_add_to_album(bg_db_t * db, bg_db_audio_file_t * t);
+void bg_db_audio_file_remove_from_album(bg_db_t * db, bg_db_audio_file_t * t);
+extern const bg_db_object_class_t bg_db_audio_album_class;
+
+/* Video container */
+
+extern const bg_db_object_class_t bg_db_series_class;
+extern const bg_db_object_class_t bg_db_season_class;
+extern const bg_db_object_class_t bg_db_multipart_movie_class;
+
+/* Image file */
+
+void bg_db_image_file_create_from_ti(bg_db_t * db, void * obj, bg_track_info_t * t);
+void bg_db_identify_images(bg_db_t * db, int64_t scan_dir_id, int scan_flags);
+
+const bg_db_object_class_t bg_db_image_file_class;
+const bg_db_object_class_t bg_db_album_cover_class;
+const bg_db_object_class_t bg_db_movie_art_class;
+const bg_db_object_class_t bg_db_thumbnail_class;
+
+/* Virtual folder */
+
+void
+bg_db_create_vfolders(bg_db_t * db, void * obj);
+
+void bg_db_create_tables_vfolders(bg_db_t * db);
+
+void
+bg_db_cleanup_vfolders(bg_db_t * db);
+
+
+extern const bg_db_object_class_t bg_db_vfolder_leaf_class;
+extern const bg_db_object_class_t bg_db_vfolder_class;
+
+/* Playlists */
+int64_t bg_db_playlist_by_name(bg_db_t * db, const char * name);
+extern const bg_db_object_class_t bg_db_playlist_class;
+
+/* Radio URLs */
+
+void * bg_db_get_radio_url_folder(bg_db_t * db, const char * path);
+void bg_db_add_radio_url(bg_db_t * db, void * parent,
+                         const char * url, const char * label);
+
+void * bg_db_get_radio_url_root_folder(bg_db_t * db);
+
+extern const bg_db_object_class_t bg_db_radio_url_class;
+
+/* Video info */
+void bg_db_video_info_free(bg_db_video_info_t* info);
+void bg_db_video_info_init(bg_db_video_info_t* info);
+
+void bg_db_video_info_query(bg_db_t * db, bg_db_video_info_t * ret, bg_db_object_t * obj);
+void bg_db_video_info_dump(bg_db_video_info_t * info);
+void bg_db_video_info_delete(bg_db_t * db, bg_db_object_t * obj);
+void bg_db_video_info_insert(bg_db_t * db, bg_db_video_info_t * info, void * obj);
+int bg_db_video_info_load(bg_db_t * db, bg_db_video_info_t * info, bg_db_object_t * obj, bg_db_file_t * nfo_file);
+void bg_db_video_info_clear(bg_db_t * db, bg_db_video_info_t * info, void * obj);
+void bg_db_video_info_update(bg_db_t * db, bg_db_video_info_t * info, void * obj);
+
+void bg_db_identify_nfo(bg_db_t * db, int64_t scan_dir_id);
+
+
+bg_db_video_info_t * bg_db_object_get_video_info(void * obj);
+
+void bg_db_video_info_set_title(bg_db_video_info_t* info, const char * title);
+void bg_db_video_info_set_title_nocpy(bg_db_video_info_t* info, char * title);
+
+extern const bg_db_object_class_t bg_db_nfo_class;
+
+/* Video container */
+
+bg_db_object_t * bg_db_tvseries_query(bg_db_t * db, const char * label);
+
+void bg_db_cleanup_tvseries(bg_db_t * db);
+
+bg_db_object_t * bg_db_season_query(bg_db_t * db, bg_db_object_t * show, const char * label, int idx);
+bg_db_object_t * bg_db_movie_multipart_query(bg_db_t * db, const char * label, const char * title);
+
+/* Utility functions we might want */
+
+char * bg_db_filename_to_abs(bg_db_t * db, char * filename);
+const char * bg_db_filename_to_rel(bg_db_t * db, const char * filename);
+
+const char * bg_db_get_search_string(const char * str);
+
+// const char * bg_db_get_group(const char * str, int * id);
+char * bg_db_get_group_condition(const char * row, int group_id);
+
+void bg_db_add_files(bg_db_t * db, bg_db_scan_item_t * files,
+                     int num, int scan_flags, int64_t scan_dir_id);
+
+void bg_db_update_files(bg_db_t * db, bg_db_scan_item_t * files,
+                        int num, int scan_flags,
+                        int64_t scan_dir_id, const char * scan_dir);
+
+int64_t bg_db_cache_search(bg_db_t * db,
+                           int (*compare)(const bg_db_object_t * ,const void*),
+                           const void * data);
+
+/* For querying multiple columns of a table */
+
+#define BG_DB_SET_QUERY_STRING(col, val)   \
+  if(!strcasecmp(azColName[i], col)) \
+    ret->val = gavl_strrep(ret->val, argv[i]);
+
+#define BG_DB_SET_QUERY_INT(col, val)      \
+  if(!strcasecmp(azColName[i], col) && argv[i]) \
+    ret->val = strtoll(argv[i], NULL, 10);
+
+#define BG_DB_SET_QUERY_DATE(col, val)      \
+  if(!strcasecmp(azColName[i], col) && argv[i]) \
+    bg_db_string_to_date(argv[i], &ret->val);
+
+#define BG_DB_SET_QUERY_MTIME(col, val)      \
+  if(!strcasecmp(azColName[i], col) && argv[i]) \
+    ret->val = bg_db_string_to_time(argv[i]);
+
+#define BG_DB_GET_COL_INT(col, val) \
+  val = sqlite3_column_int64(st, col)
+
+#define BG_DB_GET_COL_STRING(col, val) \
+  val = gavl_strdup((const char*)sqlite3_column_text(st, col))
+
+#define BG_DB_GET_COL_DATE(col, val) \
+  bg_db_string_to_date((const char*)sqlite3_column_text(st, col), &val)
+
+#define BG_DB_GET_COL_MTIME(col, val) \
+  val = bg_db_string_to_time((const char*)sqlite3_column_text(st, col))

gmerlin-1.2.0.tar.gz/include/ovl2text.h -> gmerlin-4256.tar.gz/include/ovl2text.h Changed

gmerlin-1.2.0.tar.gz/include/playerprivate.h -> gmerlin-4256.tar.gz/include/playerprivate.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -33,11 +33,14 @@
 
 #include <gmerlin/translation.h>
 #include <gmerlin/ov.h>
+#include <gmerlin/subtitle.h>
 
-#include <player_thread.h>
+#include <gavl/peakdetector.h>
 
-/* Each thread get it's private context */
 
+#include <gmerlin/bgthread.h>
+
+/* Each thread get it's private context */
 
 typedef enum
   {
@@ -61,26 +64,22 @@
 
 typedef struct
   {
+  gavl_audio_source_t * in_src_int;
+  gavl_audio_source_t * in_src;
+
+  gavl_audio_source_t * src;
+  
   /* Pipeline */
   
   bg_audio_filter_chain_t * fc;
-  gavl_audio_converter_t * cnv_out;
   
-  bg_read_audio_func_t in_func;
-  void * in_data;
-  int    in_stream;
-  
-  int do_convert_out;
-  
-  gavl_audio_frame_t * fifo_frame;
-  gavl_audio_frame_t * output_frame;
+  gavl_audio_frame_t * mute_frame;
   
   pthread_mutex_t config_mutex;
   bg_gavl_audio_options_t options;
   
   gavl_audio_format_t input_format;
   gavl_audio_format_t output_format;
-  gavl_audio_format_t fifo_format;
 
   /* Volume control */
   gavl_volume_control_t * volume;
@@ -91,9 +90,7 @@
   pthread_mutex_t mute_mutex;
   
   int send_silence;
-  
   gavl_peak_detector_t * peak_detector;
-  
   /* If the playback was interrupted due to changed parameters */
   int interrupted;
   
@@ -125,31 +122,25 @@
   pthread_mutex_t eof_mutex;
   int eof;
 
-  bg_player_thread_t * th;
+  bg_thread_t * th;
+
+  gavl_audio_sink_t * sink;
   
   } bg_player_audio_stream_t;
 
 typedef struct
   {
   bg_text_renderer_t * renderer;
-  gavl_video_converter_t * cnv;
-  int do_convert;
+
+  //  gavl_video_converter_t * cnv;
+  //  int do_convert;
 
   pthread_mutex_t config_mutex;
+
+  gavl_video_source_t * vsrc;
   
   gavl_video_format_t input_format;
   gavl_video_format_t output_format;
-
-  /* For text subtitles */
-  char * buffer;
-  int buffer_alloc;
-  
-  gavl_overlay_t input_subtitle;
-  
-  gavl_overlay_t * current_subtitle;
-  gavl_overlay_t * next_subtitle;
-
-  gavl_overlay_t * subtitles[2];
   
   int eof;
 
@@ -161,11 +152,11 @@
 typedef struct
   {
   bg_video_filter_chain_t * fc;
-  
+#if 0  
   bg_read_video_func_t in_func;
   void * in_data;
   int    in_stream;
-    
+#endif
   pthread_mutex_t config_mutex;
 
   bg_gavl_video_options_t options;
@@ -180,26 +171,16 @@
   /* If the playback was interrupted due to changed parameters */
   int interrupted;
 
-#if 0  
-  bg_plugin_handle_t * plugin_handle;
-  bg_ov_plugin_t     * plugin;
-  void               * priv;
-#else
   bg_ov_t * ov;
-#endif
-
   bg_ov_callbacks_t callbacks;
-  //  gavl_video_frame_t * still_frame;
   gavl_time_t frame_time;
-  //  gavl_time_t last_time; /* Last player time */
   
-  int subtitle_id; /* Stream id for subtitles in the output plugin */
+  gavl_video_sink_t * subtitle_sink; /* Stream id for subtitles in the output plugin */
 
   gavl_video_format_t osd_format;
   
   bg_osd_t * osd;
-  int osd_id;
-  gavl_overlay_t * osd_ovl;
+  gavl_video_sink_t * osd_sink;
   
   bg_msg_queue_t * msg_queue;
   
@@ -209,22 +190,30 @@
   bg_accelerator_map_t * accel_map;
   
   bg_player_subtitle_stream_t * ss;
-
-  gavl_video_frame_t * still_frame_in;
-  int do_still;
+  bg_subtitle_handler_t * sh;
+  
+  //  gavl_video_frame_t * still_frame_in;
+  //  int do_still;
   
   int eof;
   pthread_mutex_t eof_mutex;
   
   float bg_color[4];
 
-  bg_player_thread_t * th;
+  bg_thread_t * th;
 
   /* 1 if we are currently displaying a subtitle */
   int subtitle_active;
-
+  
   int64_t skip;
   int64_t last_frame_time;
+
+  int do_skip;
+  
+  gavl_video_source_t * in_src_int;
+  gavl_video_source_t * in_src;
+
+  gavl_video_source_t * src;
   
   } bg_player_video_stream_t;
 
@@ -247,6 +236,7 @@
 #define PLAYER_DO_REPORT_PEAK      (1<<16)
 #define PLAYER_FREEZE_FRAME        (1<<17)
 #define PLAYER_FREEZE_VIS          (1<<18)
+#define PLAYER_DO_STILL            (1<<19)
 
 #define DO_SUBTITLE_TEXT(f) \
  (f & PLAYER_DO_SUBTITLE_TEXT)
@@ -272,6 +262,9 @@
 #define DO_PEAK(f) \
  (f & PLAYER_DO_REPORT_PEAK)
 
+#define DO_STILL(f)                              \
+ (f & PLAYER_DO_STILL)
+
 /* The player */
 
 #define PLAYER_MAX_THREADS 2
@@ -280,9 +273,9 @@
   {
   pthread_t player_thread;
 
-  bg_player_thread_common_t * thread_common;
+  bg_thread_common_t * thread_common;
 
-  bg_player_thread_t * threads[PLAYER_MAX_THREADS];
+  bg_thread_t * threads[PLAYER_MAX_THREADS];
   
   /* Input plugin and stuff */
 
@@ -302,6 +295,8 @@
   
   bg_track_info_t * track_info;
 
+  gavl_time_t duration;
+  
   /*
    *  Visualizer: Initialized and cleaned up by the player
    *  core, run by the audio thread
@@ -473,7 +468,7 @@
 void bg_player_video_destroy(bg_player_t * p);
 
 int bg_player_read_video(bg_player_t * p,
-                         gavl_video_frame_t * frame);
+                         gavl_video_frame_t ** frame);
 
 void bg_player_video_set_eof(bg_player_t * p);
 
@@ -493,6 +488,11 @@
 void bg_player_oa_set_volume(bg_player_audio_stream_t * ctx,
                              float volume);
 
+void bg_player_peak_callback(void * priv, int num_samples,
+                             const double * min,
+                             const double * max,
+                             const double * abs);
+
 
 /*
  *  Audio output must be locked, since the sound latency is
@@ -509,7 +509,7 @@
 void bg_player_audio_create(bg_player_t * p, bg_plugin_registry_t * plugin_reg);
 void bg_player_audio_destroy(bg_player_t * p);
 
-int bg_player_read_audio(bg_player_t * p, gavl_audio_frame_t * frame);
+// int bg_player_read_audio(bg_player_t * p, gavl_audio_frame_t * frame);
 
 /* Returns 1 if the thread should be finished, 0 if silence should be sent */
 int bg_player_audio_set_eof(bg_player_t * p);
@@ -517,7 +517,7 @@
 
 /* player_subtitle.c */
 
-int bg_player_subtitle_init(bg_player_t * player, int subtitle_stream);
+int bg_player_subtitle_init(bg_player_t * player);
 void bg_player_subtitle_cleanup(bg_player_t * p);
 
 void bg_player_subtitle_create(bg_player_t * p);
@@ -525,14 +525,12 @@
 
 void bg_player_subtitle_init_converter(bg_player_t * player);
 
-int bg_player_has_subtitle(bg_player_t * p);
-int bg_player_read_subtitle(bg_player_t * p, gavl_overlay_t * ovl);
-
-
-
 void bg_player_accel_pressed(bg_player_t * player, int id);
 
-void bg_player_set_track_name(bg_player_t * player, const char *);
 void bg_player_set_duration(bg_player_t * player, gavl_time_t duration, int can_seek);
 
 void bg_player_set_metadata(bg_player_t * player, const gavl_metadata_t *);
+
+int bg_player_get_subtitle_index(bg_track_info_t * info, int stream_index, int * is_text);
+
+void bg_player_subtitle_unscale_time(bg_player_subtitle_stream_t * s, gavl_overlay_t * ovl);

gmerlin-1.2.0.tar.gz/include/pluginreg_priv.h -> gmerlin-4256.tar.gz/include/pluginreg_priv.h Changed

gmerlin-1.2.0.tar.gz/include/recorder_private.h -> gmerlin-4256.tar.gz/include/recorder_private.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -23,7 +23,9 @@
 #include <gmerlin/filters.h>
 #include <gmerlin/encoder.h>
 
-#include <player_thread.h>
+#include <gmerlin/bgthread.h>
+
+#include <gavl/peakdetector.h>
 
 #define NUM_THREADS 2
 
@@ -71,7 +73,7 @@
   gavl_audio_converter_t * enc_cnv;
   gavl_audio_frame_t     * enc_frame;
   
-  bg_player_thread_t * th;
+  bg_thread_t * th;
   
   bg_read_audio_func_t in_func;
   void * in_data;
@@ -118,7 +120,8 @@
   /* Monitor section */
   bg_plugin_handle_t     * monitor_handle;
   bg_ov_plugin_t         * monitor_plugin;
-
+  gavl_video_sink_t      * monitor_sink;
+  
   bg_ov_callbacks_t monitor_cb;
   
   int do_convert_monitor;
@@ -137,7 +140,7 @@
   gavl_video_converter_t * monitor_cnv;
   gavl_video_converter_t * snapshot_cnv;
   
-  bg_player_thread_t * th;
+  bg_thread_t * th;
 
   bg_read_video_func_t in_func;
   void * in_data;
@@ -157,6 +160,8 @@
   /* Frames */
   gavl_video_frame_t * pipe_frame;
   gavl_video_frame_t * pipe_frame_priv;
+  gavl_video_frame_t * monitor_frame_priv;
+  
   gavl_video_frame_t * snapshot_frame;
   gavl_video_frame_t * enc_frame;
   
@@ -167,12 +172,7 @@
   
   gavl_time_t last_frame_time;
   gavl_time_t last_capture_duration;
-
-  int do_limit_fps;
-  
-  int limit_timescale;
-  int limit_duration;
-  
+    
   int64_t frame_counter;
   
   pthread_mutex_t config_mutex;
@@ -192,6 +192,7 @@
   int eof;
   pthread_mutex_t eof_mutex;
   
+  gavl_metadata_t m;
   } bg_recorder_video_stream_t;
 
 void bg_recorder_video_set_eof(bg_recorder_video_stream_t*, int eof);
@@ -204,9 +205,9 @@
   
   bg_plugin_registry_t * plugin_reg;
   
-  bg_player_thread_common_t * tc;
+  bg_thread_common_t * tc;
   
-  bg_player_thread_t * th[NUM_THREADS];
+  bg_thread_t * th[NUM_THREADS];
   
   char * display_string;
   
@@ -237,7 +238,6 @@
   bg_recoder_metadata_mode_t metadata_mode;
 
   gavl_metadata_t updated_metadata;
-  char * updated_name;
   
   bg_recorder_callbacks_t recorder_cb;

gmerlin-1.2.0.tar.gz/include/registry_priv.h -> gmerlin-4256.tar.gz/include/registry_priv.h Changed

gmerlin-1.2.0.tar.gz/include/treeprivate.h -> gmerlin-4256.tar.gz/include/treeprivate.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -21,12 +21,14 @@
 
 #include <config.h>
 #include <time.h>
+#include <gmerlin/upnp/ssdp.h>
 
 /* Flags should not be changed */
 
 #define BG_ALBUM_EXPANDED    (1<<1)
 #define BG_ALBUM_ERROR       (1<<2)
 #define BG_ALBUM_CAN_EJECT   (1<<3)
+#define BG_ALBUM_HAS_DIDL    (1<<4) // Album has current data from upnp server
 
 typedef struct bg_shuffle_list_s
   {
@@ -99,6 +101,8 @@
 
 void bg_album_common_set_auth_info(bg_album_common_t*, bg_album_entry_t*);
 
+#define BG_ALBUM_TAG_DISC_NAME "DISC"
+
 struct bg_album_s
   {
   bg_album_type_t type;
@@ -110,8 +114,10 @@
   char * xml_file;    /* Album filename */
   char * device;      /* Device */
   
-  char * disc_name;   /* Set by open_removable */
+  //  char * disc_name;   /* Set by open_removable */
   char * watch_dir;   /* Directory to watch */
+
+  gavl_metadata_t m;
   
   const bg_plugin_info_t * plugin_info;
   bg_plugin_handle_t      * handle;
@@ -138,6 +144,13 @@
                                   const bg_album_entry_t * current_entry, void * data);
   void * current_change_callback_data;
 
+  /* Functions */
+
+  int (*open_func)(bg_album_t * a);
+  void (*close_func)(bg_album_t * a);
+  void (*expand_func)(bg_album_t * a);
+  void (*collapse_func)(bg_album_t * a);
+  
   /* Tracks were deleted */
 
   void (*delete_callback)(bg_album_t*,
@@ -149,18 +162,12 @@
   void (*insert_callback)(bg_album_t*,
                           int start, int num, void * data);
   void * insert_callback_data;
-  
-  /* Coordinates in the screen */
 
-  //  int x;
-  //  int y;
-  //  int width;
-  //  int height;
+  /* Called when the album is about to be destroyed */
+  void (*destroy_callback)(bg_album_t*, void * data);
+  void * destroy_callback_data;
+  
   
-  /* Path for loading files */
-    
-  //  char * open_path;
-
   /* Here, dialogs can store additional config data */
     
   bg_cfg_section_t * cfg_section;
@@ -260,6 +267,7 @@
   /* Here, dialogs can store additional config data */
     
   bg_cfg_section_t * cfg_section;
+  bg_ssdp_t * ssdp;
   };
 
 /* Purge the directory (remove unused albums) */
@@ -270,9 +278,24 @@
 
 // char * bg_media_tree_new_album_filename(bg_media_tree_t * tree);
 
-void bg_album_entry_destroy(bg_album_entry_t * entry);
 
 bg_album_entry_t * bg_album_entry_create(void);
 
 bg_album_entry_t * bg_album_entry_copy(bg_album_t * a, bg_album_entry_t * e);
 
+
+bg_album_t *
+bg_album_append_to_list(bg_album_t * list, bg_album_t * new_album);
+
+
+
+/* tree_upnp.c */
+
+void bg_media_tree_upnp_create(bg_media_tree_t * t);
+void bg_media_tree_upnp_update(bg_media_tree_t * t);
+void bg_media_tree_upnp_destroy(bg_media_tree_t * t);
+
+int bg_album_open_upnp(bg_album_t * a);
+void bg_album_close_upnp(bg_album_t * a);
+void bg_album_expand_upnp(bg_album_t * a);
+void bg_album_collapse(bg_album_t * a);

gmerlin-4256.tar.gz/include/upnp Added

gmerlin-4256.tar.gz/include/upnp/Makefile.am Added

gmerlin-4256.tar.gz/include/upnp/devicepriv.h Added

@@ -0,0 +1,70 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/upnp/device.h>
+#include <gmerlin/upnp/ssdp.h>
+
+#include <upnp/servicepriv.h>
+
+struct bg_upnp_device_s
+  {
+  char * description;
+  char * type;
+  int version;
+
+  int num_services;
+  bg_upnp_service_t * services;
+  
+  void (*destroy)(void*priv);
+  void * priv;
+
+  bg_ssdp_root_device_t ssdp_dev;
+  bg_ssdp_t * ssdp;
+
+  bg_socket_address_t * sa;
+  uuid_t uuid;
+  char * name;
+
+  char * model_name;
+  char * model_description;
+  const bg_upnp_icon_t * icons;
+
+  char * server_string;
+  char * url_base;
+    
+  gavl_timer_t * timer;
+  
+  };
+
+void bg_upnp_device_init(bg_upnp_device_t * dev,
+                         bg_socket_address_t * addr,
+                         uuid_t uuid, const char * name,
+                         const char * type, int version, int num_services,
+                         const char * model_name,
+                         const char * model_description,
+                         const bg_upnp_icon_t * icons);
+
+int
+bg_upnp_device_create_common(bg_upnp_device_t * dev);
+
+/* Send a description */
+void bg_upnp_device_send_description(const gavl_metadata_t * req, bg_upnp_device_t * dev,
+                                     int fd, const char * desc);

gmerlin-4256.tar.gz/include/upnp/didl.h Added

@@ -0,0 +1,59 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+xmlDocPtr bg_didl_create(int gmerlin_ns);
+
+xmlNodePtr bg_didl_add_item(xmlDocPtr doc);
+
+xmlNodePtr bg_didl_add_container(xmlDocPtr doc);
+
+xmlNodePtr bg_didl_add_element(xmlDocPtr doc,
+                               xmlNodePtr node,
+                               const char * name,
+                               const char * value);
+
+void bg_didl_set_class(xmlDocPtr doc,
+                       xmlNodePtr node,
+                       const char * klass);
+
+void bg_didl_set_title(xmlDocPtr doc,
+                       xmlNodePtr node,
+                       const char * title);
+
+int bg_didl_filter_element(const char * name, char ** filter);
+
+int bg_didl_filter_attribute(const char * element, const char * attribute, char ** filter);
+
+xmlNodePtr bg_didl_add_element_string(xmlDocPtr doc,
+                                      xmlNodePtr node,
+                                      const char * name,
+                                      const char * content, char ** filter);
+
+xmlNodePtr bg_didl_add_element_int(xmlDocPtr doc,
+                                   xmlNodePtr node,
+                                   const char * name,
+                                   int64_t content, char ** filter);
+
+/* Filtering must be done by the caller!! */
+void bg_didl_set_attribute_int(xmlNodePtr node, const char * name, int64_t val);
+
+void bg_didl_set_date(xmlDocPtr didl, xmlNodePtr node,
+                      const bg_db_date_t * date_c, char ** filter);

gmerlin-4256.tar.gz/include/upnp/mediaserver.h Added

@@ -0,0 +1,26 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct
+  {
+  bg_db_t * db;
+  } bg_mediaserver_t;
+

gmerlin-4256.tar.gz/include/upnp/servicepriv.h Added

@@ -0,0 +1,310 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/upnp/device.h>
+// #include <gmerlin/upnp/ssdp.h>
+
+typedef struct bg_upnp_service_s bg_upnp_service_t;
+
+/* We support just a subset of defined variable types */
+typedef enum
+  {
+  BG_UPNP_SV_INT4,
+  BG_UPNP_SV_STRING,
+  } bg_upnp_sv_type_t;
+
+/* Value for a state variable */
+
+typedef struct
+  {
+  char * s;
+  int i;
+  } bg_upnp_sv_val_t;
+
+char * bg_upnp_val_to_string(bg_upnp_sv_type_t type,
+                             const bg_upnp_sv_val_t * val);
+int bg_upnp_string_to_val(bg_upnp_sv_type_t type,
+                          const char * str, bg_upnp_sv_val_t * val);
+void bg_upnp_sv_val_free(bg_upnp_sv_val_t * val);
+void bg_upnp_sv_val_copy(bg_upnp_sv_type_t type,
+                         bg_upnp_sv_val_t * dst,
+                         const bg_upnp_sv_val_t * src);
+
+/* Range for a state variable */
+
+typedef struct
+  {
+  bg_upnp_sv_val_t min;
+  bg_upnp_sv_val_t max;
+  bg_upnp_sv_val_t step;
+  } bg_upnp_sv_range_t;
+
+/* State variable */
+
+// State variable exists only for defining the type of an argument (A_ARG_TYPE_*)
+#define BG_UPNP_SV_ARG_ONLY    (1<<0)
+#define BG_UPNP_SV_HAS_DEFAULT (1<<1)
+#define BG_UPNP_SV_HAS_RANGE   (1<<2)
+#define BG_UPNP_SV_EVENT       (1<<3)
+
+typedef struct
+  {
+  char * name;
+  int flags;
+  bg_upnp_sv_type_t type;
+  bg_upnp_sv_val_t def;
+  
+  bg_upnp_sv_range_t range;
+
+  int num_allowed;
+  int allowed_alloc;
+  bg_upnp_sv_val_t * allowed;
+  } bg_upnp_sv_desc_t;
+
+void bg_upnp_sv_desc_set_default(bg_upnp_sv_desc_t * d, bg_upnp_sv_val_t * val);
+void bg_upnp_sv_desc_set_range(bg_upnp_sv_desc_t * d, bg_upnp_sv_val_t * min,
+                               bg_upnp_sv_val_t * max, bg_upnp_sv_val_t * step);
+void bg_upnp_sv_desc_add_allowed(bg_upnp_sv_desc_t * d, bg_upnp_sv_val_t * val);
+void bg_upnp_sv_desc_free(bg_upnp_sv_desc_t * d);
+
+
+/* Argument for an action */
+
+#define BG_UPNP_ARG_RETVAL (1<<0) // Return value
+
+typedef struct
+  {
+  char * name;
+  char * rsv_name;         // Related state variable  
+  const bg_upnp_sv_desc_t * rsv;
+  int flags;
+  int id; // For lookup without second strcmp
+  } bg_upnp_sa_arg_desc_t;
+
+void bg_upnp_arg_desc_free(bg_upnp_sa_arg_desc_t * d);
+
+/* Description of a service action */
+
+typedef int (*bg_upnp_service_func)(bg_upnp_service_t * s);
+
+typedef struct
+  {
+  bg_upnp_service_func func;
+  
+  char * name;
+  int num_args_in;
+  int args_in_alloc;
+  bg_upnp_sa_arg_desc_t * args_in;
+
+  int num_args_out;
+  int args_out_alloc;
+  bg_upnp_sa_arg_desc_t * args_out;
+  } bg_upnp_sa_desc_t;
+
+void
+bg_upnp_sa_desc_add_arg_in(bg_upnp_sa_desc_t * d, const char * name,
+                           const char * rsv_name, int flags, int id);
+
+void
+bg_upnp_sa_desc_add_arg_out(bg_upnp_sa_desc_t * d, const char * name,
+                            const char * rsv_name, int flags, int id);
+
+void bg_upnp_sa_desc_free(bg_upnp_sa_desc_t * d);
+
+const bg_upnp_sa_arg_desc_t *
+bg_upnp_sa_desc_in_arg_by_name(const bg_upnp_sa_desc_t * d, const char * name);
+
+const bg_upnp_sa_arg_desc_t *
+bg_upnp_sa_desc_out_arg_by_name(const bg_upnp_sa_desc_t * d, const char * name);
+
+
+/* Description of a service */
+typedef struct
+  {
+  int num_sv;
+  int sv_alloc;
+  bg_upnp_sv_desc_t * sv; /* State variables */
+
+  int num_sa;
+  int sa_alloc;
+  bg_upnp_sa_desc_t * sa;  /* Actions */
+  } bg_upnp_service_desc_t;
+
+bg_upnp_sv_desc_t *
+bg_upnp_service_desc_add_sv(bg_upnp_service_desc_t * d, const char * name,
+                            int flags, bg_upnp_sv_type_t type);
+
+bg_upnp_sa_desc_t *
+bg_upnp_service_desc_add_action(bg_upnp_service_desc_t * d,
+                                const char * name, bg_upnp_service_func func);
+
+void bg_upnp_service_desc_free(bg_upnp_service_desc_t * d);
+
+const bg_upnp_sv_desc_t *
+bg_upnp_service_desc_sv_by_name(bg_upnp_service_desc_t * d, const char * name);
+
+const bg_upnp_sa_desc_t *
+bg_upnp_service_desc_sa_by_name(bg_upnp_service_desc_t * d, const char * name);
+
+char * bg_upnp_service_desc_2_xml(bg_upnp_service_desc_t * d);
+
+int bg_upnp_service_desc_resolve_refs(bg_upnp_service_desc_t * d);
+
+/* */
+
+typedef struct
+  {
+  bg_upnp_sv_val_t val;
+  const bg_upnp_sa_arg_desc_t * desc;
+  } bg_upnp_soap_arg_t;
+
+typedef struct
+  {
+  const gavl_metadata_t * req;
+  
+  bg_upnp_soap_arg_t * args_in;
+  int num_args_in;
+  int args_in_alloc;
+
+  bg_upnp_soap_arg_t * args_out;
+  int num_args_out;
+  int args_out_alloc;
+  
+  const bg_upnp_sa_desc_t * action;
+  
+  xmlDocPtr result; // Result (or fault description) goes here
+  } bg_upnp_soap_request_t;
+
+int
+bg_upnp_soap_request_from_xml(bg_upnp_service_t * s,
+                              const char * xml, int len, const gavl_metadata_t * req);
+
+char *
+bg_upnp_soap_response_to_xml(bg_upnp_service_t * s, int * len);
+
+void bg_upnp_soap_request_cleanup(bg_upnp_soap_request_t * req);
+
+/* Functions called by the service actions */
+
+int
+bg_upnp_service_get_arg_in_int(bg_upnp_soap_request_t * req,
+                               int id);
+const char *
+bg_upnp_service_get_arg_in_string(bg_upnp_soap_request_t * req,
+                                  int id);
+
+void
+bg_upnp_service_set_arg_out_int(bg_upnp_soap_request_t * req,
+                                int id, int val);
+void
+bg_upnp_service_set_arg_out_string(bg_upnp_soap_request_t * req,
+                                   int id, char * val);
+
+typedef struct
+  {
+  void (*destroy)(void*priv);
+  } bg_upnp_service_funcs_t;
+
+/* */
+
+typedef struct
+  {
+  bg_upnp_sv_val_t val;
+  const bg_upnp_sv_desc_t * sv;
+  } bg_upnp_event_var_t;
+
+typedef struct
+  {
+  char uuid[37];
+  char * url;   // For delivering
+  uint32_t key; // Counter
+  gavl_time_t expire_time;
+  } bg_upnp_event_subscriber_t;
+
+struct bg_upnp_service_s
+  {
+  /* Description */
+  bg_upnp_service_desc_t desc;
+  const bg_upnp_service_funcs_t * funcs;  
+
+  char * name;        // For finding the service from the http request
+  char * description; // xml
+  char * type;        
+  int version;
+  
+  /* Pointer to the device we belong to */
+  bg_upnp_device_t * dev;
+
+  /* Evented variable */
+  bg_upnp_event_var_t * event_vars;
+  int num_event_vars;
+  
+  /* Event subscribers */
+  bg_upnp_event_subscriber_t * es;
+  int num_es;
+  int es_alloc;
+
+  /* Request: Allocted once and used for all actions */
+  bg_upnp_soap_request_t req;
+  
+  };
+
+void bg_upnp_service_init(bg_upnp_service_t * ret,
+                          const char * name,
+                          const char * type, int version);
+
+int
+bg_upnp_service_start(bg_upnp_service_t * s);
+
+void bg_upnp_service_free(bg_upnp_service_t * s);
+
+int
+bg_upnp_service_handle_request(bg_upnp_service_t * s, int fd,
+                               const char * method,
+                               const char * path,
+                               const gavl_metadata_t * header);
+
+int
+bg_upnp_service_handle_event_request(bg_upnp_service_t * s, int fd,
+                                     const char * method,
+                                     const gavl_metadata_t * header);
+
+int
+bg_upnp_service_remove_expired_subsriptions(bg_upnp_service_t * s,
+                                            gavl_time_t current_time);
+
+
+int
+bg_upnp_service_handle_action_request(bg_upnp_service_t * s, int fd,
+                                      const char * method,
+                                      const gavl_metadata_t * header);
+
+/* ContentDirectory:1 */
+
+void bg_upnp_service_init_content_directory(bg_upnp_service_t * ret,
+                                            const char * name,
+                                            bg_db_t * db);
+
+/* ConnectionManager:1 */
+
+void bg_upnp_service_init_connection_manager(bg_upnp_service_t * ret,
+                                             const char * name);
+

gmerlin-1.2.0.tar.gz/include/visualize_priv.h -> gmerlin-4256.tar.gz/include/visualize_priv.h Changed

gmerlin-1.2.0.tar.gz/include/x11/x11.h -> gmerlin-4256.tar.gz/include/x11/x11.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,6 +22,7 @@
 #include <gmerlin/parameter.h>
 #include <gmerlin/accelerator.h>
 #include <gavl/gavl.h>
+#include <gavl/connectors.h>
 
 /* Min- Max values for Hue, Saturation, Brightness and Contrast */
 
@@ -143,16 +144,22 @@
 
 int bg_x11_window_open_video(bg_x11_window_t*, gavl_video_format_t * format);
 
-int bg_x11_window_add_overlay_stream(bg_x11_window_t*,
-                                     gavl_video_format_t * format);
+gavl_video_sink_t *
+bg_x11_window_add_overlay_stream(bg_x11_window_t*,
+                                 gavl_video_format_t * format);
 
+#if 0
 void bg_x11_window_set_overlay(bg_x11_window_t*, int stream, gavl_overlay_t * ovl);
-
 gavl_overlay_t * bg_x11_window_create_overlay(bg_x11_window_t*, int);
 void bg_x11_window_destroy_overlay(bg_x11_window_t*, int, gavl_overlay_t *);
+#endif
+
+gavl_video_sink_t * bg_x11_window_get_sink(bg_x11_window_t*);
 
+#if 0
 gavl_video_frame_t * bg_x11_window_create_frame(bg_x11_window_t*);
 void bg_x11_window_destroy_frame(bg_x11_window_t*, gavl_video_frame_t *);
+#endif
 
 void bg_x11_window_set_rectangles(bg_x11_window_t * w,
                                   gavl_rectangle_f_t * src_rect,
@@ -184,5 +191,7 @@
 void bg_x11_grab_window_destroy(bg_x11_grab_window_t *);
 
 int bg_x11_grab_window_init(bg_x11_grab_window_t *, gavl_video_format_t * format);
-int bg_x11_grab_window_grab(bg_x11_grab_window_t *, gavl_video_frame_t  * frame);
+gavl_source_status_t
+bg_x11_grab_window_grab(void *, gavl_video_frame_t ** frame);
+
 void bg_x11_grab_window_close(bg_x11_grab_window_t * win);

gmerlin-1.2.0.tar.gz/include/x11/x11_window_private.h -> gmerlin-4256.tar.gz/include/x11/x11_window_private.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -78,6 +78,16 @@
 void
 bg_x11_screensaver_cleanup(bg_x11_screensaver_t *);
 
+/* Overlay stream */
+
+typedef struct
+  {
+  gavl_overlay_t * ovl;
+  gavl_video_format_t format;
+  bg_x11_window_t * win;
+  gavl_video_sink_t * sink;
+  int active;
+  } overlay_stream_t;
 
 typedef struct video_driver_s video_driver_t;
 
@@ -119,11 +129,12 @@
   int (*init)(driver_data_t* data);
   int (*open)(driver_data_t* data);
   
-  void (*add_overlay_stream)(driver_data_t* data);
-  void (*set_overlay)(driver_data_t* data, int stream, gavl_overlay_t * ovl);
+  void (*init_overlay_stream)(driver_data_t* data, overlay_stream_t * str);
+  void (*set_overlay)(driver_data_t* data, overlay_stream_t * str);
   
-  gavl_video_frame_t * (*create_overlay)(driver_data_t* data, int stream);
-  void (*destroy_overlay)(driver_data_t* data, int stream, gavl_video_frame_t*);
+  gavl_video_frame_t * (*create_overlay)(driver_data_t* d, overlay_stream_t * str);
+  void (*destroy_overlay)(driver_data_t* data, overlay_stream_t * str,
+                          gavl_video_frame_t*);
   
   gavl_video_frame_t * (*create_frame)(driver_data_t* data);
   
@@ -170,8 +181,32 @@
   int modality;
   } window_t;
 
+
+#define FLAG_IS_FULLSCREEN                  (1<<0)
+#define FLAG_DO_DELETE                      (1<<1)
+#define FLAG_POINTER_HIDDEN                 (1<<2)
+#define FLAG_AUTO_RESIZE                    (1<<3)
+#define FLAG_HAVE_SHM                       (1<<4)
+#define FLAG_DISABLE_SCREENSAVER_NORMAL     (1<<5)
+#define FLAG_DISABLE_SCREENSAVER_FULLSCREEN (1<<6)
+#define FLAG_WAIT_FOR_COMPLETION            (1<<7)
+#define FLAG_DO_SW_SCALE                    (1<<8)
+#define FLAG_VIDEO_OPEN                     (1<<9)
+#define FLAG_DRIVERS_INITIALIZED            (1<<10)
+#define FLAG_NEED_FOCUS                     (1<<11)
+#define FLAG_NEED_FULLSCREEN                (1<<12)
+#define FLAG_FORCE_HW_SCALE                 (1<<13)
+#define FLAG_STILL_MODE                     (1<<14)
+#define FLAG_OVERLAY_CHANGED                (1<<15)
+
+#define SET_FLAG(w, flag) w->flags |= (flag)
+#define CLEAR_FLAG(w, flag) w->flags &= ~(flag)
+#define TEST_FLAG(w, flag) (w->flags & flag)
+
 struct bg_x11_window_s
   {
+  int flags;
+
   /* User settable stuff (initialized before x11_window_create) */
   
   int min_width;
@@ -186,8 +221,6 @@
   Display * dpy;
   GC gc;
 
-  int is_fullscreen;
-  
   window_t normal;
   window_t fullscreen;
   window_t * current;
@@ -199,10 +232,6 @@
   int screen;
   int window_x, window_y;
 
-  /* Event types (set by x11_window_handle_event()) */
-
-  int do_delete;
-    
   /* Fullscreen stuff */
 
   int fullscreen_mode;
@@ -227,18 +256,12 @@
   
   /* For hiding the mouse pointer */
   int idle_counter;
-  int pointer_hidden;
   
   /* Screensaver stuff */
-  
-  int disable_screensaver_normal;
-  int disable_screensaver_fullscreen;
-  
+    
   char * display_string_parent;
   char * display_string_child;
 
-  int auto_resize;
-  
   Colormap colormap;
   Colormap sub_colormap;
   
@@ -264,19 +287,14 @@
 
   /* XShm */
   
-  int have_shm;
   int shm_completion_type;
-  int wait_for_completion;
   
   gavl_video_format_t video_format;
-  int video_open;
   
   /* Scaling stuff */
   gavl_video_format_t window_format;
   gavl_video_frame_t * window_frame;
   gavl_video_scaler_t * scaler;
-  int do_sw_scale;
-  int scaler_options_changed;
   
   gavl_rectangle_f_t src_rect;
   gavl_rectangle_i_t dst_rect;
@@ -285,41 +303,28 @@
   
   driver_data_t * current_driver;
   
-  int drivers_initialized;
-
   /* For asynchronous focus grabbing */
-  int need_focus;
   Time focus_time;
-
-  int need_fullscreen;
-  
-  int force_hw_scale;
   
   /* Overlay stuff */
   int num_overlay_streams;
   
-  int has_overlay; /* 1 if there are overlays to blend, 0 else */
+  overlay_stream_t * overlay_streams;
+  gavl_video_sink_t * sink;
   
-  struct
-    {
-    gavl_overlay_t * ovl;
-    unsigned long texture; /* For OpenGL only */
-    gavl_video_format_t format;
-    } * overlay_streams;
-
   float brightness;
   float saturation;
   float contrast;
   
-  gavl_video_frame_t * still_frame;
-  int still_mode;
-
   Pixmap icon;
   Pixmap icon_mask;
 
   /* Screensaver */
   bg_x11_screensaver_t scr;
-  
+
+  /* Frame from the sink */
+  gavl_video_frame_t * frame;
+  gavl_video_frame_t * still_frame;
   };
 
 void bg_x11_window_put_frame_internal(bg_x11_window_t * win,

gmerlin-1.2.0.tar.gz/lib/Makefile.am -> gmerlin-4256.tar.gz/lib/Makefile.am Changed

@@ -1,5 +1,6 @@
 plugindir=$(pkglibdir)/plugins
-INCLUDES = -I$(top_srcdir)/include
+pkgbindir=$(pkglibdir)/bin
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 if HAVE_X11
 x11_subdirs = x11
@@ -31,7 +32,7 @@
 sem_sources = uthread_sem.c
 endif
 
-SUBDIRS = $(x11_subdirs) . $(gtk_subdirs)
+SUBDIRS = $(x11_subdirs) upnp . $(gtk_subdirs)
 
 AM_CFLAGS = \
 @FONTCONFIG_CFLAGS@ \
@@ -40,16 +41,17 @@
 -DPLUGIN_DIR=\"$(plugindir)\" \
 -DDOC_DIR=\"$(docdir)\"  \
 -DDATA_DIR=\"$(pkgdatadir)\" \
+-DPKGBIN_DIR=\"$(pkgbindir)\" \
 $(lv_cflags)
 
-libgmerlin_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ -export-symbols-regex ^bg_
+libgmerlin_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ -export-symbols-regex ^bg_ @GMERLIN_LIB_LDFLAGS@
 
-libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread
+libgmerlin_la_LIBADD = $(x11_libadd) upnp/libupnp.la @SQLITE3_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @MQ_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread
 
-bin_PROGRAMS = gmerlin_visualizer_slave
+pkgbin_PROGRAMS = gmerlin_visualizer_slave
 
 gmerlin_visualizer_slave_SOURCES = visualize_slave.c
-gmerlin_visualizer_slave_LDADD = libgmerlin.la
+gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
 
 lib_LTLIBRARIES = libgmerlin.la
 libgmerlin_la_SOURCES = \
@@ -58,9 +60,13 @@
 accelerator.c \
 album.c \
 album_xml.c \
+audiofilters.c \
 bggavl.c \
 bgladspa.c \
 bgfrei0r.c \
+bgplug.c \
+bgplug_io.c \
+bgshm.c \
 bgxml.c \
 cfg_item.c \
 cfg_registry.c \
@@ -70,21 +76,41 @@
 chapterlist_xml.c \
 charset.c \
 cmdline.c \
+colormatrix.c \
 converters.c \
+db.c \
+db_audio.c \
+db_audioalbum.c \
+db_dir.c \
+db_file.c \
+db_image.c \
+db_object.c \
+db_playlist.c \
+db_root.c \
+db_scan.c \
+db_stringcache.c \
+db_thumbnail.c \
+db_url.c \
+db_vfolder.c \
+db_video.c \
+db_videocontainer.c \
+db_videoinfo.c \
 device.c \
 edl.c \
 edldec.c \
 edl_xml.c \
 encoder.c \
-fileformat.c \
-filters.c \
+fileutils.c \
 formats.c \
+frametimer.c \
+gavfenc.c \
 hexdump.c \
+http.c \
 language_table.c \
 lcdproc.c \
 log.c \
 md5.c \
-mediafiledevice.c \
+mediaconnector.c \
 metadata.c \
 metadata_xml.c \
 msgqueue.c \
@@ -118,9 +144,11 @@
 serialize.c \
 singlepic.c \
 socket.c \
+sqlite.c \
 streaminfo.c \
 stringutils.c \
 subprocess.c \
+subtitle.c \
 textrenderer.c \
 threadpool.c \
 thumbnail.c \
@@ -130,8 +158,10 @@
 transcoder_track_xml.c \
 translation.c \
 tree.c \
+tree_upnp.c \
 tree_xml.c \
 urilist.c \
 utf8.c \
+videofilters.c \
 visualize.c

gmerlin-1.2.0.tar.gz/lib/accelerator.c -> gmerlin-4256.tar.gz/lib/accelerator.c Changed

gmerlin-1.2.0.tar.gz/lib/album.c -> gmerlin-4256.tar.gz/lib/album.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -56,6 +56,19 @@
 #include <sys/inotify.h>
 #endif
 
+#include <gavl/metatags.h>
+
+/* Methods */
+
+static int open_regular(bg_album_t * album);
+static int open_tuner(bg_album_t * album);
+static int open_removable(bg_album_t * album);
+static int open_device(bg_album_t * album);
+
+static void close_regular(bg_album_t * album);
+static void close_removable(bg_album_t * album);
+static void close_tuner(bg_album_t * album);
+
 /*
  *  This must be called, whenever the tracks in an album
  *  change.
@@ -88,7 +101,7 @@
   pos = strrchr(path, '/');
 
   pos++;
-  ret = bg_strdup(NULL, pos);
+  ret = gavl_strdup(pos);
   free(path);
     
   fail:
@@ -111,8 +124,11 @@
                                   bg_track_info_t  * track_info,
                                   int update_name)
   {
+  const char * url;
   int i;
   int name_set = 0;
+  int def_name = 0;
+  
   entry->num_audio_streams = track_info->num_audio_streams;
 
   entry->num_video_streams = 0;
@@ -127,8 +143,10 @@
       entry->num_video_streams++;
     }
   
-  entry->num_subtitle_streams = track_info->num_subtitle_streams;
-
+  entry->num_subtitle_streams =
+    track_info->num_text_streams +
+    track_info->num_overlay_streams;
+  
   if(!entry->name || update_name)
     {
     if(entry->name)
@@ -156,28 +174,54 @@
     
     if(!name_set)
       {
-      if(track_info->name)
-        {
-        entry->name = bg_strdup(entry->name, track_info->name);
-        }
+      const char * name;
+
+      if((name = gavl_metadata_get(&track_info->metadata, GAVL_META_STATION)) ||
+         (name = gavl_metadata_get(&track_info->metadata, GAVL_META_LABEL)))
+        entry->name = gavl_strrep(entry->name, name);
       /* Take filename minus extension */
       else
         {
         entry->name =
           bg_get_track_name_default(entry->location,
                                     entry->index, entry->total_tracks);
+        def_name = 1;
         }
       }
     }
-  entry->duration = track_info->duration;
+
+  if(!gavl_metadata_get_long(&track_info->metadata,
+                             GAVL_META_APPROX_DURATION, &entry->duration))
+    entry->duration = GAVL_TIME_UNDEFINED;
   entry->flags &= ~BG_ALBUM_ENTRY_ERROR;
   
-  if(track_info->url)
+  if((url = gavl_metadata_get(&track_info->metadata, GAVL_META_REFURL)))
     {
-    entry->location = bg_strdup(entry->location, track_info->url);
-    entry->index = 0;
-    entry->total_tracks = 1;
-    entry->flags = BG_ALBUM_ENTRY_REDIRECTOR;
+    bg_plugin_handle_t * h = NULL;
+    bg_input_plugin_t * plugin;
+    bg_track_info_t * ti;
+    const char * name;
+
+    bg_album_common_prepare_callbacks(com, entry);
+    /* Handle redirectors */
+    if(bg_input_plugin_load(com->plugin_reg, url, NULL, &h, &com->input_callbacks, 0) &&
+       (plugin = (bg_input_plugin_t*)h->plugin) &&
+       (ti = plugin->get_track_info(h->priv, 0)) &&
+       (!gavl_metadata_get(&ti->metadata, GAVL_META_REFURL)))
+      {
+      if(def_name && (name = gavl_metadata_get(&track_info->metadata, GAVL_META_LABEL)))
+        entry->name = gavl_strrep(entry->name, name);
+      entry_from_track_info(com, entry, ti, 0);
+      }
+    else
+      {
+      entry->location = gavl_strrep(entry->location, url);
+      entry->index = 0;
+      entry->total_tracks = 1;
+      entry->flags = BG_ALBUM_ENTRY_REDIRECTOR;
+      }
+    if(h)
+      bg_plugin_unref(h);
     }
   
   }
@@ -198,7 +242,7 @@
   {
   bg_album_entry_t * ret;
   ret = bg_album_entry_create();
-  ret->location = bg_strdup(ret->location, url);
+  ret->location = gavl_strrep(ret->location, url);
   entry_from_track_info(NULL, ret, track_info, 1);
   return ret;
   }
@@ -213,10 +257,55 @@
 #ifdef HAVE_INOTIFY
   ret->inotify_wd = -1;
 #endif
+
+  switch(ret->type)
+    {
+    /* Regular album */
+    case BG_ALBUM_TYPE_REGULAR:
+      ret->open_func = open_regular;
+      ret->close_func = close_regular;
+      break;
+    /* Drive for removable media */
+    case BG_ALBUM_TYPE_REMOVABLE:
+      ret->open_func = open_removable;
+      ret->close_func = close_removable;
+      break;
+    /* Hardware plugin (Subalbums are devices) */
+    case BG_ALBUM_TYPE_PLUGIN:
+      ret->open_func = open_device;
+      break;
+    /* Incoming album: Stuff from the commandline and the remote will go there */
+    case BG_ALBUM_TYPE_INCOMING:
+      ret->open_func = open_regular;
+      ret->close_func = close_regular;
+      break;
+    /* Favourites */
+    case BG_ALBUM_TYPE_FAVOURITES:
+      ret->open_func = open_regular;
+      ret->close_func = close_regular;
+      break;
+    /* Tuner */
+    case BG_ALBUM_TYPE_TUNER:
+      ret->open_func = open_tuner;
+      ret->close_func = close_tuner;
+      break;
+    /* Upnp */
+    case BG_ALBUM_TYPE_UPNP:
+      ret->open_func = bg_album_open_upnp;
+      ret->close_func = bg_album_close_upnp;
+      ret->expand_func = bg_album_expand_upnp;
+      break;
+    case BG_ALBUM_TYPE_UPNP_ROOT:
+      ret->open_func = bg_album_open_upnp;
+      ret->close_func = bg_album_close_upnp;
+      ret->expand_func = bg_album_expand_upnp;
+      break;
+    }
+
   return ret;
   }
 
-char * bg_album_get_name(bg_album_t * a)
+const char * bg_album_get_name(bg_album_t * a)
   {
   return a->name;
   }
@@ -266,6 +355,8 @@
       break;
     case BG_ALBUM_TYPE_REMOVABLE:
     case BG_ALBUM_TYPE_PLUGIN:
+    case BG_ALBUM_TYPE_UPNP:
+    case BG_ALBUM_TYPE_UPNP_ROOT:
       break;
     }
   delete_shuffle_list(album);
@@ -484,7 +575,7 @@
   if(prefix)
     return bg_sprintf("%s%s", prefix, orig);
   else
-    return bg_strdup(NULL, orig);
+    return gavl_strdup(orig);
   }
 
 int bg_album_entries_save_extm3u(bg_album_entry_t * e, const char * name,
@@ -580,7 +671,7 @@
 
 /* Open / close */
 
-static int open_device(bg_album_t * a)
+static int open_dev(bg_album_t * a)
   {
   bg_track_info_t * track_info;
   int i, j;
@@ -604,10 +695,13 @@
 
   if(plugin->get_disc_name)
     {
-    a->disc_name = bg_strdup(a->disc_name,
-                             plugin->get_disc_name(a->handle->priv));
-    if(!a->disc_name || (*a->disc_name == '\0'))
-      a->disc_name = bg_strdup(a->disc_name, TR("Unnamed disc"));
+    const char * name = plugin->get_disc_name(a->handle->priv);
+
+    if(!name || (*name == '\0'))
+      name = TR("Unnamed disc");
+    
+    gavl_metadata_set(&a->m, BG_ALBUM_TAG_DISC_NAME,
+                      name);
     }
   
   if(plugin->eject_disc)
@@ -625,10 +719,10 @@
 
     new_entry->index = i;
     new_entry->total_tracks = num_tracks;
-    new_entry->name   = bg_strdup(NULL, track_info->name);
-    new_entry->plugin = bg_strdup(NULL, a->handle->info->name);
+    new_entry->name   = gavl_strdup(gavl_metadata_get(&track_info->metadata, GAVL_META_LABEL));
+    new_entry->plugin = gavl_strdup(a->handle->info->name);
     
-    new_entry->location = bg_strdup(new_entry->location,
+    new_entry->location = gavl_strrep(new_entry->location,
                                       a->device);
     new_entry->num_audio_streams = track_info->num_audio_streams;
 
@@ -642,9 +736,13 @@
       else
         new_entry->num_video_streams++;
       }
-    new_entry->num_subtitle_streams =
-      track_info->num_subtitle_streams;
-    new_entry->duration = track_info->duration;
+    new_entry->num_subtitle_streams = track_info->num_text_streams +
+      track_info->num_overlay_streams;
+
+
+    if(!gavl_metadata_get_long(&track_info->metadata,
+                               GAVL_META_APPROX_DURATION, &new_entry->duration))
+      new_entry->duration = GAVL_TIME_UNDEFINED;
 
     bg_album_insert_entries_before(a, new_entry, NULL);
     }
@@ -814,100 +912,29 @@
   
   }
 
-int bg_album_open(bg_album_t * a)
+static int open_regular(bg_album_t * a)
   {
   char * tmp_filename;
   FILE * testfile;
-  bg_input_plugin_t * plugin;
-   
-  if(a->open_count)
-    {
-    bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Album %s already open", a->name);
-    a->open_count++;
-    return 1;
-    }
 
-  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Opening album %s", a->name);
-  
-  
-  a->cfg_section = bg_cfg_section_create(NULL);
-  
-  switch(a->type)
+  if(a->xml_file)
     {
-    case BG_ALBUM_TYPE_REGULAR:
-    case BG_ALBUM_TYPE_FAVOURITES:
-    case BG_ALBUM_TYPE_INCOMING:
-      if(a->xml_file)
-        {
-        tmp_filename = bg_sprintf("%s/%s", a->com->directory,
-                                  a->xml_file);
-        
-        /* If the file cannot be opened, it was deleted earlier
-           we exit quietly here */
-        
-        if(!(testfile = fopen(tmp_filename,"r")))
-          {
-          free(tmp_filename);
-          break;
-          }
-        fclose(testfile);
-        
-        bg_album_load(a, tmp_filename);
-        free(tmp_filename);
-        }
-      break;
-    case BG_ALBUM_TYPE_TUNER:
-      if(a->xml_file)
-        {
-        tmp_filename = bg_sprintf("%s/%s", a->com->directory,
-                                  a->xml_file);
-        
-        /* If the file cannot be opened, it was deleted earlier
-           we exit quietly here */
-        
-        if(!(testfile = fopen(tmp_filename,"r")))
-          {
-          free(tmp_filename);
-          if(!open_device(a))
-            return 0;
-          break;
-          }
-        fclose(testfile);
-        
-        bg_album_load(a, tmp_filename);
-        free(tmp_filename);
-        a->handle = bg_plugin_load(a->com->plugin_reg, a->plugin_info);
+    tmp_filename = bg_sprintf("%s/%s", a->com->directory,
+                              a->xml_file);
 
-        bg_plugin_lock(a->handle);
+     /* If the file cannot be opened, it was deleted earlier
+        we exit quietly here */
 
-        plugin = (bg_input_plugin_t*)a->handle->plugin;
-        
-        /* Open the plugin */
-        
-        if(!plugin->open(a->handle->priv, a->device))
-          {
-          bg_plugin_unlock(a->handle);
-          return 0;
-          }
-        bg_plugin_unlock(a->handle);
-        }
-      else
-        if(!open_device(a))
-          return 0;
-      break;
-    case BG_ALBUM_TYPE_REMOVABLE:
-      /* Get infos from the plugin */
-      if(!open_device(a))
-        return 0;
-      break;
-    case BG_ALBUM_TYPE_PLUGIN:
-      return 0; /* Cannot be opened */
-      break;
+    if((testfile = fopen(tmp_filename,"r")))
+      {
+      fclose(testfile);
+      bg_album_load(a, tmp_filename);
+      }
+    free(tmp_filename);
     }
-  a->open_count++;
 
   if((a->type == BG_ALBUM_TYPE_REGULAR) &&
-     a->watch_dir) 
+     a->watch_dir)
     {
     sync_with_dir(a);
 #ifdef HAVE_INOTIFY
@@ -920,6 +947,81 @@
   return 1;
   }
 
+static int open_tuner(bg_album_t * a)
+  {
+  char * tmp_filename;
+  FILE * testfile;
+  bg_input_plugin_t * plugin;
+
+  if(a->xml_file)
+    {
+    tmp_filename = bg_sprintf("%s/%s", a->com->directory,
+                              a->xml_file);
+
+     /* If the file cannot be opened, it was deleted earlier
+        we exit quietly here */
+
+    if(!(testfile = fopen(tmp_filename,"r")))
+      {
+      free(tmp_filename);
+      if(!open_dev(a))
+        return 0;
+      return 1;
+      }
+    fclose(testfile);
+
+    bg_album_load(a, tmp_filename);
+    free(tmp_filename);
+    a->handle = bg_plugin_load(a->com->plugin_reg, a->plugin_info);
+
+    bg_plugin_lock(a->handle);
+
+    plugin = (bg_input_plugin_t*)a->handle->plugin;
+
+    /* Open the plugin */
+
+    if(!plugin->open(a->handle->priv, a->device))
+      {
+      bg_plugin_unlock(a->handle);
+      return 0;
+      }
+    bg_plugin_unlock(a->handle);
+    }
+  else
+    if(!open_dev(a))
+      return 0;
+  return 1;
+  }
+
+static int open_removable(bg_album_t * a)
+  {
+  return open_dev(a);
+  }
+
+static int open_device(bg_album_t * a)
+  {
+  return 0;
+  }
+
+int bg_album_open(bg_album_t * a)
+  {
+  if(a->open_count)
+    {
+    bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Album %s already open", a->name);
+    a->open_count++;
+    return 1;
+    }
+
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Opening album %s", a->name);
+  
+  a->cfg_section = bg_cfg_section_create(NULL);
+
+  if(a->open_func && !a->open_func(a))
+    return 0;
+  a->open_count++;
+  return 1;
+  }
+
 
 void bg_album_entry_destroy(bg_album_entry_t * entry)
   {
@@ -964,6 +1066,44 @@
   return ret;
   }
 
+static void close_regular(bg_album_t * a)
+  {
+  bg_album_save(a, NULL);
+
+#ifdef HAVE_INOTIFY
+  if(a->inotify_wd >= 0)
+    {
+    inotify_rm_watch(a->com->inotify_fd, a->inotify_wd);
+    a->inotify_wd = -1;
+    }
+#endif
+  /* Delete entries */
+  bg_album_entries_destroy(a->entries);
+  a->entries = NULL;
+  }
+
+static void close_removable(bg_album_t * a)
+  {
+  a->flags &= ~BG_ALBUM_CAN_EJECT;
+  bg_plugin_unref(a->handle);
+  a->handle = NULL;
+  gavl_metadata_set(&a->m, BG_ALBUM_TAG_DISC_NAME, NULL);
+  /* Delete entries */
+  bg_album_entries_destroy(a->entries);
+  a->entries = NULL;
+  } 
+
+static void close_tuner(bg_album_t * a)
+  {
+  bg_plugin_unref(a->handle);
+  a->handle = NULL;
+  bg_album_save(a, NULL);
+
+  /* Delete entries */
+  bg_album_entries_destroy(a->entries);
+  a->entries = NULL;
+  }
+
 void bg_album_close(bg_album_t *a )
   {
   //  char * tmp_filename;
@@ -984,35 +1124,10 @@
     a->com->set_current_callback(a->com->set_current_callback_data,
                                  NULL, NULL);
     }
-  switch(a->type)
-    {
-    case BG_ALBUM_TYPE_REMOVABLE:
-    case BG_ALBUM_TYPE_TUNER:
-      a->flags &= ~BG_ALBUM_CAN_EJECT;
-      bg_plugin_unref(a->handle);
-      a->handle = NULL;
-      if(a->disc_name)
-        {
-        free(a->disc_name);
-        a->disc_name = NULL;
-        }
-      if(a->type == BG_ALBUM_TYPE_TUNER)
-        bg_album_save(a, NULL);
-      break;
-    case BG_ALBUM_TYPE_REGULAR:
-    case BG_ALBUM_TYPE_INCOMING:
-    case BG_ALBUM_TYPE_FAVOURITES:
-      bg_album_save(a, NULL);
-      break;
-    case BG_ALBUM_TYPE_PLUGIN:
-      break;
-    }
+ 
+  if(a->close_func)
+    a->close_func(a);
   
-  /* Delete entries */
-
-  bg_album_entries_destroy(a->entries);
-  a->entries = NULL;
-
   /* Delete shuffle list */
 
   delete_shuffle_list(a);
@@ -1023,28 +1138,24 @@
     bg_cfg_section_destroy(a->cfg_section);
     a->cfg_section = NULL;
     }
-
-#ifdef HAVE_INOTIFY
-  if(a->inotify_wd >= 0)
-    {
-    inotify_rm_watch(a->com->inotify_fd, a->inotify_wd);
-    a->inotify_wd = -1;
-    }
-#endif
-
-  // if(a->watch_dir)
-    
   }
 
 void bg_album_set_expanded(bg_album_t * a, int expanded)
   {
   if(expanded)
+    {
     a->flags |= BG_ALBUM_EXPANDED;
+    if(a->expand_func)
+      a->expand_func(a);
+    }
   else
     {
     bg_album_t * child;
-    a->flags &= ~BG_ALBUM_EXPANDED;
-    
+    a->flags &= ~BG_ALBUM_EXPANDED;    
+
+    if(a->collapse_func)
+      a->collapse_func(a);
+
     /* Unexpand the children too */
     child = a->children;
     while(child)
@@ -1076,20 +1187,21 @@
   /* Things to do if an album was open */
 
   if(a->open_count)
-    {
     bg_album_save(a, NULL);
-    }
+
+  if(a->destroy_callback)
+    a->destroy_callback(a, a->destroy_callback_data);
+  
   if(a->name)
     free(a->name);
   if(a->xml_file)
     free(a->xml_file);
   if(a->device)
     free(a->device);
-  
-  if(a->disc_name)
-    free(a->disc_name);
   if(a->cfg_section)
     bg_cfg_section_destroy(a->cfg_section);
+
+  gavl_metadata_free(&a->m);
   
   /* Free entries */
 
@@ -1665,7 +1777,7 @@
       break;
     entry = entry->next;
     }
-  entry->name = bg_strdup(entry->name, name);
+  entry->name = gavl_strrep(entry->name, name);
   
   if(entry->name_w)
     {
@@ -1679,7 +1791,7 @@
 
 void bg_album_rename(bg_album_t * a, const char * name)
   {
-  a->name = bg_strdup(a->name, name);
+  a->name = gavl_strrep(a->name, name);
 
   if(((a->type == BG_ALBUM_TYPE_REMOVABLE) ||
       (a->type == BG_ALBUM_TYPE_TUNER)) &&
@@ -1844,6 +1956,13 @@
   a->insert_callback_data = insert_callback_data;
   }
 
+void bg_album_set_destroy_callback(bg_album_t * a,
+                                   void (*destroy_callback)(bg_album_t * current_album, void * data),
+                                   void * data)
+  {
+  a->destroy_callback      = destroy_callback;
+  a->destroy_callback_data = data;
+  }
 
 
 void bg_album_set_name_change_callback(bg_album_t * a,
@@ -2005,15 +2124,15 @@
   
   device_album = bg_album_create(album->com, type, album);
  
-  device_album->device = bg_strdup(device_album->device, device);
+  device_album->device = gavl_strrep(device_album->device, device);
   if(name)
     {
-    device_album->name = bg_strdup(device_album->name,
+    device_album->name = gavl_strrep(device_album->name,
                                    name);
     }
   else
     {
-    device_album->name = bg_strdup(device_album->name,
+    device_album->name = gavl_strrep(device_album->name,
                                    device);
     }
 
@@ -2111,11 +2230,9 @@
   bg_album_entry_t * before;
   bg_album_entry_t * e;
   bg_album_entry_t * new_entry, * end_entry;
-  int done = 0;
   const bg_plugin_info_t * info;
   const char * name;
   
-  done = 1;
   e = entries;
   
   while(e)
@@ -2154,11 +2271,11 @@
         while(end_entry->next)
           {
           /* Set plugin so we don't have to set it next time */
-          end_entry->plugin = bg_strdup(end_entry->plugin, album->com->load_handle->info->name);
+          end_entry->plugin = gavl_strrep(end_entry->plugin, album->com->load_handle->info->name);
           end_entry = end_entry->next;
           }
         /* Set plugin so we don't have to set it next time */
-        end_entry->plugin = bg_strdup(end_entry->plugin, album->com->load_handle->info->name);
+        end_entry->plugin = gavl_strrep(end_entry->plugin, album->com->load_handle->info->name);
         end_entry->next = e->next;
         bg_album_entry_destroy(e);
         e = new_entry;
@@ -2285,7 +2402,7 @@
     
     new_entry = bg_album_entry_create();
     //    new_entry->location = bg_system_to_utf8(url, strlen(url));
-    new_entry->location = bg_strdup(new_entry->location, url);
+    new_entry->location = gavl_strdup(url);
     new_entry->index = i;
     new_entry->total_tracks = num_entries;
 
@@ -2297,8 +2414,8 @@
     
     bg_album_common_set_auth_info(album->com, new_entry);
     bg_album_update_entry(album, new_entry, track_info, 0, 1);
-    
-    new_entry->plugin = bg_strdup(new_entry->plugin, plugin_name);
+
+    new_entry->plugin = gavl_strrep(new_entry->plugin, plugin_name);
     
     if(ret)
       {
@@ -2325,7 +2442,7 @@
   }
 
 static int refresh_entry(bg_album_t * album,
-                         bg_album_entry_t * entry, bg_edl_t * edl)
+                         bg_album_entry_t * entry, gavl_edl_t * edl, gavl_edl_track_t * edl_track)
   {
   const bg_plugin_info_t * info;
   //  char * system_location;
@@ -2380,17 +2497,28 @@
         plugin->set_video_stream(album->com->load_handle->priv,
                                  i, BG_STREAM_ACTION_DECODE);
       }
-    if(plugin->set_subtitle_stream)
+    if(plugin->set_text_stream)
       {
-      for(i = 0; i < track_info->num_subtitle_streams; i++)
-        plugin->set_subtitle_stream(album->com->load_handle->priv,
-                                    i, BG_STREAM_ACTION_DECODE);
+      for(i = 0; i < track_info->num_text_streams; i++)
+        plugin->set_text_stream(album->com->load_handle->priv,
+                                i, BG_STREAM_ACTION_DECODE);
+      }
+    if(plugin->set_overlay_stream)
+      {
+      for(i = 0; i < track_info->num_overlay_streams; i++)
+        plugin->set_overlay_stream(album->com->load_handle->priv,
+                                   i, BG_STREAM_ACTION_DECODE);
       }
     
     if(plugin->start)
       plugin->start(album->com->load_handle->priv);
-    bg_edl_append_track_info(edl, track_info, entry->location, entry->index,
-                             entry->total_tracks, entry->name);
+
+    if(edl_track)
+      bg_edl_track_append_track_info(edl, edl_track, track_info, entry->location, entry->index,
+                               entry->total_tracks, entry->name);
+    else 
+      bg_edl_append_track_info(edl, track_info, entry->location, entry->index,
+                               entry->total_tracks, entry->name);
     }
   
   bg_album_update_entry(album, entry, track_info, 1, 1);
@@ -2406,23 +2534,30 @@
   while(cur)
     {
     if(cur->flags & BG_ALBUM_ENTRY_SELECTED)
-      refresh_entry(album, cur, NULL);
+      refresh_entry(album, cur, NULL, NULL);
     cur = cur->next;
     }
   }
 
-bg_edl_t * bg_album_selected_to_edl(bg_album_t * album)
+gavl_edl_t * bg_album_selected_to_edl(bg_album_t * album, int separate_tracks)
   {
-  bg_edl_t * ret;
+  gavl_edl_t * ret;
+  gavl_edl_track_t * track;
+
   bg_album_entry_t * cur;
 
-  ret = bg_edl_create();
+  ret = gavl_edl_create();
+
+  if(separate_tracks)
+    track = NULL;
+  else
+    track = gavl_edl_add_track(ret);
   
   cur = album->entries;
   while(cur)
     {
     if(cur->flags & BG_ALBUM_ENTRY_SELECTED)
-      refresh_entry(album, cur, ret);
+      refresh_entry(album, cur, ret, track);
     cur = cur->next;
     }
   return ret;
@@ -2469,12 +2604,17 @@
 
 const char * bg_album_get_disc_name(bg_album_t * a)
   {
-  return a->disc_name;
+  return gavl_metadata_get(&a->m, BG_ALBUM_TAG_DISC_NAME);
   }
 
-char * bg_album_get_label(bg_album_t * a)
+const char * bg_album_get_label(bg_album_t * a)
   {
-  return a->disc_name ? a->disc_name : a->name;
+  const char * ret = gavl_metadata_get(&a->m, BG_ALBUM_TAG_DISC_NAME);
+
+  if(!ret)
+    return a->name;
+  else
+    return ret;
   }
 
 
@@ -2511,10 +2651,10 @@
     if(entry->flags & BG_ALBUM_ENTRY_SELECTED)
       {
       if(ret)
-        ret = bg_strcat(ret, "\n");
+        ret = gavl_strcat(ret, "\n");
       gavl_time_prettyprint(entry->duration, time_string);
       tmp_string = bg_sprintf("%d.\t%s\t%s", index, entry->name, time_string);
-      ret = bg_strcat(ret, tmp_string);
+      ret = gavl_strcat(ret, tmp_string);
       free(tmp_string);
       }
     entry = entry->next;
@@ -2658,7 +2798,7 @@
   {
   if(d->str && !strcmp(d->str, str))
     return;
-  d->str = bg_strdup(d->str, str);
+  d->str = gavl_strrep(d->str, str);
   d->changed = 1;
   }
 
@@ -2887,9 +3027,9 @@
   /* Also sets unique ID */
   ret = bg_album_entry_create();
 
-  ret->name = bg_strdup(ret->name, e->name);
-  ret->location = bg_strdup(ret->location, e->location);
-  ret->plugin = bg_strdup(ret->plugin, e->plugin);
+  ret->name = gavl_strrep(ret->name, e->name);
+  ret->location = gavl_strrep(ret->location, e->location);
+  ret->plugin = gavl_strrep(ret->plugin, e->plugin);
   ret->duration = e->duration;
 
   ret->num_audio_streams = e->num_audio_streams;
@@ -2906,8 +3046,8 @@
                           
   /* Authentication data */
 
-  ret->username = bg_strdup(ret->username, e->username);
-  ret->password = bg_strdup(ret->password, e->password);
+  ret->username = gavl_strrep(ret->username, e->username);
+  ret->password = gavl_strrep(ret->password, e->password);
   
   ret->flags = e->flags;
   /* Clear selected bit */
@@ -2922,8 +3062,29 @@
                             const char * dir)
   {
   char * pos;
-  a->watch_dir = bg_strdup(a->watch_dir, dir);
+  a->watch_dir = gavl_strrep(a->watch_dir, dir);
   pos = a->watch_dir + strlen(a->watch_dir) - 1;
   if(*pos == '\n')
     *pos = '\0';
   }
+
+const gavl_metadata_t * bg_album_get_metadata(bg_album_t * a)
+  {
+  return &a->m;
+  }
+
+bg_album_t *
+bg_album_append_to_list(bg_album_t * list, bg_album_t * new_album)
+  {
+  bg_album_t * a;
+  if(!list)
+    return new_album;
+
+  a = list;
+    
+  while(a->next)
+    a = a->next;
+  a->next = new_album;
+  return list;
+  }
+

gmerlin-1.2.0.tar.gz/lib/album_xml.c -> gmerlin-4256.tar.gz/lib/album_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -76,7 +76,14 @@
       ret->flags |= BG_ALBUM_ENTRY_SAVE_AUTH;
     xmlFree(tmp_string);
     }
-  
+#if 0
+  if((tmp_string = BG_XML_GET_PROP(node, "redirector")))
+    {
+    if(atoi(tmp_string))
+      ret->flags |= BG_ALBUM_ENTRY_REDIRECTOR;
+    xmlFree(tmp_string);
+    }
+#endif
   node = node->children;
   
   while(node)
@@ -90,7 +97,7 @@
     
     if(!BG_XML_STRCMP(node->name, "NAME"))
       {
-      ret->name = bg_strdup(ret->name, tmp_string);
+      ret->name = gavl_strrep(ret->name, tmp_string);
       }
     else if(!BG_XML_STRCMP(node->name, "LOCATION"))
       {
@@ -98,7 +105,7 @@
       }
     else if(!BG_XML_STRCMP(node->name, "USER"))
       {
-      ret->username = bg_strdup(ret->username, tmp_string);
+      ret->username = gavl_strrep(ret->username, tmp_string);
       }
     else if(!BG_XML_STRCMP(node->name, "PASS"))
       {
@@ -106,7 +113,7 @@
       }
     else if(!BG_XML_STRCMP(node->name, "PLUGIN"))
       {
-      ret->plugin = (void*)bg_strdup(ret->plugin, tmp_string);
+      ret->plugin = (void*)gavl_strrep(ret->plugin, tmp_string);
       }
     else if(!BG_XML_STRCMP(node->name, "DURATION"))
       {
@@ -219,7 +226,7 @@
   bg_album_entry_t * ret;
   xmlDocPtr xml_doc;
 
-  xml_doc = bg_xml_parse_file(filename);
+  xml_doc = bg_xml_parse_file(filename, 1);
 
   if(!xml_doc)
     {
@@ -379,22 +386,17 @@
   xml_entry = xmlNewTextChild(parent, NULL, (xmlChar*)"ENTRY", NULL);
 
   if(a && bg_album_entry_is_current(a, entry) && preserve_current)
-    {
     BG_XML_SET_PROP(xml_entry, "current", "1");
-    }
   if(entry->flags & BG_ALBUM_ENTRY_ERROR)
-    {
     BG_XML_SET_PROP(xml_entry, "error", "1");
-    }
   if(entry->flags & BG_ALBUM_ENTRY_SAVE_AUTH)
-    {
     BG_XML_SET_PROP(xml_entry, "save_auth", "1");
-    }
   if(entry->flags & BG_ALBUM_ENTRY_EDL)
-    {
     BG_XML_SET_PROP(xml_entry, "edl", "1");
-    }
-  
+#if 0
+  if(entry->flags & BG_ALBUM_ENTRY_REDIRECTOR)
+    BG_XML_SET_PROP(xml_entry, "redirector", "1");
+#endif
   xmlAddChild(xml_entry, BG_XML_NEW_TEXT("\n"));
   xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
 
@@ -573,86 +575,28 @@
 
 /* Output routines for writing to memory */
 
-#if 0
-typedef struct output_mem_s
-  {
-  int bytes_written;
-  int bytes_allocated;
-  char * buffer;
-  } output_mem_t;
-
-#define BLOCK_SIZE 2048
-
-static int xml_write_callback(void * context, const char * buffer,
-                       int len)
-  {
-  output_mem_t * o = (output_mem_t*)context;
-
-  if(o->bytes_allocated - o->bytes_written < len)
-    {
-    o->bytes_allocated += BLOCK_SIZE;
-    while(o->bytes_allocated < o->bytes_written + len)
-      o->bytes_allocated += BLOCK_SIZE;
-    o->buffer = realloc(o->buffer, o->bytes_allocated);
-    }
-  memcpy(&o->buffer[o->bytes_written], buffer, len);
-  o->bytes_written += len;
-  return len;
-  }
-
-static int xml_close_callback(void * context)
-  {
-  output_mem_t * o = (output_mem_t*)context;
-
-  if(o->bytes_allocated == o->bytes_written)
-    {
-    o->bytes_allocated++;
-    o->buffer = realloc(o->buffer, o->bytes_allocated);
-    }
-  o->buffer[o->bytes_written] = '\0';
-  return 0;
-  }
-#endif
-
 char * bg_album_save_to_memory(bg_album_t * a)
   {
   xmlDocPtr  xml_doc;
-  bg_xml_output_mem_t ctx;
-  xmlOutputBufferPtr b;
-  memset(&ctx, 0, sizeof(ctx));
+  char * ret;
   
   xml_doc = album_2_xml(a);
-  
-  b = xmlOutputBufferCreateIO (bg_xml_write_callback,
-                               bg_xml_close_callback,
-                               &ctx,
-                               NULL);
-  
-  xmlSaveFileTo(b, xml_doc, NULL);
+
+  ret = bg_xml_save_to_memory(xml_doc);
   xmlFreeDoc(xml_doc);
-  return ctx.buffer;
+  return ret;
   }
 
 char * bg_album_save_selected_to_memory(bg_album_t * a, int preserve_current)
   {
   xmlDocPtr  xml_doc;
-  bg_xml_output_mem_t ctx;
-  xmlOutputBufferPtr b;
-  
-  memset(&ctx, 0, sizeof(ctx));
-  
+  char * ret;
   xml_doc = entries_2_xml(a, preserve_current, 1);
+
+  ret = bg_xml_save_to_memory(xml_doc);
   
-  b = xmlOutputBufferCreateIO(bg_xml_write_callback,
-                              bg_xml_close_callback,
-                              &ctx,
-                              NULL);
-  
-  xmlSaveFileTo(b,
-                xml_doc,
-                NULL);
   xmlFreeDoc(xml_doc);
-  return ctx.buffer;
+  return ret;
   }
 
 static void set_permissions(const char * filename)
@@ -677,7 +621,7 @@
 
   if(filename)
     {
-    xmlSaveFile(filename, xml_doc);
+    bg_xml_save_file(xml_doc, filename, 1);
     set_permissions(filename);
     }
   else
@@ -687,7 +631,8 @@
       bg_album_set_default_location(a);
       }
     tmp_filename = bg_sprintf("%s/%s", a->com->directory, a->xml_file);
-    xmlSaveFile(tmp_filename, xml_doc);
+
+    bg_xml_save_file(xml_doc, tmp_filename, 1);
     set_permissions(tmp_filename);
     free(tmp_filename);
     }

gmerlin-4256.tar.gz/lib/audiofilters.c Added

@@ -0,0 +1,385 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/converters.h>
+
+
+#include <gmerlin/utils.h>
+
+#include <gmerlin/filters.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "audiofilters"
+
+/* Audio */
+
+typedef struct
+  {
+  bg_plugin_handle_t * handle;
+  bg_fa_plugin_t     * plugin;
+  gavl_audio_source_t * out_src;
+  } audio_filter_t;
+
+struct bg_audio_filter_chain_s
+  {
+  gavl_audio_source_t * out_src; // Last filter element
+  gavl_audio_source_t * in_src; // Legacy!!
+
+  /* Legacy !! */
+  int in_samples;
+  int out_samples;
+  gavl_audio_frame_t * out_frame;
+  
+
+  
+  int num_filters;
+  audio_filter_t * filters;
+  const bg_gavl_audio_options_t * opt;
+  bg_plugin_registry_t * plugin_reg;
+  
+  bg_parameter_info_t * parameters;
+  
+  char * filter_string;
+  int need_rebuild;
+  int need_restart;
+
+  pthread_mutex_t mutex;
+
+  /* Legacy!! */
+  bg_read_audio_func_t in_func;
+  void * in_data;
+  int in_stream;
+  
+  };
+
+int bg_audio_filter_chain_need_restart(bg_audio_filter_chain_t * ch)
+  {
+  return ch->need_restart || ch->need_rebuild;
+  }
+
+
+static int audio_filter_create(audio_filter_t * f,
+                               bg_audio_filter_chain_t * ch,
+                                const char * name)
+  {
+  const bg_plugin_info_t * info;
+  info = bg_plugin_find_by_name(ch->plugin_reg, name);
+  if(!info)
+    return 0;
+  f->handle = bg_plugin_load(ch->plugin_reg, info);
+  if(!f->handle)
+    return 0;
+
+  f->plugin = (bg_fa_plugin_t*)(f->handle->plugin);
+  return 1;
+  }
+
+void bg_audio_filter_chain_lock(void * priv)
+  {
+  bg_audio_filter_chain_t * cnv = priv;
+  pthread_mutex_lock(&cnv->mutex);
+  }
+
+void bg_audio_filter_chain_unlock(void * priv)
+  {
+  bg_audio_filter_chain_t * cnv = priv;
+  pthread_mutex_unlock(&cnv->mutex);
+  }
+
+
+static void audio_filter_destroy(audio_filter_t * f)
+  {
+  if(f->handle)
+    bg_plugin_unref_nolock(f->handle);
+  }
+
+static void destroy_audio_chain(bg_audio_filter_chain_t * ch)
+  {
+  int i;
+  
+  /* Destroy previous filters */
+  for(i = 0; i < ch->num_filters; i++)
+    audio_filter_destroy(&ch->filters[i]);
+  if(ch->filters)
+    {
+    free(ch->filters);
+    ch->filters = NULL;
+    }
+  ch->num_filters = 0;
+  }
+
+static void bg_audio_filter_chain_rebuild(bg_audio_filter_chain_t * ch)
+  {
+  int i;
+  char ** filter_names;
+
+  ch->need_rebuild = 0;
+  filter_names = bg_strbreak(ch->filter_string, ',');
+  
+  destroy_audio_chain(ch);
+  
+  if(!filter_names)
+    return;
+  
+  while(filter_names[ch->num_filters])
+    ch->num_filters++;
+
+  ch->filters = calloc(ch->num_filters, sizeof(*ch->filters));
+  for(i = 0; i < ch->num_filters; i++)
+    {
+    audio_filter_create(&ch->filters[i], ch,
+                        filter_names[i]);
+    }
+  bg_strbreak_free(filter_names);
+  }
+
+bg_audio_filter_chain_t *
+bg_audio_filter_chain_create(const bg_gavl_audio_options_t * opt,
+                             bg_plugin_registry_t * plugin_reg)
+  {
+  bg_audio_filter_chain_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  ret->opt = opt;
+  ret->plugin_reg = plugin_reg;
+  
+  pthread_mutex_init(&ret->mutex, NULL);
+  return ret;
+  }
+
+static const bg_parameter_info_t params[] =
+  {
+    {
+      .name      = "audio_filters",
+      .opt       = "f",
+      .long_name = TRS("Audio Filters"),
+      .preset_path = "audiofilters",
+      .gettext_domain = PACKAGE,
+      .gettext_directory = LOCALE_DIR,
+      .type = BG_PARAMETER_MULTI_CHAIN,
+      .flags = BG_PARAMETER_SYNC,
+    },
+    { /* End */ }
+  };
+
+static void create_audio_parameters(bg_audio_filter_chain_t * ch)
+  {
+  ch->parameters = bg_parameter_info_copy_array(params);
+  bg_plugin_registry_set_parameter_info(ch->plugin_reg,
+                                        BG_PLUGIN_FILTER_AUDIO,
+                                        BG_PLUGIN_FILTER_1,
+                                        ch->parameters);
+  }
+
+const bg_parameter_info_t *
+bg_audio_filter_chain_get_parameters(bg_audio_filter_chain_t * ch)
+  {
+  if(!ch->parameters)
+    create_audio_parameters(ch);
+  return ch->parameters;
+  }
+
+void
+bg_audio_filter_chain_set_parameter(void * data, const char * name,
+                                    const bg_parameter_value_t * val)
+  {
+  bg_audio_filter_chain_t * ch;
+  int i;
+  char * pos;
+  audio_filter_t * f;
+  
+  ch = (bg_audio_filter_chain_t *)data;
+  
+  if(!name)
+    {
+    for(i = 0; i < ch->num_filters; i++)
+      {
+      if(ch->filters[i].plugin->common.set_parameter)
+        ch->filters[i].plugin->common.set_parameter(ch->filters[i].handle->priv,
+                                             NULL, NULL);
+      }
+    return;
+    }
+
+  if(!strcmp(name, "audio_filters"))
+    {
+    if(!ch->filter_string && !val->val_str)
+      goto the_end;
+    
+    if(ch->filter_string && val->val_str &&
+       !strcmp(ch->filter_string, val->val_str))
+      {
+      goto the_end;
+      }
+    /* Rebuild chain */
+    ch->filter_string = gavl_strrep(ch->filter_string, val->val_str);
+    ch->need_rebuild = 1;
+    }
+  else if(!strncmp(name, "audio_filters.", 14))
+    {
+    if(ch->need_rebuild)
+      bg_audio_filter_chain_rebuild(ch);
+    
+    pos = strchr(name, '.');
+    pos++;
+    i = atoi(pos);
+    f = ch->filters + i;
+
+    pos = strchr(pos, '.');
+    if(!pos)
+      goto the_end;
+    pos++;
+    if(f->plugin->common.set_parameter)
+      {
+      f->plugin->common.set_parameter(f->handle->priv, pos, val);
+      if(f->plugin->need_restart && f->plugin->need_restart(f->handle->priv))
+        ch->need_restart = 1;
+      }
+    }
+  the_end:
+  return;
+  }
+
+/* Legacy */
+static gavl_source_status_t
+read_func_in(void * priv, gavl_audio_frame_t ** frame)
+  {
+  int num_samples;
+  bg_audio_filter_chain_t * ch = priv;
+
+  num_samples =
+    (*frame == ch->out_frame) ? ch->out_samples : ch->in_samples;
+  
+  if(!ch->in_func(ch->in_data, *frame, ch->in_stream, num_samples))
+    return GAVL_SOURCE_EOF;
+  return GAVL_SOURCE_OK;
+  }
+
+int bg_audio_filter_chain_init(bg_audio_filter_chain_t * ch,
+                               const gavl_audio_format_t * in_format,
+                               gavl_audio_format_t * out_format)
+  {
+  ch->need_restart = 0;
+  
+
+  if(ch->in_src)
+    gavl_audio_source_destroy(ch->in_src);
+  
+  ch->in_src = gavl_audio_source_create(read_func_in, ch, 0, in_format);
+  ch->in_samples = in_format->samples_per_frame;
+  
+  bg_audio_filter_chain_connect(ch, ch->in_src);
+  gavl_audio_format_copy(out_format,
+                         gavl_audio_source_get_src_format(ch->out_src));
+  
+  //  if(ch->in_samples > out_format->samples_per_frame)
+  //    ch->in_samples = out_format->samples_per_frame;
+  return ch->num_filters;
+  }
+
+/* LEGACY */
+int bg_audio_filter_chain_set_out_format(bg_audio_filter_chain_t * ch,
+                                         const gavl_audio_format_t * out_format)
+  {
+  gavl_audio_source_set_dst(ch->out_src, 0, out_format);
+  return 1;
+  }
+
+/* LEGACY */
+void bg_audio_filter_chain_connect_input(bg_audio_filter_chain_t * ch,
+                                         bg_read_audio_func_t func,
+                                         void * priv, int stream)
+  {
+  ch->in_func = func;
+  ch->in_data = priv;
+  ch->in_stream = stream;
+  }
+
+int bg_audio_filter_chain_read(void * priv, gavl_audio_frame_t* frame,
+                               int stream, int num_samples)
+  {
+  bg_audio_filter_chain_t * ch = priv;
+
+  ch->out_frame = frame;
+  ch->out_samples = num_samples;
+  
+  return gavl_audio_source_read_samples(ch->out_src,
+                                        frame, num_samples);
+  }
+
+void bg_audio_filter_chain_destroy(bg_audio_filter_chain_t * ch)
+  {
+  if(ch->parameters)
+    bg_parameter_info_destroy_array(ch->parameters);
+
+  if(ch->filter_string)
+    free(ch->filter_string);
+  
+  destroy_audio_chain(ch);
+  pthread_mutex_destroy(&ch->mutex);
+  free(ch);
+  }
+
+void bg_audio_filter_chain_reset(bg_audio_filter_chain_t * ch)
+  {
+  int i;
+  for(i = 0; i < ch->num_filters; i++)
+    {
+    if(ch->filters[i].plugin->reset)
+      ch->filters[i].plugin->reset(ch->filters[i].handle->priv);
+    gavl_audio_source_reset(ch->filters[i].out_src);
+    }
+  }
+
+gavl_audio_source_t *
+bg_audio_filter_chain_connect(bg_audio_filter_chain_t * ch,
+                              gavl_audio_source_t * src)
+  {
+  int i;
+
+  if(ch->need_rebuild)
+    bg_audio_filter_chain_rebuild(ch);
+  
+  for(i = 0; i < ch->num_filters; i++)
+    {
+    gavl_audio_options_copy(gavl_audio_source_get_options(src),
+                            ch->opt->opt);
+    
+    ch->filters[i].out_src =
+      ch->filters[i].plugin->connect(ch->filters[i].handle->priv,
+                                     src, ch->opt->opt);
+    src = ch->filters[i].out_src;
+    }
+  
+  ch->out_src = src;
+  gavl_audio_source_set_lock_funcs(ch->out_src,
+                                   bg_audio_filter_chain_lock,
+                                   bg_audio_filter_chain_unlock,
+                                   ch);
+  return ch->out_src;
+  }

gmerlin-1.2.0.tar.gz/lib/bgfrei0r.c -> gmerlin-4256.tar.gz/lib/bgfrei0r.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -107,11 +107,10 @@
     memset(&param_info, 0, sizeof(param_info));
     get_param_info(&param_info, i);
 
-    ret[i].name = bg_strdup(NULL, param_info.name);
-    ret[i].long_name = bg_strdup(NULL, param_info.name);
+    ret[i].name = gavl_strdup(param_info.name);
+    ret[i].long_name = gavl_strdup(param_info.name);
     ret[i].flags = BG_PARAMETER_SYNC;
-    ret[i].help_string = bg_strdup(NULL,
-                                       param_info.explanation);
+    ret[i].help_string = gavl_strdup(param_info.explanation);
     switch(param_info.type)
       {
       case F0R_PARAM_BOOL:
@@ -193,7 +192,7 @@
   ret->type        = BG_PLUGIN_FILTER_VIDEO;
   ret->api         = BG_PLUGIN_API_FREI0R;
   ret->flags       = BG_PLUGIN_FILTER_1;
-  ret->module_filename = bg_strdup(NULL, filename);
+  ret->module_filename = gavl_strdup(filename);
 
   // fprintf(stderr, "Loading %s\n", ret->name);
   
@@ -241,6 +240,10 @@
   
   const bg_parameter_info_t * parameters;
   int do_swap;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+
   } frei0r_t;
 
 static void set_parameter_instance(void * data,
@@ -326,8 +329,10 @@
     bg_cfg_section_set_parameter(vp->section, info, val);
   }
 
+#if 0
 static void connect_input_port_frei0r(void *priv,
-                                      bg_read_video_func_t func, void *data, int stream, int port)
+                                      bg_read_video_func_t func,
+                                      void *data, int stream, int port)
   {
   frei0r_t * vp;
   vp = (frei0r_t *)priv;
@@ -347,6 +352,7 @@
   vp = (frei0r_t *)priv;
   gavl_video_format_copy(format, &vp->format);
   }
+#endif
 
 static const gavl_pixelformat_t packed32_formats[] =
   {
@@ -357,7 +363,9 @@
     GAVL_PIXELFORMAT_NONE,
   };
 
-static void set_input_format_frei0r(void *priv, gavl_video_format_t *format, int port)
+#if 0
+static void set_input_format_frei0r(void *priv,
+                                    gavl_video_format_t *format, int port)
   {
   /* Set input format */
   frei0r_t * vp;
@@ -376,8 +384,11 @@
                                                       NULL);
       break;
     }
-  /* Frei0r demands image sizes to be a multiple of 8. We fake this by making a larger
-     frame */
+  /*
+   * Frei0r demands image sizes to be a multiple of 8.
+   * We fake this by making a larger
+   * frame
+   */
 
   format->frame_width  = ((format->image_width+7)/8)*8;
   format->frame_height = ((format->image_height+7)/8)*8;
@@ -412,7 +423,7 @@
   {
   frei0r_t * vp;
   double time;
-  vp = (frei0r_t *)priv;
+  vp = priv;
 
   if(!vp->read_func(vp->read_data, vp->in_frame, vp->read_stream))
     return 0;
@@ -439,6 +450,91 @@
   
   return 1;
   }
+#endif
+
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
+  {
+  frei0r_t * vp;
+  gavl_source_status_t st;
+  gavl_video_frame_t * f = NULL;
+  double time;
+  
+  vp = priv;
+  if((st = gavl_video_source_read_frame(vp->in_src, &f)) != GAVL_SOURCE_OK)
+    return st;
+
+  time = gavl_time_to_seconds(gavl_time_unscale(vp->format.timescale,
+                                                f->timestamp));
+
+  vp->update(vp->instance, time,
+             (const uint32_t*)f->planes[0],
+             (uint32_t*)(*frame)->planes[0]);
+
+  gavl_video_frame_copy_metadata(*frame, f);  
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_video_source_t * connect_frei0r(void * priv,
+                                            gavl_video_source_t * src,
+                                            const gavl_video_options_t * opt)
+  {
+  frei0r_t * vp;
+  vp = priv;
+  
+  vp->in_src = src;
+
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  
+  gavl_video_format_copy(&vp->format, 
+                         gavl_video_source_get_src_format(vp->in_src));
+
+  switch(vp->plugin_info.color_model)
+    {
+    case F0R_COLOR_MODEL_BGRA8888:
+      vp->do_swap = 1;
+      /* Fall through */
+    case F0R_COLOR_MODEL_RGBA8888:
+      vp->format.pixelformat = GAVL_RGBA_32;
+      break;
+    case F0R_COLOR_MODEL_PACKED32:
+      vp->format.pixelformat =
+        gavl_pixelformat_get_best(vp->format.pixelformat,
+                                  packed32_formats,
+                                  NULL);
+      break;
+    }
+  /*
+   * Frei0r demands image sizes to be a multiple of 8.
+   * We fake this by making a larger
+   * frame
+   */
+
+  vp->format.frame_width  = ((vp->format.image_width+7)/8)*8;
+  vp->format.frame_height = ((vp->format.image_height+7)/8)*8;
+  
+  /* Fire up the plugin */
+  
+  vp->instance = vp->construct(vp->format.frame_width,
+                               vp->format.frame_height);
+  
+  /* Now, we can set parameters */
+
+  if(vp->section)
+    {
+    bg_cfg_section_apply(vp->section,
+                         vp->parameters,
+                         set_parameter_instance, vp);
+    }
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  
+  vp->out_src = gavl_video_source_create_source(read_func,
+                                                vp, 0,
+                                                vp->in_src);
+  return vp->out_src;
+  }
 
 static const bg_parameter_info_t * get_parameters_frei0r(void * priv)
   {
@@ -458,11 +554,15 @@
   ret->plugin_nc = (bg_plugin_common_t*)vf;
   ret->plugin = ret->plugin_nc;
 
+#if 0  
   vf->set_input_format = set_input_format_frei0r;
   vf->connect_input_port = connect_input_port_frei0r;
   vf->get_output_format = get_output_format_frei0r;
   vf->read_video = read_video_frei0r;
-
+#else
+  vf->connect = connect_frei0r;
+#endif
+  
   if(info->parameters)
     {
     ret->plugin_nc->get_parameters = get_parameters_frei0r;
@@ -516,9 +616,15 @@
   {
   frei0r_t * vp;
   vp = (frei0r_t *)h->priv;
-  if(vp->instance)  vp->destruct(vp->instance);
-  if(vp->in_frame)  gavl_video_frame_destroy(vp->in_frame);
-  if(vp->out_frame) gavl_video_frame_destroy(vp->out_frame);
+  if(vp->instance)
+    vp->destruct(vp->instance);
+  if(vp->in_frame)
+    gavl_video_frame_destroy(vp->in_frame);
+  if(vp->out_frame)
+    gavl_video_frame_destroy(vp->out_frame);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
   free(vp);
   }

gmerlin-1.2.0.tar.gz/lib/bggavl.c -> gmerlin-4256.tar.gz/lib/bggavl.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -193,6 +193,7 @@
 
 void bg_gavl_audio_options_init(bg_gavl_audio_options_t *opt)
   {
+  memset(opt, 0, sizeof(*opt));
   opt->opt = gavl_audio_options_create();
   }
 
@@ -641,6 +642,7 @@
 
 void bg_gavl_video_options_init(bg_gavl_video_options_t * opt)
   {
+  memset(opt, 0, sizeof(*opt));
   opt->opt = gavl_video_options_create();
   }
 
@@ -733,3 +735,45 @@
     return 1;
   return 0;
   }
+
+static int time_active = 0;
+
+void bg_print_time_stop(FILE * out)
+  {
+  putc('\n', out);
+  time_active = 0;
+  }
+
+void bg_print_time(FILE * out,
+                   gavl_time_t time, gavl_time_t total_time)
+  {
+  char str[GAVL_TIME_STRING_LEN];
+  int i;
+  int len;
+  
+  if(time_active)
+    putc('\r', out);
+  
+  gavl_time_prettyprint(time, str);
+
+  fprintf(out, "[ ");
+  len = strlen(str);
+
+  for(i = 0; i < GAVL_TIME_STRING_LEN - len - 1; i++)
+    {
+    fprintf(out, " ");
+    }
+  fprintf(out, "%s ]/", str);
+
+  gavl_time_prettyprint(total_time, str);
+
+  fprintf(out, "[ ");
+  len = strlen(str);
+
+  for(i = 0; i < GAVL_TIME_STRING_LEN - len - 1; i++)
+    {
+    fprintf(out, " ");
+    }
+  fprintf(out, "%s ]", str);
+  time_active = 1;
+  }

gmerlin-1.2.0.tar.gz/lib/bgladspa.c -> gmerlin-4256.tar.gz/lib/bgladspa.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -191,8 +191,8 @@
 
   if(desc->run_adding)
     {
-    ret[index].name = bg_strdup(ret[index].name, "$run_adding");
-    ret[index].long_name = bg_strdup(ret[index].long_name,
+    ret[index].name = gavl_strrep(ret[index].name, "$run_adding");
+    ret[index].long_name = gavl_strrep(ret[index].long_name,
                                      TR("Add effect to input data"));
     ret[index].type = BG_PARAMETER_CHECKBUTTON;
     ret[index].val_default.val_i = 0;
@@ -201,8 +201,8 @@
     }
   if(desc->set_run_adding_gain)
     {
-    ret[index].name = bg_strdup(ret[index].name, "$run_adding_gain");
-    ret[index].long_name = bg_strdup(ret[index].long_name,
+    ret[index].name = gavl_strrep(ret[index].name, "$run_adding_gain");
+    ret[index].long_name = gavl_strrep(ret[index].long_name,
                                      TR("Add gain (dB)"));
     ret[index].type = BG_PARAMETER_SLIDER_FLOAT;
     ret[index].num_digits = 2;
@@ -210,7 +210,7 @@
     ret[index].val_max.val_f =  0.0;
     ret[index].val_default.val_f = 0.0;
     ret[index].help_string =
-      bg_strdup(ret[index].help_string,
+      gavl_strrep(ret[index].help_string,
                 TR("Overall gain for this filter. This is only valid if you add the effect to the input data"));
     ret[index].flags = BG_PARAMETER_SYNC;
     index++;
@@ -257,7 +257,7 @@
   ret = calloc(1, sizeof(*ret));
 
   ret->name        = bg_sprintf("fa_ladspa_%s", desc->Label);
-  ret->long_name   = bg_strdup(NULL, desc->Name);
+  ret->long_name   = gavl_strdup(desc->Name);
   ret->type        = BG_PLUGIN_FILTER_AUDIO;
   ret->api         = BG_PLUGIN_API_LADSPA;
   ret->flags       = BG_PLUGIN_FILTER_1;
@@ -301,7 +301,7 @@
     {
     new = get_info(desc);
     new->index = index;
-    new->module_filename = bg_strdup(NULL, filename);
+    new->module_filename = gavl_strdup(filename);
     if(ret)
       {
       end->next = new;
@@ -321,15 +321,14 @@
   {
   LADSPA_Data * config_ports;
   gavl_audio_format_t format;
-  gavl_audio_frame_t * frame;
+  //  gavl_audio_frame_t * frame;
   const LADSPA_Descriptor * desc;
   float run_adding_gain;
   int run_adding;
-  
-  bg_read_audio_func_t read_func;
-  void * read_data;
-  int read_stream;
 
+  gavl_audio_source_t * in_src;
+  gavl_audio_source_t * out_src;
+  
   bg_parameter_info_t * parameters;
 
   /* Port maps */
@@ -366,11 +365,6 @@
       lp->desc->cleanup(lp->channels[i].Instance);
     }
   lp->num_instances = 0;
-  if(lp->frame)
-    {
-    gavl_audio_frame_destroy(lp->frame);
-    lp->frame = NULL;
-    }
   }
 
 /* Initialize instances, called after the input format is known */
@@ -397,7 +391,7 @@
   else /* Stereo -> Stereo */
     lp->num_instances = 1;
   
-  lp->format.samples_per_frame = 0;
+//  lp->format.samples_per_frame = 0;
   for(i = 0; i < lp->num_instances; i++)
     {
     lp->channels[i].Instance =
@@ -434,48 +428,6 @@
     }
   }
 
- 
-static void set_input_format_ladspa(void * priv,
-                                    gavl_audio_format_t * format, 
-                                    int port)
-  {
-  ladspa_priv_t * lp;
-  lp = (ladspa_priv_t *)priv;
-  
-  if(!port)
-    {
-    format->interleave_mode = GAVL_INTERLEAVE_NONE;
-    format->sample_format = GAVL_SAMPLE_FLOAT;
-    
-    gavl_audio_format_copy(&lp->format, format);
-    init_ladspa(lp);
-    gavl_audio_format_copy(format, &lp->format);
-    }
-  }
-
-static void connect_input_port_ladspa(void * priv,
-                                      bg_read_audio_func_t func,
-                                      void * data, int stream, 
-                                      int port)
-  {
-  ladspa_priv_t * lp;
-  lp = (ladspa_priv_t *)priv;
-  
-  if(!port)
-    {
-    lp->read_func = func;
-    lp->read_data = data;
-    lp->read_stream = stream;
-    }
-  }
-
-static void get_output_format_ladspa(void * priv,
-                                     gavl_audio_format_t * format)
-  {
-  ladspa_priv_t * lp;
-  lp = (ladspa_priv_t *)priv;
-  gavl_audio_format_copy(format, &lp->format);
-  }
 
 static void connect_input(ladspa_priv_t * lp, gavl_audio_frame_t * f)
   {
@@ -499,69 +451,55 @@
     }
   }
 
-
-static int read_audio_ladspa(void * priv,
-                             gavl_audio_frame_t * frame,
-                             int stream, int num_samples)
+static gavl_source_status_t
+read_func(void * priv,
+          gavl_audio_frame_t ** frame)
   {
+  
+  
   int i;
   ladspa_priv_t * lp;
-  int ret;
+  int num_samples;
+  gavl_source_status_t st;
+  gavl_audio_frame_t * in_frame = NULL;
   lp = (ladspa_priv_t *)priv;
   
-  /* Check whether to (re)allocate the frame */
-  if(lp->frame &&
-     lp->inplace_broken &&
-     (num_samples > lp->format.samples_per_frame))
-    {
-    gavl_audio_frame_destroy(lp->frame);
-    lp->frame = NULL;
-    }
-  
-  if(!lp->frame && lp->inplace_broken)
-    {
-    lp->format.samples_per_frame = num_samples + 1024;
-    lp->frame = gavl_audio_frame_create(&lp->format);
-    connect_input(lp, lp->frame);
-    }
-  
-  if(!lp->inplace_broken)
+  if(lp->inplace_broken)
     {
-    ret =
-      lp->read_func(lp->read_data, frame, lp->read_stream, num_samples);
-    if(!ret)
-      return 0;
-
-    connect_input(lp, frame);
+    if((st = gavl_audio_source_read_frame(lp->in_src, &in_frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    
+    if(lp->run_adding)
+      gavl_audio_frame_copy(&lp->format, *frame, in_frame,
+                            0, 0, in_frame->valid_samples,
+                            in_frame->valid_samples);
+    connect_input(lp, in_frame);
+    num_samples = in_frame->valid_samples;
+
+    (*frame)->valid_samples = num_samples;
+    (*frame)->timestamp = in_frame->timestamp;
     }
   else
     {
-    ret =
-      lp->read_func(lp->read_data, lp->frame, 
-                    lp->read_stream, num_samples);
-    if(!ret)
-      return 0;
-
-    if(lp->run_adding)
-      gavl_audio_frame_copy(&lp->format, frame, lp->frame,
-                            0, 0, lp->frame->valid_samples,
-                            lp->frame->valid_samples);
-    frame->timestamp = lp->frame->timestamp;
+    if((st = gavl_audio_source_read_frame(lp->in_src, frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    connect_input(lp, *frame);
+    num_samples = (*frame)->valid_samples;
     }
   
-  connect_output(lp, frame);
+  connect_output(lp, *frame);
   
   /* Run */
   for(i = 0; i < lp->num_instances; i++)
     {
     if(lp->run_adding)
-      lp->desc->run_adding(lp->channels[i].Instance, ret);
+      lp->desc->run_adding(lp->channels[i].Instance, num_samples);
     else
-      lp->desc->run(lp->channels[i].Instance, ret);
+      lp->desc->run(lp->channels[i].Instance, num_samples);
     }
-  
-  frame->valid_samples = ret;
-  return ret;
+  return GAVL_SOURCE_OK;
   }
 
 static void reset_ladspa(void * priv)
@@ -636,6 +574,33 @@
     }
   }
 
+static gavl_audio_source_t *
+connect_ladspa(void * priv, gavl_audio_source_t * src,
+               const gavl_audio_options_t * opt)
+  {
+  ladspa_priv_t * lp = priv;
+
+  lp->in_src = src;
+
+  if(lp->out_src)
+    {
+    gavl_audio_source_destroy(lp->out_src);
+    lp->out_src = NULL;
+    }
+  gavl_audio_format_copy(&lp->format,
+                         gavl_audio_source_get_src_format(lp->in_src));
+  lp->format.interleave_mode = GAVL_INTERLEAVE_NONE;
+  lp->format.sample_format = GAVL_SAMPLE_FLOAT;
+  init_ladspa(lp);
+  
+  gavl_audio_source_set_dst(lp->in_src, 0, &lp->format);
+
+  lp->out_src = gavl_audio_source_create_source(read_func,
+                                                lp, 0,
+                                                lp->in_src);
+  return lp->out_src;
+  }
+
 int bg_ladspa_load(bg_plugin_handle_t * ret,
                     const bg_plugin_info_t * info)
   {
@@ -649,13 +614,17 @@
   af = calloc(1, sizeof(*af));
   ret->plugin_nc = (bg_plugin_common_t*)af;
   ret->plugin = ret->plugin_nc;
-  
+#if 0
   af->set_input_format = set_input_format_ladspa;
   af->connect_input_port = connect_input_port_ladspa;
   af->get_output_format = get_output_format_ladspa;
   af->read_audio = read_audio_ladspa;
+#endif
   af->reset      = reset_ladspa;
 
+  af->connect      = connect_ladspa;
+
+  
   if(info->parameters)
     {
     ret->plugin_nc->get_parameters = get_parameters_ladspa;
@@ -733,6 +702,9 @@
   FREE(lp->in_c_ports);
   FREE(lp->out_c_ports);
 
+  if(lp->out_src)
+    gavl_audio_source_destroy(lp->out_src);
+  
   cleanup_ladspa(lp);
   free(h->plugin_nc);
   free(lp);

gmerlin-1.2.0.tar.gz/lib/bglv.c -> gmerlin-4256.tar.gz/lib/bglv.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -249,14 +249,14 @@
       for(i = 0; i < num_items; i++)
         {
         visual_list_next(&VISUAL_UI_CHOICE(w)->choices.choices, &list_entry);
-        info->multi_names_nc[i] = bg_strdup(NULL, ((VisUIChoiceEntry*)(list_entry->data))->name);
+        info->multi_names_nc[i] = gavl_strdup(((VisUIChoiceEntry*)(list_entry->data))->name);
 
         /* Check if this is the current value */
         //        visual_param_entry_compare(((VisUIChoiceEntry*)(list_entry->data))->value,
         //                                       VISUAL_UI_MUTATOR(w)->param)
         if(!i)
           {
-          info->val_default.val_str = bg_strdup(NULL, info->multi_names_nc[i]);
+          info->val_default.val_str = gavl_strdup(info->multi_names_nc[i]);
           }
         }
       ret = w;
@@ -270,7 +270,7 @@
       break;
     }
   if(ret)
-    info->help_string = bg_strdup(info->help_string, w->tooltip);
+    info->help_string = gavl_strrep(info->help_string, w->tooltip);
   bg_parameter_info_set_const_ptrs(info);
   return ret;
   }
@@ -341,7 +341,7 @@
         case VISUAL_PARAM_ENTRY_TYPE_STRING:   /**< String parameter. */
           ret[index].type = BG_PARAMETER_STRING;
           ret[index].val_default.val_str =
-            bg_strdup(ret[index].val_default.val_str,
+            gavl_strrep(ret[index].val_default.val_str,
                       param_entry->string);
           break;
         case VISUAL_PARAM_ENTRY_TYPE_INTEGER:  /**< Integer parameter. */
@@ -380,8 +380,8 @@
     if(!supported)
       continue;
     
-    ret[index].name = bg_strdup(NULL, param_entry->name);
-    ret[index].long_name = bg_strdup(NULL, param_entry->name);
+    ret[index].name = gavl_strdup(param_entry->name);
+    ret[index].long_name = gavl_strdup(param_entry->name);
     index++;
     }
   return ret;
@@ -423,45 +423,45 @@
     
   
   ret->name        = bg_sprintf("vis_lv_%s", actor_name);
-  ret->long_name   = bg_strdup(NULL, info->name);
+  ret->long_name   = gavl_strdup(info->name);
   ret->type        = BG_PLUGIN_VISUALIZATION;
   ret->api         = BG_PLUGIN_API_LV;
   ret->description = bg_sprintf(TR("libvisual plugin"));
-  ret->module_filename = bg_strdup(NULL, filename);
+  ret->module_filename = gavl_strdup(filename);
   /* Optional info */
   if(info->author && *info->author)
     {
     tmp_string = bg_sprintf(TR("\nAuthor: %s"),
                             info->author);
-    ret->description = bg_strcat(ret->description, tmp_string);
+    ret->description = gavl_strcat(ret->description, tmp_string);
     free(tmp_string);
     }
   if(info->version && *info->version)
     {
     tmp_string = bg_sprintf(TR("\nVersion: %s"),
                             info->version);
-    ret->description = bg_strcat(ret->description, tmp_string);
+    ret->description = gavl_strcat(ret->description, tmp_string);
     free(tmp_string);
     }
   if(info->about && *info->about)
     {
     tmp_string = bg_sprintf(TR("\nAbout: %s"),
                             info->about);
-    ret->description = bg_strcat(ret->description, tmp_string);
+    ret->description = gavl_strcat(ret->description, tmp_string);
     free(tmp_string);
     }
   if(info->help && *info->help)
     {
     tmp_string = bg_sprintf(TR("\nHelp: %s"),
                             info->help);
-    ret->description = bg_strcat(ret->description, tmp_string);
+    ret->description = gavl_strcat(ret->description, tmp_string);
     free(tmp_string);
     }
   if(info->license && *info->license)
     {
     tmp_string = bg_sprintf(TR("\nLicense: %s"),
                             info->license);
-    ret->description = bg_strcat(ret->description, tmp_string);
+    ret->description = gavl_strcat(ret->description, tmp_string);
     free(tmp_string);
     }
   
@@ -593,9 +593,6 @@
 
 static void close_lv(void * data)
   {
-  lv_priv_t * priv;
-  priv = (lv_priv_t*)data;
-  
   //  if(priv->win)
   //    bg_x11_window_show(priv->win, 0);
   }
@@ -748,7 +745,7 @@
   /* This would crash if multi_parameters were supported */
   index = info - priv->parameters;
 
-  tmp_string = bg_strdup(NULL, name);
+  tmp_string = gavl_strdup(name);
   param = visual_param_entry_new(tmp_string);
   free(tmp_string);
   /* Menus have to be treated specially */

gmerlin-4256.tar.gz/lib/bgplug.c Added

@@ -0,0 +1,2082 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef HAVE_MQ
+#include <fcntl.h>           /* For O_* constants */
+#include <sys/stat.h>        /* For mode constants */
+#define _XOPEN_SOURCE 600
+#include <mqueue.h>
+#include <errno.h>
+#include <time.h>
+
+#define MQ_NAME_MAX 32
+
+
+#endif
+
+
+#include <bgshm.h>
+
+#include <gmerlin/plugin.h>
+
+#include <gmerlin/bgplug.h>
+
+#include <gmerlin/translation.h>
+#include <gmerlin/log.h>
+
+#define LOG_DOMAIN "plug"
+
+#define META_SHM_SIZE     "bgplug_shm_size"
+#define META_RETURN_QUEUE "bgplug_return_queue"
+
+// #define SHM_THRESHOLD 1024 // Minimum max_packet_size to switch to shm
+
+
+typedef struct
+  {
+  int id;  /* ID of the segment */
+  int len; /* Real length       */
+  } shm_info_t;
+
+typedef struct
+  {
+  gavf_stream_header_t * h;
+
+  bg_shm_pool_t * sp;
+  bg_shm_t * shm_segment;
+
+  int shm_size; // Size of an shm seqment */
+  
+  /* Reading */
+  gavl_packet_source_t * src_int;
+  gavl_packet_source_t * src_ext;
+
+  /* Writing */
+  gavl_packet_sink_t * sink_ext;
+  gavl_packet_sink_t * sink_int;
+  
+  bg_plug_t * plug;
+
+  gavl_packet_t p_shm;
+  gavl_packet_t * p_ext;
+  
+  int index; // Index inside the program header
+
+  /* Audio stuff */
+  gavl_audio_frame_t * aframe;
+  gavl_audio_source_t * asrc;
+  gavl_audio_sink_t   * asink;
+  gavl_audio_format_t afmt;
+  
+  /* Video stuff */
+  gavl_video_frame_t * vframe;
+  gavl_video_source_t * vsrc;
+  gavl_video_sink_t   * vsink;
+  gavl_video_format_t vfmt;
+  gavl_compression_info_t ci;
+
+  gavl_metadata_t m;
+  uint32_t timescale;
+
+  /* Proxy stuff */
+  gavl_audio_source_t * asrc_proxy;
+  gavl_video_source_t * vsrc_proxy;
+  gavl_packet_source_t * psrc_proxy;
+  const gavl_metadata_t * m_proxy;
+  
+  bg_plugin_handle_t * codec_handle;
+  bg_stream_action_t action;
+  
+  gavl_dsp_context_t * dsp;
+  } stream_t;
+
+struct bg_plug_s
+  {
+  int wr;
+  gavf_t * g;
+  gavf_io_t * io;
+  gavf_program_header_t * ph;
+  
+  int num_audio_streams;
+  stream_t * audio_streams;
+
+  int num_video_streams;
+  stream_t * video_streams;
+
+  int num_text_streams;
+  stream_t * text_streams;
+
+  int num_overlay_streams;
+  stream_t * overlay_streams;
+  int io_flags;  
+  
+  bg_plugin_registry_t * plugin_reg;
+  gavf_options_t * opt;
+
+  const bg_parameter_info_t * ac_params;
+  const bg_parameter_info_t * vc_params;
+  const bg_parameter_info_t * oc_params;
+
+  pthread_mutex_t mutex;
+  
+  gavl_packet_t skip_packet;
+  
+  int got_error;
+  int shm_threshold;
+  int timeout;
+  
+#ifdef HAVE_MQ
+  mqd_t mq;
+  int mq_id;
+#endif
+  };
+
+const gavl_metadata_t * bg_plug_get_metadata(bg_plug_t * p)
+  {
+  return &p->ph->m;
+  }
+
+const gavl_chapter_list_t * bg_plug_get_chapter_list(bg_plug_t * p)
+  {
+  return gavf_get_chapter_list(p->g);;
+  }
+
+/* Message queue stuff */
+
+#ifdef HAVE_MQ
+static void gen_mq_name(int id, char * ret)
+  {
+  snprintf(ret, MQ_NAME_MAX, "/gmerlin-mq-%08x", id);
+  }
+
+static void create_message_queue(bg_plug_t * p, gavl_metadata_t * m)
+  {
+  char name[128];
+  struct mq_attr attr =
+    {
+      .mq_flags = 0,             /* Flags: 0 or O_NONBLOCK */
+      .mq_maxmsg = 2,            /* Max. # of messages on queue */
+      .mq_msgsize = sizeof(int), /* Max. message size (bytes) */
+      .mq_curmsgs = 0,           /* # of messages currently in queue */
+    };
+ 
+  p->mq_id = 0;
+  
+  if(p->wr)
+    {
+    while(1)
+      {
+      p->mq_id++;
+    
+      gen_mq_name(p->mq_id, name);
+    
+      if((p->mq = mq_open(name, O_RDONLY | O_CREAT | O_EXCL,
+                           S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &attr)) < 0)
+        {
+        if(errno != EEXIST)
+          {
+          bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+                 "mq_open of %s failed: %s", name, strerror(errno));
+          return;
+          }
+        }
+      else
+        break;
+      }
+    gavl_metadata_set_int(m, META_RETURN_QUEUE, p->mq_id);
+    bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+           "Opened message queue %s for reading", name);
+
+    }
+  else
+    {
+    if(!gavl_metadata_get_int(m, META_RETURN_QUEUE, &p->mq_id))
+      return;
+
+    gavl_metadata_set(m, META_RETURN_QUEUE, NULL); /* Clear this */
+    gen_mq_name(p->mq_id, name);
+
+    if((p->mq = mq_open(name, O_WRONLY)) < 0)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "mq_open of %s failed: %s", name, strerror(errno));
+      return;
+      }
+    bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+           "Opened message queue %s for writing", name);
+    /* It's save to unlink the queue now */
+    mq_unlink(name);
+    }
+  
+  }
+
+static int io_cb_read(void * priv, int type, const void * data)
+  {
+  bg_plug_t * p = priv;
+  /* Write confirmation */
+  
+  if((type == GAVF_IO_CB_PROGRAM_HEADER_END) && (p->mq < 0))
+    create_message_queue(p, &p->ph->m);
+
+#if 0
+  if(type == GAVF_IO_CB_PACKET_END)
+    {
+    fprintf(stderr, "Got packet\n");
+    if(data)
+      gavl_packet_dump(data);
+    }
+#endif
+
+  if(p->mq < 0)
+    return 1;
+  
+#ifdef DUMP_CB
+  if(GAVF_IO_CB_TYPE_END(type))
+    fprintf(stderr, "io_cb_read %08x\n", type);
+#endif  
+  if(GAVF_IO_CB_TYPE_END(type) && 
+     mq_send(p->mq, (const char *)&type, sizeof(type), 0))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "mq_send failed: %s",
+           strerror(errno));
+    p->got_error = 1;
+    return 0;
+    }
+  return 1;
+  }
+
+static int io_cb_write(void * priv, int type, const void * data)
+  {
+  int type_ret = -1;
+  ssize_t size_ret;
+  bg_plug_t * p = priv;
+  unsigned msg_prio;
+  struct timespec timeout;
+  
+  if(!GAVF_IO_CB_TYPE_END(type))
+    return 1;
+  
+  /* Read confirmation */
+  
+  // fprintf(stderr, "io_cb_write type: %d %d\n", type, p->packets++);
+
+  //  if((type == GAVF_IO_CB_PACKET) && data)
+  //    gavl_packet_dump(data);
+
+  clock_gettime(CLOCK_REALTIME, &timeout);
+  timeout.tv_nsec += (p->timeout % 1000) * 1000000;
+  if(timeout.tv_nsec > 1000000000)
+    {
+    timeout.tv_sec++;
+    timeout.tv_nsec -= 1000000000;
+    }
+  timeout.tv_sec += p->timeout / 1000;
+
+    
+#ifdef DUMP_CB
+  fprintf(stderr, "io_cb_write %08x\n", type);
+#endif    
+
+  //  fprintf(stderr, "Reading message %d\n", p->timeout);
+
+#if 0
+  size_ret =
+    mq_timedreceive(p->mq, (char *)&type_ret,
+                    sizeof(type_ret), &msg_prio, &timeout);
+#else
+  size_ret =
+    mq_receive(p->mq, (char *)&type_ret,
+               sizeof(type_ret), &msg_prio);
+#endif
+  
+  if(size_ret < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Reading message failed: %s",
+           strerror(errno));
+    p->got_error = 1;
+    return 0;
+    }
+  
+  if(size_ret != sizeof(type_ret))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Wrong message size: %zd != %zd",
+           size_ret, sizeof(type_ret));
+    p->got_error = 1;
+    return 0;
+    }
+  if(!type_ret) // EOF
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Shutting down (receiver said bye)");
+    return 0;
+    }
+  if(type_ret != type)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Wrong message type: %08x != %08x",
+           type_ret, type);
+    p->got_error = 1;
+    return 0;
+    }
+  return 1;
+  }
+
+#endif
+
+void bg_plug_set_compressor_config(bg_plug_t * p,
+                                   const bg_parameter_info_t * ac_params,
+                                   const bg_parameter_info_t * vc_params,
+                                   const bg_parameter_info_t * oc_params)
+  {
+  p->ac_params = ac_params;
+  p->vc_params = vc_params;
+  p->oc_params = oc_params;
+  }
+
+static bg_plug_t * create_common()
+  {
+  bg_plug_t * ret = calloc(1, sizeof(*ret));
+  ret->g = gavf_create();
+  ret->ph = gavf_get_program_header(ret->g);
+  ret->opt = gavf_get_options(ret->g);
+
+  ret->timeout = 10000;
+  ret->shm_threshold = 1024;
+  
+#ifdef HAVE_MQ
+  ret->mq = -1;
+#endif
+  
+  //  gavf_options_set_flags(ret->opt,
+  //                         GAVF_OPT_FLAG_DUMP_HEADERS |
+  //                         GAVF_OPT_FLAG_DUMP_METADATA);
+  
+  pthread_mutex_init(&ret->mutex, NULL);
+
+  return ret;
+  }
+
+static void lock_func(void * priv)
+  {
+  bg_plug_t * p = priv;
+  pthread_mutex_lock(&p->mutex);
+  }
+
+static void unlock_func(void * priv)
+  {
+  bg_plug_t * p = priv;
+  pthread_mutex_unlock(&p->mutex);
+  }
+
+bg_plug_t * bg_plug_create_reader(bg_plugin_registry_t * plugin_reg)
+  {
+  bg_plug_t * ret;
+  ret = create_common();
+  ret->plugin_reg = plugin_reg;
+  return ret;
+  }
+
+bg_plug_t * bg_plug_create_writer(bg_plugin_registry_t * plugin_reg)
+  {
+  bg_plug_t * ret = bg_plug_create_reader(plugin_reg);
+  ret->wr = 1;
+  
+  gavf_options_set_sync_distance(ret->opt, GAVL_TIME_SCALE / 2);
+
+  return ret;
+  }
+
+static void flush_streams(stream_t * streams, int num)
+  {
+  int i;
+  stream_t * s;
+  for(i = 0; i < num; i++)
+    {
+    s = streams + i;
+
+    /* Flush the codecs, might write some final packets */
+    if(s->codec_handle)
+      bg_plugin_unref(s->codec_handle);
+    else
+      {
+      /* Sinks and sources are owned by the codec if there is one */
+      if(s->asink)
+        gavl_audio_sink_destroy(s->asink);
+      if(s->vsink)
+        gavl_video_sink_destroy(s->vsink);
+      if(s->asrc)
+        gavl_audio_source_destroy(s->asrc);
+      if(s->vsrc)
+        gavl_video_source_destroy(s->vsrc);
+      }
+    if(s->dsp)
+      gavl_dsp_context_destroy(s->dsp);
+    }
+  }
+
+static void free_streams(stream_t * streams, int num)
+  {
+  int i;
+  stream_t * s;
+
+  for(i = 0; i < num; i++)
+    {
+    s = streams + i;
+    if(s->sp)
+      bg_shm_pool_destroy(s->sp);
+
+    if(s->src_ext && (s->src_ext != s->src_int))
+      gavl_packet_source_destroy(s->src_ext);
+    if(s->sink_ext && (s->sink_ext != s->sink_int))
+      gavl_packet_sink_destroy(s->sink_ext);
+    
+    if(s->aframe)
+      {
+      gavl_audio_frame_null(s->aframe);
+      gavl_audio_frame_destroy(s->aframe);
+      }
+    if(s->vframe)
+      {
+      gavl_video_frame_null(s->vframe);
+      gavl_video_frame_destroy(s->vframe);
+      }
+    gavl_compression_info_free(&s->ci);
+    gavl_metadata_free(&s->m);
+    }
+  if(streams)
+    free(streams);
+  }
+
+void bg_plug_destroy(bg_plug_t * p)
+  {
+  flush_streams(p->audio_streams, p->num_audio_streams);
+  flush_streams(p->video_streams, p->num_video_streams);
+  flush_streams(p->text_streams, p->num_text_streams);
+  flush_streams(p->overlay_streams, p->num_overlay_streams);
+  
+  gavf_close(p->g);
+  if(p->io)
+    gavf_io_destroy(p->io);
+
+  free_streams(p->audio_streams, p->num_audio_streams);
+  free_streams(p->video_streams, p->num_video_streams);
+  free_streams(p->text_streams, p->num_text_streams);
+  free_streams(p->overlay_streams, p->num_overlay_streams);
+
+#if HAVE_MQ
+  if(p->mq >= 0)
+    {
+    if(!p->wr)
+      {
+      int type = 0;
+      mq_send(p->mq, (const char *)&type, sizeof(type), 0);
+      }
+    mq_close(p->mq);
+    }
+#endif
+  
+  gavl_packet_free(&p->skip_packet);
+  
+  pthread_mutex_destroy(&p->mutex);
+
+  free(p);
+  }
+
+static const bg_parameter_info_t input_parameters[] =
+  {
+    {
+      .name = "dh",
+      .long_name = TRS("Dump gavf headers"),
+      .type = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Use this for debugging"),
+    },
+    {
+      .name = "dp",
+      .long_name = TRS("Dump gavf packets"),
+      .type = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Use this for debugging"),
+    },
+    {
+      .name = "dm",
+      .long_name = TRS("Dump inline metadata"),
+      .type = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Use this for debugging"),
+    },
+    {
+      .name = "timeout",
+      .opt = "t",
+      .type = BG_PARAMETER_INT,
+      .val_default = { .val_i = 5000 },
+      .val_min =     { .val_i =  500 },
+      .val_max =     { .val_i = 100000 },
+      .long_name = TRS("Timeout (milliseconds)"),
+      
+    },
+    { /* End */ },
+  };
+
+static const bg_parameter_info_t output_parameters[] =
+  {
+    {
+      .name = "shm",
+      .long_name = TRS("SHM threshold"),
+      .type = BG_PARAMETER_INT,
+      .val_default = { .val_i = 1024 },
+      .help_string = TRS("Select the minimum packet size for using shared memory for a stream. Non-positive values disable shared memory completely"),
+    },
+    {
+      .name = "timeout",
+      .opt = "t",
+      .type = BG_PARAMETER_INT,
+      .val_default = { .val_i = 5000 },
+      .val_min =     { .val_i =  500 },
+      .val_max =     { .val_i = 100000 },
+      .long_name = TRS("Timeout (milliseconds)"),
+    },
+    {
+      .name = "dp",
+      .long_name = TRS("Dump gavf packets"),
+      .type = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Use this for debugging"),
+    },
+    { /* End */ }
+  };
+
+const bg_parameter_info_t *
+bg_plug_get_input_parameters()
+  {
+  return input_parameters;
+  }
+
+const bg_parameter_info_t *
+bg_plug_get_output_parameters()
+  {
+  return output_parameters;
+  }
+
+#define SET_GAVF_FLAG(f) \
+  int flags = gavf_options_get_flags(p->opt); \
+  if(val->val_i) \
+    flags |= f; \
+  else \
+    flags &= ~f; \
+  gavf_options_set_flags(p->opt, flags);
+
+void bg_plug_set_parameter(void * data, const char * name,
+                           const bg_parameter_value_t * val)
+  {
+  bg_plug_t * p = data;
+  
+  if(!name)
+    return;
+  else if(!strcmp(name, "dh"))
+    {
+    SET_GAVF_FLAG(GAVF_OPT_FLAG_DUMP_HEADERS);
+    }
+  else if(!strcmp(name, "dp"))
+    {
+    SET_GAVF_FLAG(GAVF_OPT_FLAG_DUMP_PACKETS);
+    }
+  else if(!strcmp(name, "dm"))
+    {
+    SET_GAVF_FLAG(GAVF_OPT_FLAG_DUMP_METADATA);
+    }
+  else if(!strcmp(name, "shm"))
+    p->shm_threshold = val->val_i;
+  else if(!strcmp(name, "timeout"))
+    p->timeout = val->val_i;
+  }
+
+#undef SET_GAVF_FLAG
+
+/* Read/write */
+
+static void init_streams_read(bg_plug_t * p)
+  {
+  int i;
+  int audio_idx = 0;
+  int video_idx = 0;
+  int text_idx = 0;
+  int overlay_idx = 0;
+  stream_t * s;
+
+  for(i = 0; i < p->ph->num_streams; i++)
+    {
+    switch(p->ph->streams[i].type)
+      {
+      case GAVF_STREAM_AUDIO:
+        p->num_audio_streams++;
+        break;
+      case GAVF_STREAM_VIDEO:
+        p->num_video_streams++;
+        break;
+      case GAVF_STREAM_TEXT:
+        p->num_text_streams++;
+        break;
+      case GAVF_STREAM_OVERLAY:
+        p->num_overlay_streams++;
+        break;
+      }
+    }
+
+  if(p->num_audio_streams)
+    p->audio_streams =
+      calloc(p->num_audio_streams, sizeof(*p->audio_streams));
+
+  if(p->num_video_streams)
+    p->video_streams =
+      calloc(p->num_video_streams, sizeof(*p->video_streams));
+
+  if(p->num_text_streams)
+    p->text_streams =
+      calloc(p->num_text_streams, sizeof(*p->text_streams));
+
+  if(p->num_overlay_streams)
+    p->overlay_streams =
+      calloc(p->num_overlay_streams, sizeof(*p->overlay_streams));
+  
+  
+  /* Initialize streams for a reader, the action can be changed
+     later on */
+  
+  for(i = 0; i < p->ph->num_streams; i++)
+    {
+    switch(p->ph->streams[i].type)
+      {
+      case GAVF_STREAM_AUDIO:
+        {
+        s = p->audio_streams + audio_idx;
+        s->h = p->ph->streams + i;
+        s->index = i;
+        s->plug = p;
+        if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+          s->action = BG_STREAM_ACTION_DECODE;
+        else
+          s->action = BG_STREAM_ACTION_READRAW;
+        
+        audio_idx++;
+        }
+        break;
+      case GAVF_STREAM_VIDEO:
+        {
+        s = p->video_streams + video_idx;
+        s->h = p->ph->streams + i;
+        s->index = i;
+        s->plug = p;
+
+        if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+          s->action = BG_STREAM_ACTION_DECODE;
+        else
+          s->action = BG_STREAM_ACTION_READRAW;
+
+        video_idx++;
+        }
+        break;
+      case GAVF_STREAM_TEXT:
+        {
+        s = p->text_streams + text_idx;
+        s->h = p->ph->streams + i;
+        s->index = i;
+        s->plug = p;
+
+        if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+          s->action = BG_STREAM_ACTION_DECODE;
+        else
+          s->action = BG_STREAM_ACTION_READRAW;
+        
+        text_idx++;
+        }
+        break;
+      case GAVF_STREAM_OVERLAY:
+        {
+        s = p->overlay_streams + overlay_idx;
+        s->h = p->ph->streams + i;
+        s->index = i;
+        s->plug = p;
+
+        if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+          s->action = BG_STREAM_ACTION_DECODE;
+        else
+          s->action = BG_STREAM_ACTION_READRAW;
+        
+        overlay_idx++;
+        }
+        break;
+      }
+    }
+  }
+
+/* Read support */
+
+static gavl_source_status_t read_packet_shm(void * priv,
+                                            gavl_packet_t ** ret)
+  {
+  shm_info_t si;
+  gavl_source_status_t st;
+  gavl_packet_t * p = NULL;
+  stream_t * s = priv;
+
+  if((st = gavl_packet_source_read_packet(s->src_int, &p)) !=
+     GAVL_SOURCE_OK)
+    return st;
+
+  /* Sanity check */
+  if(p->data_len != sizeof(si))
+    {
+    bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "SHM packet data size mismatch, %d != %d\n",
+           (int)p->data_len, (int)(sizeof(si)));
+    return GAVL_SOURCE_EOF;
+    }
+  memcpy(&si, p->data, sizeof(si));
+
+  /* Unref the old segment if there is one */
+  if(s->shm_segment)
+    bg_shm_unref(s->shm_segment);
+  
+  /* Obtain memory segment */
+  s->shm_segment = bg_shm_pool_get_read(s->sp, si.id);
+
+  if(!s->shm_segment)
+    return GAVL_SOURCE_EOF;
+  
+  /* Copy metadata */
+  
+  memcpy(&s->p_shm, p, sizeof(*p));
+  
+  /* Exchange pointers */
+  s->p_shm.data       = bg_shm_get_buffer(s->shm_segment, &s->p_shm.data_alloc);
+  s->p_shm.data_len   = si.len;
+  
+  *ret = &s->p_shm;
+  return GAVL_SOURCE_OK;
+  }
+
+static void skip_shm_packet(gavf_t * gavf,
+                            const gavf_stream_header_t * h,
+                            void * priv)
+  {
+  shm_info_t si;
+  stream_t * s = priv;
+  
+  if(!gavf_packet_read_packet(s->plug->g, &s->plug->skip_packet))
+    return;
+  
+  /* Sanity check */
+  if(s->plug->skip_packet.data_len != sizeof(si))
+    return;
+  
+  memcpy(&si, s->plug->skip_packet.data, sizeof(si));
+  
+  /* Obtain memory segment */
+  s->shm_segment = bg_shm_pool_get_read(s->sp, si.id);
+  
+  /* Unref the segment if there is one */
+  if(s->shm_segment)
+    bg_shm_unref(s->shm_segment);
+  
+  }
+
+static int init_read_common(bg_plug_t * p,
+                            stream_t * s)
+  {
+  gavl_metadata_get_int(&s->h->m, META_SHM_SIZE, &s->shm_size);
+  
+  if(s->shm_size)
+    {
+    /* Create shared memory pool */
+    s->sp = bg_shm_pool_create(s->shm_size, 0);
+    /* Clear metadata tags */
+    gavl_metadata_set(&s->h->m, META_SHM_SIZE, NULL);
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using shm for reading (segment size: %d)",
+           s->shm_size);
+    }
+
+  if(s->action == BG_STREAM_ACTION_OFF)
+    {
+    gavf_stream_set_skip(p->g, s->h->id, s->shm_size ? skip_shm_packet : NULL, s);
+    return 0;
+    }
+  
+  s->src_int = gavf_get_packet_source(p->g, s->h->id);
+  gavl_packet_source_set_lock_funcs(s->src_int, lock_func, unlock_func, p);
+
+  if(s->shm_size)
+    s->src_ext =
+      gavl_packet_source_create_source(read_packet_shm, s,
+                                       GAVL_SOURCE_SRC_ALLOC,
+                                       s->src_int);
+  else
+    s->src_ext = s->src_int;
+  return 1;
+  }
+
+/* Uncompressed source funcs */
+static gavl_source_status_t read_audio_func(void * priv,
+                                            gavl_audio_frame_t ** f)
+  {
+  gavl_source_status_t st;
+  gavl_packet_t * p = NULL;
+  stream_t * s = priv;
+
+  if((st = gavl_packet_source_read_packet(s->src_ext, &p))
+     != GAVL_SOURCE_OK)
+    return st;
+
+  gavf_packet_to_audio_frame(p, s->aframe,
+                             &s->h->format.audio,
+                             &s->h->m, &s->dsp);
+  *f = s->aframe;
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_source_status_t read_video_func(void * priv,
+                                            gavl_video_frame_t ** f)
+  {
+  gavl_source_status_t st;
+  gavl_packet_t * p = NULL;
+  stream_t * s = priv;
+  // fprintf(stderr, "Read video func\n");
+  if((st = gavl_packet_source_read_packet(s->src_ext, &p))
+     != GAVL_SOURCE_OK)
+    return st;
+  
+  gavf_packet_to_video_frame(p, s->vframe,
+                             &s->h->format.video,
+                             &s->h->m, &s->dsp);
+  *f = s->vframe;
+
+  // fprintf(stderr, "Read video func done\n");
+  
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_source_status_t read_overlay_func(void * priv,
+                                              gavl_video_frame_t ** f)
+  {
+  gavl_source_status_t st;
+  gavl_packet_t * p = NULL;
+  stream_t * s = priv;
+  // fprintf(stderr, "Read video func\n");
+  if((st = gavl_packet_source_read_packet(s->src_ext, &p))
+     != GAVL_SOURCE_OK)
+    return st;
+  gavf_packet_to_overlay(p, *f, &s->h->format.video);
+  // fprintf(stderr, "Read video func done\n");
+  return GAVL_SOURCE_OK;
+  }
+
+static const struct
+  {
+  int mask;
+  const char * name;
+  }
+codec_types[] =
+  {
+    { BG_PLUGIN_AUDIO_DECOMPRESSOR, "audio" },
+    { BG_PLUGIN_VIDEO_DECOMPRESSOR, "video" },
+    { BG_PLUGIN_OVERLAY_DECOMPRESSOR, "overlay" },
+    { }
+  };
+
+static const char * codec_type_name(int mask)
+  {
+  int i = 0;
+  while(codec_types[i].name)
+    {
+    if(mask & codec_types[i].mask)
+      return codec_types[i].name;
+    i++;
+    }
+  return NULL;
+  }
+
+static bg_plugin_handle_t * load_decompressor(bg_plugin_registry_t * plugin_reg,
+                                              gavl_codec_id_t id,
+                                              int flag_mask)
+  {
+  /* Add decoder */
+  const bg_plugin_info_t * info;
+  bg_plugin_handle_t * ret;
+  info = bg_plugin_find_by_compression(plugin_reg, id,
+                                       BG_PLUGIN_CODEC,
+                                       flag_mask);
+  if(!info)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Cannot find %s decompressor for %s",
+           codec_type_name(flag_mask),
+           gavl_compression_get_short_name(id));
+    return NULL;
+    }
+  ret = bg_plugin_load(plugin_reg, info);
+  if(!ret)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Cannot load %s decompressor for %s",
+           codec_type_name(flag_mask),
+           gavl_compression_get_short_name(id));
+    return NULL;
+    }
+  return ret;
+  }
+
+static int init_read(bg_plug_t * p)
+  {
+  int i; 
+  stream_t * s;
+  
+  //  init_streams_read(p);
+
+  for(i = 0; i < p->num_audio_streams; i++)
+    {
+    s = p->audio_streams + i;
+    
+    if(!init_read_common(p, s))
+      continue; // Stream is switched off
+    
+    if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+      {
+      s->asrc = gavl_audio_source_create(read_audio_func, s,
+                                         GAVL_SOURCE_SRC_ALLOC,
+                                         &s->h->format.audio);
+      s->aframe = gavl_audio_frame_create(NULL);
+      }
+    else if(s->action == BG_STREAM_ACTION_DECODE)
+      {
+      bg_codec_plugin_t * codec;
+      /* Add decoder */
+      if(!(s->codec_handle = load_decompressor(p->plugin_reg,
+                                               s->h->ci.id,
+                                               BG_PLUGIN_AUDIO_DECOMPRESSOR)))
+        return 0;
+
+      codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+
+      s->asrc = codec->connect_decode_audio(s->codec_handle->priv,
+                                            s->src_ext,
+                                            &s->h->ci,
+                                            &s->h->format.audio,
+                                            &s->h->m);
+      if(!s->asrc)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Initializing audio decoder failed");
+        return 0;
+        }
+      }
+    }
+
+  for(i = 0; i < p->num_video_streams; i++)
+    {
+    s = p->video_streams + i;
+
+    if(!init_read_common(p, s))
+      continue;
+    
+    if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+      {
+      s->vsrc =
+        gavl_video_source_create(read_video_func, s,
+                                 GAVL_SOURCE_SRC_ALLOC,
+                                 &s->h->format.video);
+      s->vframe = gavl_video_frame_create(NULL);
+      }
+    else if(s->action == BG_STREAM_ACTION_DECODE)
+      {
+      bg_codec_plugin_t * codec;
+      /* Add decoder */
+      if(!(s->codec_handle = load_decompressor(p->plugin_reg,
+                                               s->h->ci.id,
+                                               BG_PLUGIN_VIDEO_DECOMPRESSOR)))
+        return 0;
+      codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+      
+      s->vsrc = codec->connect_decode_video(s->codec_handle->priv,
+                                            s->src_ext,
+                                            &s->h->ci,
+                                            &s->h->format.video,
+                                            &s->h->m);
+
+      if(!s->vsrc)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Initializing video decoder failed");
+        return 0;
+        }
+
+      }
+    }
+  for(i = 0; i < p->num_overlay_streams; i++)
+    {
+    s = p->overlay_streams + i;
+
+    if(!init_read_common(p, s))
+      continue;
+    
+    if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+      {
+      s->vsrc =
+        gavl_video_source_create(read_overlay_func, s,
+                                 GAVL_SOURCE_SRC_ALLOC |
+                                 GAVL_SOURCE_SRC_DISCONTINUOUS, 
+                                 &s->h->format.video);
+      s->vframe = gavl_video_frame_create(NULL);
+      }
+    else if(s->action == BG_STREAM_ACTION_DECODE)
+      {
+      bg_codec_plugin_t * codec;
+      /* Add decoder */
+      if(!(s->codec_handle = load_decompressor(p->plugin_reg,
+                                               s->h->ci.id,
+                                               BG_PLUGIN_OVERLAY_DECOMPRESSOR)))
+        return 0;
+      codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+      
+      s->vsrc = codec->connect_decode_overlay(s->codec_handle->priv,
+                                              s->src_ext,
+                                              &s->h->ci,
+                                              &s->h->format.video,
+                                              &s->h->m);
+      if(!s->vsrc)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Initializing overlay decoder failed");
+        return 0;
+        }
+
+      }
+    }
+  
+  for(i = 0; i < p->num_text_streams; i++)
+    {
+    s = p->text_streams + i;
+    if(!init_read_common(p, s))
+      continue;
+    }
+  return 1;
+  }
+
+/* Uncompressed Sink funcs */
+
+static gavl_audio_frame_t * get_audio_func(void * priv)
+  {
+  stream_t * as = priv;
+  as->p_ext = gavl_packet_sink_get_packet(as->sink_ext);
+  gavl_packet_alloc(as->p_ext, as->h->ci.max_packet_size);
+  as->aframe->valid_samples = as->h->format.audio.samples_per_frame;
+  gavl_audio_frame_set_channels(as->aframe, &as->h->format.audio,
+                                as->p_ext->data);
+  return as->aframe;
+  }
+
+static gavl_sink_status_t put_audio_func(void * priv,
+                                         gavl_audio_frame_t * f)
+  {
+  stream_t * as = priv;
+  gavf_audio_frame_to_packet_metadata(f, as->p_ext);
+  as->p_ext->data_len = as->h->ci.max_packet_size;
+  gavf_shrink_audio_frame(as->aframe, as->p_ext, &as->h->format.audio);
+
+#ifdef DUMP_PACKETS
+  fprintf(stderr, "Got audio packet\n");
+  gavl_packet_dump(as->p_ext);
+#endif
+  return gavl_packet_sink_put_packet(as->sink_ext, as->p_ext);
+  }
+
+static gavl_video_frame_t * get_video_func(void * priv)
+  {
+  stream_t * vs = priv;
+  vs->p_ext = gavl_packet_sink_get_packet(vs->sink_ext);
+  gavl_packet_alloc(vs->p_ext, vs->h->ci.max_packet_size);
+  gavl_video_frame_set_planes(vs->vframe, &vs->h->format.video,
+                              vs->p_ext->data);
+  return vs->vframe;
+  }
+
+static gavl_sink_status_t put_video_func(void * priv,
+                                         gavl_video_frame_t * f)
+  {
+  stream_t * vs = priv;
+  gavf_video_frame_to_packet_metadata(f, vs->p_ext);
+  vs->p_ext->data_len = vs->h->ci.max_packet_size;
+#ifdef DUMP_PACKETS
+  fprintf(stderr, "Got video packet\n");
+  gavl_packet_dump(vs->p_ext);
+#endif
+  return gavl_packet_sink_put_packet(vs->sink_ext, vs->p_ext);;
+  }
+
+static gavl_sink_status_t put_overlay_func(void * priv,
+                                           gavl_video_frame_t * f)
+  {
+  stream_t * vs = priv;
+  vs->p_ext = gavl_packet_sink_get_packet(vs->sink_ext);
+  gavl_packet_alloc(vs->p_ext, vs->h->ci.max_packet_size);
+  gavf_overlay_to_packet(f, vs->p_ext, &vs->h->format.video);
+#ifdef DUMP_PACKETS
+  fprintf(stderr, "Got video packet\n");
+  gavl_packet_dump(vs->p_ext);
+#endif
+  return gavl_packet_sink_put_packet(vs->sink_ext, vs->p_ext);;
+  }
+
+
+
+/* Packet */
+
+static gavl_packet_t * get_packet_shm(void * priv)
+  {
+  stream_t * s = priv;
+
+  s->shm_segment = bg_shm_pool_get_write(s->sp);
+  
+  s->p_shm.data = bg_shm_get_buffer(s->shm_segment, &s->p_shm.data_alloc);
+  gavl_packet_reset(&s->p_shm);
+  return &s->p_shm;
+  }
+
+static gavl_sink_status_t put_packet_shm(void * priv, gavl_packet_t * pp)
+  {
+  gavl_packet_t * p;
+  shm_info_t si;
+  stream_t * s = priv;
+
+  /* Exchange pointers */
+  si.id = bg_shm_get_id(s->shm_segment);
+  si.len = s->p_shm.data_len;
+
+  p = gavl_packet_sink_get_packet(s->sink_int);
+  
+  gavl_packet_copy_metadata(p, &s->p_shm);
+  gavl_packet_alloc(p, sizeof(si));
+  memcpy(p->data, &si, sizeof(si));
+  p->data_len = sizeof(si);
+  return gavl_packet_sink_put_packet(s->sink_int, p);
+  }
+
+static void check_shm_write(bg_plug_t * p, stream_t * s,
+                            gavl_metadata_t * m,
+                            const gavl_compression_info_t * ci)
+  {
+#ifdef HAVE_MQ
+  if((p->io_flags & BG_PLUG_IO_IS_LOCAL) &&
+     (p->shm_threshold > 0) &&
+     (ci->max_packet_size > p->shm_threshold))
+    {
+    s->shm_size = ci->max_packet_size + GAVL_PACKET_PADDING;
+    s->sp = bg_shm_pool_create(s->shm_size, 1);
+    gavl_metadata_set_int(m, META_SHM_SIZE, s->shm_size);
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using shm for writing (segment size: %d)",
+           s->shm_size);
+
+    if(p->mq < 0)
+      {
+      create_message_queue(p, &p->ph->m);
+      if(p->mq >= 0)
+        gavf_io_set_cb(p->io, io_cb_write, p);
+      }
+    }
+#endif
+  }
+
+static int init_write_common(bg_plug_t * p, stream_t * s)
+  {
+  s->sink_int = gavf_get_packet_sink(p->g, s->h->id);
+  gavl_packet_sink_set_lock_funcs(s->sink_int, lock_func, unlock_func, p);
+  
+  if(s->shm_size)
+    {
+    s->sink_ext = gavl_packet_sink_create(get_packet_shm,
+                                          put_packet_shm,
+                                          s);
+    }
+  else
+    s->sink_ext = s->sink_int;
+
+  if(s->codec_handle)
+    {
+    bg_codec_plugin_t * codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+    codec->set_packet_sink(s->codec_handle->priv, s->sink_ext);
+    }
+  
+  return 1;
+  }
+
+static void create_sinks(bg_plug_t * p)
+  {
+  int i;
+  stream_t * s;
+
+  /* Create sinks */
+  for(i = 0; i < p->num_audio_streams; i++)
+    {
+    s = p->audio_streams + i;
+    init_write_common(p, s);
+    
+    if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+      {
+      s->asink = gavl_audio_sink_create(get_audio_func,
+                                        put_audio_func,
+                                        s, &s->h->format.audio);
+      s->aframe = gavl_audio_frame_create(NULL);
+      }
+    }
+  for(i = 0; i < p->num_video_streams; i++)
+    {
+    s = p->video_streams + i;
+    init_write_common(p, s);
+    
+    if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+      {
+      s->vsink = gavl_video_sink_create(get_video_func,
+                                        put_video_func,
+                                       s, &s->h->format.video);
+      s->vframe = gavl_video_frame_create(NULL);
+      }
+    }
+  for(i = 0; i < p->num_overlay_streams; i++)
+    {
+    s = p->overlay_streams + i;
+    init_write_common(p, s);
+    
+    if(s->h->ci.id == GAVL_CODEC_ID_NONE)
+      {
+      s->vsink = gavl_video_sink_create(NULL,
+                                        put_overlay_func,
+                                        s, &s->h->format.video);
+      s->vframe = gavl_video_frame_create(NULL);
+      }
+    }
+  for(i = 0; i < p->num_text_streams; i++)
+    {
+    s = p->text_streams + i;
+    init_write_common(p, s);
+    }
+
+  }
+
+
+static int init_write(bg_plug_t * p)
+  {
+  int i;
+  stream_t * s;
+
+  /* 1. Set up compressors and add gavf streams */
+  for(i = 0; i < p->num_audio_streams; i++)
+    {
+    s = p->audio_streams + i;
+
+    if(s->codec_handle)
+      {
+      bg_codec_plugin_t * codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+      
+      gavl_metadata_delete_compression_fields(&s->m);
+      s->asink = codec->open_encode_audio(s->codec_handle->priv,
+                                          &s->ci, &s->afmt, &s->m);
+      if(!s->asink)
+        return 0;
+      }
+
+    s->ci.max_packet_size = gavf_get_max_audio_packet_size(&s->afmt, &s->ci);
+    check_shm_write(p, s, &s->m, &s->ci);
+    
+    if((s->index = gavf_add_audio_stream(p->g, &s->ci, &s->afmt, &s->m)) < 0)
+      return 0;
+    }
+  for(i = 0; i < p->num_video_streams; i++)
+    {
+    s = p->video_streams + i;
+
+    if(s->codec_handle)
+      {
+      bg_codec_plugin_t * codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+      gavl_metadata_delete_compression_fields(&s->m);
+      s->vsink = codec->open_encode_video(s->codec_handle->priv,
+                                          &s->ci, &s->vfmt, &s->m);
+      if(!s->vsink)
+        return 0;
+      }
+
+    s->ci.max_packet_size = gavf_get_max_video_packet_size(&s->vfmt, &s->ci);
+    check_shm_write(p, s, &s->m, &s->ci);
+
+    if((s->index = gavf_add_video_stream(p->g, &s->ci, &s->vfmt, &s->m)) < 0)
+      return 0;
+    }
+  for(i = 0; i < p->num_overlay_streams; i++)
+    {
+    s = p->overlay_streams + i;
+
+    if(s->codec_handle)
+      {
+      bg_codec_plugin_t * codec = (bg_codec_plugin_t*)s->codec_handle->plugin;
+      gavl_metadata_delete_compression_fields(&s->m);
+      s->vsink = codec->open_encode_overlay(s->codec_handle->priv,
+                                            &s->ci, &s->vfmt, &s->m);
+      if(!s->vsink)
+        return 0;
+      }
+
+    s->ci.max_packet_size = gavf_get_max_video_packet_size(&s->vfmt, &s->ci);
+    check_shm_write(p, s, &s->m, &s->ci);
+
+    if((s->index = gavf_add_overlay_stream(p->g, &s->ci, &s->vfmt, &s->m)) < 0)
+      return 0;
+    }
+  for(i = 0; i < p->num_text_streams; i++)
+    {
+    s = p->text_streams + i;
+    check_shm_write(p, s, &s->m, &s->ci);
+    if((s->index = gavf_add_text_stream(p->g, s->timescale, &s->m)) < 0)
+      return 0;
+    }
+
+  /* 2. Now all streams are added, set the pointers to the stream headers */  
+  for(i = 0; i < p->num_audio_streams; i++)
+    {
+    s = p->audio_streams + i;
+    s->h = p->ph->streams + s->index;
+    }
+  for(i = 0; i < p->num_video_streams; i++)
+    {
+    s = p->video_streams + i;
+    s->h = p->ph->streams + s->index;
+    }
+  for(i = 0; i < p->num_text_streams; i++)
+    {
+    s = p->text_streams + i;
+    s->h = p->ph->streams + s->index;
+    }
+  for(i = 0; i < p->num_overlay_streams; i++)
+    {
+    s = p->overlay_streams + i;
+    s->h = p->ph->streams + s->index;
+    }
+  
+  if(!gavf_start(p->g))
+    return 0;
+
+  create_sinks(p);
+  
+  return 1;
+  }
+
+static void update_metadata(void * priv, const gavl_metadata_t * m)
+  {
+  gavf_update_metadata(priv, m);
+  }
+
+void bg_plug_transfer_metadata(bg_plug_t * in_plug, bg_plug_t * out_plug)
+  {
+  gavf_options_set_metadata_callback(gavf_get_options(bg_plug_get_gavf(in_plug)),
+                                     update_metadata, bg_plug_get_gavf(out_plug));
+  
+  }
+
+
+
+
+int bg_plug_set_from_ph(bg_plug_t * p,
+                        const gavf_program_header_t * ph)
+  {
+  int i;
+  int idx;
+  gavf_stream_header_t * sh;
+  stream_t * s;
+
+  if(!p->wr)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "bg_plug_set_from_ph only works for write plugs");
+    return 0;
+    }
+  gavf_add_streams(p->g, ph);
+
+  for(i = 0; i < ph->num_streams; i++)
+    {
+    sh = p->ph->streams + i;
+    
+    switch(sh->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        sh->ci.max_packet_size =
+          gavf_get_max_audio_packet_size(&sh->format.audio, &sh->ci);
+
+        idx = bg_plug_add_audio_stream(p,
+                                       &sh->ci,
+                                       &sh->format.audio,
+                                       &sh->m,
+                                       NULL);
+
+        s = p->audio_streams + idx;
+        break;
+      case GAVF_STREAM_VIDEO:
+        sh->ci.max_packet_size =
+          gavf_get_max_video_packet_size(&sh->format.video, &sh->ci);
+        idx = bg_plug_add_video_stream(p,
+                                       &sh->ci,
+                                       &sh->format.video,
+                                       &sh->m,
+                                       NULL);
+        s = p->video_streams + idx;
+        break;
+      case GAVF_STREAM_TEXT:
+        idx = bg_plug_add_text_stream(p,
+                                      sh->format.text.timescale,
+                                      &sh->m);
+        s = p->text_streams + idx;
+        break;
+      case GAVF_STREAM_OVERLAY:
+        sh->ci.max_packet_size =
+          gavf_get_max_video_packet_size(&sh->format.video, &sh->ci);
+        idx = bg_plug_add_overlay_stream(p,
+                                         &sh->ci,
+                                         &sh->format.video,
+                                         &sh->m,
+                                         NULL);
+        s = p->overlay_streams + idx;
+        break;
+      }
+    s->index = i;
+    check_shm_write(p, s, &sh->m, &sh->ci);
+    s->h = sh;
+    }
+
+  if(!gavf_start(p->g))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "gavf_start failed");
+    return 0;
+    }
+  create_sinks(p);
+  
+  return 1;
+  }
+
+
+
+int bg_plug_start(bg_plug_t * p)
+  {
+  if(!p->io)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot start %s plug (call open first)",
+           (p->wr ? "output" : "input"));
+    return 0;
+    }
+  
+  if(p->wr)
+    return init_write(p);
+  else
+    return init_read(p);
+  }
+
+int bg_plug_open(bg_plug_t * p, gavf_io_t * io,
+                 const gavl_metadata_t * m,
+                 const gavl_chapter_list_t * cl, int io_flags)
+  {
+  int flags;
+  
+  p->io = io;
+  p->io_flags = io_flags;
+  
+  if(p->wr)
+    {
+    if(p->io_flags & BG_PLUG_IO_IS_REGULAR)
+      {
+      /* Force writing a sync index if we write to a regular file */
+      flags = gavf_options_get_flags(p->opt);
+      flags |= GAVF_OPT_FLAG_SYNC_INDEX;
+      gavf_options_set_flags(p->opt, flags);
+      }
+    
+    if(!gavf_open_write(p->g, p->io, m, cl))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "gavf_open_write failed");
+      return 0;
+      }
+    return 1;
+    }
+
+  flags = gavf_options_get_flags(p->opt);
+  flags |= GAVF_OPT_FLAG_BUFFER_READ;
+  gavf_options_set_flags(p->opt, flags);
+
+#ifdef HAVE_MQ
+  gavf_io_set_cb(p->io, io_cb_read, p);
+#endif
+  
+  if(!gavf_open_read(p->g, p->io))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "gavf_open_read failed");
+    return 0;
+    }
+  
+  init_streams_read(p);
+  return 1;
+  }
+
+int bg_plug_open_location(bg_plug_t * p, const char * location,
+                          const gavl_metadata_t * m,
+                          const gavl_chapter_list_t * cl)
+  {
+  int io_flags = 0;
+  gavf_io_t * io =
+    bg_plug_io_open_location(location,
+                             p->wr ? BG_PLUG_IO_METHOD_WRITE :
+                             BG_PLUG_IO_METHOD_READ,
+                             &io_flags, p->timeout);
+  if(io)
+    {
+    if(!bg_plug_open(p, io, m, cl, io_flags))
+      return 0;
+    else
+      return 1;
+    }
+  else
+    return 0;
+  }
+
+gavf_t * bg_plug_get_gavf(bg_plug_t * p)
+  {
+  return p->g;
+  }
+
+
+const gavf_stream_header_t * bg_plug_next_packet_header(bg_plug_t * p)
+  {
+  int i;
+  const gavf_packet_header_t * ph = gavf_packet_read_header(p->g);
+
+  if(!ph)
+    return NULL;
+
+  for(i = 0; i < p->ph->num_streams; i++)
+    {
+    if(ph->stream_id == p->ph->streams[i].id)
+      return &p->ph->streams[i];
+    }
+  return NULL;
+  }
+
+/* Utility functions */
+
+const gavf_stream_header_t *
+bg_plug_header_from_index(bg_plug_t * p, int index)
+  {
+  return &p->ph->streams[index];
+  }
+
+const gavf_stream_header_t *
+bg_plug_header_from_id(bg_plug_t * p, uint32_t id)
+  {
+  int i;
+  for(i = 0; i < p->ph->num_streams; i++)
+    {
+    if(p->ph->streams[i].id == id)
+      return &p->ph->streams[i];
+    }
+  return NULL;
+  }
+
+/* Get stream sources */
+
+static stream_t * find_stream_by_id(stream_t * streams, int num, uint32_t id)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    {
+    if(streams[i].h->id == id)
+      return &streams[i];
+    }
+  return NULL;
+  }
+
+static stream_t * find_stream_by_id_all(bg_plug_t * p, uint32_t id)
+  {
+  stream_t * ret;
+  ret = find_stream_by_id(p->audio_streams, p->num_audio_streams, id);
+  if(ret)
+    return ret;
+  ret = find_stream_by_id(p->video_streams, p->num_video_streams, id);
+  if(ret)
+    return ret;
+  ret = find_stream_by_id(p->text_streams, p->num_text_streams, id);
+  if(ret)
+    return ret;
+  ret = find_stream_by_id(p->overlay_streams, p->num_overlay_streams, id);
+  if(ret)
+    return ret;
+  return NULL;
+  }
+  
+int bg_plug_get_stream_source(bg_plug_t * p,
+                              const gavf_stream_header_t * h,
+                              gavl_audio_source_t ** as,
+                              gavl_video_source_t ** vs,
+                              gavl_packet_source_t ** ps)
+  {
+  stream_t * s = NULL;
+  if(!(s = find_stream_by_id_all(p, h->id)))
+    return 0;
+  
+  if(as)
+    {
+    *as = s->asrc_proxy ? s->asrc_proxy : s->asrc;
+    if(*as)
+      return 1;
+    }
+  else if(vs)
+    {
+    *vs = s->vsrc_proxy ? s->vsrc_proxy : s->vsrc;
+    if(*vs)
+      return 1;
+    }
+  if(ps)
+    *ps = s->psrc_proxy ? s->psrc_proxy : s->src_ext;
+  
+  return 1;
+  }
+
+int bg_plug_get_stream_sink(bg_plug_t * p,
+                            const gavf_stream_header_t * h,
+                            gavl_audio_sink_t ** as,
+                            gavl_video_sink_t ** vs,
+                            gavl_packet_sink_t ** ps)
+  {
+  stream_t * s = NULL;
+  if(!(s = find_stream_by_id_all(p, h->id)))
+    return 0;
+     
+  if(s->asink && as)
+    *as = s->asink;
+  else if(s->vsink && vs)
+    *vs = s->vsink;
+  else if(ps)
+    *ps = s->sink_ext;
+  else
+    return 0;
+  return 1;
+  }
+
+static stream_t *
+append_stream(bg_plug_t * plug,
+              stream_t ** streams, int * num, const gavl_metadata_t * m)
+  {
+  stream_t * ret;
+  *streams = realloc(*streams, (*num + 1) * sizeof(**streams));
+  ret = (*streams) + *num;
+  memset(ret, 0, sizeof(*ret));
+  gavl_metadata_copy(&ret->m, m);
+  ret->plug = plug;
+  (*num)++;
+  return ret;
+  }
+
+/* Compression parameters */
+
+typedef struct
+  {
+  stream_t * s;
+  bg_plugin_registry_t * plugin_reg;
+  } set_codec_parameter_t;
+
+static void set_codec_parameter(void * data, const char * name,
+                                const bg_parameter_value_t * v)
+  {
+  set_codec_parameter_t * p = data;
+  bg_plugin_registry_set_compressor_parameter(p->plugin_reg,
+                                              &p->s->codec_handle,
+                                              name,
+                                              v);
+  }
+
+int bg_plug_add_audio_stream(bg_plug_t * p,
+                             const gavl_compression_info_t * ci,
+                             const gavl_audio_format_t * format,
+                             const gavl_metadata_t * m,
+                             bg_cfg_section_t * encode_section)
+  {
+  stream_t * s;
+  s = append_stream(p, &p->audio_streams, &p->num_audio_streams, m);
+  gavl_compression_info_copy(&s->ci, ci);
+  gavl_audio_format_copy(&s->afmt, format);
+
+  if(encode_section && (s->ci.id == GAVL_CODEC_ID_NONE) &&
+     p->ac_params)
+    {
+    set_codec_parameter_t sc;
+    sc.s = s;
+    sc.plugin_reg = p->plugin_reg;
+    bg_cfg_section_apply(encode_section,
+                         p->ac_params,
+                         set_codec_parameter,
+                         &sc);
+    }
+  return p->num_audio_streams-1;
+  }
+
+int bg_plug_add_video_stream(bg_plug_t * p,
+                             const gavl_compression_info_t * ci,
+                             const gavl_video_format_t * format,
+                             const gavl_metadata_t * m,
+                             bg_cfg_section_t * encode_section)
+  {
+  stream_t * s;
+  s = append_stream(p, &p->video_streams, &p->num_video_streams, m);
+  gavl_compression_info_copy(&s->ci, ci);
+  gavl_video_format_copy(&s->vfmt, format);
+
+  if(encode_section && (s->ci.id == GAVL_CODEC_ID_NONE) &&
+     p->vc_params)
+    {
+    set_codec_parameter_t sc;
+    sc.s = s;
+    sc.plugin_reg = p->plugin_reg;
+    bg_cfg_section_apply(encode_section,
+                         p->vc_params,
+                         set_codec_parameter,
+                         &sc);
+    }
+  
+  return p->num_video_streams-1;
+  }
+
+int bg_plug_add_overlay_stream(bg_plug_t * p,
+                             const gavl_compression_info_t * ci,
+                             const gavl_video_format_t * format,
+                             const gavl_metadata_t * m,
+                             bg_cfg_section_t * encode_section)
+  {
+  stream_t * s;
+  s = append_stream(p, &p->overlay_streams, &p->num_overlay_streams, m);
+  gavl_compression_info_copy(&s->ci, ci);
+  gavl_video_format_copy(&s->vfmt, format);
+
+  if(encode_section && (s->ci.id == GAVL_CODEC_ID_NONE) &&
+     p->oc_params)
+    {
+    set_codec_parameter_t sc;
+    sc.s = s;
+    sc.plugin_reg = p->plugin_reg;
+    bg_cfg_section_apply(encode_section,
+                         p->oc_params,
+                         set_codec_parameter,
+                         &sc);
+    }
+  return p->num_overlay_streams-1;
+  }
+
+int bg_plug_add_text_stream(bg_plug_t * p,
+                            uint32_t timescale,
+                            const gavl_metadata_t * m)
+  {
+  stream_t * s;
+  s = append_stream(p, &p->text_streams, &p->num_text_streams, m);
+  s->timescale = timescale;
+  return p->num_text_streams-1;
+  
+  }
+
+int bg_plug_add_mediaconnector_stream(bg_plug_t * p,
+                                      bg_mediaconnector_stream_t * s)
+  {
+  const gavl_audio_format_t * afmt;
+  const gavl_video_format_t * vfmt;
+  const gavl_compression_info_t * ci;
+  gavl_compression_info_t ci_none;
+  memset(&ci_none, 0, sizeof(ci_none));
+  
+  switch(s->type)
+    {
+    case GAVF_STREAM_AUDIO:
+      if(s->psrc)
+        {
+        ci = gavl_packet_source_get_ci(s->psrc);
+        afmt = gavl_packet_source_get_audio_format(s->psrc);
+        }
+      else if(s->asrc)
+        {
+        ci = &ci_none;
+        afmt = gavl_audio_source_get_src_format(s->asrc);
+        }
+      else
+        return 0;
+        
+      if(bg_plug_add_audio_stream(p, ci, afmt, &s->m, s->encode_section) < 0)
+        return 0;
+      break;
+    case GAVF_STREAM_VIDEO:
+      if(s->psrc)
+        {
+        ci = gavl_packet_source_get_ci(s->psrc);
+        vfmt = gavl_packet_source_get_video_format(s->psrc);
+        }
+      else if(s->vsrc)
+        {
+        ci = &ci_none;
+        vfmt = gavl_video_source_get_src_format(s->vsrc);
+        }
+      else
+        return 0;
+        
+      if(bg_plug_add_video_stream(p, ci, vfmt, &s->m, s->encode_section) < 0)
+        return 0;
+      break;
+    case GAVF_STREAM_OVERLAY:
+      if(s->psrc)
+        {
+        ci = gavl_packet_source_get_ci(s->psrc);
+        vfmt = gavl_packet_source_get_video_format(s->psrc);
+        }
+      else if(s->vsrc)
+        {
+        ci = &ci_none;
+        vfmt = gavl_video_source_get_src_format(s->vsrc);
+        }
+      else
+        return 0;
+        
+      if(bg_plug_add_overlay_stream(p, ci, vfmt, &s->m, s->encode_section) < 0)
+        return 0;
+      break;
+    case GAVF_STREAM_TEXT:
+      if(bg_plug_add_text_stream(p, s->timescale, &s->m) < 0)
+        return 0;
+      break;
+    }
+  return 1;
+  }
+
+int bg_plug_connect_mediaconnector_stream(bg_plug_t * p,
+                                          bg_mediaconnector_stream_t * s,
+                                          const gavf_stream_header_t * h)
+  {
+  gavl_audio_sink_t * as;
+  gavl_video_sink_t * vs;
+  gavl_packet_sink_t * ps;
+  
+  as = NULL;
+  vs = NULL;
+  ps = NULL;
+    
+  if(!bg_plug_get_stream_sink(p, h, &as, &vs, &ps))
+    return 0;
+    
+  if(as && s->aconn)
+    gavl_audio_connector_connect(s->aconn, as);
+  else if(vs && s->vconn)
+    gavl_video_connector_connect(s->vconn, vs);
+  else if(ps && s->pconn)
+    gavl_packet_connector_connect(s->pconn, ps);
+  else
+    return 0;
+  return 1;
+  }
+
+/* Setup writer */
+
+int bg_plug_setup_writer(bg_plug_t * p, bg_mediaconnector_t * conn)
+  {
+  int i;
+  bg_mediaconnector_stream_t * s;
+  const gavf_stream_header_t * h;
+  
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+    if(!bg_plug_add_mediaconnector_stream(p, s))
+      return 0;
+    }
+
+  if(!bg_plug_start(p))
+    return 0;
+  
+  /* Get sinks and connect them */
+
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+    h = p->ph->streams + i;
+
+    if(!bg_plug_connect_mediaconnector_stream(p, s, h))
+      return 0;
+    }
+  return 1;
+  }
+
+int bg_plug_setup_reader(bg_plug_t * p, bg_mediaconnector_t * conn)
+  {
+  int i;
+  stream_t * s;
+  bg_mediaconnector_stream_t * cs;
+  gavl_audio_source_t * as;
+  gavl_video_source_t * vs;
+  gavl_packet_source_t * ps;
+  
+  for(i = 0; i < p->num_audio_streams; i++)
+    {
+    s = p->audio_streams + i;
+
+    as = NULL;
+    ps = NULL;
+
+    bg_plug_get_stream_source(p, s->h, &as, NULL, &ps);
+    
+    if(as || ps)
+      {
+      cs = bg_mediaconnector_add_audio_stream(conn,
+                                              &s->h->m,
+                                              as,
+                                              ps);
+      cs->src_index = i;
+      }
+    else
+      continue;
+    }
+
+  for(i = 0; i < p->num_video_streams; i++)
+    {
+    s = p->video_streams + i;
+
+    vs = NULL;
+    ps = NULL;
+
+    bg_plug_get_stream_source(p, s->h, NULL, &vs, &ps);
+
+    if(vs || ps)
+      {
+      cs = bg_mediaconnector_add_video_stream(conn,
+                                              &s->h->m,
+                                              vs,
+                                              ps);
+      cs->src_index = i;
+      }
+    else
+      continue;
+    }
+
+  for(i = 0; i < p->num_text_streams; i++)
+    {
+    s = p->text_streams + i;
+
+    ps = NULL;
+    
+    bg_plug_get_stream_source(p, s->h, NULL, NULL, &ps);
+    
+    if(ps)
+      {
+      cs = bg_mediaconnector_add_text_stream(conn,
+                                             &s->h->m,
+                                             ps, s->h->format.text.timescale);
+      cs->src_index = i;
+      }
+    else
+      continue;
+    }
+
+  for(i = 0; i < p->num_overlay_streams; i++)
+    {
+    s = p->overlay_streams + i;
+
+    vs = NULL;
+    ps = NULL;
+
+    bg_plug_get_stream_source(p, s->h, NULL, &vs, &ps);
+    
+    if(vs || ps)
+      {
+      cs = bg_mediaconnector_add_overlay_stream(conn,
+                                                &s->h->m,
+                                                vs,
+                                                ps);
+      cs->src_index = i;
+      }
+    else
+      continue;
+    }
+
+  return 1;
+  }
+
+
+void bg_plug_set_stream_action(bg_plug_t * p,
+                               const gavf_stream_header_t * h,
+                               bg_stream_action_t action)
+  {
+  stream_t * s = find_stream_by_id_all(p, h->id);
+  if(!s)
+    return;
+  s->action = action;
+  }
+
+int bg_plug_got_error(bg_plug_t * p)
+  {
+  int ret;
+  pthread_mutex_lock(&p->mutex);
+  ret = p->got_error || gavf_io_got_error(p->io);
+  pthread_mutex_unlock(&p->mutex);
+  return ret;
+  }
+
+gavl_sink_status_t bg_plug_put_packet(bg_plug_t * p,
+                                      gavl_packet_t * pkt)
+  {
+  stream_t * s = find_stream_by_id_all(p, pkt->id);
+  if(!s)
+    return GAVL_SINK_ERROR;
+  return gavl_packet_sink_put_packet(s->sink_ext, pkt);
+  }
+
+
+/* Proxy stuff */
+
+void bg_plug_set_audio_proxy(bg_plug_t * p, int stream,
+                             gavl_audio_source_t * asrc,
+                             gavl_packet_source_t * psrc)
+  {
+  p->audio_streams[stream].asrc_proxy = asrc;
+  p->audio_streams[stream].psrc_proxy = psrc;
+  }
+
+void bg_plug_set_video_proxy(bg_plug_t * p, int stream,
+                             gavl_video_source_t * vsrc,
+                             gavl_packet_source_t * psrc)
+  {
+  p->video_streams[stream].vsrc_proxy = vsrc;
+  p->video_streams[stream].psrc_proxy = psrc;
+  }
+
+void bg_plug_set_overlay_proxy(bg_plug_t * p, int stream,
+                               gavl_video_source_t * vsrc,
+                               gavl_packet_source_t * psrc)
+  {
+  p->overlay_streams[stream].vsrc_proxy = vsrc;
+  p->overlay_streams[stream].psrc_proxy = psrc;
+  }
+
+void bg_plug_set_text_proxy(bg_plug_t * p, int stream,
+                            gavl_video_source_t * vsrc,
+                            gavl_packet_source_t * psrc)
+  {
+  p->text_streams[stream].psrc_proxy = psrc;
+  }

gmerlin-4256.tar.gz/lib/bgplug_io.c Added

@@ -0,0 +1,811 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include <unistd.h>
+#include <ctype.h>
+
+#include <gmerlin/bgplug.h>
+#include <gmerlin/subprocess.h>
+#include <gmerlin/bgsocket.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/http.h>
+
+#include <gmerlin/translation.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "plug_io"
+
+// #define TIMEOUT 5000
+
+// #define DUMP_HEADERS
+
+/* stdin / stdout */
+
+static gavf_io_t * open_dash(int method, int * flags)
+  {
+  struct stat st;
+  int fd;
+  FILE * f;
+    
+  /* Stdin/stdout */
+  if(method == BG_PLUG_IO_METHOD_WRITE)
+    f = stdout;
+  else
+    f = stdin;
+    
+  fd = fileno(f);
+
+  if(isatty(fd))
+    {
+    if(method == BG_PLUG_IO_METHOD_WRITE)
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Not writing to a TTY");
+    else
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Not reading from a TTY");
+    return NULL;
+    }
+    
+  if(fstat(fd, &st))
+    {
+    if(method == BG_PLUG_IO_METHOD_WRITE)
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot stat stdout");
+    else
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot stat stdin");
+    return 0;
+    }
+  if(S_ISFIFO(st.st_mode)) /* Pipe: Use local connection */
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+  else if(S_ISREG(st.st_mode))
+    *flags |= BG_PLUG_IO_IS_REGULAR;
+  return gavf_io_create_file(f, method == BG_PLUG_IO_METHOD_WRITE, 0, 0);
+  }
+
+/* TCP client */
+
+/* Unix domain client */
+
+/* Pipe */
+
+static int read_pipe(void * priv, uint8_t * data, int len)
+  {
+  bg_subprocess_t * sp = priv;
+  return bg_subprocess_read_data(sp->stdout_fd, data, len);
+  }
+
+static int write_pipe(void * priv, const uint8_t * data, int len)
+  {
+  bg_subprocess_t * sp = priv;
+  return write(sp->stdin_fd, data, len);
+  }
+
+static void close_pipe(void * priv)
+  {
+  bg_subprocess_t * sp = priv;
+  bg_subprocess_close(sp);
+  }
+
+static gavf_io_t * open_pipe(const char * location, int wr)
+  {
+  const char * pos;
+  bg_subprocess_t * sp;
+  
+  pos = location;
+
+  if(!wr && (*pos == '|'))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Read pipes must start with '<'");
+    return NULL;
+    }
+  else if(wr && (*pos == '<'))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write pipes must start with '|'");
+    return NULL;
+    }
+  
+  pos++;
+  while(isspace(*pos) && (*pos != '\0'))
+    pos++;
+
+  if(pos == '\0')
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid pipe: %s", location);
+    return NULL;
+    }
+  
+  sp = bg_subprocess_create(pos,
+                            wr ? 1 : 0, // Do stdin
+                            wr ? 0 : 1, // Do stdout
+                            0);         // Do stderr
+  
+  if(!sp)
+    return NULL;
+  
+  return gavf_io_create(wr ? NULL : read_pipe,
+                        wr ? write_pipe : NULL,
+                        NULL, // seek
+                        close_pipe,
+                        NULL, // flush
+                        sp);
+  }
+
+/* Socket */
+
+/* Handshake */
+
+/*
+ * Protocol
+ *
+ * Client to server:
+ * METHOD location protocol
+ *
+ * METHOD can be READ or WRITE
+ *
+ * Server: PROTOCOL STATUS STATUS_STRING
+ *
+ * If the method was read: Server starts to write
+ * If the method was write: Server starts to read
+ *
+ * Supported status codes:
+ *
+ * 200 OK
+ * 400 Bad Request
+ * 405 Method Not Allowed
+ * 505 Protocol Version Not Supported
+ * 503 Service Unavailable
+ */
+
+#define PROTOCOL "HTTP/1.1"
+
+const char * bg_plug_mimetype = "application/bgplug-"VERSION;
+const char * bg_plug_app_id = "bgplug-"VERSION;
+
+int 
+bg_plug_request_get_method(const gavl_metadata_t * req, int * method)
+  {
+  const char * val;
+
+  
+  if(!(val = bg_http_request_get_method(req)))
+    return 0;
+  
+  if(!strcmp(val, "PUT"))
+    {
+    *method = BG_PLUG_IO_METHOD_WRITE;
+    return 1;
+    }
+  else if(!strcmp(val, "GET"))
+    {
+    *method = BG_PLUG_IO_METHOD_READ;
+    return 1;
+    }
+  else if(!strcmp(val, "HEAD"))
+    {
+    *method = BG_PLUG_IO_METHOD_HEAD;
+    return 1;
+    }
+  else
+    return 0;
+  }
+
+int bg_plug_io_server_handshake(int fd, int method, int timeout)
+  {
+  int ret = 0;
+  int status = 0;
+  gavl_metadata_t req;
+  gavl_metadata_t res;
+  int request_method;
+  const char * var;
+  int write_response_now = 0;
+  const char * status_str = NULL;
+  
+  gavl_metadata_init(&req);
+  gavl_metadata_init(&res);
+
+  if(!bg_http_request_read(fd, &req, timeout))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Reading request failed");
+    goto fail;
+    }
+  
+  if(!bg_plug_request_get_method(&req, &request_method))
+    {
+    // 400 Bad Request
+    status = BG_PLUG_IO_STATUS_400;
+    status_str = "Bad Request";
+    goto fail;
+    }
+
+  else if(method == request_method)
+    {
+    status = BG_PLUG_IO_STATUS_405;
+    status_str = "Method Not Allowed";
+    goto fail;
+    }
+  
+  if(!status)
+    {
+    switch(request_method)
+      {
+      case BG_PLUG_IO_METHOD_WRITE:  // PUT
+        if(method == BG_PLUG_IO_METHOD_WRITE)
+          {
+          status = BG_PLUG_IO_STATUS_405;
+          status_str = "Method Not Allowed";
+          goto fail;
+          }
+        var = gavl_metadata_get(&req, "Expect");
+        if(var)
+          {
+          if(!strcmp(var, "100-continue"))
+            write_response_now = 1;
+          else
+            {
+            status = BG_PLUG_IO_STATUS_417;
+            status_str = "Expectation Failed";
+            goto fail;
+            }
+          }
+        
+        /* We support no locations in our simple servers */
+        var = bg_http_request_get_path(&req);
+        if(strcmp(var, "/"))
+          {
+          status = BG_PLUG_IO_STATUS_404;
+          status_str = "Not Found";
+          goto fail;
+          }
+        
+        var = gavl_metadata_get(&req, "Content-Type");
+        if(!var)
+          {
+          status = BG_PLUG_IO_STATUS_400;
+          status_str = "Bad Request";
+          goto fail;
+          }
+        if(strcmp(var, bg_plug_mimetype))
+          {
+          status = BG_PLUG_IO_STATUS_415;
+          status_str = "Unsupported Media Type";
+          goto fail;
+          }
+        if(write_response_now)
+          {
+          status = BG_PLUG_IO_STATUS_100;
+          status_str = "Continue";
+          ret = 1;
+          }
+        else
+          {
+          status = BG_PLUG_IO_STATUS_200;
+          status_str = "OK";
+          ret = 1;
+          }
+        break;
+      case BG_PLUG_IO_METHOD_READ: // GET
+      case BG_PLUG_IO_METHOD_HEAD:
+        /* We support no locations in our simple servers */
+        var = bg_http_request_get_path(&req);
+        if(strcmp(var, "/"))
+          {
+          status = BG_PLUG_IO_STATUS_404;
+          status_str = "Not Found";
+          goto fail;
+          }
+        
+        status = BG_PLUG_IO_STATUS_200;
+        status_str = "OK";
+
+        write_response_now = 1;
+        gavl_metadata_set(&res, "Content-Type", bg_plug_mimetype);
+        ret = 1;
+        break;
+      default:
+        status = BG_PLUG_IO_STATUS_405;
+        status_str = "Unsupported Media Type";
+        break;
+      }
+    }
+
+  fail:
+
+  bg_http_response_init(&res, PROTOCOL, status, status_str);
+  
+  /* Write response */
+  if(write_response_now)
+    {
+    /* Set common fields */
+    gavl_metadata_set(&res, "Server", bg_plug_app_id);
+    
+    //    fprintf(stderr, "Sending response:\n");
+    //    gavl_metadata_dump(&res, 0);
+    
+    if(!bg_http_response_write(fd, &res))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing response failed");
+      goto fail;
+      }
+    }
+
+  if(request_method == BG_PLUG_IO_METHOD_HEAD)
+    ret = 0;
+  
+  gavl_metadata_free(&req);
+  gavl_metadata_free(&res);
+  return ret;
+  }
+
+static int client_handshake(int fd, int method, const char * path, int timeout)
+  {
+  int ret = 0;
+  int status = 0;
+  gavl_metadata_t req;
+  gavl_metadata_t res;
+  const char * method_string;
+  
+  gavl_metadata_init(&req);
+  gavl_metadata_init(&res);
+
+  if(!path)
+    path = "/";
+
+  if(method == BG_PLUG_IO_METHOD_WRITE)
+    method_string = "PUT";
+  else
+    method_string = "GET";
+  
+  bg_http_request_init(&req, method_string, path, PROTOCOL);
+  
+  if(method == BG_PLUG_IO_METHOD_WRITE)
+    {
+    gavl_metadata_set(&req, "Expect", "100-continue");
+    gavl_metadata_set(&req, "Content-Type", bg_plug_mimetype);
+    }
+  else if(method == BG_PLUG_IO_METHOD_READ)
+    {
+    gavl_metadata_set(&req, "Accept", bg_plug_mimetype);
+    }
+
+  /* Set common fields */
+  gavl_metadata_set(&req, "User-Agent", bg_plug_app_id);
+  
+#ifdef DUMP_HEADERS
+  fprintf(stderr, "Sending request\n");
+  gavl_metadata_dump(&req, 0);
+#endif
+  
+  if(!bg_http_request_write(fd, &req))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing request failed");
+    goto fail;
+    }
+  if(!bg_http_response_read(fd, &res, timeout))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Reading response failed");
+    goto fail;
+    }
+
+  if(!(status = bg_http_response_get_status_int(&res)))
+    goto fail;
+  
+  if(((method == BG_PLUG_IO_METHOD_READ) && (status != BG_PLUG_IO_STATUS_200)) ||
+     ((method == BG_PLUG_IO_METHOD_WRITE) && (status != BG_PLUG_IO_STATUS_100)))
+    {
+    const char * status_str;
+    
+    if(!(status_str = bg_http_response_get_status_str(&res)))
+      status_str = "??";
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got status: %d %s", status, status_str);
+    goto fail;
+    }
+  ret = 1;
+  
+  fail:
+  gavl_metadata_free(&req);
+  gavl_metadata_free(&res);
+  return ret;
+  }
+
+typedef struct
+  {
+  int fd;
+  int timeout;
+  } socket_t;
+
+static int read_socket(void * priv, uint8_t * data, int len)
+  {
+  socket_t * s = priv;
+  return bg_socket_read_data(s->fd, data, len, s->timeout);
+  }
+
+static int write_socket(void * priv, const uint8_t * data, int len)
+  {
+  socket_t * s = priv;
+  return bg_socket_write_data(s->fd, data, len);
+  }
+
+static void close_socket(void * priv)
+  {
+  socket_t * s = priv;
+  close(s->fd);
+  free(s);
+  }
+
+static gavf_io_t * io_create_socket(socket_t * s, int method)
+  {
+  return gavf_io_create((method == BG_PLUG_IO_METHOD_READ) ? read_socket : NULL,
+                        (method == BG_PLUG_IO_METHOD_WRITE) ? write_socket : NULL,
+                        NULL, // seek
+                        close_socket,
+                        NULL, // flush
+                        s);
+  }
+
+static gavf_io_t * open_tcp(const char * location,
+                            int method, int * flags, int timeout)
+  {
+  /* Remote TCP socket */
+  char * host = NULL;
+  char * path = NULL;
+  gavf_io_t * ret = NULL;
+  int port;
+  int fd;
+  socket_t * s;
+  bg_socket_address_t * addr = NULL;
+  
+  if(!bg_url_split(location,
+                   NULL,
+                   NULL,
+                   NULL,
+                   &host,
+                   &port,
+                   &path))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Invalid TCP address %s", location);
+    goto fail;
+    }
+  
+  if(port < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Port missing in address %s", location);
+    goto fail;
+    }
+
+  addr = bg_socket_address_create();
+  if(!bg_socket_address_set(addr, host, port, SOCK_STREAM))
+    goto fail;
+  
+  fd = bg_socket_connect_inet(addr, timeout);
+
+  if(fd < 0)
+    goto fail;
+
+  /* Handshake */
+
+  if(!client_handshake(fd, method, path, timeout))
+    goto fail;
+  
+  /* Return */
+  s = calloc(1, sizeof(*s));
+  s->fd = fd;
+  s->timeout = timeout;
+  
+  if(bg_socket_is_local(s->fd))
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+
+  ret = io_create_socket(s, method);
+  
+  fail:
+  if(host)
+    free(host);
+  if(path)
+    free(path);
+  if(addr)
+    bg_socket_address_destroy(addr);
+  return ret;
+  }
+
+static gavf_io_t * open_unix(const char * addr, int method, int timeout)
+  {
+  char * name = NULL;
+  const char * path;
+  
+  socket_t * s;
+  int fd;
+  gavf_io_t * ret = NULL;
+  gavl_metadata_t vars;
+  gavl_metadata_init(&vars);
+  
+  name = gavl_strdup(addr+7);
+  bg_url_get_vars(name, &vars);
+  
+  fd = bg_socket_connect_unix(name);
+  
+  if(fd < 0)
+    goto fail;
+
+  path = gavl_metadata_get(&vars, "p");
+  
+  /* Handshake */
+  
+  if(!client_handshake(fd, method, path, timeout))
+    goto fail;
+
+  /* Return */
+  s = calloc(1, sizeof(*s));
+  s->fd = fd;
+  s->timeout = timeout;
+  
+  ret = io_create_socket(s, method);
+  
+  fail:
+  if(name)
+    free(name);
+  
+  gavl_metadata_free(&vars);
+  
+  return ret;
+  }
+
+static gavf_io_t * open_tcpserv(const char * addr,
+                                int method, int * flags, int timeout)
+  {
+  socket_t * s;
+  
+  bg_socket_address_t * a = NULL;
+  int port;
+  int server_fd, fd;
+
+  char * host = NULL;
+  gavf_io_t * ret = NULL;
+
+  if(!bg_url_split(addr,
+                   NULL,
+                   NULL,
+                   NULL,
+                   &host,
+                   &port,
+                   NULL))
+    {
+    if(host)
+      free(host);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Invalid TCP address %s", addr);
+    goto fail;
+    }
+
+  a = bg_socket_address_create();
+  if(!bg_socket_address_set(a, host,
+                          port, SOCK_STREAM))
+    goto fail;
+
+  server_fd = bg_listen_socket_create_inet(a, 0, 1, 0);
+  
+  if(server_fd < 0)
+    {
+    return NULL;
+    }
+  while(1)
+    {
+    fd = bg_listen_socket_accept(server_fd, -1, NULL);
+    
+    if(fd < 0)
+      break;
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN,
+           "Got connection");
+    
+    if(bg_plug_io_server_handshake(fd, method, timeout))
+      break;
+
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Handshake failed");
+    close(fd);
+    }
+  
+  bg_listen_socket_destroy(server_fd);
+
+  if(fd < 0)
+    goto fail;
+  
+  s = calloc(1, sizeof(*s));
+  s->fd = fd;
+  s->timeout = timeout;
+  
+  if(bg_socket_is_local(s->fd))
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+
+  ret = io_create_socket(s, method);
+  
+  fail:
+
+  if(a)
+    bg_socket_address_destroy(a);
+  
+  return ret;
+  }
+
+static gavf_io_t * open_unixserv(const char * addr, int method, int timeout)
+  {
+  socket_t * s;
+  int server_fd, fd;
+  char * name = NULL;
+  gavf_io_t * ret = NULL;
+
+  if(!bg_url_split(addr,
+                   NULL,
+                   NULL,
+                   NULL,
+                   &name,
+                   NULL,
+                   NULL))
+    {
+    if(name)
+      free(name);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Invalid UNIX domain address address %s", addr);
+    return NULL;
+    }
+  server_fd = bg_listen_socket_create_unix(name, 1);
+    
+  if(server_fd < 0)
+    {
+    free(name);
+    return NULL;
+    }
+  while(1)
+    {
+    fd = bg_listen_socket_accept(server_fd, -1, NULL);
+    
+    if(fd < 0)
+      break;
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN,
+           "Got connection");
+    
+    if(bg_plug_io_server_handshake(fd, method, timeout))
+      break;
+
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Handshake failed");
+    close(fd);
+    }
+  
+  bg_listen_socket_destroy(server_fd);
+  
+  if(unlink(name))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unlinking socket failed: %s",
+           strerror(errno));
+    }
+  
+  free(name);
+  
+  if(fd < 0)
+    return NULL;
+
+  s = calloc(1, sizeof(*s));
+  s->fd = fd;
+  s->timeout = timeout;
+  
+  ret = io_create_socket(s, method);
+  
+  return ret;
+  }
+
+/* File */
+
+static gavf_io_t * open_file(const char * file, int wr, int * flags)
+  {
+  FILE * f;
+  struct stat st;
+  
+  if(stat(file, &st))
+    {
+    if(!wr)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Cannot stat %s: %s", file, strerror(errno));
+      return NULL;
+      }
+    }
+
+  if(S_ISFIFO(st.st_mode)) /* Pipe: Use local connection */
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+  else if(S_ISREG(st.st_mode))
+    *flags |= BG_PLUG_IO_IS_REGULAR;
+  
+  f = fopen(file, (wr ? "w" : "r"));
+  if(!f)
+    return NULL;
+  return gavf_io_create_file(f, wr, !!(*flags & BG_PLUG_IO_IS_REGULAR), 1);
+  }
+
+gavf_io_t * bg_plug_io_open_location(const char * location,
+                                     int method, int * flags, int timeout)
+  {
+  *flags = 0;
+
+  if(!location)
+    location = "-";
+  
+  if(!strcmp(location, "-"))
+    return open_dash(method, flags);
+  else if(!strncmp(location, "http://", 6))
+    return open_tcp(location, method, flags, timeout);
+  else if(!strncmp(location, "unix://", 7))
+    {
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+    /* Local UNIX domain socket */
+    return open_unix(location, method, timeout);
+    }
+  else if(!strncmp(location, "httpserv://", 10))
+    {
+    return open_tcpserv(location, method, flags, timeout);
+    }
+  else if(!strncmp(location, "unixserv://", 11))
+    {
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+    return open_unixserv(location, method, timeout);
+    }
+  
+  else if((location[0] == '|') ||
+          (location[0] == '<'))
+    {
+    /* Pipe */
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+    return open_pipe(location, method);
+    }
+  else
+    {
+    /* Regular file */
+    return open_file(location, method, flags);
+    }
+  return NULL;
+  }
+
+
+gavf_io_t * bg_plug_io_open_socket(int fd,
+                                   int method, int * flags, int timeout)
+  {
+  socket_t * s;
+
+  if(bg_socket_is_local(fd))
+    *flags |= BG_PLUG_IO_IS_LOCAL;
+  
+  /* Handshake was already done at this point */
+
+  /* Return */
+  s = calloc(1, sizeof(*s));
+  s->fd = fd;
+  s->timeout = timeout;
+  
+  return io_create_socket(s, method);
+  }

gmerlin-4256.tar.gz/lib/bgshm.c Added

@@ -0,0 +1,314 @@
+#include <config.h>
+
+
+#include <inttypes.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include <pthread.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <sys/mman.h>
+#include <sys/stat.h>        /* For mode constants */
+#include <fcntl.h>           /* For O_* constants */
+
+#include <bgshm.h>
+
+#include <gmerlin/translation.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "shm"
+#define SHM_NAME_MAX 32
+
+#define ALIGN_BYTES 16
+
+typedef struct
+  {
+  pthread_mutex_t mutex;
+  int refcount;
+  } refcounter_t;
+
+struct bg_shm_s
+  {
+  uint8_t * addr;
+  int size;
+  int id;
+  int wr;
+  refcounter_t * rc;
+  };
+
+static int align_size(int size)
+  {
+  size = ((size + ALIGN_BYTES - 1) / ALIGN_BYTES) * ALIGN_BYTES;
+  return size;
+  }
+
+static int get_real_size(int size)
+  {
+  return align_size(size) + sizeof(refcounter_t);
+  }
+
+uint8_t * bg_shm_get_buffer(bg_shm_t * s, int * size)
+  {
+  if(size)
+    *size = s->size;
+  return s->addr;
+  }
+
+int bg_shm_get_id(bg_shm_t * s)
+  {
+  return s->id;
+  }
+
+static void gen_name(int id, char * ret)
+  {
+  snprintf(ret, SHM_NAME_MAX, "/gmerlin-shm-%08x", id);
+  }
+
+bg_shm_t * bg_shm_alloc_write(int size)
+  {
+  int shm_fd = -1;
+  void * addr;
+  bg_shm_t * ret = NULL;
+  char name[SHM_NAME_MAX];
+  int id = 0;
+  pthread_mutexattr_t attr;
+  int real_size = get_real_size(size);
+  
+  while(1)
+    {
+    id++;
+    
+    gen_name(id, name);
+    
+    if((shm_fd = shm_open(name, O_RDWR | O_CREAT | O_EXCL,
+                          S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
+      {
+      if(errno != EEXIST)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+               "shm_open of %s failed: %s", name, strerror(errno));
+        return NULL;
+        }
+      }
+    else
+      break;
+    }
+  
+  if(ftruncate(shm_fd, real_size))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "ftruncate failed: %s", strerror(errno));
+    goto fail;
+    }
+
+  if((addr = mmap(0, real_size, PROT_READ | PROT_WRITE,
+                  MAP_SHARED, shm_fd, 0)) == MAP_FAILED)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "mmap failed: %s", strerror(errno));
+    return NULL;
+    }
+
+  ret = calloc(1, sizeof(*ret));
+  ret->addr = addr;
+  ret->size = size;
+  ret->id = id;
+  ret->wr = 1;
+  ret->rc = (refcounter_t*)(ret->addr + align_size(size));
+
+  /* Initialize process shared mutex */
+
+  pthread_mutexattr_init(&attr);
+  if(pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "cannot create process shared mutex: %s", strerror(errno));
+    goto fail;
+    }
+  pthread_mutex_init(&ret->rc->mutex, &attr);
+
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+         "created shm segment (write) %s", name);
+
+  ret->rc->refcount = 0;
+  fail:
+  
+  close(shm_fd);
+  
+  return ret;
+  }
+
+bg_shm_t * bg_shm_alloc_read(int id, int size)
+  {
+  void * addr;
+  bg_shm_t * ret = NULL;
+  int shm_fd;
+  char name[SHM_NAME_MAX];
+  int real_size = get_real_size(size);
+  
+  gen_name(id, name);
+  
+  shm_fd = shm_open(name, O_RDWR, 0);
+  if(shm_fd < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "shm_open of %s failed: %s", name, strerror(errno));
+    goto fail;
+    }
+  if((addr = mmap(0, real_size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                  shm_fd, 0)) == MAP_FAILED)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "mmap failed: %s", strerror(errno));
+    goto fail;
+    }
+  
+  ret = calloc(1, sizeof(*ret));
+  ret->addr = addr;
+  ret->size = size;
+  ret->rc = (refcounter_t*)(ret->addr + align_size(size));
+  ret->id = id;
+
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+         "created shm segment (read) %s", name);
+
+  fail:
+  if(shm_fd >= 0)
+    close(shm_fd);
+  
+  return ret;
+  }
+
+void bg_shm_free(bg_shm_t * shm)
+  {
+  munmap(shm->addr, shm->size);
+
+  if(shm->wr)
+    {
+    char name[SHM_NAME_MAX];
+    gen_name(shm->id, name);
+    shm_unlink(name);
+    }
+  free(shm);
+  }
+
+void bg_shm_ref(bg_shm_t * s)
+  {
+  pthread_mutex_lock(&s->rc->mutex);
+  s->rc->refcount++;
+  //  fprintf(stderr, "bg_shm_ref %08x %d\n", s->id, s->rc->refcount);
+  pthread_mutex_unlock(&s->rc->mutex);
+
+  }
+
+void bg_shm_unref(bg_shm_t * s)
+  {
+  pthread_mutex_lock(&s->rc->mutex);
+  s->rc->refcount--;
+  //  fprintf(stderr, "bg_shm_unref %08x %d\n", s->id, s->rc->refcount);
+  pthread_mutex_unlock(&s->rc->mutex);
+  }
+
+int bg_shm_refcount(bg_shm_t * s)
+  {
+  int ret;
+  pthread_mutex_lock(&s->rc->mutex);
+  ret = s->rc->refcount;
+  pthread_mutex_unlock(&s->rc->mutex);
+  return ret;
+  }
+
+
+/* Shared memory pool */
+
+struct bg_shm_pool_s
+  {
+  int wr;
+  int segment_size;
+  
+  int num_segments;
+  int segments_alloc;
+  bg_shm_t ** segments;
+  };
+
+bg_shm_pool_t * bg_shm_pool_create(int seg_size, int wr)
+  {
+  bg_shm_pool_t * ret = calloc(1, sizeof(*ret));
+  ret->wr = wr;
+  ret->segment_size = seg_size;
+  return ret;
+  }
+
+bg_shm_t * bg_shm_pool_get_read(bg_shm_pool_t * p, int id)
+  {
+  int i;
+  bg_shm_t * ret;
+  for(i = 0; i < p->num_segments; i++)
+    {
+    if(p->segments[i]->id == id)
+      return p->segments[i];
+    }
+
+  /* Segment isn't in the pool yet, map a new one */
+  if(p->num_segments + 1 >= p->segments_alloc)
+    {
+    p->segments_alloc += 16;
+    p->segments = realloc(p->segments,
+                          p->segments_alloc * sizeof(*p->segments));
+    }
+  ret = bg_shm_alloc_read(id, p->segment_size);
+
+  if(!ret)
+    return ret;
+  p->segments[p->num_segments] = ret;
+  p->num_segments++;
+  return ret;
+  }
+
+bg_shm_t * bg_shm_pool_get_write(bg_shm_pool_t * p)
+  {
+  int i;
+  bg_shm_t * ret = NULL;
+  for(i = 0; i < p->num_segments; i++)
+    {
+    if(!bg_shm_refcount(p->segments[i]))
+      {
+      ret = p->segments[i];
+      break;
+      }
+    }
+
+  if(!ret)
+    {
+    /* No unused segment available, create a new one */
+    if(p->num_segments + 1 >= p->segments_alloc)
+      {
+      p->segments_alloc += 16;
+      p->segments = realloc(p->segments,
+                            p->segments_alloc * sizeof(*p->segments));
+      }
+    p->segments[p->num_segments] =
+      bg_shm_alloc_write(p->segment_size);
+    ret = p->segments[p->num_segments];
+    p->num_segments++;
+    }
+
+  /* Set refcount to 1 */
+  bg_shm_ref(ret);
+  return ret;
+  }
+
+void bg_shm_pool_destroy(bg_shm_pool_t * p)
+  {
+  int i;
+  for(i = 0; i < p->num_segments; i++)
+    bg_shm_free(p->segments[i]);
+  if(p->segments)
+    free(p->segments);
+  free(p);
+  }

gmerlin-1.2.0.tar.gz/lib/bgxml.c -> gmerlin-4256.tar.gz/lib/bgxml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -32,16 +32,24 @@
 
 #include <gmerlin/utils.h>
 #include <gmerlin/xmlutils.h>
+#include <gmerlin/http.h>
 
 #define BLOCK_SIZE 2048
 
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "xmlutils"
 
-int bg_xml_write_callback(void * context, const char * buffer,
-                       int len)
+typedef struct
   {
-  bg_xml_output_mem_t * o = (bg_xml_output_mem_t*)context;
+  int bytes_written;
+  int bytes_allocated;
+  char * buffer;
+  } bg_xml_output_mem_t;
+
+static int mem_write_callback(void * context, const char * buffer,
+                              int len)
+  {
+  bg_xml_output_mem_t * o = context;
 
   if(o->bytes_allocated - o->bytes_written < len)
     {
@@ -55,9 +63,9 @@
   return len;
   }
 
-int bg_xml_close_callback(void * context)
+static int mem_close_callback(void * context)
   {
-  bg_xml_output_mem_t * o = (bg_xml_output_mem_t*)context;
+  bg_xml_output_mem_t * o = context;
 
   if(o->bytes_allocated == o->bytes_written)
     {
@@ -68,19 +76,275 @@
   return 0;
   }
 
-xmlDocPtr bg_xml_parse_file(const char * filename)
+char * bg_xml_save_to_memory(xmlDocPtr doc)
+  {
+  xmlOutputBufferPtr b;
+  bg_xml_output_mem_t ctx;
+  memset(&ctx, 0, sizeof(ctx));
+  
+  b = xmlOutputBufferCreateIO (mem_write_callback,
+                               mem_close_callback,
+                               &ctx,
+                               NULL);
+  xmlSaveFileTo(b, doc, NULL);
+  return ctx.buffer;
+  }
+
+char * bg_xml_save_to_memory_opt(xmlDocPtr doc, int opt)
+  {
+  bg_xml_output_mem_t ctx;
+  xmlSaveCtxtPtr xtc;
+
+  memset(&ctx, 0, sizeof(ctx));
+  xtc = xmlSaveToIO(mem_write_callback, 
+                    mem_close_callback, 
+                    &ctx, NULL, opt);
+  xmlSaveDoc(xtc, doc);
+  xmlSaveClose(xtc);
+  return ctx.buffer;
+  }
+
+static int FILE_write_callback(void * context, const char * buffer,
+                               int len)
+  {
+  return fwrite(buffer, 1, len, context);
+  }
+
+static int FILE_read_callback(void * context, char * buffer,
+                               int len)
+  {
+  return fread(buffer, 1, len, context);
+  }
+
+static int gavf_io_write_callback(void * context, const char * buffer,
+                                  int len)
+  {
+  return gavf_io_write_data(context, (uint8_t*)buffer, len);
+  }
+
+static int gavf_io_read_callback(void * context, char * buffer,
+                                 int len)
+  {
+  return gavf_io_read_data(context, (uint8_t*)buffer, len);
+  }
+
+
+xmlDocPtr bg_xml_load_FILE(FILE * f)
+  {
+  return xmlReadIO(FILE_read_callback, NULL, f, NULL, NULL, 0);
+  }
+
+void bg_xml_save_FILE(xmlDocPtr doc, FILE * f)
   {
-  struct stat st;
+  xmlOutputBufferPtr b;
 
-  if(stat(filename, &st))
+  b = xmlOutputBufferCreateIO (FILE_write_callback,
+                               NULL, f, NULL);
+  xmlSaveFileTo(b, doc, NULL);
+  }
+
+xmlDocPtr bg_xml_load_gavf_io(gavf_io_t* io)
+  {
+  return xmlReadIO(gavf_io_read_callback, NULL, io, NULL, NULL, 0);
+  }
+
+void bg_xml_save_io(xmlDocPtr doc, gavf_io_t* io)
+  {
+  xmlOutputBufferPtr b;
+
+  b = xmlOutputBufferCreateIO (gavf_io_write_callback,
+                               NULL, io, NULL);
+  xmlSaveFileTo(b, doc, NULL);
+  }
+
+
+
+xmlDocPtr bg_xml_parse_file(const char * filename, int lock)
+  {
+  xmlDocPtr ret = NULL;
+  FILE * f = fopen(filename, "r");
+  if(!f)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot stat %s: %s",
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s: %s",
            filename, strerror(errno));
     return NULL;
     }
 
-  /* Return silently */
-  if(!st.st_size)
+  if(lock)
+    {
+    if(!bg_lock_file(f, 0))
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot lock file %s: %s",
+             filename, strerror(errno));
+    }
+
+  if(bg_file_size(f))
+    ret = bg_xml_load_FILE(f);
+  
+  if(lock)
+    {
+    if(!bg_unlock_file(f))
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot unlock file %s: %s",
+             filename, strerror(errno));
+    }
+  
+  fclose(f);
+  return ret;
+  }
+
+void bg_xml_save_file(xmlDocPtr doc, const char * filename, int lock)
+  {
+  FILE * f = fopen(filename, "w");
+  if(!f)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s: %s",
+           filename, strerror(errno));
+    return;
+    }
+  
+  if(lock)
+    {
+    if(!bg_lock_file(f, 1))
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot lock file %s: %s",
+             filename, strerror(errno));
+    }
+  
+  bg_xml_save_FILE(doc, f);
+  fflush(f);
+  
+  if(lock)
+    {
+    if(!bg_unlock_file(f))
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot unlock file %s: %s",
+             filename, strerror(errno));
+    }
+  fclose(f);
+  }
+
+static xmlNodePtr find_children(xmlNodePtr node, const char * child)
+  {
+  while(node && (!node->name || strcmp((char*)node->name, child)))
+    node = node->next;
+  return node;
+  }
+
+xmlNodePtr
+bg_xml_find_node_child(xmlNodePtr parent, const char * child)
+  {
+  return find_children(parent->children, child);
+  }
+
+xmlNodePtr
+bg_xml_find_doc_child(xmlDocPtr parent, const char * child)
+  {
+  return find_children(parent->children, child);
+  }
+
+xmlNodePtr
+bg_xml_find_next_node_child(xmlNodePtr parent, xmlNodePtr node)
+  {
+  if(!node)
+    node = parent->children;
+  else
+    node = node->next;
+
+  while(node && (node->type != XML_ELEMENT_NODE))
+    node = node->next;
+  return node;
+  }
+
+xmlNodePtr
+bg_xml_find_next_node_child_by_name(xmlNodePtr parent, xmlNodePtr node,
+                                    const char * name)
+  {
+  while(1)
+    {
+    node = bg_xml_find_next_node_child(parent, node);
+    if(!node || (node->name && !strcmp((char*)node->name, name)))
+      break;
+    }
+  return node;
+  }
+
+
+xmlNodePtr
+bg_xml_find_next_doc_child(xmlDocPtr parent, xmlNodePtr node)
+  {
+  if(!node)
+    node = parent->children;
+  else
+    node = node->next;
+  while(node && (node->type != XML_ELEMENT_NODE))
+    node = node->next;
+  return node;
+  }
+
+
+
+xmlNodePtr
+bg_xml_append_child_node(xmlNodePtr parent, const char * name,
+                         const char * content)
+  {
+  xmlNodePtr node;
+
+  node = xmlNewTextChild(parent, NULL, (xmlChar*)name, NULL);
+  if(content)
+    xmlAddChild(node, BG_XML_NEW_TEXT(content));
+  else
+    xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
+  xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+  return node;
+  }
+
+const char empty_string = '\0';
+
+const char * bg_xml_node_get_text_content(xmlNodePtr parent)
+  {
+  xmlNodePtr node = parent->children;
+
+  if(!node)
+    return &empty_string;
+  
+  if((node->type != XML_TEXT_NODE) || node->next)
+    return NULL;
+  return (char*)node->content;
+  }
+
+xmlDocPtr bg_xml_from_url(const char * url)
+  {
+  uint8_t * data = NULL;
+  int len;
+  char * mimetype = NULL;
+  xmlDocPtr ret = NULL;
+
+  data = bg_http_get(url, &len, &mimetype);
+  if(!data)
+    goto fail;
+  
+  if(strncasecmp(mimetype, "text/xml", 8))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid mimetype %s for xml parsing from %s",
+           mimetype, url);
+    goto fail;
+    }
+
+  ret = xmlParseMemory((char*)data, len);
+
+  fail:
+
+  if(data)
+    free(data);
+  if(mimetype)
+    free(mimetype);
+
+  return ret;
+  }
+
+const char * bg_xml_node_get_child_content(xmlNodePtr parent,
+                                           const char * child_name)
+  {
+  xmlNodePtr child = bg_xml_find_next_node_child_by_name(parent, NULL,
+                                                         child_name);
+  if(!child)
     return NULL;
-  return xmlParseFile(filename);
+  return bg_xml_node_get_text_content(child);
   }

gmerlin-1.2.0.tar.gz/lib/cfg_item.c -> gmerlin-4256.tar.gz/lib/cfg_item.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,7 +29,7 @@
 bg_cfg_item_t * bg_cfg_item_create_empty(const char * name)
   {
   bg_cfg_item_t * ret = calloc(1, sizeof(*ret));
-  ret->name = bg_strdup(ret->name, name);
+  ret->name = gavl_strrep(ret->name, name);
   return ret;
   }
 
@@ -83,7 +83,7 @@
   
   ret = calloc(1, sizeof(*ret));
   ret->type = type;
-  ret->name = bg_strdup(ret->name, info->name);
+  ret->name = gavl_strrep(ret->name, info->name);
     
   switch(ret->type)
     {
@@ -125,11 +125,11 @@
     case BG_CFG_STRING_HIDDEN:
       if(value && value->val_str)
         {
-        ret->value.val_str = bg_strdup(ret->value.val_str, value->val_str);
+        ret->value.val_str = gavl_strrep(ret->value.val_str, value->val_str);
         }
       else if(info->val_default.val_str)
         {
-        ret->value.val_str = bg_strdup(ret->value.val_str,
+        ret->value.val_str = gavl_strrep(ret->value.val_str,
                                        info->val_default.val_str);
         }
       break;
@@ -207,7 +207,7 @@
   bg_cfg_item_t * ret;
   ret = calloc(1, sizeof(*ret));
 
-  ret->name = bg_strdup(ret->name, src->name);
+  ret->name = gavl_strrep(ret->name, src->name);
   ret->type = src->type;
   bg_cfg_item_transfer(src, ret);
   return ret;

gmerlin-1.2.0.tar.gz/lib/cfg_registry.c -> gmerlin-4256.tar.gz/lib/cfg_registry.c Changed

gmerlin-1.2.0.tar.gz/lib/cfg_section.c -> gmerlin-4256.tar.gz/lib/cfg_section.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,7 +34,7 @@
 bg_cfg_section_t * bg_cfg_section_create(const char * name)
   {
   bg_cfg_section_t * ret = calloc(1, sizeof(*ret));
-  ret->name = bg_strdup(ret->name, name);
+  ret->name = gavl_strrep(ret->name, name);
   return ret;
   }
 
@@ -269,7 +269,7 @@
       break;
     case BG_CFG_STRING:
     case BG_CFG_STRING_HIDDEN:
-      item->value.val_str = bg_strdup(item->value.val_str,
+      item->value.val_str = gavl_strrep(item->value.val_str,
                                       value->val_str);
       break;
     case BG_CFG_COLOR:
@@ -322,12 +322,12 @@
         {
         end_c++;
         cpy_str[0] = *end_c;
-        ret = bg_strcat(ret, cpy_str);
+        ret = gavl_strcat(ret, cpy_str);
         }
       else
         {
         cpy_str[0] = *end_c;
-        ret = bg_strcat(ret, cpy_str);
+        ret = gavl_strcat(ret, cpy_str);
         }
       }
     else if((*end_c == ':') ||
@@ -339,11 +339,12 @@
     else
       {
       cpy_str[0] = *end_c;
-      ret = bg_strcat(ret, cpy_str);
+      ret = gavl_strcat(ret, cpy_str);
       }
     end_c++;
     }
   *len_ret = end_c - str;
+  
   return ret;
   }
 
@@ -405,6 +406,10 @@
   {
   int i = 0;
   FILE * out = stderr;
+
+  if(!info->multi_names) // Can be that there are no options available
+    return 1;
+  
   while(info->multi_names[i])
     {
     if(!strcmp(info->multi_names[i], name))
@@ -417,9 +422,10 @@
 
 
 /* Returns characters read or 0 */
-int bg_cfg_section_set_parameters_from_string(bg_cfg_section_t * sec,
-                                              const bg_parameter_info_t * parameters,
-                                              const char * str_start)
+int
+bg_cfg_section_set_parameters_from_string(bg_cfg_section_t * sec,
+                                          const bg_parameter_info_t * parameters,
+                                          const char * str_start)
   {
   FILE * out = stderr;
   char * end;
@@ -431,7 +437,6 @@
   
   bg_cfg_section_t * real_section;
   bg_cfg_section_t * subsection;
-  char * tmp_string;
   
   const char * str = str_start;
   
@@ -536,27 +541,41 @@
         index = 0;
         while(1)
           {
+          char * tmp_string;
+          
           /* Loop over options */
           tmp_string = parse_string(str, &len);
           if(!check_option(info, tmp_string))
+            {
+            free(tmp_string);
             goto fail;
-
+            }
           str += len;
           if(item->value.val_str)
-            item->value.val_str = bg_strcat(item->value.val_str, ",");
-          item->value.val_str = bg_strcat(item->value.val_str, tmp_string);
+            item->value.val_str = gavl_strcat(item->value.val_str, ",");
+          item->value.val_str = gavl_strcat(item->value.val_str, tmp_string);
+
+          /* Create subsection (regardless of we have subparameters or not) */
+          subsection = bg_cfg_section_find_subsection(real_section, info->name);
+          
+          if(info->type == BG_PARAMETER_MULTI_LIST)
+            subsection = bg_cfg_section_find_subsection(subsection, tmp_string);
+          else
+            subsection = bg_cfg_section_create_subsection_at_pos(subsection, index);
+          
           
           /* Suboptions */
           if(*str == '{')
             {
             str++;
+#if 0
             subsection = bg_cfg_section_find_subsection(real_section, info->name);
 
             if(info->type == BG_PARAMETER_MULTI_LIST)
               subsection = bg_cfg_section_find_subsection(subsection, tmp_string);
             else
               subsection = bg_cfg_section_create_subsection_at_pos(subsection, index);
-            
+#endif            
             i = 0;
             
             while(info->multi_names[i])
@@ -565,13 +584,19 @@
                 break;
               i++;
               }
-            if(!info->multi_names[i]) return 0; // Already checked by check_option above
-            
+            if(!info->multi_names[i])
+              {
+              free(tmp_string);
+              return 0; // Already checked by check_option above
+              }
             str += bg_cfg_section_set_parameters_from_string(subsection,
                                                              info->multi_parameters[i],
                                                              str);
             if(*str != '}')
+              {
+              free(tmp_string);
               goto fail;
+              }
             str++;
             }
           if(*str == '}')
@@ -580,7 +605,10 @@
             break;
             }
           else if(*str != ':')
+            {
+            free(tmp_string);
             goto fail;
+            }
           str++;
           free(tmp_string);
           index++;
@@ -720,7 +748,7 @@
       break;
     case BG_CFG_STRING:
     case BG_CFG_STRING_HIDDEN:
-      value->val_str = bg_strdup(value->val_str, item->value.val_str);
+      value->val_str = gavl_strrep(value->val_str, item->value.val_str);
       break;
     case BG_CFG_COLOR:
       value->val_color[0] = item->value.val_color[0];
@@ -998,7 +1026,7 @@
   bg_cfg_item_t * item;
   item = find_item_by_name(section, name, 1);
   item->type = BG_CFG_STRING;
-  item->value.val_str = bg_strdup(item->value.val_str, value);
+  item->value.val_str = gavl_strrep(item->value.val_str, value);
   }
 
 void bg_cfg_section_set_parameter_time(bg_cfg_section_t * section,
@@ -1146,7 +1174,7 @@
   bg_cfg_section_t * ret;
   
   ret = calloc(1, sizeof(*ret));
-  ret->name = bg_strdup(ret->name, src->name);
+  ret->name = gavl_strrep(ret->name, src->name);
   copy_contents(src, ret);
   copy_refs(src, ret);
   return ret;
@@ -1203,10 +1231,10 @@
   if(s->gettext_domain && s->gettext_directory)
     {
     bg_bindtextdomain(s->gettext_domain, s->gettext_directory);
-    return bg_strdup(NULL, dgettext(s->gettext_domain, s->name));
+    return gavl_strdup(dgettext(s->gettext_domain, s->name));
     }
   else
-    return bg_strdup(NULL, s->name);
+    return gavl_strdup(s->name);
   }
 
 
@@ -1214,9 +1242,9 @@
                              const char * gettext_domain,
                              const char * gettext_directory)
   {
-  s->name = bg_strdup(s->name, name);
-  s->gettext_domain    = bg_strdup(s->gettext_domain,    gettext_domain);
-  s->gettext_directory = bg_strdup(s->gettext_directory, gettext_directory);
+  s->name = gavl_strrep(s->name, name);
+  s->gettext_domain    = gavl_strrep(s->gettext_domain,    gettext_domain);
+  s->gettext_directory = gavl_strrep(s->gettext_directory, gettext_directory);
   }
 
 bg_cfg_section_t *

gmerlin-1.2.0.tar.gz/lib/cfg_xml.c -> gmerlin-4256.tar.gz/lib/cfg_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -33,7 +33,6 @@
   {
   char * tmp_type;
   char * tmp_string;
-  char * start;
   
   bg_parameter_info_t info;
 
@@ -106,7 +105,7 @@
       sscanf(tmp_string, "%lf", &item->value.val_f);
       break;
     case BG_CFG_STRING:
-      item->value.val_str = bg_strdup(item->value.val_str,
+      item->value.val_str = gavl_strrep(item->value.val_str,
                                       tmp_string);
       break;
     case BG_CFG_STRING_HIDDEN:
@@ -120,7 +119,6 @@
       
       break;
     case BG_CFG_COLOR:
-      start = tmp_string;
       sscanf(tmp_string, "%f %f %f %f",
              &item->value.val_color[0],
              &item->value.val_color[1],
@@ -128,7 +126,6 @@
              &item->value.val_color[3]);
       break;
     case BG_CFG_POSITION:
-      start = tmp_string;
       sscanf(tmp_string, "%lf %lf",
              &item->value.val_pos[0],
              &item->value.val_pos[1]);
@@ -156,14 +153,14 @@
   if(tmp_string)
     {
     cfg_section->gettext_domain =
-      bg_strdup(cfg_section->gettext_domain, tmp_string);
+      gavl_strrep(cfg_section->gettext_domain, tmp_string);
     xmlFree(tmp_string);
     }
   tmp_string = BG_XML_GET_PROP(xml_section, "gettext_directory");
   if(tmp_string)
     {
     cfg_section->gettext_directory =
-      bg_strdup(cfg_section->gettext_directory, tmp_string);
+      gavl_strrep(cfg_section->gettext_directory, tmp_string);
     xmlFree(tmp_string);
     }
   
@@ -204,7 +201,7 @@
   if(!filename)
     return;
     
-  xml_doc = bg_xml_parse_file(filename);
+  xml_doc = bg_xml_parse_file(filename, 1);
 
   if(!xml_doc)
     return;
@@ -360,7 +357,7 @@
     xmlAddChild(xml_registry, BG_XML_NEW_TEXT("\n"));
     
     }
-  xmlSaveFile(filename, xml_doc);
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   }
 
@@ -373,6 +370,6 @@
   xmlDocSetRootElement(xml_doc, xml_section);
   BG_XML_SET_PROP(xml_section, "name", section->name);
   bg_cfg_section_2_xml(section, xml_section);
-  xmlSaveFile(filename, xml_doc);
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   }

gmerlin-1.2.0.tar.gz/lib/chapterlist.c -> gmerlin-4256.tar.gz/lib/chapterlist.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,104 +28,7 @@
 #include <gmerlin/utils.h>
 #include <gmerlin/translation.h>
 
-bg_chapter_list_t * bg_chapter_list_create(int num_chapters)
-  {
-  bg_chapter_list_t * ret;
-  ret = calloc(1, sizeof(*ret));
-  if(num_chapters)
-    {
-    ret->chapters = calloc(num_chapters, sizeof(*(ret->chapters)));
-    ret->num_chapters = num_chapters;
-    }
-  return ret;
-  }
-
-bg_chapter_list_t * bg_chapter_list_copy(const bg_chapter_list_t * list)
-  {
-  int i;
-  bg_chapter_list_t * ret;
-
-  if(!list || !list->num_chapters)
-    return NULL;
-  
-  ret = bg_chapter_list_create(list->num_chapters);
-  for(i = 0; i < ret->num_chapters; i++)
-    {
-    ret->chapters[i].time = list->chapters[i].time;
-    ret->chapters[i].name = bg_strdup(ret->chapters[i].name,
-                                      list->chapters[i].name);
-    }
-  ret->timescale = list->timescale;
-  return ret;
-  }
-
-
-void bg_chapter_list_destroy(bg_chapter_list_t * list)
-  {
-  int i;
-  for(i = 0; i < list->num_chapters; i++)
-    {
-    if(list->chapters[i].name)
-      free(list->chapters[i].name);
-    }
-  free(list->chapters);
-  free(list);
-  }
-
-void bg_chapter_list_insert(bg_chapter_list_t * list, int index,
-                            int64_t time, const char * name)
-  {
-  int chapters_to_add;
-  /* Add a chapter behind the last one */
-  if(index >= list->num_chapters)
-    {
-    chapters_to_add = index + 1 - list->num_chapters;
-    list->chapters =
-      realloc(list->chapters,
-              (chapters_to_add + list->num_chapters)*sizeof(*list->chapters));
-    memset(list->chapters + list->num_chapters,
-           0, sizeof(*list->chapters) * chapters_to_add);
-    list->chapters[index].name = bg_strdup(list->chapters[index].name, name);
-    list->chapters[index].time = time;
-    list->num_chapters = index + 1;
-    }
-  else
-    {
-    list->chapters = realloc(list->chapters,
-                             (list->num_chapters + 1)*
-                             sizeof(*list->chapters));
-    
-    memmove(list->chapters + index + 1, list->chapters + index,
-            (list->num_chapters - index) * sizeof(*list->chapters));
-
-    list->chapters[index].name = bg_strdup(NULL, name);
-    list->chapters[index].time = time;
-    list->num_chapters++;
-    }
-  
-  }
-
-void bg_chapter_list_delete(bg_chapter_list_t * list, int index)
-  {
-  if((index < 0) || (index >= list->num_chapters))
-    return;
-
-  if(list->chapters[index].name)
-    free(list->chapters[index].name);
-
-  if(index < list->num_chapters-1)
-    {
-    memmove(list->chapters + index, list->chapters + index + 1,
-            sizeof(*list->chapters) * (list->num_chapters - index));
-    }
-  if(!index)
-    list->chapters[index].time = 0;
-  
-  list->num_chapters--;
-  
-  }
-
-void bg_chapter_list_set_default_names(bg_chapter_list_t * list)
+void bg_chapter_list_set_default_names(gavl_chapter_list_t * list)
   {
   int i;
   for(i = 0; i < list->num_chapters; i++)
@@ -134,34 +37,3 @@
       list->chapters[i].name = bg_sprintf(TR("Chapter %d"), i+1);
     }
   }
-
-int bg_chapter_list_get_current(bg_chapter_list_t * list,
-                                gavl_time_t time)
-  {
-  int i;
-  int64_t time_scaled = gavl_time_scale(list->timescale, time);
-  for(i = 0; i < list->num_chapters-1; i++)
-    {
-    if(time_scaled < list->chapters[i+1].time)
-      return i;
-    }
-  return list->num_chapters-1;
-  }
-
-int bg_chapter_list_changed(bg_chapter_list_t * list,
-                            gavl_time_t time, int * current_chapter)
-  {
-  int ret = 0;
-  int64_t time_scaled = gavl_time_scale(list->timescale, time);
-  while(*current_chapter < list->num_chapters-1)
-    {
-    if(time_scaled >= list->chapters[(*current_chapter)+1].time)
-      {
-      (*current_chapter)++;
-      ret = 1;
-      }
-    else
-      break;
-    }
-  return ret;
-  }

gmerlin-1.2.0.tar.gz/lib/chapterlist_xml.c -> gmerlin-4256.tar.gz/lib/chapterlist_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -31,7 +31,7 @@
 #define CHAPTERS_KEY "CHAPTERS"
 #define NAME_KEY    "name"
 
-void bg_chapter_list_2_xml(bg_chapter_list_t * list, xmlNodePtr xml_list)
+void bg_chapter_list_2_xml(gavl_chapter_list_t * list, xmlNodePtr xml_list)
   {
   char * tmp_string;
   int i;
@@ -59,16 +59,16 @@
   
   }
 
-bg_chapter_list_t *
+gavl_chapter_list_t *
 bg_xml_2_chapter_list(xmlDocPtr xml_doc, xmlNodePtr xml_list)
   {
   int index;
-  bg_chapter_list_t * ret;
+  gavl_chapter_list_t * ret;
   char * tmp_string;
   gavl_time_t time;
   xmlNodePtr node;
   
-  ret = bg_chapter_list_create(0);
+  ret = gavl_chapter_list_create(0);
   ret->timescale = GAVL_TIME_SCALE;
   
   tmp_string = (char*)BG_XML_GET_PROP(xml_list, "timescale");
@@ -90,7 +90,7 @@
 
       tmp_string = BG_XML_GET_PROP(node, NAME_KEY);
       
-      bg_chapter_list_insert(ret, index,
+      gavl_chapter_list_insert(ret, index,
                              time, tmp_string);
       if(tmp_string)
         xmlFree(tmp_string);
@@ -101,7 +101,7 @@
   return ret;
   }
 
-void bg_chapter_list_save(bg_chapter_list_t * list, const char * filename)
+void bg_chapter_list_save(gavl_chapter_list_t * list, const char * filename)
   {
   xmlDocPtr  xml_doc;
   xmlNodePtr  xml_list;
@@ -111,18 +111,19 @@
   xmlDocSetRootElement(xml_doc, xml_list);
   
   bg_chapter_list_2_xml(list, xml_list);
-  xmlSaveFile(filename, xml_doc);
+
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   }
 
-bg_chapter_list_t * bg_chapter_list_load(const char * filename)
+gavl_chapter_list_t * bg_chapter_list_load(const char * filename)
   {
   xmlDocPtr xml_doc;
   xmlNodePtr node;
 
-  bg_chapter_list_t * ret;
+  gavl_chapter_list_t * ret;
 
-  xml_doc = bg_xml_parse_file(filename);
+  xml_doc = bg_xml_parse_file(filename, 1);
 
   if(!xml_doc)
     return NULL;

gmerlin-1.2.0.tar.gz/lib/charset.c -> gmerlin-4256.tar.gz/lib/charset.c Changed

gmerlin-1.2.0.tar.gz/lib/cmdline.c -> gmerlin-4256.tar.gz/lib/cmdline.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -33,6 +33,8 @@
 #include <gmerlin/cfg_registry.h>
 #include <gmerlin/cmdline.h>
 #include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "cmdline"
 
 static const bg_cmdline_app_data_t * app_data;
 
@@ -173,7 +175,22 @@
       /* Do nothing */
       break;
     case BG_HELP_FORMAT_MAN:
-      fprintf(out, ".B %s\n", str);
+      {
+      const char * pos;
+
+      fprintf(out, ".B ");
+
+      pos = str;
+      while(*pos)
+        {
+        if(*pos == '-')
+          fprintf(out, "\\%c", *pos);
+        else
+          fprintf(out, "%c", *pos);
+        pos++;
+        }
+      }
+      fprintf(out, "\n");
       break;
     case BG_HELP_FORMAT_TEXI:
       fprintf(out, "@b{");
@@ -383,10 +400,14 @@
 
       free(string_uc);
 
-      printf(".SH NAME\n%s\n", app_data->name);
+      if(app_data->long_name)
+        printf(".SH NAME\n%s \\- %s\n", app_data->name,
+               app_data->long_name);
+      else
+        printf(".SH NAME\n%s\n", app_data->name);
+        
       printf(".SH SYNOPSIS\n.B %s \n", app_data->name);
-      tmp_string = bg_strdup(NULL,
-                             TRD(app_data->synopsis, app_data->package));
+      tmp_string = gavl_strdup(TRD(app_data->synopsis, app_data->package));
       
       args = bg_strbreak(tmp_string, ' ');
       i = 0;
@@ -553,9 +574,7 @@
   i = 1;
 
   if(parse_auto)
-    {
     cmdline_parse(auto_options, argc, _argv, NULL, 0);
-    }
   
   if(!args)
     return;
@@ -575,10 +594,16 @@
         bg_cmdline_remove_arg(argc, _argv, i);
         if(args[j].callback)
           args[j].callback(callback_data, argc, _argv, i);
-        else if(args[j].parameters)
+        if(args[j].argv)
           {
+          if(i >= *argc)
+            {
+            fprintf(stderr, "Option %s requires an argument\n", args[j].arg);
+            exit(-1);
+            }
+          *args[j].argv = argv[i];
+          bg_cmdline_remove_arg(argc, _argv, i);
           }
-          
         found = 1;
         break;
         }
@@ -657,17 +682,100 @@
                              const bg_parameter_info_t * parameters,
                              const char * option_string)
   {
+  bg_cfg_section_t * section_priv = NULL;
+
+  if(!section)
+    {
+    section_priv = 
+      bg_cfg_section_create_from_parameters("sec", parameters);
+    section = section_priv;
+    }
+
   if(!bg_cfg_section_set_parameters_from_string(section,
                                                 parameters,
                                                 option_string))
+    {
+    if(section_priv)
+      bg_cfg_section_destroy(section_priv);
     return 0;
+    }
   /* Now, apply the section */
   if(set_parameter)
     bg_cfg_section_apply(section, parameters, set_parameter, data);
+
+  if(section_priv)
+    bg_cfg_section_destroy(section_priv);
   return 1;
   }
 
+static char * create_stream_key(int stream)
+  {
+  if(stream < 0)
+    return gavl_strdup("opt");
+  else
+    return bg_sprintf("opt_%d", stream);
+  }
 
+int bg_cmdline_set_stream_options(gavl_metadata_t * m,
+                                  const char * option_string)
+  {
+  int stream;
+  char * key;
+  /* Options can be prepended by <num>: to specify a particular
+     stream or global */
+  if(isdigit(*option_string))
+    {
+    char * rest;
+    stream = strtol(option_string, &rest, 10);
+    if(!rest || (*rest != ':'))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid stream options %s", option_string);
+      return 0;
+      }
+    if(stream <= 0)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid stream index %d", stream);
+      return 0;
+      }
+
+    stream--; // off by one
+    rest++;   // Skip ':'
+
+    key = create_stream_key(stream);
+    gavl_metadata_set(m, key, rest);
+    free(key);
+    }
+  else
+    {
+    key = create_stream_key(-1);
+    gavl_metadata_set(m, key, option_string);
+    free(key);
+    }
+  return 1;
+  }
+
+const char *
+bg_cmdline_get_stream_options(gavl_metadata_t * m, int stream)
+  {
+  const char * ret;
+  char * key;
+
+  /* Try specific option */
+  key = create_stream_key(stream);
+  ret = gavl_metadata_get(m, key);
+  free(key);
+
+  if(ret)
+    return ret;
+
+  /* Try generic option */
+  key = create_stream_key(-1);
+  ret = gavl_metadata_get(m, key);
+  free(key);
+
+  return ret; // Can be NULL
+
+  }
 
 static void print_help_parameters(int indent,
                                   const bg_parameter_info_t * parameters,
@@ -1108,3 +1216,30 @@
   {
   app_data = data;
   }
+
+void bg_cmdline_arg_set_parameters(bg_cmdline_arg_t * args, const char * opt,
+                                   const bg_parameter_info_t * params)
+  {
+  int i = 0;
+  while(args[i].arg)
+    {
+    if(!strcmp(args[i].arg, opt))
+      {
+      args[i].parameters = params;
+      return;
+      }
+    i++;
+    }
+  }
+
+int bg_cmdline_check_unsupported(int argc, char ** argv)
+  {
+  int ret = 1;
+  int i;
+  for(i = 1; i < argc; i++)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported option: %s", argv[i]);
+    ret = 0;
+    }
+  return ret;
+  }

gmerlin-4256.tar.gz/lib/colormatrix.c Added

@@ -0,0 +1,1467 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <config.h>
+
+#include <gavl/gavl.h>
+#include <gmerlin/colormatrix.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "colormatrix"
+
+#define CLAMP_FLOAT(val) (val > 1.0) ? 1.0 : ((val < 0.0) ? 0.0 : val)
+#define CLAMP_FLOAT_UV(val) (val > 0.5) ? 0.5 : ((val < -0.5) ? -0.5 : val)
+
+typedef struct
+  {
+  float coeffs_f[4][5];
+  int   coeffs_i[4][5];
+  } matrix_t;
+
+#if 0
+static void dump_matrix(float coeffs_f[4][5])
+  {
+  int i;
+  fprintf(stderr, "Matrix\n");
+  for(i = 0; i < 4; i++)
+    {
+    fprintf(stderr, "%f %f %f %f %f\n",
+            coeffs_f[i][0],
+            coeffs_f[i][1],
+            coeffs_f[i][2],
+            coeffs_f[i][3],
+            coeffs_f[i][4]);
+    }
+  }
+#endif
+
+struct bg_colormatrix_s
+  {
+  matrix_t rgba;
+  matrix_t yuva;
+  
+  void (*func)(void * priv, int start, int end);
+  gavl_video_format_t format;
+
+  /* Multithreading stuff */
+
+  gavl_video_run_func run_func;
+  void * run_data;
+  gavl_video_stop_func stop_func;
+  void * stop_data;
+  int num_threads;
+
+  gavl_video_frame_t * frame;
+  };
+
+static void matrixmult_cn(const float coeffs1[4][5],
+                          float coeffs2[4][5],
+                          float result[4][5])
+  {
+  int i, j;
+
+  for(i = 0; i < 4; i++)
+    {
+    for(j = 0; j < 5; j++)
+      {
+      result[i][j] = 
+        coeffs1[i][0] * coeffs2[0][j] +
+        coeffs1[i][1] * coeffs2[1][j] +
+        coeffs1[i][2] * coeffs2[2][j] +
+        coeffs1[i][3] * coeffs2[3][j];
+      }
+    result[i][4] += coeffs1[i][4];
+    }
+  }
+
+static void matrixmult_nc(float coeffs1[4][5],
+                          const float coeffs2[4][5],
+                          float result[4][5])
+  {
+  int i, j;
+
+  for(i = 0; i < 4; i++)
+    {
+    for(j = 0; j < 5; j++)
+      {
+      result[i][j] = 
+        coeffs1[i][0] * coeffs2[0][j] +
+        coeffs1[i][1] * coeffs2[1][j] +
+        coeffs1[i][2] * coeffs2[2][j] +
+        coeffs1[i][3] * coeffs2[3][j];
+      }
+    result[i][4] += coeffs1[i][4];
+    }
+  }
+
+static const float rgba_2_yuva[4][5] =
+  {
+    /*       ry         gy         by   ay   oy */
+    {  0.299000,  0.587000,  0.114000, 0.0, 0.0 },
+    /*       ru         gu         bu   au   ou */
+    { -0.168736, -0.331264,  0.500000, 0.0, 0.0 },
+    /*       rv         gv         bv   av   ov */
+    {  0.500000, -0.418688, -0.081312, 0.0, 0.0 },
+    /*       ra         ga         ba   aa   oa */
+    {       0.0,       0.0,       0.0, 1.0, 0.0 },
+  };
+
+
+static const float yuva_2_rgba[4][5] =
+  {
+    /* yr         ur         vr   ar   or */
+    { 1.0,  0.000000,  1.402000, 0.0, 0.0 },
+    /* yg         ug         vg   ag   og */
+    { 1.0, -0.344136, -0.714136, 0.0, 0.0},
+    /* yb         ub         vb   ab   ob */
+    { 1.0,  1.772000,  0.000000, 0.0, 0.0},
+    /* ya         ua         va   aa   oa */
+    { 0.0,  0.000000,  0.000000, 1.0, 0.0 },
+  };
+
+static void colormatrix_rgb2yuv(float coeffs_in[4][5],
+                                float coeffs_out[4][5])
+  {
+  float coeffs_tmp[4][5];
+  matrixmult_cn(rgba_2_yuva, coeffs_in, coeffs_tmp);
+  matrixmult_nc(coeffs_tmp, yuva_2_rgba, coeffs_out);
+  }
+
+static void colormatrix_yuv2rgb(float coeffs_in[4][5],
+                                float coeffs_out[4][5])
+  {
+  float coeffs_tmp[4][5];
+  matrixmult_cn(yuva_2_rgba,  coeffs_in, coeffs_tmp);
+  matrixmult_nc(coeffs_tmp, rgba_2_yuva, coeffs_out);
+  }
+
+static void colormatrix_set_4(float coeffs_in[4][5],
+                              float coeffs_out[4][5])
+  {
+  int i, j;
+  for(i = 0; i < 4; i++)
+    {
+    for(j = 0; j < 5; j++)
+      coeffs_out[i][j] = coeffs_in[i][j];
+    }
+  }
+
+static void colormatrix_set_3(float coeffs_in[3][4],
+                              float coeffs_out[4][5])
+  {
+  int i, j;
+  for(i = 0; i < 3; i++)
+    {
+    for(j = 0; j < 3; j++)
+      coeffs_out[i][j] = coeffs_in[i][j];
+    
+    coeffs_out[i][3] = 0.0;
+    coeffs_out[i][4] = coeffs_in[i][3];
+    }
+  coeffs_out[3][0] = 0.0;
+  coeffs_out[3][1] = 0.0;
+  coeffs_out[3][2] = 0.0;
+  coeffs_out[3][3] = 1.0;
+  }
+
+bg_colormatrix_t * bg_colormatrix_create()
+  {
+  bg_colormatrix_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  
+  return ret;
+  }
+
+void bg_colormatrix_destroy(bg_colormatrix_t * m)
+  {
+  free(m);
+  }
+
+/* */
+
+/* Gray */
+
+static void process_gray_8(void * priv, int start, int end)
+  {
+  int g;
+  int i, j;
+  uint8_t * src;
+
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      g =
+        ((m->yuva.coeffs_i[0][0] * src[0]) >> 8) +
+        m->yuva.coeffs_i[0][4];
+      
+      src[0] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src++;
+      }
+    }
+  
+  }
+
+
+static void process_graya_16(void * priv, int start, int end)
+  {
+  int g, a;
+  int i, j;
+  uint8_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      g =
+        ((m->yuva.coeffs_i[0][0] * (src[0]) +
+          m->yuva.coeffs_i[0][3] * src[1]) >> 8) +
+        m->yuva.coeffs_i[0][4];
+      
+      a =
+        ((m->yuva.coeffs_i[3][0] * (src[0]) +
+          m->yuva.coeffs_i[3][3] * src[1]) >> 8) +
+        m->yuva.coeffs_i[3][4];
+
+      src[0] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src[1] = (uint8_t)((a & ~0xFF)?((-a) >> 31) : a);
+      
+      src += 2;
+      }
+    }
+  
+  }
+
+/* */
+
+static void process_gray_16(void * priv, int start, int end)
+  {
+  int64_t g;
+  int i, j;
+  uint16_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      g =
+        (((int64_t)m->yuva.coeffs_i[0][0] * src[0]) >> 16) +
+        m->yuva.coeffs_i[0][4];
+      
+      src[0] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
+      src++;
+      }
+    }
+  
+  }
+
+
+static void process_graya_32(void * priv, int start, int end)
+  {
+  int64_t g, a;
+  int i, j;
+  uint16_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      g =
+        (((int64_t)m->yuva.coeffs_i[0][0] * (src[0]) +
+          m->yuva.coeffs_i[0][3] * src[1]) >> 16) +
+        m->yuva.coeffs_i[0][4];
+      
+      a =
+        (((int64_t)m->yuva.coeffs_i[3][0] * (src[0]) +
+          m->yuva.coeffs_i[3][3] * src[1]) >> 16) +
+        m->yuva.coeffs_i[3][4];
+      
+      src[0] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
+      src[1] = (uint16_t)((a & ~0xFFFF)?((-a) >> 63) : a);
+      
+      src += 2;
+      }
+    }
+  
+  }
+
+
+static void process_gray_float(void * priv, int start, int end)
+  {
+  float g;
+  int i, j;
+  float * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (float*)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      g =
+        (m->yuva.coeffs_f[0][0] * src[0]) + m->yuva.coeffs_f[0][4];
+      
+      src[0] = CLAMP_FLOAT(g);
+      src++;
+      }
+    }
+  
+  }
+
+
+static void process_graya_float(void * priv, int start, int end)
+  {
+  float g, a;
+  int i, j;
+  float * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (float*)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      g =
+        ((m->yuva.coeffs_f[0][0] * (src[0]) +
+          m->yuva.coeffs_f[0][3] * src[1])) +
+        m->yuva.coeffs_f[0][4];
+      
+      a =
+        ((m->yuva.coeffs_f[3][0] * (src[0]) +
+          m->yuva.coeffs_f[3][3] * src[1])) +
+        m->yuva.coeffs_f[3][4];
+      
+      src[0] = CLAMP_FLOAT(g);
+      src[1] = CLAMP_FLOAT(a);
+      
+      src += 2;
+      }
+    }
+  
+  }
+
+
+
+
+
+/* RGB(A) 8 bit */
+
+
+static void process_bgr_24(void * priv, int start, int end)
+  {
+  int i, j;
+  int r, g, b;
+  uint8_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        ((m->rgba.coeffs_i[0][0] * src[2] +
+          m->rgba.coeffs_i[0][1] * src[1] + 
+          m->rgba.coeffs_i[0][2] * src[0]) >> 8) +
+        m->rgba.coeffs_i[0][4];
+      
+      g =
+        ((m->rgba.coeffs_i[1][0] * src[2] +
+          m->rgba.coeffs_i[1][1] * src[1] + 
+          m->rgba.coeffs_i[1][2] * src[0]) >> 8) +
+        m->rgba.coeffs_i[1][4];
+      
+      b =
+        ((m->rgba.coeffs_i[2][0] * src[2] +
+          m->rgba.coeffs_i[2][1] * src[1] + 
+          m->rgba.coeffs_i[2][2] * src[0]) >> 8) +
+        m->rgba.coeffs_i[2][4];
+      
+      src[2] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
+      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src[0] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
+      
+      src += 3;
+      }
+    }
+  }
+
+static void process_rgb_24(void * priv, int start, int end)
+  {
+  int i, j;
+  int r, g, b;
+  uint8_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        ((m->rgba.coeffs_i[0][0] * src[0] +
+          m->rgba.coeffs_i[0][1] * src[1] + 
+          m->rgba.coeffs_i[0][2] * src[2]) >> 8) +
+        m->rgba.coeffs_i[0][4];
+      
+      g =
+        ((m->rgba.coeffs_i[1][0] * src[0] +
+          m->rgba.coeffs_i[1][1] * src[1] + 
+          m->rgba.coeffs_i[1][2] * src[2]) >> 8) +
+        m->rgba.coeffs_i[1][4];
+      
+      b =
+        ((m->rgba.coeffs_i[2][0] * src[0] +
+          m->rgba.coeffs_i[2][1] * src[1] + 
+          m->rgba.coeffs_i[2][2] * src[2]) >> 8) +
+        m->rgba.coeffs_i[2][4];
+      
+      src[0] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
+      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src[2] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
+      
+      src += 3;
+      }
+    }
+  }
+
+
+static void process_bgr_32(void * priv, int start, int end)
+  {
+  int i, j;
+  int r, g, b;
+  uint8_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        ((m->rgba.coeffs_i[0][0] * src[2] +
+          m->rgba.coeffs_i[0][1] * src[1] + 
+          m->rgba.coeffs_i[0][2] * src[0]) >> 8) +
+        m->rgba.coeffs_i[0][4];
+      
+      g =
+        ((m->rgba.coeffs_i[1][0] * src[2] +
+          m->rgba.coeffs_i[1][1] * src[1] + 
+          m->rgba.coeffs_i[1][2] * src[0]) >> 8) +
+        m->rgba.coeffs_i[1][4];
+      
+      b =
+        ((m->rgba.coeffs_i[2][0] * src[2] +
+          m->rgba.coeffs_i[2][1] * src[1] + 
+          m->rgba.coeffs_i[2][2] * src[0]) >> 8) +
+        m->rgba.coeffs_i[2][4];
+      
+      src[2] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
+      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src[0] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
+      
+      src += 4;
+      }
+    }
+  }
+
+static void process_rgb_32(void * priv, int start, int end)
+  {
+  int i, j;
+  int r, g, b;
+  uint8_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        ((m->rgba.coeffs_i[0][0] * src[0] +
+          m->rgba.coeffs_i[0][1] * src[1] + 
+          m->rgba.coeffs_i[0][2] * src[2]) >> 8) +
+        m->rgba.coeffs_i[0][4];
+      
+      g =
+        ((m->rgba.coeffs_i[1][0] * src[0] +
+          m->rgba.coeffs_i[1][1] * src[1] + 
+          m->rgba.coeffs_i[1][2] * src[2]) >> 8) +
+        m->rgba.coeffs_i[1][4];
+      
+      b =
+        ((m->rgba.coeffs_i[2][0] * src[0] +
+          m->rgba.coeffs_i[2][1] * src[1] + 
+          m->rgba.coeffs_i[2][2] * src[2]) >> 8) +
+        m->rgba.coeffs_i[2][4];
+      
+      src[0] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
+      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src[2] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
+      
+      src += 4;
+      }
+    }
+  }
+
+static void process_rgba_32(void * priv, int start, int end)
+  {
+  int i, j;
+  uint8_t * src;
+  int r, g, b, a;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        ((m->rgba.coeffs_i[0][0] * src[0] +
+          m->rgba.coeffs_i[0][1] * src[1] + 
+          m->rgba.coeffs_i[0][2] * src[2] + 
+          m->rgba.coeffs_i[0][3] * src[3]) >> 8) +
+        m->rgba.coeffs_i[0][4];
+      
+      g =
+        ((m->rgba.coeffs_i[1][0] * src[0] +
+          m->rgba.coeffs_i[1][1] * src[1] + 
+          m->rgba.coeffs_i[1][2] * src[2] + 
+          m->rgba.coeffs_i[1][3] * src[3]) >> 8) +
+        m->rgba.coeffs_i[1][4];
+      
+      b =
+        ((m->rgba.coeffs_i[2][0] * src[0] +
+          m->rgba.coeffs_i[2][1] * src[1] + 
+          m->rgba.coeffs_i[2][2] * src[2] + 
+          m->rgba.coeffs_i[2][3] * src[3]) >> 8) +
+        m->rgba.coeffs_i[2][4];
+
+      a =
+        ((m->rgba.coeffs_i[3][0] * src[0] +
+          m->rgba.coeffs_i[3][1] * src[1] + 
+          m->rgba.coeffs_i[3][2] * src[2] + 
+          m->rgba.coeffs_i[3][3] * src[3]) >> 8) +
+        m->rgba.coeffs_i[3][4];
+
+      src[0] = (uint8_t)((r & ~0xFF)?((-r) >> 31) : r);
+      src[1] = (uint8_t)((g & ~0xFF)?((-g) >> 31) : g);
+      src[2] = (uint8_t)((b & ~0xFF)?((-b) >> 31) : b);
+      src[3] = (uint8_t)((a & ~0xFF)?((-a) >> 31) : a);
+      
+      src += 4;
+      }
+    }
+  
+  }
+
+/* RGB(A) 16 bit */
+
+static void process_rgb_48(void * priv, int start, int end)
+  {
+  int64_t r, g, b;
+  int i, j;
+  uint16_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+
+  for(i = start; i < end; i++)
+    {
+    src = (uint16_t *)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        (((int64_t)m->rgba.coeffs_i[0][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[0][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[0][2] * (int64_t)src[2]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[0][4];
+      
+      g =
+        (((int64_t)m->rgba.coeffs_i[1][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[1][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[1][2] * (int64_t)src[2]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[1][4];
+      
+      b =
+        (((int64_t)m->rgba.coeffs_i[2][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[2][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[2][2] * (int64_t)src[2]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[2][4];
+
+      src[0] = (uint16_t)((r & ~0xFFFF)?((-r) >> 63) : r);
+      src[1] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
+      src[2] = (uint16_t)((b & ~0xFFFF)?((-b) >> 63) : b);
+      
+      src += 3;
+      }
+    }
+  }
+
+static void process_rgba_64(void * priv, int start, int end)
+  {
+  int64_t r, g, b, a;
+  int i, j;
+  uint16_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+
+  for(i = start; i < end; i++)
+    {
+    src = (uint16_t *)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        (((int64_t)m->rgba.coeffs_i[0][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[0][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[0][2] * (int64_t)src[2] + 
+          (int64_t)m->rgba.coeffs_i[0][3] * (int64_t)src[3]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[0][4];
+      
+      g =
+        (((int64_t)m->rgba.coeffs_i[1][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[1][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[1][2] * (int64_t)src[2] + 
+          (int64_t)m->rgba.coeffs_i[1][3] * (int64_t)src[3]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[1][4];
+      
+      b =
+        (((int64_t)m->rgba.coeffs_i[2][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[2][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[2][2] * (int64_t)src[2] + 
+          (int64_t)m->rgba.coeffs_i[2][3] * (int64_t)src[3]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[2][4];
+
+      a =
+        (((int64_t)m->rgba.coeffs_i[3][0] * (int64_t)src[0] +
+          (int64_t)m->rgba.coeffs_i[3][1] * (int64_t)src[1] + 
+          (int64_t)m->rgba.coeffs_i[3][2] * (int64_t)src[2] + 
+          (int64_t)m->rgba.coeffs_i[3][3] * (int64_t)src[3]) >> 16) +
+        (int64_t)m->rgba.coeffs_i[3][4];
+
+      src[0] = (uint16_t)((r & ~0xFFFF)?((-r) >> 63) : r);
+      src[1] = (uint16_t)((g & ~0xFFFF)?((-g) >> 63) : g);
+      src[2] = (uint16_t)((b & ~0xFFff)?((-b) >> 63) : b);
+      src[3] = (uint16_t)((a & ~0xFFFF)?((-a) >> 63) : a);
+      
+      src += 4;
+      }
+    }
+  
+  }
+
+
+/* Float */
+
+static void process_rgb_float(void * priv, int start, int end)
+  {
+  int i, j;
+  float * src;
+  float r, g, b;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+
+  for(i = start; i < end; i++)
+    {
+    src = (float *)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        m->rgba.coeffs_f[0][0] * src[0] +
+        m->rgba.coeffs_f[0][1] * src[1] + 
+        m->rgba.coeffs_f[0][2] * src[2] +
+        m->rgba.coeffs_f[0][4];
+      g =
+        m->rgba.coeffs_f[1][0] * src[0] +
+        m->rgba.coeffs_f[1][1] * src[1] + 
+        m->rgba.coeffs_f[1][2] * src[2] +
+        m->rgba.coeffs_f[1][4];
+      b =
+        m->rgba.coeffs_f[2][0] * src[0] +
+        m->rgba.coeffs_f[2][1] * src[1] + 
+        m->rgba.coeffs_f[2][2] * src[2] +
+        m->rgba.coeffs_f[2][4];
+      src[0] = CLAMP_FLOAT(r);
+      src[1] = CLAMP_FLOAT(g);
+      src[2] = CLAMP_FLOAT(b);
+      src += 3;
+      }
+    }
+  }
+
+
+static void process_rgba_float(void * priv, int start, int end)
+  {
+  int i, j;
+  float * src;
+  float r, g, b, a;
+
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+
+  for(i = start; i < end; i++)
+    {
+    src = (float *)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      r =
+        m->rgba.coeffs_f[0][0] * src[0] +
+        m->rgba.coeffs_f[0][1] * src[1] + 
+        m->rgba.coeffs_f[0][2] * src[2] +
+        m->rgba.coeffs_f[0][3] * src[3] +
+        m->rgba.coeffs_f[0][4];
+      g =
+        m->rgba.coeffs_f[1][0] * src[0] +
+        m->rgba.coeffs_f[1][1] * src[1] + 
+        m->rgba.coeffs_f[1][2] * src[2] +
+        m->rgba.coeffs_f[1][3] * src[3] +
+        m->rgba.coeffs_f[1][4];
+      b =
+        m->rgba.coeffs_f[2][0] * src[0] +
+        m->rgba.coeffs_f[2][1] * src[1] + 
+        m->rgba.coeffs_f[2][2] * src[2] +
+        m->rgba.coeffs_f[2][3] * src[3] +
+        m->rgba.coeffs_f[2][4];
+      a =
+        m->rgba.coeffs_f[3][0] * src[0] +
+        m->rgba.coeffs_f[3][1] * src[1] + 
+        m->rgba.coeffs_f[3][2] * src[2] +
+        m->rgba.coeffs_f[3][3] * src[3] +
+        m->rgba.coeffs_f[3][4];
+      src[0] = CLAMP_FLOAT(r);
+      src[1] = CLAMP_FLOAT(g);
+      src[2] = CLAMP_FLOAT(b);
+      src[3] = CLAMP_FLOAT(a);
+      
+      src += 4;
+      }
+    }
+  }
+
+static void process_yuv_float(void * priv, int start, int end)
+  {
+  int i, j;
+  float * src;
+  float y, u, v;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (float *)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        m->yuva.coeffs_f[0][0] * src[0] +
+        m->yuva.coeffs_f[0][1] * src[1] + 
+        m->yuva.coeffs_f[0][2] * src[2] +
+        m->yuva.coeffs_f[0][4];
+      u =
+        m->yuva.coeffs_f[1][0] * src[0] +
+        m->yuva.coeffs_f[1][1] * src[1] + 
+        m->yuva.coeffs_f[1][2] * src[2] +
+        m->yuva.coeffs_f[1][4];
+      v =
+        m->yuva.coeffs_f[2][0] * src[0] +
+        m->yuva.coeffs_f[2][1] * src[1] + 
+        m->yuva.coeffs_f[2][2] * src[2] +
+        m->yuva.coeffs_f[2][4];
+      src[0] = CLAMP_FLOAT(y);
+      src[1] = CLAMP_FLOAT_UV(u);
+      src[2] = CLAMP_FLOAT_UV(v);
+      src += 3;
+      }
+    }
+  }
+
+
+static void process_yuva_float(void * priv, int start, int end)
+  {
+  int i, j;
+  float * src;
+  float y, u, v, a;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (float *)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        m->yuva.coeffs_f[0][0] * src[0] +
+        m->yuva.coeffs_f[0][1] * src[1] + 
+        m->yuva.coeffs_f[0][2] * src[2] +
+        m->yuva.coeffs_f[0][3] * src[3] +
+        m->yuva.coeffs_f[0][4];
+      u =
+        m->yuva.coeffs_f[1][0] * src[0] +
+        m->yuva.coeffs_f[1][1] * src[1] + 
+        m->yuva.coeffs_f[1][2] * src[2] +
+        m->yuva.coeffs_f[1][3] * src[3] +
+        m->yuva.coeffs_f[1][4];
+      v =
+        m->yuva.coeffs_f[2][0] * src[0] +
+        m->yuva.coeffs_f[2][1] * src[1] + 
+        m->yuva.coeffs_f[2][2] * src[2] +
+        m->yuva.coeffs_f[2][3] * src[3] +
+        m->yuva.coeffs_f[2][4];
+      a =
+        m->yuva.coeffs_f[3][0] * src[0] +
+        m->yuva.coeffs_f[3][1] * src[1] + 
+        m->yuva.coeffs_f[3][2] * src[2] +
+        m->yuva.coeffs_f[3][3] * src[3] +
+        m->yuva.coeffs_f[3][4];
+      src[0] = CLAMP_FLOAT(y);
+      src[1] = CLAMP_FLOAT_UV(u);
+      src[2] = CLAMP_FLOAT_UV(v);
+      src[3] = CLAMP_FLOAT(a);
+      
+      src += 4;
+      }
+    }
+  }
+
+static void process_yuva_32(void * priv, int start, int end)
+  {
+  int y, u, v, a;
+  int i, j;
+  uint8_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = in->planes[0]  + i * in->strides[0];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        ((m->yuva.coeffs_i[0][0] * (src[0] - 0x10) +
+          m->yuva.coeffs_i[0][1] * (src[1] - 0x80) + 
+          m->yuva.coeffs_i[0][2] * (src[2] - 0x80) + 
+          m->yuva.coeffs_i[0][3] * src[3]) >> 8) +
+        m->yuva.coeffs_i[0][4];
+      y += 0x10;
+      
+      u =
+        ((m->yuva.coeffs_i[1][0] * (src[0] - 0x10) +
+          m->yuva.coeffs_i[1][1] * (src[1] - 0x80) + 
+          m->yuva.coeffs_i[1][2] * (src[2] - 0x80) + 
+          m->yuva.coeffs_i[1][3] * src[3]) >> 8) +
+        m->yuva.coeffs_i[1][4];
+      u += 0x80;
+      
+      v =
+        ((m->yuva.coeffs_i[2][0] * (src[0] - 0x10) +
+          m->yuva.coeffs_i[2][1] * (src[1] - 0x80) + 
+          m->yuva.coeffs_i[2][2] * (src[2] - 0x80) + 
+          m->yuva.coeffs_i[2][3] * src[3]) >> 8) +
+        m->yuva.coeffs_i[2][4];
+      v += 0x80;
+
+      a =
+        ((m->yuva.coeffs_i[3][0] * (src[0] - 0x10) +
+          m->yuva.coeffs_i[3][1] * (src[1] - 0x80) + 
+          m->yuva.coeffs_i[3][2] * (src[2] - 0x80) + 
+          m->yuva.coeffs_i[3][3] * src[3]) >> 8) +
+        m->yuva.coeffs_i[3][4];
+
+      src[0] = (uint8_t)((y & ~0xFF)?((-y) >> 31) : y);
+      src[1] = (uint8_t)((u & ~0xFF)?((-u) >> 31) : u);
+      src[2] = (uint8_t)((v & ~0xFF)?((-v) >> 31) : v);
+      src[3] = (uint8_t)((a & ~0xFF)?((-a) >> 31) : a);
+      
+      src += 4;
+      }
+    }
+  
+  }
+
+static void process_yuva_64(void * priv, int start, int end)
+  {
+  int64_t y, u, v, a;
+  int i, j;
+  uint16_t * src;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  for(i = start; i < end; i++)
+    {
+    src = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        (((int64_t)m->yuva.coeffs_i[0][0] * (src[0] - 0x1000) +
+          m->yuva.coeffs_i[0][1] * (src[1] - 0x8000) + 
+          m->yuva.coeffs_i[0][2] * (src[2] - 0x8000) + 
+          m->yuva.coeffs_i[0][3] * src[3]) >> 16) +
+        m->yuva.coeffs_i[0][4];
+      y += 0x1000;
+      
+      u =
+        (((int64_t)m->yuva.coeffs_i[1][0] * (src[0] - 0x1000) +
+          m->yuva.coeffs_i[1][1] * (src[1] - 0x8000) + 
+          m->yuva.coeffs_i[1][2] * (src[2] - 0x8000) + 
+          m->yuva.coeffs_i[1][3] * src[3]) >> 16) +
+        m->yuva.coeffs_i[1][4];
+      u += 0x8000;
+      
+      v =
+        (((int64_t)m->yuva.coeffs_i[2][0] * (src[0] - 0x1000) +
+          m->yuva.coeffs_i[2][1] * (src[1] - 0x8000) + 
+          m->yuva.coeffs_i[2][2] * (src[2] - 0x8000) + 
+          m->yuva.coeffs_i[2][3] * src[3]) >> 16) +
+        m->yuva.coeffs_i[2][4];
+      v += 0x8000;
+
+      a =
+        (((int64_t)m->yuva.coeffs_i[3][0] * (src[0] - 0x1000) +
+          m->yuva.coeffs_i[3][1] * (src[1] - 0x8000) + 
+          m->yuva.coeffs_i[3][2] * (src[2] - 0x8000) + 
+          m->yuva.coeffs_i[3][3] * src[3]) >> 16) +
+        m->yuva.coeffs_i[3][4];
+
+      src[0] = (uint16_t)((y & ~0xFFFF)?((-y) >> 63) : y);
+      src[1] = (uint16_t)((u & ~0xFFFF)?((-u) >> 63) : u);
+      src[2] = (uint16_t)((v & ~0xFFFF)?((-v) >> 63) : v);
+      src[3] = (uint16_t)((a & ~0xFFFF)?((-a) >> 63) : a);
+      
+      src += 4;
+      }
+    }
+  
+  }
+
+
+
+static void process_444j(void * priv, int start, int end)
+  {
+  int y, u, v;
+  int i, j;
+  uint8_t * src_y, * src_u, *src_v;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  
+  for(i = start; i < end; i++)
+    {
+    src_y = in->planes[0]  + i * in->strides[0];
+    src_u = in->planes[1]  + i * in->strides[1];
+    src_v = in->planes[2]  + i * in->strides[2];
+
+
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        ((m->yuva.coeffs_i[0][0] * *src_y +
+          m->yuva.coeffs_i[0][1] * (*src_u-0x80) + 
+          m->yuva.coeffs_i[0][2] * (*src_v-0x80)) >> 8) +
+        m->yuva.coeffs_i[0][4];
+
+      u =
+        ((m->yuva.coeffs_i[1][0] * *src_y +
+          m->yuva.coeffs_i[1][1] * (*src_u-0x80) + 
+          m->yuva.coeffs_i[1][2] * (*src_v-0x80)) >> 8) +
+        m->yuva.coeffs_i[1][4];
+      u += 0x80;
+      
+      v =
+        ((m->yuva.coeffs_i[2][0] * *src_y +
+          m->yuva.coeffs_i[2][1] * (*src_u-0x80) + 
+          m->yuva.coeffs_i[2][2] * (*src_v-0x80)) >> 8) +
+        m->yuva.coeffs_i[2][4];
+      v += 0x80;
+
+      *src_y = (uint8_t)((y & ~0xFF)?((-y) >> 31) : y);
+      *src_u = (uint8_t)((u & ~0xFF)?((-u) >> 31) : u);
+      *src_v = (uint8_t)((v & ~0xFF)?((-v) >> 31) : v);
+      
+      src_y++;
+      src_u++;
+      src_v++;
+
+      }
+    }
+  }
+
+static void process_444(void * priv, int start, int end)
+  {
+  int y, u, v;
+  int i, j;
+  uint8_t * src_y, * src_u, *src_v;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  
+  for(i = start; i < end; i++)
+    {
+    src_y = in->planes[0]  + i * in->strides[0];
+    src_u = in->planes[1]  + i * in->strides[1];
+    src_v = in->planes[2]  + i * in->strides[2];
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        ((m->yuva.coeffs_i[0][0] * (*src_y-0x10) +
+          m->yuva.coeffs_i[0][1] * (*src_u-0x80) + 
+          m->yuva.coeffs_i[0][2] * (*src_v-0x80)) >> 8) +
+        m->yuva.coeffs_i[0][4];
+      y += 0x10;
+
+      u =
+        ((m->yuva.coeffs_i[1][0] * (*src_y-0x10) +
+          m->yuva.coeffs_i[1][1] * (*src_u-0x80) + 
+          m->yuva.coeffs_i[1][2] * (*src_v-0x80)) >> 8) +
+        m->yuva.coeffs_i[1][4];
+      u += 0x80;
+      
+      v =
+        ((m->yuva.coeffs_i[2][0] * (*src_y-0x10) +
+          m->yuva.coeffs_i[2][1] * (*src_u-0x80) + 
+          m->yuva.coeffs_i[2][2] * (*src_v-0x80)) >> 8) +
+        m->yuva.coeffs_i[2][4];
+      v += 0x80;
+
+      *src_y = (uint8_t)((y & ~0xFF)?((-y) >> 31) : y);
+      *src_u = (uint8_t)((u & ~0xFF)?((-u) >> 31) : u);
+      *src_v = (uint8_t)((v & ~0xFF)?((-v) >> 31) : v);
+      
+      src_y++;
+      src_u++;
+      src_v++;
+      
+      }
+    }
+  }
+
+static void process_444_16(void * priv, int start, int end)
+  {
+  int64_t y, u, v;
+  int i, j;
+  uint16_t * src_y, * src_u, *src_v;
+  bg_colormatrix_t * m = priv;
+  gavl_video_frame_t * in = m->frame;
+  
+  for(i = start; i < end; i++)
+    {
+    src_y = (uint16_t*)(in->planes[0]  + i * in->strides[0]);
+    src_u = (uint16_t*)(in->planes[1]  + i * in->strides[1]);
+    src_v = (uint16_t*)(in->planes[2]  + i * in->strides[2]);
+    
+    for(j = 0; j < m->format.image_width; j++)
+      {
+      y =
+        (((int64_t)m->yuva.coeffs_i[0][0] * (*src_y-0x1000) +
+          m->yuva.coeffs_i[0][1] * (*src_u-0x8000) + 
+          m->yuva.coeffs_i[0][2] * (*src_v-0x8000)) >> 16) +
+        m->yuva.coeffs_i[0][4];
+      y += 0x1000;
+      
+      
+      u =
+        (((int64_t)m->yuva.coeffs_i[1][0] * (*src_y-0x1000) +
+          m->yuva.coeffs_i[1][1] * (*src_u-0x8000) + 
+          m->yuva.coeffs_i[1][2] * (*src_v-0x8000)) >> 16) +
+        m->yuva.coeffs_i[1][4];
+      u += 0x8000;
+
+      
+      v =
+        (((int64_t)m->yuva.coeffs_i[2][0] * (*src_y-0x1000) +
+          m->yuva.coeffs_i[2][1] * (*src_u-0x8000) + 
+          m->yuva.coeffs_i[2][2] * (*src_v-0x8000)) >> 16) +
+        m->yuva.coeffs_i[2][4];
+      v += 0x8000;
+
+      *src_y = (uint16_t)((y & ~0xFFFF)?((-y) >> 63) : y);
+      *src_u = (uint16_t)((u & ~0xFFFF)?((-u) >> 63) : u);
+      *src_v = (uint16_t)((v & ~0xFFFF)?((-v) >> 63) : v);
+      
+      src_y++;
+      src_u++;
+      src_v++;
+      }
+    }
+  }
+
+
+
+static void matrix_f_to_8(matrix_t * mat)
+  {
+  int i, j;
+  for(i = 0; i < 4; i++)
+    {
+    for(j = 0; j < 5; j++)
+      mat->coeffs_i[i][j] = (int)(mat->coeffs_f[i][j] * 256.0 + 0.5);
+    }
+  }
+
+static void matrix_f_to_16(matrix_t * mat)
+  {
+  int i, j;
+  for(i = 0; i < 4; i++)
+    {
+    for(j = 0; j < 5; j++)
+      mat->coeffs_i[i][j] = (int)(mat->coeffs_f[i][j] * 65536.0 + 0.5);
+    }
+  }
+
+#define SCALE_Y    219.0
+#define SCALE_UV   224.0
+#define SCALE_A    255.0
+#define SCALE_OFF  255.0
+
+static void matrix_f_to_8_yuv(matrix_t * mat)
+  {
+
+  /* y -> y */
+  mat->coeffs_i[0][0] = (int)(mat->coeffs_f[0][0] * 256.0 + 0.5);
+  /* u -> y */
+  mat->coeffs_i[0][1] = (int)(mat->coeffs_f[0][1] * 256.0 * SCALE_Y / SCALE_UV + 0.5);
+  /* v -> y */
+  mat->coeffs_i[0][2] = (int)(mat->coeffs_f[0][2] * 256.0 * SCALE_Y / SCALE_UV + 0.5);
+  /* a -> y */
+  mat->coeffs_i[0][3] = (int)(mat->coeffs_f[0][3] * 256.0 * SCALE_Y / SCALE_A + 0.5);
+  /* y off */
+  mat->coeffs_i[0][4] = (int)(mat->coeffs_f[0][4] * 256.0 * SCALE_Y / SCALE_OFF + 0.5);
+  
+  /* y -> u */
+  mat->coeffs_i[1][0] = (int)(mat->coeffs_f[1][0] * 256.0 * SCALE_UV / SCALE_Y + 0.5);
+  /* u -> u */
+  mat->coeffs_i[1][1] = (int)(mat->coeffs_f[1][1] * 256.0 + 0.5);
+  /* v -> u */
+  mat->coeffs_i[1][2] = (int)(mat->coeffs_f[1][2] * 256.0 + 0.5);
+  /* a -> u */
+  mat->coeffs_i[1][3] = (int)(mat->coeffs_f[1][3] * 256.0 * SCALE_UV / SCALE_A + 0.5);
+  /* u off */
+  mat->coeffs_i[1][4] = (int)(mat->coeffs_f[1][4] * 256.0 * SCALE_UV / SCALE_OFF + 0.5);
+
+  /* y -> v */
+  mat->coeffs_i[2][0] = (int)(mat->coeffs_f[2][0] * 256.0 * SCALE_UV / SCALE_Y + 0.5);
+  /* u -> v */
+  mat->coeffs_i[2][1] = (int)(mat->coeffs_f[2][1] * 256.0 + 0.5);
+  /* v -> v */
+  mat->coeffs_i[2][2] = (int)(mat->coeffs_f[2][2] * 256.0 + 0.5);
+  /* a -> v */
+  mat->coeffs_i[2][3] = (int)(mat->coeffs_f[2][3] * 256.0 * SCALE_UV / SCALE_A + 0.5);
+  /* v off */
+  mat->coeffs_i[2][4] = (int)(mat->coeffs_f[2][4] * 256.0 * SCALE_UV / SCALE_OFF + 0.5);
+
+  /* y -> a */
+  mat->coeffs_i[3][0] = (int)(mat->coeffs_f[3][0] * 256.0 * SCALE_A / SCALE_Y + 0.5);
+  /* u -> a */
+  mat->coeffs_i[3][1] = (int)(mat->coeffs_f[3][1] * 256.0 * SCALE_A / SCALE_UV + 0.5);
+  /* v -> a */
+  mat->coeffs_i[3][2] = (int)(mat->coeffs_f[3][2] * 256.0 * SCALE_A / SCALE_UV + 0.5);
+  /* a -> a */
+  mat->coeffs_i[3][3] = (int)(mat->coeffs_f[3][3] * 256.0 + 0.5);
+  /* a off */
+  mat->coeffs_i[3][4] = (int)(mat->coeffs_f[3][4] * 256.0 * SCALE_A / SCALE_OFF + 0.5);
+  }
+
+static void matrix_f_to_16_yuv(matrix_t * mat)
+  {
+
+  /* y -> y */
+  mat->coeffs_i[0][0] = (int)(mat->coeffs_f[0][0] * 65536.0 + 0.5);
+  /* u -> y */
+  mat->coeffs_i[0][1] = (int)(mat->coeffs_f[0][1] * 65536.0 * SCALE_Y / SCALE_UV + 0.5);
+  /* v -> y */
+  mat->coeffs_i[0][2] = (int)(mat->coeffs_f[0][2] * 65536.0 * SCALE_Y / SCALE_UV + 0.5);
+  /* a -> y */
+  mat->coeffs_i[0][3] = (int)(mat->coeffs_f[0][3] * 65536.0 * SCALE_Y / SCALE_A + 0.5);
+  /* y off */
+  mat->coeffs_i[0][4] = (int)(mat->coeffs_f[0][4] * 65536.0 * SCALE_Y / SCALE_OFF + 0.5);
+  
+  /* y -> u */
+  mat->coeffs_i[1][0] = (int)(mat->coeffs_f[1][0] * 65536.0 * SCALE_UV / SCALE_Y + 0.5);
+  /* u -> u */
+  mat->coeffs_i[1][1] = (int)(mat->coeffs_f[1][1] * 65536.0 + 0.5);
+  /* v -> u */
+  mat->coeffs_i[1][2] = (int)(mat->coeffs_f[1][2] * 65536.0 + 0.5);
+  /* a -> u */
+  mat->coeffs_i[1][3] = (int)(mat->coeffs_f[1][3] * 65536.0 * SCALE_UV / SCALE_A + 0.5);
+  /* u off */
+  mat->coeffs_i[1][4] = (int)(mat->coeffs_f[1][4] * 65536.0 * SCALE_UV / SCALE_OFF + 0.5);
+
+  /* y -> v */
+  mat->coeffs_i[2][0] = (int)(mat->coeffs_f[2][0] * 65536.0 * SCALE_UV / SCALE_Y + 0.5);
+  /* u -> v */
+  mat->coeffs_i[2][1] = (int)(mat->coeffs_f[2][1] * 65536.0 + 0.5);
+  /* v -> v */
+  mat->coeffs_i[2][2] = (int)(mat->coeffs_f[2][2] * 65536.0 + 0.5);
+  /* a -> v */
+  mat->coeffs_i[2][3] = (int)(mat->coeffs_f[2][3] * 65536.0 * SCALE_UV / SCALE_A + 0.5);
+  /* v off */
+  mat->coeffs_i[2][4] = (int)(mat->coeffs_f[2][4] * 65536.0 * SCALE_UV / SCALE_OFF + 0.5);
+
+  /* y -> a */
+  mat->coeffs_i[3][0] = (int)(mat->coeffs_f[3][0] * 65536.0 * SCALE_A / SCALE_Y + 0.5);
+  /* u -> a */
+  mat->coeffs_i[3][1] = (int)(mat->coeffs_f[3][1] * 65536.0 * SCALE_A / SCALE_UV + 0.5);
+  /* v -> a */
+  mat->coeffs_i[3][2] = (int)(mat->coeffs_f[3][2] * 65536.0 * SCALE_A / SCALE_UV + 0.5);
+  /* a -> a */
+  mat->coeffs_i[3][3] = (int)(mat->coeffs_f[3][3] * 65536.0 + 0.5);
+  /* a off */
+  mat->coeffs_i[3][4] = (int)(mat->coeffs_f[3][4] * 65536.0 * SCALE_A / SCALE_OFF + 0.5);
+  }
+
+
+static void init_internal(bg_colormatrix_t*m)
+  {
+  switch(m->format.pixelformat)
+    {
+    case GAVL_RGB_24:
+      m->func = process_rgb_24;
+      matrix_f_to_8(&m->rgba);
+      break;
+    case GAVL_RGB_48:
+      m->func = process_rgb_48;
+      matrix_f_to_16(&m->rgba);
+      break;
+    case GAVL_RGB_FLOAT:
+      m->func = process_rgb_float;
+      break;
+    case GAVL_RGB_32:
+      m->func = process_rgb_32;
+      matrix_f_to_8(&m->rgba);
+      break;
+    case GAVL_BGR_24:
+      m->func = process_bgr_24;
+      matrix_f_to_8(&m->rgba);
+      break;
+    case GAVL_BGR_32:
+      m->func = process_bgr_32;
+      matrix_f_to_8(&m->rgba);
+      break;
+    case GAVL_RGBA_32:
+      m->func = process_rgba_32;
+      matrix_f_to_8(&m->rgba);
+      break;
+    case GAVL_RGBA_64:
+      m->func = process_rgba_64;
+      matrix_f_to_16(&m->rgba);
+      break;
+    case GAVL_RGBA_FLOAT:
+      m->func = process_rgba_float;
+      break;
+    case GAVL_YUVJ_444_P:
+      m->func = process_444j;
+      matrix_f_to_8(&m->yuva);
+      break;
+    case GAVL_YUV_444_P:
+      m->func = process_444;
+      matrix_f_to_8_yuv(&m->yuva);
+      break;
+    case GAVL_YUVA_32:
+      m->func = process_yuva_32;
+      matrix_f_to_8_yuv(&m->yuva);
+      break;
+    case GAVL_YUV_444_P_16:
+      m->func = process_444_16;
+      matrix_f_to_16_yuv(&m->yuva);
+      break;
+      /* */
+    case GAVL_GRAY_8:
+      matrix_f_to_8(&m->yuva);
+      m->func = process_gray_8;
+      break;
+    case GAVL_GRAY_16:
+      matrix_f_to_16(&m->yuva);
+      m->func = process_gray_16;
+      break;
+    case GAVL_GRAY_FLOAT:
+      m->func = process_gray_float;
+      break;
+    case GAVL_GRAYA_16:
+      matrix_f_to_8(&m->yuva);
+      m->func = process_graya_16;
+      break;
+    case GAVL_GRAYA_32:
+      matrix_f_to_16(&m->yuva);
+      m->func = process_graya_32;
+      break;
+    case GAVL_GRAYA_FLOAT:
+      m->func = process_graya_float;
+      break;
+    case GAVL_YUV_FLOAT:
+      m->func = process_yuv_float;
+      break;
+    case GAVL_YUVA_FLOAT:
+      m->func = process_yuva_float;
+      break;
+    case GAVL_YUVA_64:
+      m->func = process_yuva_64;
+      matrix_f_to_16_yuv(&m->yuva);
+      break;
+    default:
+      break;
+    }
+  }
+
+
+void bg_colormatrix_set_rgba(bg_colormatrix_t * m, float coeffs[4][5])
+  {
+  colormatrix_set_4(coeffs, m->rgba.coeffs_f);
+  colormatrix_rgb2yuv(m->rgba.coeffs_f, m->yuva.coeffs_f);
+  init_internal(m);
+  }
+
+void bg_colormatrix_set_yuva(bg_colormatrix_t * m, float coeffs[4][5])
+  {
+  colormatrix_set_4(coeffs, m->yuva.coeffs_f);
+  colormatrix_rgb2yuv(m->yuva.coeffs_f, m->rgba.coeffs_f);
+  init_internal(m);
+  }
+
+void bg_colormatrix_set_rgb(bg_colormatrix_t * m, float coeffs[3][4])
+  {
+  colormatrix_set_3(coeffs, m->rgba.coeffs_f);
+  colormatrix_rgb2yuv(m->rgba.coeffs_f, m->yuva.coeffs_f);
+  init_internal(m);
+  //  dump_matrix(m->rgba.coeffs_f);
+  //  dump_matrix(m->yuva.coeffs_f);
+  }
+
+void bg_colormatrix_set_yuv(bg_colormatrix_t * m, float coeffs[3][4])
+  {
+  colormatrix_set_3(coeffs, m->yuva.coeffs_f);
+  colormatrix_yuv2rgb(m->yuva.coeffs_f, m->rgba.coeffs_f);
+  init_internal(m);
+  }
+
+static const gavl_pixelformat_t pixelformats[] =
+  {
+    GAVL_RGB_24,
+    GAVL_RGB_48,
+    GAVL_RGB_32,
+    GAVL_BGR_24,
+    GAVL_BGR_32,
+    GAVL_RGBA_32,
+    GAVL_RGBA_64,
+    GAVL_RGB_FLOAT,
+    GAVL_RGBA_FLOAT,
+    GAVL_YUVJ_444_P,
+    GAVL_YUV_444_P,
+    GAVL_YUV_444_P_16,
+    GAVL_YUVA_32,
+    GAVL_GRAY_8,
+    GAVL_GRAY_16,
+    GAVL_GRAY_FLOAT,
+    GAVL_GRAYA_16,
+    GAVL_GRAYA_32,
+    GAVL_GRAYA_FLOAT,
+    GAVL_YUV_FLOAT,
+    GAVL_YUVA_FLOAT,
+    GAVL_YUVA_64,
+    GAVL_PIXELFORMAT_NONE,
+  };
+
+static const gavl_pixelformat_t pixelformats_alpha[] =
+  {
+    GAVL_RGBA_32,
+    GAVL_RGBA_64,
+    GAVL_YUVA_32,
+    GAVL_YUVA_FLOAT,
+    GAVL_RGBA_FLOAT,
+    GAVL_PIXELFORMAT_NONE,
+  };
+
+
+void bg_colormatrix_init(bg_colormatrix_t * m,
+                         gavl_video_format_t * format, int flags,
+                         gavl_video_options_t * opt)
+  {
+  m->run_func  = gavl_video_options_get_run_func(opt, &m->run_data);
+  m->stop_func = gavl_video_options_get_stop_func(opt, &m->stop_data);
+  m->num_threads = gavl_video_options_get_num_threads(opt);
+  
+  if(flags & BG_COLORMATRIX_FORCE_ALPHA)
+    format->pixelformat = gavl_pixelformat_get_best(format->pixelformat,
+                                                    pixelformats_alpha,
+                                                    NULL);
+  else
+    format->pixelformat = gavl_pixelformat_get_best(format->pixelformat,
+                                                    pixelformats,
+                                                    NULL);
+  
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Pixelformat: %s",
+         TRD(gavl_pixelformat_to_string(format->pixelformat), NULL));
+  
+  gavl_video_format_copy(&m->format, format);
+  init_internal(m);
+  
+  }
+
+void bg_colormatrix_process(bg_colormatrix_t * m,
+                            gavl_video_frame_t * in_frame)
+  {
+  int j, nt, scanline, delta;
+
+  m->frame = in_frame;
+  
+  nt = m->num_threads;
+  if(nt > m->format.image_height)
+    nt = m->format.image_height;
+
+  delta = m->format.image_height / nt;
+  scanline = 0;
+
+  for(j = 0; j < nt - 1; j++)
+    {
+    m->run_func(m->func, m, scanline, scanline+delta, m->run_data, j);
+    scanline += delta;
+    }
+  m->run_func(m->func, m, scanline, m->format.image_height,
+              m->run_data, nt - 1);
+  
+  for(j = 0; j < nt; j++)
+    m->stop_func(m->stop_data, j);
+  }
+

gmerlin-1.2.0.tar.gz/lib/converters.c -> gmerlin-4256.tar.gz/lib/converters.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -328,14 +328,14 @@
       cnv->convert_framerate = 1;
 
       if(cnv->in_format.framerate_mode == GAVL_FRAMERATE_VARIABLE)
-        str1 = bg_strdup(NULL, TR("variable"));
+        str1 = gavl_strdup(TR("variable"));
       else
         str1 = bg_sprintf("%5.2f",
                           (float)(cnv->in_format.timescale) /
                           (float)(cnv->in_format.frame_duration));
 
       if(cnv->out_format.framerate_mode == GAVL_FRAMERATE_VARIABLE)
-        str2 = bg_strdup(NULL, TR("variable"));
+        str2 = gavl_strdup(TR("variable"));
       else
         str2 = bg_sprintf("%5.2f",
                           (float)(cnv->out_format.timescale) /

gmerlin-4256.tar.gz/lib/db.c Added

@@ -0,0 +1,983 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#define _XOPEN_SOURCE
+#define _GNU_SOURCE
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+#include <ctype.h>
+
+#define LOG_DOMAIN "db"
+
+static const char * create_commands[] =
+  {
+
+    "CREATE TABLE OBJECTS ("
+    "ID INTEGER PRIMARY KEY, "
+    "TYPE INTEGER, "
+    "REF_ID INTEGER, "
+    "PARENT_ID INTEGER, "
+    "CHILDREN INTEGER, "
+    "SIZE INTEGER, "
+    "DURATION INTEGER, "
+    "LABEL INTEGER);"
+    
+    "CREATE TABLE DIRECTORIES ("
+    "ID INTEGER PRIMARY KEY, "
+    "PATH TEXT, "
+    "SCAN_FLAGS INTEGER, "
+    "UPDATE_ID INTEGER, "
+    "SCAN_DIR_ID INTEGER"
+    ");",
+
+    "CREATE TABLE FILES ("
+    "ID INTEGER PRIMARY KEY, "
+    "PATH TEXT, "
+    "MTIME TEXT, "
+    "MIMETYPE INTEGER, "
+    "SCAN_DIR_ID INTEGER" 
+    ");",
+
+    /* String lookup tables */
+
+    "CREATE TABLE MIMETYPES("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+    
+    "CREATE TABLE AUDIO_GENRES("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+
+    "CREATE TABLE AUDIO_ARTISTS("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+
+    "CREATE TABLE VIDEO_PERSONS("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+
+    "CREATE TABLE VIDEO_GENRES("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+
+    "CREATE TABLE VIDEO_COUNTRIES("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+
+    "CREATE TABLE VIDEO_LANGUAGES("
+    "ID INTEGER PRIMARY KEY, "
+    "NAME TEXT"
+    ");",
+
+    "CREATE TABLE AUDIO_FILES("
+    "ID INTEGER PRIMARY KEY, "
+    "TITLE TEXT, "
+    "SEARCH_TITLE TEXT, "
+    "ARTIST INTEGER, "
+    "GENRE INTEGER, "
+    "DATE TEXT, "
+    "ALBUM INTEGER, "
+    "TRACK INTEGER, "
+    "BITRATE TEXT, "
+    "SAMPLERATE INTEGER, "
+    "CHANNELS INTEGER"
+    ");",
+
+    "CREATE TABLE IMAGE_FILES("
+    "ID INTEGER PRIMARY KEY, "
+    "WIDTH INTEGER, "
+    "HEIGHT INTEGER, "
+    "DATE TEXT"
+    ");"
+
+    "CREATE TABLE AUDIO_ALBUMS("
+    "ID INTEGER PRIMARY KEY, "
+    "ARTIST INTEGER, "
+    "TITLE TEXT, "
+    "SEARCH_TITLE TEXT, "
+    "GENRE INTEGER, "
+    "COVER INTEGER, " 
+    "DATE TEXT"
+    ");",
+   
+    "CREATE TABLE PLAYLISTS("
+    "ID INTEGER PRIMARY KEY, "
+    "PLAYLIST_ID INTEGER, "
+    "ITEM_ID INTEGER, "
+    "IDX INTEGER"
+    ");",
+
+    "CREATE TABLE VIDEO_FILES("
+    "ID INTEGER PRIMARY KEY, "
+    "WIDTH INTEGER, "
+    "HEIGHT INTEGER, "
+    "ASPECT TEXT, "
+    "TIMESCALE INTEGER, "
+    "FRAME_DURATION INTEGER, "
+    "VIDEO_CODEC TEXT, "
+    "COLLECTION INTEGER, "
+    "IDX INTEGER"
+    ");",
+
+    "CREATE TABLE VIDEO_ACTORS_VIDEOS("
+    "ID INTEGER PRIMARY KEY, "
+    "VIDEO_ID INTEGER, "
+    "PERSON_ID INTEGER, "
+    "UNIQUE(VIDEO_ID, PERSON_ID)"
+    ");",
+
+    "CREATE TABLE VIDEO_DIRECTORS_VIDEOS("
+    "ID INTEGER PRIMARY KEY, "
+    "VIDEO_ID INTEGER, "
+    "PERSON_ID INTEGER, "
+    "UNIQUE(VIDEO_ID, PERSON_ID)"
+    ");",
+
+    "CREATE TABLE VIDEO_GENRES_VIDEOS("
+    "ID INTEGER PRIMARY KEY, "
+    "VIDEO_ID INTEGER, "
+    "GENRE_ID INTEGER, "
+    "UNIQUE(VIDEO_ID, GENRE_ID)"
+    ");",
+
+    "CREATE TABLE VIDEO_COUNTRIES_VIDEOS("
+    "ID INTEGER PRIMARY KEY, "
+    "VIDEO_ID INTEGER, "
+    "COUNTRY_ID INTEGER, "
+    "UNIQUE(VIDEO_ID, COUNTRY_ID)"
+    ");",
+
+    "CREATE TABLE VIDEO_AUDIO_LANGUAGES_VIDEOS("
+    "ID INTEGER PRIMARY KEY, "
+    "VIDEO_ID INTEGER, "
+    "LANGUAGE_ID INTEGER, "
+    "UNIQUE(VIDEO_ID, LANGUAGE_ID)"
+    ");",
+
+    "CREATE TABLE VIDEO_SUBTITLE_LANGUAGES_VIDEOS("
+    "ID INTEGER PRIMARY KEY, "
+    "VIDEO_ID INTEGER, "
+    "LANGUAGE_ID INTEGER, "
+    "UNIQUE(VIDEO_ID, LANGUAGE_ID)"
+    ");",
+
+    "CREATE TABLE VIDEO_INFOS("
+    "ID INTEGER PRIMARY KEY, "
+    "TITLE TEXT, "
+    "SEARCH_TITLE TEXT, "
+    "TITLE_ORIG TEXT, "
+    "RATING TEXT, "
+    "PARENTAL_CONTROL TEXT, "
+    "DATE TEXT, "
+    "PLOT TEXT, "
+    "POSTER INTEGER, "
+    "FANART INTEGER, "
+    "NFO_FILE INTEGER, "
+    "VIDEO_TYPE INTEGER"
+    ");",
+
+    "CREATE TABLE URLS("
+    "ID INTEGER PRIMARY KEY, "
+    "STREAM_URL TEXT, "
+    "STATION_URL TEXT, "
+    "MIMETYPE INTEGER"
+    ");",
+
+    "CREATE INDEX AUDIO_FILES_ALBUM ON AUDIO_FILES (ALBUM);",
+    "CREATE INDEX OBJECTS_TYPE ON OBJECTS (TYPE);",
+    "CREATE INDEX OBJECTS_PARENT_ID ON OBJECTS (PARENT_ID);",
+    "CREATE INDEX FILES_PATH ON FILES (PATH);",
+    "CREATE INDEX DIRECTORIES_PATH ON DIRECTORIES(PATH);",
+    NULL,
+  };
+
+static void build_database(bg_db_t * db)
+  {
+  void * obj;
+  int i = 0;
+  while(create_commands[i])
+    {
+    if(!bg_sqlite_exec(db->db, create_commands[i], NULL, NULL))
+      return;
+    i++;
+    }
+  bg_db_create_tables_vfolders(db);
+
+  /* Create root container */
+  obj = bg_db_object_create_root(db);
+  bg_db_object_set_type(obj, BG_DB_OBJECT_ROOT);
+  bg_db_object_set_label(obj, "Root");
+  bg_db_object_set_parent_id(db, obj, -1);
+  bg_db_object_unref(obj);
+  bg_db_flush(db);
+  }
+
+const char * directories[] =
+  {
+    "gmerlin-db",
+    "gmerlin-db/previews",
+    "gmerlin-db/thumbnails",
+    NULL,
+  };
+
+bg_db_t * bg_db_create(const char * path,
+                       bg_plugin_registry_t * plugin_reg, int create)
+  {
+  int result;
+  int exists = 0;
+  sqlite3 * db;
+  bg_db_t * ret;
+  int i;
+  char * tmp_string;
+  const char * sql;
+  tmp_string = bg_sprintf("%s/gmerlin-db", path);
+  
+  if(!access(tmp_string, R_OK | W_OK))
+    exists = 1;
+  free(tmp_string);
+
+  if(!exists && !create)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Cannot open database in %s (maybe use create option)", path);
+    return NULL;
+    }
+
+  if(exists && create)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Database in %s already exists", path);
+    return NULL;
+    }
+
+  if(create && !exists)
+    {
+    i = 0;
+    while(directories[i])
+      {
+      tmp_string = bg_sprintf("%s/%s", path, directories[i]);
+      bg_ensure_directory(tmp_string, 0);
+      free(tmp_string);
+      i++;
+      }
+    }
+  
+  /* Create database */
+
+  tmp_string = bg_sprintf("%s/gmerlin-db/gmerlin.db", path);
+  result = sqlite3_open(tmp_string, &db);
+
+  if(result)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open database %s: %s", tmp_string,
+           sqlite3_errmsg(db));
+    sqlite3_close(db);
+    free(tmp_string);
+    return NULL;
+    }
+  free(tmp_string);
+
+  ret = calloc(1, sizeof(*ret));
+  ret->db = db;
+  ret->plugin_reg = plugin_reg;
+
+  ret->cache_size = 256;
+  ret->cache = calloc(ret->cache_size, sizeof(*ret->cache));
+
+  for(i = 0; i < ret->cache_size; i++)
+    bg_db_object_init(&ret->cache[i]);
+                      
+  if(!exists)
+    build_database(ret);
+  
+  /* Base path */
+  ret->base_dir = bg_canonical_filename(path);
+  ret->base_dir = gavl_strcat(ret->base_dir, "/");
+  ret->base_len = strlen(ret->base_dir);
+
+  /* String cache */
+  ret->audio_artists =
+    bg_db_string_cache_create(256,
+                              "AUDIO_ARTISTS",
+                              "NAME", "ID");
+
+  ret->audio_genres =
+    bg_db_string_cache_create(16,
+                              "AUDIO_GENRES",
+                              "NAME", "ID");
+
+  ret->video_genres =
+    bg_db_string_cache_create(16,
+                              "VIDEO_GENRES",
+                              "NAME", "ID");
+
+  ret->video_persons =
+    bg_db_string_cache_create(256,
+                              "VIDEO_PERSONS",
+                              "NAME", "ID");
+
+  ret->video_countries =
+    bg_db_string_cache_create(16,
+                              "VIDEO_COUNTRIES",
+                              "NAME", "ID");
+
+  ret->video_languages =
+    bg_db_string_cache_create(16,
+                              "VIDEO_LANGUAGES",
+                              "NAME", "ID");
+ 
+  ret->audio_albums =
+    bg_db_string_cache_create(256,
+                              "AUDIO_ALBUMS",
+                              "TITLE", "ID");
+
+  ret->mimetypes =
+    bg_db_string_cache_create(16,
+                              "MIMETYPES",
+                              "NAME", "ID");
+
+  bg_db_thumbnail_cache_init(&ret->th_cache);
+  
+  /* Pre-compile select statements */
+
+  sql = "SELECT * FROM OBJECTS WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_objects, NULL) != SQLITE_OK)
+    return NULL;
+  
+  sql = "SELECT * FROM FILES WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_files, NULL) != SQLITE_OK)
+    return NULL;
+  
+  sql = "SELECT * FROM AUDIO_FILES WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_audio_files, NULL) != SQLITE_OK)
+    return NULL;
+
+  sql = "SELECT * FROM VIDEO_FILES WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_video_files, NULL) != SQLITE_OK)
+    return NULL;
+  
+  sql = "SELECT * FROM AUDIO_ALBUMS WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_audio_albums, NULL) != SQLITE_OK)
+    return NULL;
+
+  sql = "SELECT * FROM DIRECTORIES WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_directories, NULL) != SQLITE_OK)
+    return NULL;
+
+  sql = "SELECT * FROM VIDEO_INFOS WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_video_infos, NULL) != SQLITE_OK)
+    return NULL;
+
+  sql = "SELECT * FROM URLS WHERE ID = ?1;";
+  if(sqlite3_prepare_v2(ret->db, sql, strlen(sql)+1, &ret->q_urls, NULL) != SQLITE_OK)
+    return NULL;
+  
+  return ret;
+  }
+
+void bg_db_start_transaction(bg_db_t * db)
+  {
+  bg_sqlite_exec(db->db, "BEGIN TRANSACTION;", NULL, NULL);
+  }
+
+void bg_db_end_transaction(bg_db_t * db)
+  {
+  bg_sqlite_exec(db->db, "END;", NULL, NULL);
+  }
+
+
+char * bg_db_filename_to_abs(bg_db_t * db, char * filename)
+  {
+  char * ret;
+  ret = bg_sprintf("%s%s", db->base_dir, filename);
+  free(filename);
+  return ret;
+  }
+
+const char * bg_db_filename_to_rel(bg_db_t * db, const char * filename)
+  {
+  return filename + db->base_len;
+  }
+
+// YYYY-MM-DD HH:MM:SS
+#define TIME_FORMAT "%Y-%m-%d %H:%M:%S"
+
+time_t bg_db_string_to_time(const char * str)
+  {
+  struct tm tm;
+  memset(&tm, 0, sizeof(tm));
+  strptime(str, TIME_FORMAT, &tm); 
+  return timegm(&tm);
+  }
+
+char * bg_db_time_to_string(time_t time, char * str)
+  {
+  struct tm tm;
+  memset(&tm, 0, sizeof(tm));
+  gmtime_r(&time, &tm);
+  strftime(str, BG_DB_TIME_STRING_LEN, TIME_FORMAT, &tm);
+  return str;
+  }
+
+static int flush_object(bg_db_t * db, void * obj)
+  {
+  bg_db_obj_cache_t * st = obj;
+  st->sync = 1;
+  if(memcmp(&st->obj, &st->orig, sizeof(st->obj)))
+    {
+    //    fprintf(stderr, "Flush %ld\n", st->obj.obj.id);
+    bg_db_object_update(db, &st->obj, 1, 1);
+    memcpy(&st->orig, &st->obj, sizeof(st->obj));
+    return 1;
+    }
+  return 0;
+  }
+
+static int children_in_cache(bg_db_t * db, int i)
+  {
+  int j;
+  int64_t id = bg_db_object_get_id(&db->cache[i]);
+  
+  for(j = 0; j < db->cache_size; j++)
+    {
+    if(j != i)
+      {
+      if(!db->cache[j].sync &&
+         (db->cache[j].obj.obj.parent_id == id))
+        {
+        // fprintf(stderr, "%"PRId64" is child of %"PRId64" in cache\n",
+        //         db->cache[j].obj.obj.id, id);
+        return 1;
+        }
+      }
+    }
+  return 0;
+  }
+
+static void db_flush(bg_db_t * db, int do_free)
+  {
+  int i;
+  int done = 0;
+  int dead_refs = 0;
+  
+  /* Pass 1: Flush all leaf objects */
+  for(i = 0; i < db->cache_size; i++)
+    {
+    if(!bg_db_object_is_valid(&db->cache[i]))
+      {
+      db->cache[i].sync = 1;
+      continue;
+      }
+    if(!(bg_db_object_get_type(&db->cache[i]) &
+         (BG_DB_FLAG_CONTAINER|BG_DB_FLAG_VCONTAINER)))
+      {
+      flush_object(db, &db->cache[i]);
+      if(do_free)
+        {
+        if(db->cache[i].refcount)
+          dead_refs++;
+        bg_db_object_free(&db->cache[i].obj);
+        bg_db_object_init(&db->cache[i].obj);
+        }
+      }
+    else
+      db->cache[i].sync = 0;
+    }
+  
+  while(!done)
+    {
+    done = 1;
+    for(i = 0; i < db->cache_size; i++)
+      {
+      if(db->cache[i].sync)
+        continue;
+      
+      done = 0;
+      
+      if(!children_in_cache(db, i))
+        {
+        flush_object(db, &db->cache[i]);
+        if(do_free)
+          {
+          if(db->cache[i].refcount)
+            {
+            fprintf(stderr, "Dead reference (%d)\n", db->cache[i].refcount);
+            bg_db_object_dump(&db->cache[i].obj);
+            dead_refs++;
+            }
+          bg_db_object_free(&db->cache[i].obj);
+          bg_db_object_init(&db->cache[i].obj);
+          }
+        }
+      }
+    }
+
+  if(do_free)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaned up cache, %d dead references",
+           dead_refs);
+
+    dead_refs = 0;
+    for(i = 0; i < db->cache_size; i++)
+      {
+      if(bg_db_object_is_valid(&db->cache[i].obj))
+        {
+        //   fprintf(stderr, "Object not freed:\n");
+        //   bg_db_object_dump(&db->cache[i].obj);
+        dead_refs++;
+        }
+      }
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "%d objects leaked",
+           dead_refs);
+    
+    }
+
+  
+  }
+
+void bg_db_flush(bg_db_t * db)
+  {
+  db_flush(db, 0);
+  }
+
+void bg_db_destroy(bg_db_t * db)
+  {
+  int num_added, num_deleted;
+  db_flush(db, 0);
+  /* Check if we need to clean things up */
+
+  num_added = db->num_added;
+  num_deleted = db->num_deleted;
+  
+  if(num_added || num_deleted)
+    bg_db_cleanup_vfolders(db);
+
+  if(num_deleted)
+    {
+    bg_db_cleanup_audio(db);
+    bg_db_cleanup_video(db);
+    }
+
+  if(num_added || num_deleted)
+    {
+    bg_db_cleanup_tvseries(db);
+    }
+  
+  /* Flush cache */
+  db_flush(db, 1);
+  free(db->cache);
+
+  sqlite3_finalize(db->q_objects);
+  sqlite3_finalize(db->q_files);
+  sqlite3_finalize(db->q_audio_files);
+  sqlite3_finalize(db->q_video_files);
+  sqlite3_finalize(db->q_audio_albums);
+  sqlite3_finalize(db->q_directories);
+  sqlite3_finalize(db->q_video_infos);
+
+  
+  sqlite3_close(db->db);
+  free(db->base_dir);
+
+  bg_db_string_cache_destroy(db->audio_artists);
+  bg_db_string_cache_destroy(db->audio_genres);
+  bg_db_string_cache_destroy(db->video_genres);  
+  bg_db_string_cache_destroy(db->video_persons);
+  bg_db_string_cache_destroy(db->video_countries);
+  bg_db_string_cache_destroy(db->video_languages);
+
+  bg_db_string_cache_destroy(db->audio_albums);
+  bg_db_string_cache_destroy(db->mimetypes);
+
+  bg_db_thumbnail_cache_free(&db->th_cache);
+  
+  free(db);
+  }
+
+/* Edit functions */
+void bg_db_add_directory(bg_db_t * db, const char * d, int scan_flags)
+  {
+  bg_db_scan_item_t * files;
+  int num_files = 0;
+  char * path;
+  int64_t id;
+  
+  path = bg_canonical_filename(d);
+  
+  if(strncmp(path, db->base_dir, db->base_len))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot add directory %s: No child of %s",
+           path, db->base_dir);
+    return;
+    }
+
+  bg_db_start_transaction(db);
+  
+  files = bg_db_scan_directory(path, &num_files);
+
+  if((id = bg_dir_by_path(db, path)) > 0)
+    {
+    bg_db_dir_t * dir;
+    dir = bg_db_object_query(db, id);
+    
+    bg_log(BG_LOG_INFO, LOG_DOMAIN,
+           "Directory %s already in database, updating", path);
+    bg_db_update_files(db, files, num_files, dir->scan_flags, id, path);
+    scan_flags = dir->scan_flags; // Ignore old scan flags
+    id = bg_db_object_get_id(dir);
+    bg_db_object_unref(dir);
+    }
+  else
+    {
+    /* Create root container */
+    bg_db_scan_item_t item;
+    id = -1;
+    memset(&item, 0, sizeof(item));
+    item.path = path;
+    bg_db_dir_create(db, scan_flags,
+                     &item, NULL, &id);
+    bg_db_add_files(db, files, num_files, scan_flags, id);
+    }
+  bg_db_scan_items_free(files, num_files);
+
+  bg_db_flush(db);
+  
+  /* Identify images */
+  bg_db_identify_images(db, id, scan_flags);
+
+  /* Identify .nfo */
+  if(scan_flags & BG_DB_SCAN_VIDEO)
+    bg_db_identify_nfo(db, id);
+
+  bg_db_end_transaction(db);
+
+  }
+
+void bg_db_del_directory(bg_db_t * db, const char * d)
+  {
+  bg_db_dir_t * dir;
+  
+  int64_t id;
+  char * path = bg_canonical_filename(d);
+  
+  if((id = bg_dir_by_path(db, path)) <= 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Directory %s not in database", path);
+    free(path);
+    return;
+    }
+
+  dir = bg_db_object_query(db, id);
+  
+  if(bg_db_object_get_parent(dir) > 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Directory %s not a root scan directory", path);
+    bg_db_object_unref(dir);
+    }
+  else
+    bg_db_object_delete(db, dir);
+  free(path);
+  }
+
+int bg_db_date_equal(const bg_db_date_t * d1,
+                     const bg_db_date_t * d2)
+  {
+  return
+    (d1->year == d2->year) &&
+    (d1->month == d2->month) &&
+    (d1->day == d2->day);
+  }
+
+void bg_db_date_copy(bg_db_date_t * dst,
+                     const bg_db_date_t * src)
+  {
+  memcpy(dst, src, sizeof(*dst));
+  }
+
+char * bg_db_date_to_string(const bg_db_date_t * d, char * str)
+  {
+  gavl_metadata_date_to_string(d->year, d->month, d->day, str);
+  return str;
+  }
+
+void bg_db_string_to_date(const char * str, bg_db_date_t * d)
+  {
+  sscanf(str, "%d-%d-%d", &d->year, &d->month, &d->day);
+  }
+
+void bg_db_date_set_invalid(bg_db_date_t * d)
+  {
+  d->year  = 9999;
+  d->day   = 01;
+  d->month = 01;
+  }
+
+int bg_db_date_is_invalid(bg_db_date_t * d)
+  {
+  return (d->year == 9999) || (d->month == 0) || (d->day == 0);
+  }
+
+int64_t bg_db_cache_search(bg_db_t * db,
+                           int (*compare)(const bg_db_object_t*,const void*),
+                           const void * data)
+  {
+  int i;
+  for(i = 0; i < db->cache_size; i++)
+    {
+    if(compare(&db->cache[i].obj.obj, data))
+      return db->cache[i].obj.obj.id;
+    }
+  return -1;
+  }
+
+static const char * search_string_skip[] =
+  {
+    "a ",
+    "the ",
+    "der ",
+    "die ",
+    "das ",
+    "ein ",
+    "eine ",
+    "le ",
+    "les ",
+    "os ",
+    "'", // 'Round Midnight
+    NULL
+  };
+
+const char * bg_db_get_search_string(const char * str)
+  {
+  int i, len;
+  
+  i = 0;
+  while(search_string_skip[i])
+    {
+    len = strlen(search_string_skip[i]);
+    if(!strncasecmp(str, search_string_skip[i], len))
+      return str + len;
+    i++;
+    }
+  return str;
+  }
+
+/* Get children */
+
+void
+bg_db_get_children(bg_db_t * db, int64_t id, bg_sqlite_id_tab_t * tab)
+  {
+  bg_db_object_type_t type;
+  bg_db_object_t * parent = NULL;
+  char * sql;
+
+  bg_db_flush(db);
+  parent = bg_db_object_query(db, id);
+  if(!parent)
+    return;
+  type = bg_db_object_get_type(parent);
+
+  if(!(type & (BG_DB_FLAG_CONTAINER|
+               BG_DB_FLAG_VCONTAINER)))
+    {
+    goto fail;
+    }
+  else if(parent->klass && parent->klass->get_children)  // Custom function (e.g. virtual containers)
+    parent->klass->get_children(db, parent, tab);
+  else if(type & BG_DB_FLAG_CONTAINER)
+    {
+    sql = sqlite3_mprintf("select ID from OBJECTS where PARENT_ID = %"PRId64" ORDER BY LABEL;",
+                          bg_db_object_get_id(parent));
+    bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+    sqlite3_free(sql);
+    }
+  fail:
+  if(parent)
+    bg_db_object_unref(parent);
+  
+  }
+
+/* Query children */
+
+int
+bg_db_query_children(bg_db_t * db, int64_t id,
+                     bg_db_query_callback cb, void * priv,
+                     int start, int num, int * total_matches)
+  {
+  int i, ret = 0;
+  int end;
+  bg_sqlite_id_tab_t tab;
+  void * obj;
+  
+  bg_sqlite_id_tab_init(&tab);
+  bg_db_get_children(db, id, &tab);
+
+  if(!tab.num_val)
+    {
+    if(total_matches)
+      *total_matches = 0;
+    return 0;
+    }
+  
+  if(!num)
+    end = tab.num_val;
+  else
+    {
+    end = start + num;
+    if(end > tab.num_val)
+      end = tab.num_val;
+    }
+
+  if(total_matches)
+    *total_matches = tab.num_val;
+  
+  for(i = start; i < end; i++)
+    {
+    obj = bg_db_object_query(db, tab.val[i]);
+    if(!obj)
+      {
+      // Error
+      goto fail;
+      }
+    cb(priv, obj);
+    bg_db_object_unref(obj);
+    ret++;
+    }
+  
+  fail:
+  bg_sqlite_id_tab_free(&tab);
+  return ret;
+  }
+
+int
+bg_db_query_sql(bg_db_t * db, const char * sql, bg_db_query_callback cb, void * priv)
+  {
+  bg_sqlite_id_tab_t tab;
+  int result;
+  int i, ret = 0;
+  void * obj;
+  
+  bg_sqlite_id_tab_init(&tab);
+  bg_db_flush(db);
+
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+
+  if(!result)
+    goto fail;
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    obj = bg_db_object_query(db, tab.val[i]);
+    if(!obj)
+      {
+      // Error
+      goto fail;
+      }
+    cb(priv, obj);
+    bg_db_object_unref(obj);
+    ret++;
+    }
+  
+  fail:
+  bg_sqlite_id_tab_free(&tab);
+
+  return ret;
+  
+  }
+
+
+/* Group management */
+
+/* Changing these changes the database file */
+
+static const struct
+  {
+  int id;
+  char * label;
+  }
+groups[] =
+  {
+    { 1,  "0-9"    },
+    { 2,  "A"      },
+    { 3,  "B"      },
+    { 4,  "C"      },
+    { 5,  "D"      },
+    { 6,  "E"      },
+    { 7,  "F"      },
+    { 8,  "G"      },
+    { 9,  "H"      },
+    { 10, "I"      },
+    { 11, "J"      },
+    { 12, "K"      },
+    { 13, "L"      },
+    { 14, "M"      },
+    { 15, "N"      },
+    { 16, "O"      },
+    { 17, "P"      },
+    { 18, "Q"      },
+    { 19, "R"      },
+    { 20, "S"      },
+    { 21, "T"      },
+    { 22, "U"      },
+    { 23, "V"      },
+    { 24, "W"      },
+    { 25, "X"      },
+    { 26, "Y"      },
+    { 27, "Z"      },
+    { 28, "Others" },
+  };
+
+const char * bg_db_get_group(const char * str, int64_t * id)
+  {
+  char upper = toupper(*str);
+  
+  if((upper >= '0') && (upper <= '9'))
+    *id = 1;
+  else if((upper >= 'A') && (upper <= 'Z'))
+    *id = upper - 'A' + 2;
+  else
+    *id = 28;
+  return groups[*id - 1].label;
+  }
+
+char * bg_db_get_group_condition(const char * row, int group_id)
+  {
+  if(group_id == 1)
+    return bg_sprintf("(UPPER(%s) GLOB '[0-9]*')", row);
+  else if(group_id == 28)
+    return bg_sprintf("(UPPER(%s) NOT GLOB '[A-Z0-9]*')", row);
+  else
+    return bg_sprintf("(UPPER(%s) GLOB '%c*')", row, 'A' + group_id-2);
+  }
+

gmerlin-4256.tar.gz/lib/db_audio.c Added

@@ -0,0 +1,322 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#define LOG_DOMAIN "db.audiofile"
+
+static void free_audio_file(void * obj)
+  {
+  bg_db_audio_file_t * file = obj;
+  if(file->title)
+    free(file->title);
+  if(file->search_title)
+    free(file->search_title);
+  if(file->bitrate)
+    free(file->bitrate);
+  if(file->genre)
+    free(file->genre);
+  if(file->album)
+    free(file->album);
+  if(file->artist)
+    free(file->artist);
+  if(file->albumartist)
+    free(file->albumartist);
+  }
+
+static void dump_audio_file(void * obj)
+  {
+  bg_db_audio_file_t * file = obj;
+  gavl_diprintf(2, "Title:       %s\n", file->title);
+  gavl_diprintf(2, "SearchTitle: %s\n", file->title);
+  gavl_diprintf(2, "Artist:      %s\n", file->artist);
+  gavl_diprintf(2, "Year:        %d\n", file->date.year);
+  gavl_diprintf(2, "Album:       %s (%"PRId64")\n", file->album, file->album_id);
+  gavl_diprintf(2, "Track:       %d\n", file->track);
+  gavl_diprintf(2, "Bitrate:     %s\n", file->bitrate);
+  gavl_diprintf(2, "Genre:       %s\n", file->genre);
+  gavl_diprintf(2, "Samplerate:  %d\n", file->samplerate);
+  gavl_diprintf(2, "Channels:    %d\n", file->channels);
+  }
+
+static void del_audio_file(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_sqlite_delete_by_id(db->db, "AUDIO_FILES", obj->id);
+  bg_db_audio_file_remove_from_album(db, (bg_db_audio_file_t*)obj);
+  }
+
+
+#define TITLE_COL         1
+#define SEARCH_TITLE_COL  2
+#define ARTIST_COL        3
+#define GENRE_COL         4
+#define DATE_COL          5
+#define ALBUM_COL         6
+#define TRACK_COL         7
+#define BITRATE_COL       8
+#define SAMPLERATE_COL    9
+#define CHANNELS_COL     10
+
+
+static int query_audio_file(bg_db_t * db, void * obj)
+  {
+  int result;
+  int found = 0;
+  bg_db_audio_file_t * f = obj;
+
+  sqlite3_stmt * st = db->q_audio_files;
+  
+  sqlite3_bind_int64(st, 1, f->file.obj.id);
+  
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_STRING(TITLE_COL, f->title);
+    BG_DB_GET_COL_STRING(SEARCH_TITLE_COL, f->search_title);
+    BG_DB_GET_COL_INT(ARTIST_COL, f->artist_id);
+    BG_DB_GET_COL_INT(GENRE_COL, f->genre_id);
+    BG_DB_GET_COL_DATE(DATE_COL, f->date);
+    BG_DB_GET_COL_INT(ALBUM_COL, f->album_id);
+    BG_DB_GET_COL_INT(TRACK_COL, f->track);
+    BG_DB_GET_COL_STRING(BITRATE_COL, f->bitrate);
+    BG_DB_GET_COL_INT(SAMPLERATE_COL, f->samplerate);
+    BG_DB_GET_COL_INT(CHANNELS_COL, f->channels);
+    found = 1;
+    }
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return 0;
+  
+  f->artist = bg_db_string_cache_get(db->audio_artists, db->db,
+                                     f->artist_id);
+  f->genre = bg_db_string_cache_get(db->audio_genres, db->db,
+                                    f->genre_id);
+  f->album = bg_db_string_cache_get(db->audio_albums, db->db,
+                                    f->album_id);
+  return 1;
+  }
+
+const bg_db_object_class_t bg_db_audio_file_class =
+  {
+  .name = "Audio file",
+  .del = del_audio_file,
+  .free = free_audio_file,
+  .query = query_audio_file,
+  .dump = &dump_audio_file,
+  .parent = &bg_db_file_class,
+  };
+
+/* Add to db */
+static void audio_file_add(bg_db_t * db, bg_db_audio_file_t * f)
+  {
+  char * sql;
+
+  char date_string[BG_DB_DATE_STRING_LEN];
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding audio file %s", f->file.path);
+  
+  /* Date */
+  bg_db_date_to_string(&f->date, date_string);
+  
+  sql = sqlite3_mprintf("INSERT INTO AUDIO_FILES ( ID, TITLE, SEARCH_TITLE, ARTIST, GENRE, DATE, ALBUM, TRACK, BITRATE, SAMPLERATE, CHANNELS ) "
+                        "VALUES"
+                        " ( %"PRId64", %Q, %Q, %"PRId64", %"PRId64", %Q, %"PRId64", %d, %Q, %d, %d );",
+                        bg_db_object_get_id(f) , f->title, f->search_title, f->artist_id, f->genre_id,
+                        date_string, f->album_id, 
+                        f->track, f->bitrate, f->samplerate, f->channels);
+
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+void bg_db_audio_file_create(bg_db_t * db, void * obj, bg_track_info_t * t)
+  {
+  int bitrate = 0;
+  const char * var;
+  bg_db_audio_file_t * f = obj;
+  
+  bg_db_object_set_type(obj, BG_DB_OBJECT_AUDIO_FILE);
+  
+  if((var = gavl_metadata_get(&t->metadata, GAVL_META_TITLE)))
+    {
+    f->title = gavl_strdup(var);
+    f->search_title = gavl_strdup(bg_db_get_search_string(f->title));
+    }
+  
+  if((var = gavl_metadata_get(&t->metadata, GAVL_META_ARTIST)))
+    f->artist = bg_strip_space(gavl_strdup(var));
+  if((var = gavl_metadata_get(&t->metadata, GAVL_META_ALBUMARTIST)))
+    f->albumartist = bg_strip_space(gavl_strdup(var));
+  if((var = gavl_metadata_get(&t->metadata, GAVL_META_GENRE)))
+    f->genre = bg_strip_space(gavl_strdup(var));
+  
+  if(!(f->date.year = bg_metadata_get_year(&t->metadata)))
+    bg_db_date_set_invalid(&f->date);
+  
+  if((var = gavl_metadata_get(&t->metadata, GAVL_META_ALBUM)))
+    f->album = bg_strip_space(gavl_strdup(var));
+
+  gavl_metadata_get_int(&t->metadata, GAVL_META_TRACKNUMBER, &f->track);
+
+  gavl_metadata_get_int(&t->audio_streams[0].m, GAVL_META_BITRATE, &bitrate);
+
+  f->samplerate = t->audio_streams[0].format.samplerate;
+  f->channels = t->audio_streams[0].format.num_channels;
+
+  if(bitrate == GAVL_BITRATE_VBR)
+    f->bitrate = gavl_strdup("VBR");
+  else if(bitrate == GAVL_BITRATE_LOSSLESS)
+    f->bitrate = gavl_strdup("Lossless");
+  else if(bitrate <= 0)
+    f->bitrate = gavl_strdup("Unknown");
+  else
+    f->bitrate = bg_sprintf("%d", bitrate / 1000);
+
+  /* Artist */
+  if(f->artist)
+    {
+    f->artist_id = 
+      bg_sqlite_string_to_id_add(db->db, "AUDIO_ARTISTS",
+                                 "ID", "NAME", f->artist);
+    }
+
+  /* Genre */
+  if(f->genre)
+    {
+    f->genre_id = 
+      bg_sqlite_string_to_id_add(db->db, "AUDIO_GENRES",
+                                 "ID", "NAME", f->genre);
+    }
+
+  /* Albumartist */
+  if(f->albumartist)
+    {
+    f->albumartist_id = 
+      bg_sqlite_string_to_id_add(db->db, "AUDIO_ARTISTS",
+                                 "ID", "NAME", f->albumartist);
+    }
+
+  /* Add to album */
+  if(f->album && f->albumartist)
+    bg_db_audio_file_add_to_album(db, f);
+
+  /* Add to db */
+  audio_file_add(db, f);
+  bg_db_create_vfolders(db, f);
+  }
+
+void bg_db_cleanup_audio(bg_db_t * db)
+  {
+  int i;
+  int64_t count;
+  int64_t total;
+  char * sql = NULL;
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+
+  total = 0;
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up audio data");
+    
+  sql = sqlite3_mprintf("select ID from AUDIO_GENRES;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    /* Count songs with that genre */
+    count = 0;
+    sql = sqlite3_mprintf("select count(*) from AUDIO_FILES where GENRE = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total = count;
+    
+    /* Count albums with that genre */
+    count = 0;
+    sql = sqlite3_mprintf("select count(*) from AUDIO_ALBUMS where GENRE = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total += count;
+
+    /* Check if empty */
+    if(!total)
+      {
+      char * name;
+      name = bg_sqlite_id_to_string(db->db, "AUDIO_GENRES", "NAME", "ID", tab.val[i]);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty audio genre %s", name);
+      free(name);
+      bg_sqlite_delete_by_id(db->db, "AUDIO_GENRES", tab.val[i]);
+      }
+    }
+
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Artists */
+  sql = sqlite3_mprintf("select ID from AUDIO_ARTISTS;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    /* Count songs with that artist */
+    count = 0;
+    sql = sqlite3_mprintf("select count(*) from AUDIO_FILES where ARTIST = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total = count;
+    
+    /* Count albums with that artist */
+    count = 0;
+    sql = sqlite3_mprintf("select count(*) from AUDIO_ALBUMS where ARTIST = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total += count;
+
+    /* Check if empty */
+    if(!total)
+      {
+      char * name;
+      name = bg_sqlite_id_to_string(db->db, "AUDIO_ARTISTS", "NAME", "ID", tab.val[i]);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty audio artist %s", name);
+      free(name);
+      bg_sqlite_delete_by_id(db->db, "AUDIO_ARTISTS", tab.val[i]);
+      }
+    }
+  
+  
+  bg_sqlite_id_tab_free(&tab);
+  }
+

gmerlin-4256.tar.gz/lib/db_audioalbum.c Added

@@ -0,0 +1,289 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#define LOG_DOMAIN "db.audioalbum"
+
+#define ARTIST_COL        1
+#define TITLE_COL         2
+#define SEARCH_TITLE_COL  3
+#define GENRE_COL         4
+#define COVER_COL         5
+#define DATE_COL          6
+
+static int query_audioalbum(bg_db_t * db, void * a1)
+  {
+  int result;
+  int found = 0;
+  bg_db_audio_album_t * a = a1;
+  sqlite3_stmt * st = db->q_audio_albums;
+  sqlite3_bind_int64(st, 1, a->obj.id);
+
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_INT(ARTIST_COL, a->artist_id);
+    BG_DB_GET_COL_STRING(TITLE_COL, a->title);
+    BG_DB_GET_COL_STRING(SEARCH_TITLE_COL, a->search_title);
+    BG_DB_GET_COL_INT(GENRE_COL, a->genre_id);
+    BG_DB_GET_COL_INT(COVER_COL, a->cover_id);
+    BG_DB_GET_COL_DATE(DATE_COL, a->date);
+    found = 1;
+    }
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return 0;
+  
+  
+  a->artist = bg_db_string_cache_get(db->audio_artists, db->db,
+                                     a->artist_id);
+  a->genre  = bg_db_string_cache_get(db->audio_genres, db->db,
+                                     a->genre_id);
+  return 1;
+  }
+
+static void get_children_audioalbum(bg_db_t * db, void * obj, bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  sql = sqlite3_mprintf("SELECT ID FROM AUDIO_FILES WHERE ALBUM = %"PRId64" ORDER BY TRACK;",
+                        bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  sqlite3_free(sql);
+  }
+
+static void update_audioalbum(bg_db_t * db, void * obj)
+  {
+  bg_db_audio_album_t * a = (bg_db_audio_album_t *)obj;
+  char * sql;
+  char date_string[BG_DB_DATE_STRING_LEN];
+  
+  bg_db_date_to_string(&a->date, date_string);
+  
+  sql = sqlite3_mprintf("UPDATE AUDIO_ALBUMS SET DATE = %Q, GENRE = %"PRId64", COVER = %"PRId64" WHERE ID = %"PRId64";",
+                        date_string, a->genre_id, a->cover_id, bg_db_object_get_id(a));
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  return;
+  }
+
+
+static void del_audioalbum(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_db_audio_album_t*a = (bg_db_audio_album_t*)obj;
+  /* If we had an album cover, we need to set it's type back to
+     image file */
+  if(a->cover_id > 0)
+    {
+    bg_db_object_t * cover = bg_db_object_query(db, a->cover_id);
+
+    // Cover can be disappeared already if a whole directory vanished
+    if(cover)
+      {
+      bg_db_object_set_type(cover, BG_DB_OBJECT_IMAGE_FILE);
+      bg_db_object_unref(cover);
+      }
+    }
+
+  bg_sqlite_delete_by_id(db->db, "AUDIO_ALBUMS", obj->id);
+  }
+
+static void free_audioalbum(void * obj)
+  {
+  bg_db_audio_album_t*a = obj;
+  if(a->artist)
+    free(a->artist);
+  if(a->title)
+    free(a->title);
+  if(a->search_title)
+    free(a->search_title);
+  if(a->genre)
+    free(a->genre);
+
+  }
+
+static void dump_audioalbum(void * obj)
+  {
+  bg_db_audio_album_t*a = obj;
+  gavl_diprintf(2, "Artist:   %s\n", a->artist);
+  gavl_diprintf(2, "Title:    %s (%s)\n", a->title, a->search_title);
+  gavl_diprintf(2, "Year:     %d\n", a->date.year);
+  gavl_diprintf(2, "Genre:    %s\n", a->genre);
+  gavl_diprintf(2, "Cover ID: %"PRId64"\n", a->cover_id);
+  }
+
+const bg_db_object_class_t bg_db_audio_album_class =
+  {
+    .name = "Audio album",
+    .del = del_audioalbum,
+    .free = free_audioalbum,
+    .query = query_audioalbum,
+    .update = update_audioalbum,
+    .dump = dump_audioalbum,
+    .get_children = get_children_audioalbum,
+    .parent = NULL, // Object
+  };
+
+static int compare_album_by_file(const bg_db_object_t * obj, const void * data)
+  {
+  const bg_db_audio_file_t * file;
+  const bg_db_audio_album_t * album;
+
+  if(obj->type == BG_DB_OBJECT_AUDIO_ALBUM)
+    {
+    file = (const bg_db_audio_file_t*)data;
+    album = (const bg_db_audio_album_t*)obj;
+    
+    if(!strcmp(file->album, album->title) &&
+       (album->artist_id == file->albumartist_id))
+      return 1;
+    }
+  return 0;
+  } 
+
+  /* Check if the album already exists */
+
+static int64_t find_by_file(bg_db_t * db, bg_db_audio_file_t * f)
+  {
+  int64_t ret;
+  char * sql;
+  int result;
+
+  ret = bg_db_cache_search(db, compare_album_by_file, f);
+  if(ret > 0)
+    return ret;
+
+  ret = -1;
+  sql = sqlite3_mprintf("select ID from AUDIO_ALBUMS where ((TITLE = %Q) & (ARTIST = %"PRId64"));",
+                        f->album, f->albumartist_id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &ret);
+  sqlite3_free(sql);
+
+  if(!result)
+    return -1; // Should never happen
+
+  return ret;
+  
+  }
+
+void bg_db_audio_file_add_to_album(bg_db_t * db, bg_db_audio_file_t * f)
+  {
+  int64_t id;
+  bg_db_audio_album_t * a;
+  if((id = find_by_file(db, f)) > 0)
+    {
+    int changed = 0;
+    /* Add to album */
+    a = bg_db_object_query(db, id);
+    bg_db_object_add_child(db, a, f);
+
+    /* Clear some fields if they changed */
+
+    /* If there is a date set, we check if it's the same for the added track */
+    if(!bg_db_date_equal(&a->date, &f->date))
+      {
+      bg_db_date_set_invalid(&a->date);
+      changed = 1;
+      }
+    /* If there is a genre set, we check if it's the same for the added track */
+    if(a->genre_id != f->genre_id)
+      {
+      a->genre_id = 0;
+      changed = 1;
+      }
+    f->album_id = bg_db_object_get_id(a);
+
+    if(changed)
+      bg_db_create_vfolders(db, a);
+
+    bg_db_object_unref(a);
+    }
+  else
+    {
+    char * sql;
+    char date_string[BG_DB_DATE_STRING_LEN];
+    
+    /* Create album */
+    a = bg_db_object_create(db);
+    bg_db_object_set_type(a, BG_DB_OBJECT_AUDIO_ALBUM);
+    bg_db_object_set_parent_id(db, a, -1);
+    a->genre_id = f->genre_id;
+    a->genre = gavl_strdup(f->genre);
+    a->cover_id = -1;
+    /* Remove title completely? */
+    a->title = gavl_strdup(f->album);
+    a->search_title = gavl_strdup(bg_db_get_search_string(a->title));
+    
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Creating album %s", a->title);
+    
+    bg_db_object_set_label(a, f->album);
+    bg_db_date_copy(&a->date, &f->date);
+    a->artist_id = f->albumartist_id;
+    a->artist = gavl_strdup(f->albumartist);
+    
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding audio album %s", a->title);
+    bg_db_date_to_string(&a->date, date_string);
+    
+    sql = sqlite3_mprintf("INSERT INTO AUDIO_ALBUMS ( ID, ARTIST, TITLE, SEARCH_TITLE, GENRE, DATE ) VALUES ( %"PRId64", %"PRId64", %Q, %Q, %"PRId64", %Q);",
+                          bg_db_object_get_id(a), a->artist_id, a->title,
+                          a->search_title, a->genre_id, date_string);
+    bg_sqlite_exec(db->db, sql, NULL, NULL);
+    sqlite3_free(sql);
+
+    f->album_id = bg_db_object_get_id(a);
+    
+    bg_db_object_add_child(db, a, f);
+    bg_db_create_vfolders(db, a);
+    bg_db_object_unref(a);
+    }
+  }
+
+void bg_db_audio_file_remove_from_album(bg_db_t * db, bg_db_audio_file_t * f)
+  {
+  bg_db_audio_album_t * a;
+
+  if(f->album_id <= 0) // Some files have no album
+    return;
+  
+  a = bg_db_object_query(db, f->album_id);
+
+  
+  if(!a)
+    return; // Shouldn't happen
+
+  bg_db_object_remove_child(db, a, f);
+
+  if(!a->obj.children)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty album %s", a->title);
+    bg_db_object_delete(db, a);
+    }
+  else
+    bg_db_object_unref(a);
+  
+  }
+

gmerlin-4256.tar.gz/lib/db_dir.c Added

@@ -0,0 +1,242 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define LOG_DOMAIN "db.dir"
+
+/* Delete from database */
+
+#define PATH_COL          1
+#define SCAN_FLAGS_COL    2
+#define UPDATE_ID_COL     3
+#define SCAN_DIR_ID_COL   4
+
+static int query_dir(bg_db_t * db, void * dir1)
+  {
+  int result;
+  int found = 0;
+  bg_db_dir_t * dir = dir1;
+  sqlite3_stmt * st = db->q_directories;
+  sqlite3_bind_int64(st, 1, dir->obj.id);
+
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_STRING(PATH_COL, dir->path);
+    BG_DB_GET_COL_INT(SCAN_FLAGS_COL, dir->scan_flags);
+    BG_DB_GET_COL_INT(UPDATE_ID_COL, dir->update_id);
+    BG_DB_GET_COL_INT(SCAN_DIR_ID_COL, dir->scan_dir_id);
+    found = 1;
+    }
+
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return 0;
+  
+  dir->path = bg_db_filename_to_abs(db, dir->path);
+  return 1;
+  }
+
+static void update_dir(bg_db_t * db, void * obj)
+  {
+  bg_db_dir_t * dir = (bg_db_dir_t *)obj;
+  char * sql;
+  
+  sql = sqlite3_mprintf("UPDATE DIRECTORIES SET UPDATE_ID = %"PRId64" WHERE ID = %"PRId64";",
+                        dir->update_id, bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  return;
+  }
+
+static void del_dir(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_sqlite_delete_by_id(db->db, "DIRECTORIES", obj->id);
+  }
+
+static void free_dir(void * obj) // Delete from db
+  {
+  bg_db_dir_t*d = obj;
+  if(d->path)
+    free(d->path);
+  }
+
+static void dump_dir(void * obj)
+  {
+  bg_db_dir_t*d = obj;
+  gavl_diprintf(2, "Path:        %s\n", d->path);
+  gavl_diprintf(2, "Scan flags:  %04x\n", d->scan_flags);
+  gavl_diprintf(2, "Update ID:   %d\n", d->update_id);
+  gavl_diprintf(2, "Scan dir ID: %"PRId64"\n", d->scan_dir_id);
+  }
+
+const bg_db_object_class_t bg_db_dir_class =
+  {
+    .name = "Directory",
+    .del = del_dir,
+    .free = free_dir,
+    .query = query_dir,
+    .update = update_dir,
+    .dump = dump_dir,
+    .parent = NULL,
+  };
+
+static int compare_dir_by_path(const bg_db_object_t * obj, const void * data)
+  {
+  bg_db_dir_t * dir;
+  if(obj->type == BG_DB_OBJECT_DIRECTORY)
+    {
+    dir = (bg_db_dir_t*)obj;
+    if(!strcmp(dir->path, data))
+      return 1;
+    }
+  return 0;
+  } 
+
+int64_t bg_dir_by_path(bg_db_t * db, const char * path)
+  {
+  int64_t ret;
+
+  ret = bg_db_cache_search(db, compare_dir_by_path,
+                           path);
+  if(ret > 0)
+    return ret;
+  
+  return bg_sqlite_string_to_id(db->db,
+                                "DIRECTORIES", "ID", "PATH",
+                                bg_db_filename_to_rel(db, path));
+  }
+
+
+int64_t bg_parent_dir_by_path(bg_db_t * db, const char * path1)
+  {
+  int64_t ret;
+  char * path = gavl_strdup(path1);
+  char * end = strrchr(path, '/');
+  
+  if(!end)
+    return -1;
+  *end = '\0';
+
+  ret = bg_db_cache_search(db, compare_dir_by_path,
+                           path);
+  if(ret > 0)
+    {
+    free(path);
+    return ret;
+    }
+  ret = bg_sqlite_string_to_id(db->db, "DIRECTORIES", "ID", "PATH",
+                               bg_db_filename_to_rel(db, path));
+  free(path);
+  return ret;
+  }
+
+void bg_db_dir_create(bg_db_t * db, int scan_flags,
+                      bg_db_scan_item_t * item,
+                      bg_db_dir_t ** parent, int64_t * scan_dir_id)
+  {
+  bg_db_object_t * obj;
+  bg_db_dir_t * dir;
+  char * sql;
+  const char * label;
+  
+  /* Make sure we have the right parent directoy */  
+  if(parent)
+    {
+    if(!(*parent = bg_db_dir_ensure_parent(db, *parent, item->path)))
+      return;
+    }
+
+  obj = bg_db_object_create(db);
+  bg_db_object_set_type(obj, BG_DB_OBJECT_DIRECTORY);
+  
+  if(parent)
+    bg_db_object_set_parent(db, obj, *parent);
+  else
+    bg_db_object_set_parent_id(db, obj, 0);    
+  
+  dir = (bg_db_dir_t *)obj;
+
+  if(*scan_dir_id > 0)
+    dir->scan_dir_id = *scan_dir_id;
+  else
+    {
+    dir->scan_dir_id = bg_db_object_get_id(dir);
+    *scan_dir_id = dir->scan_dir_id;
+    }
+  dir->scan_flags = scan_flags;
+  dir->path = item->path;
+  item->path = NULL;
+  label = strrchr(dir->path, '/');
+  if(label)
+    {
+    label++;
+    bg_db_object_set_label(dir, label);
+    }
+  else
+    bg_db_object_set_label_nocpy(dir, bg_path_to_label(dir->path));
+  
+  
+  sql = sqlite3_mprintf("INSERT INTO DIRECTORIES ( ID, PATH, SCAN_FLAGS, UPDATE_ID, SCAN_DIR_ID ) VALUES ( %"PRId64", %Q, %d, %"PRId64", %"PRId64");",
+                        bg_db_object_get_id(obj), bg_db_filename_to_rel(db, dir->path), dir->scan_flags, dir->update_id, dir->scan_dir_id);
+  
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+  bg_db_object_unref(obj);
+  }
+
+bg_db_dir_t *
+bg_db_dir_ensure_parent(bg_db_t * db, bg_db_dir_t * dir, const char * path)
+  {
+  int64_t id;
+  const char * end = strrchr(path, '/');
+  if(!end)
+    return 0;
+  
+  if(dir &&
+     (strlen(dir->path) == (end - path)) &&
+     !strncmp(dir->path, path, end-path))
+    return dir;
+
+  /* Get proper parent */
+  if(dir)
+    bg_db_object_unref(dir);
+  
+  id = bg_parent_dir_by_path(db, path);
+
+  if(id < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find parent directory of %s",
+           path);
+    return 0;
+    }
+  return bg_db_object_query(db, id);
+  }

gmerlin-4256.tar.gz/lib/db_file.c Added

@@ -0,0 +1,500 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#define LOG_DOMAIN "db.file"
+
+#define PATH_COL        1
+#define MTIME_COL       2
+#define MIMETYPE_COL    3
+#define SCAN_DIR_ID_COL 4
+
+static int query_file(bg_db_t * db, void * file1)
+  {
+  int result;
+  bg_db_file_t * f = file1;
+  int found = 0;
+
+  sqlite3_stmt * st = db->q_files;
+
+  sqlite3_bind_int64(st, 1, f->obj.id);
+  
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_STRING(PATH_COL, f->path);
+    BG_DB_GET_COL_MTIME(MTIME_COL, f->mtime);
+    BG_DB_GET_COL_INT(MIMETYPE_COL, f->mimetype_id);
+    BG_DB_GET_COL_INT(SCAN_DIR_ID_COL, f->scan_dir_id);
+    found = 1;
+    }
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return 0;
+  
+  f->path = bg_db_filename_to_abs(db, f->path);
+  
+  f->mimetype = bg_db_string_cache_get(db->mimetypes, db->db,
+                                       f->mimetype_id);
+  return 1;
+  }
+
+static void del_file(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_sqlite_delete_by_id(db->db, "FILES", obj->id);
+  }
+
+static void free_file(void * obj)
+  {
+  bg_db_file_t * f = obj;
+  if(f->path)
+    free(f->path);
+  if(f->mimetype)
+    free(f->mimetype);
+  }
+
+static void dump_file(void * obj)
+  {
+  bg_db_file_t * f = obj;
+  gavl_diprintf(2, "Path:        %s\n", f->path);
+  gavl_diprintf(2, "Mtime:       %"PRId64"\n", (int64_t)f->mtime);
+  gavl_diprintf(2, "Mimetype:    %s\n", f->mimetype);
+  gavl_diprintf(2, "Scan dir ID: %"PRId64"\n", f->scan_dir_id);
+  }
+
+const bg_db_object_class_t bg_db_file_class =
+  {
+  .name = "File",
+  .dump = dump_file,
+  .del = del_file,
+  .free = free_file,
+  .query = query_file,
+  .parent = NULL,  /* Object */
+  };
+
+static int file_add(bg_db_t * db, bg_db_file_t * f)
+  {
+  char * sql;
+  int result;
+  char mtime_str[BG_DB_TIME_STRING_LEN];
+  
+  /* Mimetype */
+  if(f->mimetype)
+    {
+    f->mimetype_id = 
+      bg_sqlite_string_to_id_add(db->db, "MIMETYPES",
+                                 "ID", "NAME", f->mimetype);
+    }
+  /* Mtime */
+  bg_db_time_to_string(f->mtime, mtime_str);
+
+#if 1
+  sql = sqlite3_mprintf("INSERT INTO FILES ( ID, PATH, MTIME, MIMETYPE, SCAN_DIR_ID ) VALUES ( %"PRId64", %Q, %Q, %"PRId64", %"PRId64" );",
+                        f->obj.id, bg_db_filename_to_rel(db, f->path), mtime_str, f->mimetype_id, f->scan_dir_id);
+
+  result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+#endif
+  return result;
+  }
+
+static int compare_file_by_path(const bg_db_object_t * obj, const void * data)
+  {
+  const bg_db_file_t * file;
+  if(obj->type & BG_DB_FLAG_FILE)
+    {
+    file = (const bg_db_file_t*)obj;
+    if(!strcmp(file->path, data))
+      return 1;
+    }
+  return 0;
+  } 
+
+int64_t bg_db_file_by_path(bg_db_t * db, const char * path)
+  {
+  int64_t ret;
+
+  ret = bg_db_cache_search(db, compare_file_by_path,
+                           path);
+  if(ret > 0)
+    return ret;
+
+  
+  return bg_sqlite_string_to_id(db->db, "FILES", "ID", "PATH",
+                                bg_db_filename_to_rel(db, path));
+  }
+
+static const struct
+  {
+  const char * ext;
+  const char * mimetype;
+  }
+text_mimetypes[] =
+  {
+    { ".nfo", "text/x-nfo" },
+    { ".txt", "text/plain" },
+    { ".htm .html",  "text/html" },
+    { ".srt",  "text/plain" },
+    { ".sub",  "text/plain" },
+    { ".meta",  "text/x-gmerlin-metadata" },
+    { },
+  };
+  
+  
+/* Open the file, load metadata and so on */
+bg_db_file_t *
+bg_db_file_create_from_object(bg_db_t * db, bg_db_object_t * obj, int scan_flags,
+                              bg_db_scan_item_t * item,
+                              int64_t scan_dir_id)
+  {
+  int i;
+  bg_track_info_t * ti;
+  bg_plugin_handle_t * h = NULL;
+  bg_input_plugin_t * plugin = NULL;
+  bg_db_file_t * file;
+  bg_db_object_type_t type;
+  const char * ext;
+  
+  gavl_time_t duration;
+  
+  bg_db_object_set_type(obj, BG_DB_OBJECT_FILE);
+
+  file = (bg_db_file_t *)obj;
+  file->path = item->path;
+  item->path = NULL;
+
+  file->mtime = item->mtime;
+  file->scan_dir_id = scan_dir_id;
+  
+  bg_db_object_update_size(db, file, item->size);
+  bg_db_object_set_label_nocpy(file, bg_path_to_label(file->path));
+
+  /* Detect text files */
+
+  if((ext = strrchr(file->path, '.')))
+    {
+    i = 0;
+    while(text_mimetypes[i].ext)
+      {
+      if(bg_string_match(ext, text_mimetypes[i].ext))
+        {
+        file->mimetype = gavl_strdup(text_mimetypes[i].mimetype);
+        file_add(db, file);
+        return file;
+        }
+      i++;
+      }
+    }
+  
+  
+  /* Load all infos */  
+  if(!bg_input_plugin_load(db->plugin_reg, file->path, NULL, &h, NULL, 0))
+    goto fail;
+  plugin = (bg_input_plugin_t *)h->plugin;
+  
+  /* Only one track supported */
+  if(plugin->get_num_tracks && (plugin->get_num_tracks(h->priv) < 1))
+    goto fail;
+
+  ti = plugin->get_track_info(h->priv, 0);
+  
+  /* Detect file type */
+  if((ti->num_audio_streams == 1) && !ti->num_video_streams)
+    type = BG_DB_OBJECT_AUDIO_FILE;
+  else if(ti->num_video_streams == 1)
+    {
+    if(!ti->num_audio_streams && (ti->num_video_streams == 1) &&
+       (ti->video_streams[0].format.framerate_mode == GAVL_FRAMERATE_STILL))
+      type = BG_DB_OBJECT_IMAGE_FILE;
+    else
+      type = BG_DB_OBJECT_VIDEO_FILE;
+    }
+  
+  file->mimetype =
+    gavl_strdup(gavl_metadata_get(&ti->metadata, GAVL_META_MIMETYPE));
+
+  /* Check if we want to add this file */
+  switch(type)
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      if(!(scan_flags & BG_DB_SCAN_AUDIO))
+        goto fail;
+      break;
+    case BG_DB_OBJECT_VIDEO_FILE:
+      if(!(scan_flags & BG_DB_SCAN_VIDEO))
+        goto fail;
+      break;
+    case BG_DB_OBJECT_IMAGE_FILE: // Images can also be movie poster and album covers
+      break;
+    default:
+      break;
+    }
+
+  /* */
+  
+  if(plugin->set_track && !plugin->set_track(h->priv, 0))
+    goto fail;
+  
+  /* Start everything */
+  if(plugin->set_audio_stream)
+    {
+    for(i = 0; i < ti->num_audio_streams; i++)
+      plugin->set_audio_stream(h->priv, i, BG_STREAM_ACTION_DECODE);
+    }
+  if(plugin->set_video_stream)
+    {
+    for(i = 0; i < ti->num_video_streams; i++)
+      plugin->set_video_stream(h->priv, i, BG_STREAM_ACTION_DECODE);
+    }
+  if(plugin->set_text_stream)
+    {
+    for(i = 0; i < ti->num_text_streams; i++)
+      plugin->set_text_stream(h->priv, i, BG_STREAM_ACTION_DECODE);
+    }
+  if(plugin->set_overlay_stream)
+    {
+    for(i = 0; i < ti->num_overlay_streams; i++)
+      plugin->set_overlay_stream(h->priv, i, BG_STREAM_ACTION_DECODE);
+    }
+  if(plugin->start && !plugin->start(h->priv))
+    goto fail;
+
+  if(gavl_metadata_get_long(&ti->metadata, GAVL_META_APPROX_DURATION,
+                             &duration))
+    bg_db_object_update_duration(db, file, duration);
+    
+  
+  /* Create derived type */
+  switch(type)
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      bg_db_audio_file_create(db, file, ti);
+      break;
+    case BG_DB_OBJECT_VIDEO_FILE:
+      bg_db_video_file_create(db, file, ti);
+      break;
+    case BG_DB_OBJECT_IMAGE_FILE:
+      bg_db_image_file_create_from_ti(db, file, ti);
+      break;
+    default:
+      break;
+    }
+  
+  fail:
+
+  if(plugin)
+    plugin->close(h->priv);
+
+  if(h)
+    bg_plugin_unref(h);
+
+  file_add(db, file);
+  return file; 
+  }
+
+void bg_db_file_create(bg_db_t * db, int scan_flags,
+                       bg_db_scan_item_t * item,
+                       bg_db_dir_t ** dir, int64_t scan_dir_id)
+  {
+  bg_db_object_t * obj;
+  bg_db_file_t * file;
+    
+  /* Make sure we have the right parent directoy */
+  if(!(*dir = bg_db_dir_ensure_parent(db, *dir, item->path)))
+    return;
+  
+  obj = bg_db_object_create(db);
+  file = bg_db_file_create_from_object(db, obj, scan_flags, item, scan_dir_id);
+
+  bg_db_object_set_parent(db, file, *dir);
+  bg_db_object_unref(file);
+  }
+
+bg_db_file_t * bg_db_file_create_internal(bg_db_t * db, const char * path_rel)
+  {
+  bg_db_file_t * file;
+  bg_db_object_t * obj;
+
+  char * path_abs = gavl_strdup(path_rel);
+  bg_db_scan_item_t item;
+  
+  memset(&item, 0, sizeof(item));
+  path_abs = bg_db_filename_to_abs(db, path_abs);
+  if(!bg_db_scan_item_set(&item, path_abs))
+    return NULL;
+  obj = bg_db_object_create(db);
+  if((file = bg_db_file_create_from_object(db, obj, ~0, &item, -1)))
+    bg_db_object_set_parent_id(db, file, -1);
+  bg_db_scan_item_free(&item);
+  return file;
+  }
+
+void bg_db_add_files(bg_db_t * db, bg_db_scan_item_t * files, int num,
+                     int scan_flags, int64_t scan_dir_id)
+  {
+  int i;
+  
+  bg_db_dir_t * dir = NULL;
+  
+  for(i = 0; i < num; i++)
+    {
+    if(files[i].done)
+      continue;
+    
+    switch(files[i].type)
+      {
+      case BG_DB_DIRENT_DIRECTORY:
+        {
+        bg_db_dir_create(db, scan_flags, &files[i],
+                         &dir, &scan_dir_id);
+        }
+        break;
+      case BG_DB_DIRENT_FILE:
+        {
+        bg_db_file_create(db, scan_flags, &files[i],
+                          &dir, scan_dir_id);
+        }
+        break;
+      }
+    }
+  if(dir)
+    bg_db_object_unref(dir);
+  }
+
+static bg_db_scan_item_t * find_by_path(bg_db_scan_item_t * files, int num, 
+                                        char * path, bg_db_dirent_type_t type)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    {
+    if((files[i].type == type) && !strcmp(files[i].path, path))
+      return &files[i];
+    }
+  return NULL;
+  }
+
+void bg_db_update_files(bg_db_t * db, bg_db_scan_item_t * files, 
+                        int num, int scan_flags,
+                        int64_t scan_dir_id, const char * scan_dir)
+  {
+  char * sql;
+  int result;
+  bg_db_file_t * file;
+  bg_db_dir_t * dir;
+  
+  int i;
+  bg_db_scan_item_t * si;
+  
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Getting directories from database");
+  sql =
+    sqlite3_mprintf("select ID from DIRECTORIES where SCAN_DIR_ID = %"PRId64";", scan_dir_id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  //  fprintf(stderr, "SQL: %s\n", sql);
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Found %d directories in database", tab.num_val);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    dir = bg_db_object_query(db, tab.val[i]);
+
+    if(!dir) // dir can be gone already if the parent directory vanished
+      continue;
+    
+    if(!strcmp(dir->path, scan_dir))
+      {
+      bg_db_object_unref(dir);
+      continue;
+      }
+    
+    si = find_by_path(files, num, dir->path, BG_DB_DIRENT_DIRECTORY);
+    if(!si)
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN,
+             "Directory %s disappeared, removing from database", dir->path);
+      bg_db_object_delete(db, dir);
+      }
+    else
+      {
+      bg_db_object_unref(dir);
+      si->done = 1;
+      }
+    }
+
+  bg_sqlite_id_tab_reset(&tab);
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Getting files from database");
+  
+  sql =
+    sqlite3_mprintf("select ID from FILES where SCAN_DIR_ID = %"PRId64";", scan_dir_id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  if(!result)
+    goto fail;
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Found %d files in database", tab.num_val);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    file = bg_db_object_query(db, tab.val[i]);
+    
+    si = find_by_path(files, num, file->path, BG_DB_DIRENT_FILE);
+    if(!si)
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN,
+             "File %s disappeared, removing from database", file->path);
+      bg_db_object_delete(db, file);
+      }
+    else if(si->mtime != file->mtime)
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, 
+             "File %s changed on disk, removing from database for re-adding later", file->path);
+      bg_db_object_delete(db, file);
+      }
+    else
+      {
+      si->done = 1;
+      bg_db_object_unref(file);
+      }
+    }
+
+  bg_db_add_files(db, files, num, scan_flags, scan_dir_id);
+  
+  fail:
+  bg_sqlite_id_tab_free(&tab);
+  
+  }

gmerlin-4256.tar.gz/lib/db_image.c Added

@@ -0,0 +1,406 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#define LOG_DOMAIN "db.image"
+
+static int image_query_callback(void * data, int argc, char **argv, char **azColName)
+  {
+  int i;
+  bg_db_image_file_t * ret = data;
+
+  for(i = 0; i < argc; i++)
+    {
+    BG_DB_SET_QUERY_INT("WIDTH",   width);
+    BG_DB_SET_QUERY_INT("HEIGHT",  height);
+    BG_DB_SET_QUERY_DATE("DATE",   date);
+    }
+  ret->file.obj.found = 1;
+  return 0;
+  }
+
+static int query_image(bg_db_t * db, void * a1)
+  {
+  char * sql;
+  int result;
+  bg_db_object_t * a = a1;
+  
+  a->found = 0;
+  sql = sqlite3_mprintf("select * from IMAGE_FILES where ID = %"PRId64";", bg_db_object_get_id(a));
+  result = bg_sqlite_exec(db->db, sql, image_query_callback, a);
+  sqlite3_free(sql);
+  if(!result || !a->found)
+    return 0;
+  return 1;
+  }
+
+static void update_image(bg_db_t * db, void * obj)
+  {
+  bg_db_image_file_t * a = obj;
+  char * sql;
+  char date_string[BG_DB_DATE_STRING_LEN];
+  
+  bg_db_date_to_string(&a->date, date_string);
+  
+  sql = sqlite3_mprintf("UPDATE IMAGE_FILES SET DATE = %Q, WIDTH = %d, HEIGHT = %d WHERE ID = %"PRId64";",
+                        date_string, a->width, a->height, bg_db_object_get_id(a));
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  return;
+  }
+
+
+static void del_image(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  char * sql;
+  int result;
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+
+  /* Delete associated thumbnails */
+  
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (REF_ID = %"PRId64");",
+                        BG_DB_OBJECT_THUMBNAIL, obj->id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(result)
+    {
+    int i;
+    for(i = 0; i < tab.num_val; i++)
+      {
+      bg_db_object_t * image = bg_db_object_query(db, tab.val[i]);
+      bg_db_object_delete(db, image);
+      }
+    }
+  bg_sqlite_id_tab_free(&tab);
+  bg_sqlite_delete_by_id(db->db, "IMAGE_FILES", obj->id);
+  }
+
+
+static void dump_image(void * obj)
+  {
+  bg_db_image_file_t*a = obj;
+  gavl_diprintf(2, "Size:   %dx%d\n", a->width, a->height);
+  gavl_diprintf(2, "Date:   %04d-%02d-%02d\n", a->date.year, a->date.month, a->date.day);
+  }
+
+const bg_db_object_class_t bg_db_image_file_class =
+  {
+    .name = "Image file",
+    .del = del_image,
+    .query = query_image,
+    .update = update_image,
+    .dump = dump_image,
+    .parent = &bg_db_file_class, // Object
+  };
+
+static void del_thumbnail(bg_db_t * db, bg_db_object_t * obj) 
+  {
+  /* Delete thumbnail file */
+  bg_db_file_t * f = (bg_db_file_t *)obj;
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing %s", f->path);
+  remove(f->path);
+  }
+
+
+const bg_db_object_class_t bg_db_thumbnail_class =
+  {
+    .name = "Thumbnail",
+    .del = del_thumbnail,
+    .parent = &bg_db_image_file_class, // Object
+  };
+
+static void del_album_cover(bg_db_t * db, bg_db_object_t * obj)
+  {
+  char * sql;
+  int result, i;
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+  
+  sql = sqlite3_mprintf("SELECT ID FROM AUDIO_ALBUMS WHERE COVER = %"PRId64";", obj->id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  if(!result)
+    return;
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    bg_db_audio_album_t * a = bg_db_object_query(db, tab.val[i]);
+    if(a)
+      {
+      a->cover_id = -1;
+      bg_db_object_unref(a);
+      }
+    }
+  bg_sqlite_id_tab_free(&tab);
+  }
+
+
+const bg_db_object_class_t bg_db_album_cover_class =
+  {
+    .name = "Album cover",
+    .del = del_album_cover,
+    .parent = &bg_db_image_file_class, // Object
+  };
+
+static void del_movie_art(bg_db_t * db, bg_db_object_t * obj)
+  {
+  char * sql;
+  int result, i;
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+
+  sql = sqlite3_mprintf("SELECT ID FROM VIDEO_INFOS WHERE "
+                        "(POSTER = %"PRId64") | (FANART = %"PRId64");", obj->id, obj->id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  if(!result)
+    return;
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    bg_db_object_t * a = bg_db_object_query(db, tab.val[i]);
+    if(a)
+      {
+      bg_db_video_info_t * vi = bg_db_object_get_video_info(a);
+      if(vi->poster_id == obj->id)
+        vi->poster_id = -1;
+      if(vi->fanart_id == obj->id)
+        vi->fanart_id = -1;
+
+      bg_db_object_unref(a);
+      }
+    }
+  bg_sqlite_id_tab_free(&tab);
+  }
+
+
+const bg_db_object_class_t bg_db_movie_art_class =
+  {
+    .name = "Movie art",
+    .del = del_movie_art,
+    .parent = &bg_db_image_file_class, // Object
+  };
+
+
+void bg_db_image_file_create_from_ti(bg_db_t * db, void * obj, bg_track_info_t * ti)
+  {
+  char * sql;
+  char date_string[BG_DB_DATE_STRING_LEN];
+  bg_db_image_file_t * f = obj;
+  bg_db_object_set_type(obj, BG_DB_OBJECT_IMAGE_FILE);
+  
+  f->width  = ti->video_streams[0].format.image_width;
+  f->height = ti->video_streams[0].format.image_height;
+
+  /* Date */
+  bg_db_date_to_string(&f->date, date_string);
+
+  /* Creation date (comes from exit data) */
+  if(!gavl_metadata_get_date(&ti->metadata, GAVL_META_DATE_CREATE, &f->date.year, &f->date.month, &f->date.day))
+    bg_db_date_set_invalid(&f->date);
+
+  sql = sqlite3_mprintf("INSERT INTO IMAGE_FILES ( ID, WIDTH, HEIGHT, DATE ) VALUES ( %"PRId64", %d, %d, %Q);",
+                          bg_db_object_get_id(f), f->width, f->height, date_string);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+static int detect_album_cover(bg_db_t * db, bg_db_image_file_t * f)
+  {
+  int result = 0;
+  int found = 0;
+  char * sql;
+  int id = -1;
+  const char * basename;
+  bg_db_audio_file_t * song = NULL;
+  bg_db_audio_album_t * album = NULL;
+
+  /* Check if there are music files in the same directory */
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE TYPE = %d and PARENT_ID =  %"PRId64";",
+                        BG_DB_OBJECT_AUDIO_FILE, f->file.obj.parent_id);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &id);
+  sqlite3_free(sql);
+  if(!result || (id <= 0))
+    goto end;
+
+  /* Check if the file has a valid album */
+  song = bg_db_object_query(db, id);
+  if(!song || (song->album_id <= 0))
+    goto end;
+
+  album = bg_db_object_query(db, song->album_id);
+  if(album->cover_id > 0)
+    goto end;
+
+  basename = bg_db_object_get_label(f);
+  if(!strcasecmp(basename, "cover") ||
+     !strcasecmp(basename, "folder") ||
+     !strcasecmp(basename, album->title))
+    found = 1;
+
+  end:
+
+  if(found)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using %s as cover for album %s",
+           f->file.path, album->title);
+    album->cover_id = bg_db_object_get_id(f);
+    bg_db_object_set_type(f, BG_DB_OBJECT_ALBUM_COVER);
+    
+    bg_db_make_thumbnail(db, f, 600, 600, "image/jpeg"); // "large"
+    bg_db_make_thumbnail(db, f, 248, 248, "image/jpeg"); // NMJ
+    bg_db_make_thumbnail(db, f, 160, 160, "image/jpeg"); // Web, DLNA JPEG_TN
+    }
+  if(song)
+    bg_db_object_unref(song);
+  if(album)
+    bg_db_object_unref(album);
+  return found;
+  }
+
+static int detect_movie_art(bg_db_t * db, bg_db_image_file_t * f)
+  {
+  int is_fanart = 0;
+  char * pos;
+  char * sql;
+  int result;
+  int ret = 0;
+  bg_sqlite_id_tab_t tab;
+  bg_db_object_t * obj;
+  bg_db_video_info_t * vi;
+  char * label = gavl_strdup(f->file.obj.label);
+  bg_sqlite_id_tab_init(&tab);  
+
+  if((pos = strrchr(label, '.')) && !strncasecmp(pos, ".fanart", 7))
+    {
+    is_fanart = 1;
+    *pos = '\0';
+    }
+
+  sql = sqlite3_mprintf("select ID from OBJECTS where (LABEL = %Q) & "
+                          "((TYPE = %d) | "
+                          "(TYPE = %d) | "
+                          "(TYPE = %d) | "
+                          "(TYPE = %d) | "
+                          "(TYPE = %d));",
+                          label, 
+                          BG_DB_OBJECT_MOVIE, 
+                          BG_DB_OBJECT_TVSERIES, 
+                          BG_DB_OBJECT_SEASON, 
+                          BG_DB_OBJECT_VIDEO_EPISODE,
+                          BG_DB_OBJECT_MOVIE_MULTIPART);
+
+   result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+   sqlite3_free(sql);
+   if(result)
+     {
+     if(tab.num_val > 1)
+       bg_log(BG_LOG_INFO, LOG_DOMAIN, "File %s matches more than one movie, taking first one", f->file.path);
+     
+     if(tab.num_val > 0)
+       {
+       if((obj = bg_db_object_query(db, tab.val[0])) &&
+          (vi = bg_db_object_get_video_info(obj)))
+         {
+         if(is_fanart)
+           {
+           vi->fanart_id = bg_db_object_get_id(f);
+           bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using %s as fanart", f->file.path);
+           bg_db_make_thumbnail(db, f, 1280, 720, "image/jpeg"); // NMT Wallpaper
+           }
+         else
+           {
+           vi->poster_id = bg_db_object_get_id(f);
+           bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using %s as poster", f->file.path);
+           bg_db_make_thumbnail(db, f, 124, 185, "image/jpeg"); // NMT Thumbnail
+           bg_db_make_thumbnail(db, f, 220, 330, "image/jpeg"); // NMT Poster
+           }
+         ret = 1;
+         bg_db_object_set_type(f, BG_DB_OBJECT_MOVIE_ART);
+         }
+       if(obj)
+         bg_db_object_unref(obj);
+       }
+     }
+  
+   free(label);
+   bg_sqlite_id_tab_free(&tab);
+   return ret;
+   }
+
+void bg_db_identify_images(bg_db_t * db, int64_t scan_dir_id, int scan_flags)
+  {
+  int i;
+  int result;
+  char * sql;
+  bg_db_image_file_t * f;
+
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+
+  /* Get all unidentified images from the scan directory */  
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Finding unidentifies images");
+
+  sql = sqlite3_mprintf("select ID from OBJECTS where TYPE = %d;", BG_DB_OBJECT_IMAGE_FILE);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(!result)
+    return;
+
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Found %d unidentifies images", tab.num_val);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    f = bg_db_object_query(db, tab.val[i]);
+
+    if(f->file.scan_dir_id != scan_dir_id)
+      {
+      bg_db_object_unref(f);
+      continue;
+      }
+    
+    if((scan_flags & BG_DB_SCAN_AUDIO) && detect_album_cover(db, f))
+      {
+      bg_db_object_unref(f);
+      continue;
+      }
+    if((scan_flags & BG_DB_SCAN_VIDEO) && detect_movie_art(db, f))
+      {
+      bg_db_object_unref(f);
+      continue;
+      }
+
+
+    bg_db_object_unref(f);
+    }
+  bg_sqlite_id_tab_free(&tab);
+  }
+

gmerlin-4256.tar.gz/lib/db_object.c Added

@@ -0,0 +1,739 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+
+#define LOG_DOMAIN "db.object"
+
+static void object_delete(bg_db_t * db, void * obj1, int64_t child_id);
+
+
+    /*
+  int64_t id;
+  bg_db_object_type_t type;
+  
+  int64_t ref_id;
+  int64_t parent_id;
+  int num_children;  // -1 for non-containers
+
+  int64_t size;
+  gavl_time_t duration;
+  char * label;
+    */
+
+/* Caching mechanisms */
+
+void bg_db_object_init(void * obj1)
+  {
+  bg_db_object_storage_t * obj = obj1;
+  memset(obj, 0, sizeof(*obj));
+  obj->obj.id = -1;
+  }
+
+static bg_db_object_t * get_cache_item(bg_db_t * db)
+  {
+  int i;
+  int ret_index = -1;
+  bg_db_object_t * obj;
+  
+  /* Check for empty items */
+  for(i = 0; i < db->cache_size; i++)
+    {
+    if(!bg_db_object_is_valid(&db->cache[i].obj))
+      {
+      ret_index = i;
+      break;
+      }
+    }
+  
+  /* Check for non-referenced non-container items (containers are more
+     likely to be reused) */
+  
+  if(ret_index < 0)
+    {
+    for(i = 0; i < db->cache_size; i++)
+      {
+      if(db->cache[i].refcount)
+        continue;
+
+      obj = (bg_db_object_t *)&db->cache[i];
+      if(!(obj->type & BG_DB_FLAG_CONTAINER))
+        {
+        ret_index = i;
+        break;
+        }
+      }
+    }
+  
+  /* Check for non-referenced items */
+  if(ret_index < 0)
+    {
+    for(i = 0; i < db->cache_size; i++)
+      {
+      if(!db->cache[i].refcount)
+        {
+        ret_index = i;
+        break;
+        }
+      }
+    }
+
+  if(ret_index < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cache full");
+    return NULL;
+    }
+
+  if(bg_db_object_is_valid(&db->cache[i].obj))
+    {
+    /* Check if we need to update the database */
+    if(memcmp(&db->cache[i].obj, &db->cache[i].orig,
+              sizeof(db->cache[i].obj)))
+      {
+      bg_db_object_update(db, &db->cache[i].obj, 1, 1);
+      }
+    bg_db_object_free(&db->cache[i].obj);
+    bg_db_object_init(&db->cache[i].obj);
+    }
+  
+  db->cache[i].refcount = 1;
+  return (bg_db_object_t *)&db->cache[i].obj;
+  }
+
+void
+bg_db_object_unref(void * obj)
+  {
+  bg_db_obj_cache_t * s = (bg_db_obj_cache_t *)obj;
+  s->refcount--;
+  }
+
+void
+bg_db_object_ref(void * obj)
+  {
+  bg_db_obj_cache_t * s = (bg_db_obj_cache_t *)obj;
+  s->refcount++;
+  }
+
+void bg_db_object_dump(void * obj1)
+  {
+  const bg_db_object_class_t * c;
+  bg_db_object_t * obj = obj1;
+  gavl_diprintf(0, "Object\n");
+  gavl_diprintf(2, "Type:     %d (%s)\n", obj->type, (obj->klass ? obj->klass->name : "Unknown"));
+  gavl_diprintf(2, "ID:       %"PRId64"\n", obj->id);
+  gavl_diprintf(2, "REF_ID:   %"PRId64"\n", obj->ref_id);
+  gavl_diprintf(2, "Parent:   %"PRId64"\n", obj->parent_id);
+  gavl_diprintf(2, "Children: %d\n", obj->children);
+  gavl_diprintf(2, "Size:     %"PRId64"\n", obj->size);
+  gavl_diprintf(2, "Duration: %"PRId64"\n", obj->duration);
+  gavl_diprintf(2, "Label:    %s\n", obj->label);
+  
+  /* Children */
+  c = obj->klass;
+  while(c)
+    {
+    if(c->dump)
+      c->dump(obj);
+    c = c->parent;
+    }
+  }
+
+const bg_db_object_class_t *
+bg_db_object_get_class(bg_db_object_type_t t)
+  {
+  switch(t)
+    {
+    case BG_DB_OBJECT_OBJECT:
+      return NULL;
+      break;
+    case BG_DB_OBJECT_ROOT:
+      return &bg_db_root_class;
+      break;
+    case BG_DB_OBJECT_FILE:
+      return &bg_db_file_class;
+      break;
+    case BG_DB_OBJECT_AUDIO_FILE:
+      return &bg_db_audio_file_class;
+      break;
+    case BG_DB_OBJECT_VIDEO_FILE:
+      return &bg_db_video_file_class;
+      break;
+    case BG_DB_OBJECT_MOVIE:
+      return &bg_db_movie_class;
+      break;
+    case BG_DB_OBJECT_MOVIE_PART:
+      return &bg_db_movie_part_class;
+      break;
+    case BG_DB_OBJECT_VIDEO_EPISODE:
+      return &bg_db_episode_class;
+      break;
+    case BG_DB_OBJECT_IMAGE_FILE:
+      return &bg_db_image_file_class;
+      break;
+    case BG_DB_OBJECT_PHOTO:
+      break;
+    case BG_DB_OBJECT_THUMBNAIL:
+      return &bg_db_thumbnail_class;
+      break;
+    case BG_DB_OBJECT_ALBUM_COVER:
+      return &bg_db_album_cover_class;
+      break;
+    case BG_DB_OBJECT_VIDEO_PREVIEW:
+      break;
+    case BG_DB_OBJECT_MOVIE_ART:
+      return &bg_db_movie_art_class;
+      break;
+    case BG_DB_OBJECT_CONTAINER:
+      break;
+    case BG_DB_OBJECT_DIRECTORY: 
+      return &bg_db_dir_class;
+      break;
+    case BG_DB_OBJECT_PLAYLIST:
+      return &bg_db_playlist_class;
+      break;
+    case BG_DB_OBJECT_VFOLDER:
+      return &bg_db_vfolder_class;
+      break;
+    case BG_DB_OBJECT_VFOLDER_LEAF:
+      return &bg_db_vfolder_leaf_class;
+      break;
+    case BG_DB_OBJECT_AUDIO_ALBUM:
+      return &bg_db_audio_album_class;
+      break;
+    case BG_DB_OBJECT_TVSERIES:
+      return &bg_db_series_class;
+      break;
+    case BG_DB_OBJECT_SEASON:
+      return &bg_db_season_class;
+      break;
+    case BG_DB_OBJECT_MOVIE_MULTIPART:
+      return &bg_db_multipart_movie_class;
+      break;
+    case BG_DB_OBJECT_VIDEO_NFO:
+      return &bg_db_nfo_class;
+      break;
+    case BG_DB_OBJECT_RADIO_URL:
+      return &bg_db_radio_url_class;
+      break;
+    }
+  return NULL;
+  }
+
+void bg_db_object_update_size(bg_db_t * db, void * obj, int64_t delta_size)
+  {
+  bg_db_object_t * o = obj;
+  o->size += delta_size;
+
+  //  fprintf(stderr, "Update size %ld %ld: %ld -> %ld\n", o->id, o->parent_id, delta_size, o->size);
+  if(o->parent_id >= 0)
+    {
+    bg_db_object_t * parent = bg_db_object_query(db, o->parent_id);
+    bg_db_object_update_size(db, parent, delta_size);
+    bg_db_object_unref(parent);
+    }
+  }
+
+void bg_db_object_update_duration(bg_db_t * db, void * obj, gavl_time_t delta_d)
+  {
+  bg_db_object_t * o = obj;
+  if(delta_d == GAVL_TIME_UNDEFINED)
+    return;
+    
+  o->duration += delta_d;
+  if(o->parent_id >= 0)
+    {
+    bg_db_object_t * parent = bg_db_object_query(db, o->parent_id);
+    bg_db_object_update_duration(db, parent, delta_d);
+    bg_db_object_unref(parent);
+    }
+  }
+
+int64_t bg_db_object_get_id(void * obj)
+  {
+  bg_db_object_t * o = obj;
+  return o->id;
+  }
+
+int bg_db_object_is_valid(void * obj)
+  {
+  bg_db_object_t * o = obj;
+  return (o->id >= 0);
+  }
+
+void bg_db_object_create_ref(void * obj1, void * parent1)
+  {
+  bg_db_object_t * obj = obj1;
+  //  bg_db_object_t * parent = parent1;
+  
+  /* Creating a reference to a reference will reference the original */
+  if(!obj->ref_id)
+    obj->ref_id = obj->id;
+  }
+
+
+int64_t bg_db_object_get_parent(void * obj)
+  {
+  bg_db_object_t * o = obj;
+  return o->parent_id;
+  }
+
+void bg_db_object_set_type(void * obj, bg_db_object_type_t t)
+  {
+  bg_db_object_t * o = obj;
+  const bg_db_object_class_t * c = bg_db_object_get_class(t);
+  if(c && (c->parent != o->klass) && (o->klass->parent != c))
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "bg_object_set_type failed");
+  o->klass = c;
+  o->type = t;
+  }
+
+static void * object_create(bg_db_t * db, int root)
+  {
+  char * sql;
+
+  bg_db_object_t * obj = get_cache_item(db);
+
+  if(root)
+    obj->id = 0;
+  else
+    obj->id = bg_sqlite_get_next_id(db->db, "OBJECTS");
+
+  obj->parent_id = -1;
+  
+  sql = sqlite3_mprintf("INSERT INTO OBJECTS "
+                        "( ID ) VALUES ( %"PRId64" );",
+                        obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  db->num_added++;
+  return obj;
+  }
+
+void * bg_db_object_create(bg_db_t * db)
+  {
+  return object_create(db, 0);
+  }
+
+void * bg_db_object_create_root(bg_db_t * db)
+  {
+  return object_create(db, 1);
+  }
+
+
+#define TYPE_COL      1
+#define REF_ID_COL    2
+#define PARENT_ID_COL 3
+#define CHILDREN_COL  4
+#define SIZE_COL      5
+#define DURATION_COL  6
+#define LABEL_COL     7
+
+/* Query from DB  */
+void * bg_db_object_query(bg_db_t * db, int64_t id) 
+  {
+  int i;
+  int result;
+  int found = 0;
+  const bg_db_object_class_t * c;
+  
+  bg_db_obj_cache_t * cache;
+  bg_db_object_t * obj;
+  sqlite3_stmt * st = db->q_objects;
+
+  /* Check if the object is in the cache */
+  for(i = 0; i < db->cache_size; i++)
+    {
+    if(bg_db_object_get_id(&db->cache[i]) == id)
+      {
+      db->cache[i].refcount++;
+      return &db->cache[i];
+      }
+    }
+
+  obj = get_cache_item(db);
+  
+  sqlite3_bind_int64(st, 1, id);
+  
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    obj->id = id;
+    BG_DB_GET_COL_INT(TYPE_COL, obj->type);
+    BG_DB_GET_COL_INT(REF_ID_COL, obj->ref_id);
+    BG_DB_GET_COL_INT(PARENT_ID_COL, obj->parent_id);
+    BG_DB_GET_COL_INT(CHILDREN_COL, obj->children);
+    BG_DB_GET_COL_INT(SIZE_COL, obj->size);
+    BG_DB_GET_COL_INT(DURATION_COL, obj->duration);
+    BG_DB_GET_COL_STRING(LABEL_COL, obj->label);
+    found = 1;
+    }
+
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  //  sqlite3_free(sql);
+
+  if(!found)
+    return NULL;
+  
+  obj->klass = bg_db_object_get_class(obj->type);
+  
+  /* Children */
+  c = obj->klass;
+  while(c)
+    {
+    if(c->query && !c->query(db, obj))
+      return 0;
+    c = c->parent;
+    }
+
+  /* Remember original state */
+
+  cache = (bg_db_obj_cache_t*)obj;
+  memcpy(&cache->orig, &cache->obj, sizeof(cache->obj));
+  
+  return obj;
+  }
+
+void bg_db_object_free(void * obj1)
+  {
+  bg_db_object_t * obj = obj1;
+  const bg_db_object_class_t * c = obj->klass;
+  //  fprintf(stderr, "bg_db_object_free\n");
+  if(obj->label)
+    free(obj->label);
+
+  while(c)
+    {
+    if(c->free)
+      c->free(obj);
+    c = c->parent;
+    }
+  obj->id = -1;
+  }
+
+bg_db_object_type_t bg_db_object_get_type(void * obj1)
+  {
+  bg_db_object_t * obj = obj1;
+  return obj->type;
+  }
+
+
+void bg_db_object_update(bg_db_t * db, void * obj1, int children, int parent)
+  {
+  char * sql;
+  const bg_db_object_class_t * c;
+  bg_db_object_t * obj = obj1;
+
+  if(obj->id < 0)
+    return;
+
+  //  fprintf(stderr, "Update Object %ld\n", obj->id);
+  
+  sql = sqlite3_mprintf("UPDATE OBJECTS SET TYPE = %d, REF_ID = %"PRId64", PARENT_ID = %"PRId64",  CHILDREN = %d, SIZE = %"PRId64", DURATION = %"PRId64", LABEL = %Q   WHERE ID = %"PRId64";",
+                        obj->type, obj->ref_id, obj->parent_id, obj->children, obj->size,
+                        obj->duration, obj->label, obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+  c = obj->klass;
+  
+  while(c)
+    {
+    if(c->update)
+      c->update(db, obj);
+    c = c->parent;
+    }
+  }
+
+void bg_db_object_set_label_nocpy(void * obj1, char * label)
+  {
+  bg_db_object_t * obj = obj1;
+  obj->label = label;
+  }
+
+void bg_db_object_set_label(void * obj1, const char * label)
+  {
+  bg_db_object_t * obj = obj1;
+  obj->label = gavl_strdup(label);
+  }
+
+const char * bg_db_object_get_label(void * obj1)
+  {
+  bg_db_object_t * obj = obj1;
+  return obj->label;
+  }
+
+void bg_db_object_set_parent_id(bg_db_t * db, void * obj1, int64_t parent_id)
+  {
+  if(parent_id < 0)
+    {
+    bg_db_object_t * obj = obj1;
+    obj->parent_id = parent_id;
+    }
+  else
+    {
+    bg_db_object_t * parent = bg_db_object_query(db, parent_id);
+    bg_db_object_set_parent(db, obj1, parent);
+    bg_db_object_unref(parent);
+    }
+  }
+
+void bg_db_object_add_child(bg_db_t * db, void * obj1, void * child1)
+  {
+  bg_db_object_t * obj = obj1;
+  bg_db_object_t * child = child1;
+
+  obj->children++;
+
+  if(obj->type & BG_DB_FLAG_CONTAINER)
+    {
+    bg_db_object_update_size(db, obj, child->size);
+
+    if(child->duration != GAVL_TIME_UNDEFINED)
+      bg_db_object_update_duration(db, obj, child->duration);
+    }
+  }
+
+void bg_db_object_remove_child(bg_db_t * db, void * obj1, void * child1)
+  {
+  bg_db_object_t * obj = obj1;
+  bg_db_object_t * child = child1;
+  obj->children--;
+
+  if(obj->type & BG_DB_FLAG_CONTAINER)
+    {
+    bg_db_object_update_size(db, obj, -child->size);
+    
+    if(child->duration != GAVL_TIME_UNDEFINED)
+      bg_db_object_update_duration(db, obj, -child->duration);
+    }
+  }
+
+void bg_db_object_set_parent(bg_db_t * db, void * obj1, void * parent1)
+  {
+  bg_db_object_t * obj = obj1;
+  bg_db_object_t * parent = parent1;
+  obj->parent_id = parent->id;
+  bg_db_object_add_child(db, parent1, obj1);
+  }
+
+
+static void delete_from_parent(bg_db_t * db, bg_db_object_t * obj)
+  {
+  bg_db_object_t * parent;
+  
+  if(obj->parent_id >= 0)
+    {
+    parent = bg_db_object_query(db, obj->parent_id);
+
+    if(!parent)
+      {
+      fprintf(stderr, "BUG: Orphaned object\n");
+      bg_db_object_dump(obj);
+      return;
+      }
+    
+    bg_db_object_remove_child(db, parent, obj);
+      
+    if(!parent->children && (parent->type & BG_DB_FLAG_NO_EMPTY))
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Deleting empty container %s",
+             parent->label);
+      object_delete(db, parent, obj->id);
+      }
+    else
+      bg_db_object_unref(parent);
+    }
+  }
+
+/* child_id if the ID of the child which triggered the delete */
+static void object_delete(bg_db_t * db, void * obj1, int64_t child_id)
+  {
+  const bg_db_object_class_t * c;
+  bg_sqlite_id_tab_t  tab;
+  bg_db_object_t * child;
+
+  int i;
+  char * sql;
+  bg_db_object_t * obj = obj1;
+  bg_db_obj_cache_t * ci;
+
+  ci = obj1;
+  
+  if(ci->refcount > 1)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot delete object, refcount = %d", ci->refcount);
+    bg_db_object_dump(obj);
+    return;
+    }
+  
+  bg_sqlite_id_tab_init(&tab);
+  
+  /* Delete referenced objects and children */
+  sql =
+    sqlite3_mprintf("select ID from OBJECTS where (REF_ID = %"PRId64") |"
+                    " (PARENT_ID = %"PRId64");", obj->id, obj->id);
+
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    if(tab.val[i] == child_id)
+      continue;
+    
+    child = bg_db_object_query(db, tab.val[i]);
+    
+    if(child->parent_id == obj->id)
+      child->flags |= BG_DB_OBJ_FLAG_DONT_PROPAGATE;
+    
+    bg_db_object_delete(db, child);
+    }
+
+  /* Remove from parent container */
+  if(!(obj->flags & BG_DB_OBJ_FLAG_DONT_PROPAGATE))
+    delete_from_parent(db, obj);
+  
+  bg_sqlite_delete_by_id(db->db, "OBJECTS", obj->id);
+
+  /* Children */
+  c = obj->klass;
+  while(c)
+    {
+    if(c->del)
+      c->del(db, obj);
+    c = c->parent;
+    }
+  db->num_deleted++;
+
+  bg_db_object_free(obj);
+  bg_db_object_init(obj);
+  ci->refcount = 0;
+  }
+
+
+void bg_db_object_delete(bg_db_t * db, void * obj1)
+  {
+  object_delete(db, obj1, -1);
+  }
+
+typedef struct
+  {
+  const char * label;
+  int64_t parent_id;
+  } cmp_container_t;
+
+static int compare_container(const bg_db_object_t * obj, const void * data)
+  {
+  if(obj->type == BG_DB_OBJECT_CONTAINER)
+    {
+    const cmp_container_t * c = data;
+    
+    if((obj->parent_id == c->parent_id) &&
+       !strcmp(c->label, obj->label))
+      return 1;
+    }
+  return 0;
+  } 
+
+static void * get_child_container(bg_db_t * db, void * parent, const char * label)
+  {
+  int64_t id;
+  bg_db_object_t * ret;
+  cmp_container_t c;
+  char * sql;
+
+  c.parent_id = bg_db_object_get_id(parent);
+  c.label = label;
+
+  /* 1. Look in cache */
+
+  id = bg_db_cache_search(db, compare_container, &c);
+  if(id > 0)
+    return bg_db_object_query(db, id);
+  
+  /* 2. Look in db */
+
+
+  id = -1;
+  
+  sql =
+    sqlite3_mprintf("select ID from OBJECTS where "
+                    " (PARENT_ID = %"PRId64") & (LABEL = %Q);", bg_db_object_get_id(parent), label);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &id);
+  sqlite3_free(sql);
+  
+  if(id > 0)
+    return bg_db_object_query(db, id);
+  
+  /* 3. Create new */
+  ret = bg_db_object_create(db);
+  bg_db_object_set_type(ret, BG_DB_OBJECT_CONTAINER);
+  bg_db_object_set_label(ret, label);
+  bg_db_object_set_parent(db, ret, parent);
+  return ret;
+  }
+
+void * bg_db_container_get(bg_db_t * db, void * parent, const char * path1)
+  {
+  void * child;
+  int len;
+  char * path = NULL;
+  char ** folders = NULL;
+  int i;
+
+  bg_db_object_ref(parent);
+  
+  /* TODO: Loop through children */
+  if(!path1)
+    return parent;
+  
+  if(*path1 == '/')
+    path1++;
+
+  path = gavl_strdup(path1);
+
+  len = strlen(path);
+
+  if(path[len-1] == '/')
+    path[len-1] = '\0';
+  
+  folders = bg_strbreak(path, '/');
+
+  i = 0;
+
+  while(folders[i])
+    {
+    child = get_child_container(db, parent, folders[i]);
+    bg_db_object_unref(parent);
+    parent = child;
+    i++;
+    }
+  bg_strbreak_free(folders);
+  free(path);
+  return child;
+  }
+

gmerlin-4256.tar.gz/lib/db_playlist.c Added

@@ -0,0 +1,190 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/tree.h>
+
+#include <string.h>
+
+#define LOG_DOMAIN "db.playlist"
+
+static void get_children_playlist(bg_db_t * db, void * obj, bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  sql = sqlite3_mprintf("SELECT ITEM_ID FROM PLAYLISTS WHERE PLAYLIST_ID = %"PRId64" ORDER BY IDX;",
+                        bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  sqlite3_free(sql);
+  }
+
+static void del_playlist(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  char * sql;
+  sql = sqlite3_mprintf("DELETE FROM PLAYLISTS WHERE PLAYLIST_ID = %"PRId64";",
+                        bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+const bg_db_object_class_t bg_db_playlist_class =
+  {
+    .name = "Playlist",
+    .del = del_playlist,
+    .get_children = get_children_playlist,
+    .parent = NULL, // Object
+  };
+
+static int compare_playlist_by_name(const bg_db_object_t * obj, const void * data)
+  {
+  if((obj->type == BG_DB_OBJECT_PLAYLIST) && !strcmp(obj->label, data))
+    return 1;
+  return 0;
+  } 
+
+int64_t bg_db_playlist_by_name(bg_db_t * db, const char * name)
+  {
+  int64_t ret = -1;
+  char * buf;
+
+  ret = bg_db_cache_search(db, compare_playlist_by_name, name);
+  if(ret > 0)
+    return ret;
+  
+  buf = sqlite3_mprintf("select ID from OBJECTS where (TYPE = %d) & (LABEL = %Q);",
+                        BG_DB_OBJECT_PLAYLIST, name);
+  bg_sqlite_exec(db->db, buf, bg_sqlite_int_callback, &ret);
+  sqlite3_free(buf);
+  return ret;
+  }
+
+static bg_db_object_t * playlist_by_name(bg_db_t * db, char * name)
+  {
+  bg_db_object_t * playlist;
+  int64_t id;
+
+  if((id = bg_db_playlist_by_name(db, name)) <= 0)
+    {
+    /* Create playlist */
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Creating playlist %s", name);
+    
+    playlist = bg_db_object_create(db);
+    bg_db_object_set_type(playlist, BG_DB_OBJECT_PLAYLIST);
+    bg_db_object_set_label_nocpy(playlist, name);
+    bg_db_object_set_parent_id(db, playlist, -1);
+    bg_db_create_vfolders(db, playlist);
+    }
+  else
+    {
+    playlist = bg_db_object_query(db, id);
+    
+    /* Clear playlist */
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Clearing existing playlist %s", name);
+    del_playlist(db, playlist);
+    playlist->children = 0;
+    free(name);
+    }
+  return playlist;  
+  }
+
+void bg_db_add_album(bg_db_t * db, const char * album_file)
+  {
+  bg_album_entry_t * entries;
+  bg_album_entry_t * e;
+  char * album_xml;
+  char * name;
+  char * sql;
+  bg_db_object_t * playlist;
+  int64_t file_id;
+  int64_t id;
+  
+  album_xml = bg_read_file(album_file, NULL);
+  if(!album_xml)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s could not be opened", album_file);
+    return;
+    }
+
+  entries = bg_album_entries_new_from_xml(album_xml);
+  free(album_xml);
+
+  if(!entries)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s contains no entries",
+           album_file);
+    return;
+    }
+
+  name = bg_path_to_label(album_file);
+
+  /* Check if a playlist of that name already exists */
+
+  playlist = playlist_by_name(db, name);
+  
+  /* Add tracks */
+  e = entries;
+  
+  while(e)
+    {
+    if(*(char*)(e->location) == '/') // Absolute path
+      {
+      if(strncmp(e->location, db->base_dir, db->base_len))
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "File %s outside of db tree",
+               (char*)e->location);
+        e = e->next;
+        continue;
+        }
+      if((file_id = bg_db_file_by_path(db, e->location)) < 0)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "File %s not found in database",
+               (char*)e->location);
+        e = e->next;
+        continue;
+        }
+      /* Add file */
+      id = bg_sqlite_get_next_id(db->db, "PLAYLISTS");
+
+      playlist->children++;
+
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding %s to playlist %s",
+             bg_db_filename_to_rel(db, e->location), playlist->label);
+      
+      sql = sqlite3_mprintf("INSERT INTO PLAYLISTS ( ID, PLAYLIST_ID, ITEM_ID, IDX ) VALUES "
+                            "( %"PRId64", %"PRId64", %"PRId64", %d );",
+                            id, playlist->id, file_id, playlist->children);
+      bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+      }
+    else
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported location %s",
+             (char*)e->location);
+      }
+    e = e->next;
+    }
+
+  bg_db_object_unref(playlist);
+  bg_album_entries_destroy(entries);
+  }

gmerlin-4256.tar.gz/lib/db_root.c Added

@@ -0,0 +1,53 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+
+static void get_children_root(bg_db_t * db, void * obj, bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (PARENT_ID = %"PRId64") ORDER BY LABEL;",
+                        BG_DB_OBJECT_VFOLDER, bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  sqlite3_free(sql);
+
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (PARENT_ID = %"PRId64") ORDER BY LABEL;",
+                        BG_DB_OBJECT_DIRECTORY, bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  sqlite3_free(sql);
+  }
+
+const bg_db_object_class_t bg_db_root_class =
+  {
+    .name = "Root",
+//    .del = del_audioalbum,
+//    .free = free_audioalbum,
+//    .query = query_audioalbum,
+//    .update = update_audioalbum,
+//    .dump = dump_audioalbum,
+    .get_children = get_children_root,
+    .parent = NULL, // Object
+  };
+

gmerlin-4256.tar.gz/lib/db_scan.c Added

@@ -0,0 +1,141 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+
+
+#define LOG_DOMAIN "db.scan"
+
+int bg_db_scan_item_set(bg_db_scan_item_t * ret, char * filename)
+  {
+  struct stat st;
+  if(!stat(filename, &st) && (S_ISDIR(st.st_mode) || S_ISREG(st.st_mode)))
+    {
+    ret->path = filename;
+    /* Check for directory */
+    if(S_ISDIR(st.st_mode))
+      {
+      ret->type = BG_DB_DIRENT_DIRECTORY;
+      }
+    else if(S_ISREG(st.st_mode))
+      {
+      ret->type = BG_DB_DIRENT_FILE;
+      ret->size = st.st_size;
+      ret->mtime = st.st_mtime;
+      }
+    return 1;
+    }
+
+  free(filename);
+  return 0;
+  }
+
+static bg_db_scan_item_t * scan_internal(const char * directory,
+                                         bg_db_scan_item_t * files,
+                                         int * num_p, int * alloc_p)
+  {
+  char * filename;
+  DIR * d;
+  struct dirent * e;
+  bg_db_scan_item_t * file;
+  int num = *num_p;
+  int alloc = *alloc_p;
+  
+  d = opendir(directory);
+  if(!d)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Opening directory %s failed: %s",
+           directory, strerror(errno));
+    return files;
+    }
+
+  while((e = readdir(d)))
+    {
+    /* Skip hidden files and "." and ".." */
+    if(e->d_name[0] == '.')
+      continue;
+
+    /* Add file to list */
+    if(num + 2 > alloc)
+      {
+      alloc += 256;
+      files = realloc(files, alloc * sizeof(*files));
+      memset(files + num, 0,
+             (alloc - num) * sizeof(*files));
+      }
+    
+    filename = bg_sprintf("%s/%s", directory, e->d_name);
+    file = files + num;
+    
+    if(bg_db_scan_item_set(file, filename))
+      {
+      num++;
+      if(file->type == BG_DB_DIRENT_DIRECTORY)
+        files = scan_internal(file->path, files, &num, &alloc);
+      }
+    }
+  
+  closedir(d);
+  *num_p = num;
+  *alloc_p = alloc;
+  return files;
+  }
+
+bg_db_scan_item_t * bg_db_scan_directory(const char * directory,
+                                         int * num)
+  {
+  bg_db_scan_item_t * ret = calloc(256, sizeof(*ret));
+  int num_ret = 0;
+  int ret_alloc = 256;
+  
+  ret = scan_internal(directory, ret, &num_ret, &ret_alloc);
+
+  *num = num_ret;
+  return ret;
+  }
+
+void bg_db_scan_item_free(bg_db_scan_item_t * item)
+  {
+  if(item->path)
+    free(item->path);
+  }
+
+void bg_db_scan_items_free(bg_db_scan_item_t * items, int num)
+  {
+  int i;
+  if(!items)
+    return;
+  for(i = 0; i < num; i++)
+    bg_db_scan_item_free(&items[i]);
+  free(items);
+  }

gmerlin-4256.tar.gz/lib/db_stringcache.c Added

@@ -0,0 +1,101 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <mediadb_private.h>
+#include <gmerlin/utils.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+/*
+  typedef struct
+  {
+  int64_t id;
+  char * str;
+  } bg_db_string_cache_item_t;
+
+typedef struct
+  {
+  int size;
+  int alloc;
+  bg_db_string_cache_item_t * items;
+  char * table;
+  char * str_col;
+  char * id_col;
+  } bg_db_string_cache_t;
+*/
+
+bg_db_string_cache_t * bg_db_string_cache_create(int size,
+                                                 const char * table,
+                                                 const char * str_col,
+                                                 const char * id_col)
+  {
+  bg_db_string_cache_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  ret->alloc = size;
+  ret->items = calloc(ret->alloc, sizeof(*ret->items));
+
+  ret->table = gavl_strdup(table);
+  ret->str_col = gavl_strdup(str_col);
+  ret->id_col = gavl_strdup(id_col);
+  
+  return ret;
+  }
+
+void
+bg_db_string_cache_destroy(bg_db_string_cache_t * c)
+  {
+  int i;
+  for(i = 0; i < c->size; i++)
+    {
+    if(c->items[i].str)
+      free(c->items[i].str);
+    }
+  free(c->items);
+  free(c->table);
+  free(c->str_col);
+  free(c->id_col);
+  free(c);
+  }
+
+char *
+bg_db_string_cache_get(bg_db_string_cache_t * c, sqlite3 * db, int64_t id)
+  {
+  int i;
+  for(i = 0; i < c->size; i++)
+    {
+    if(c->items[i].id == id)
+      return gavl_strdup(c->items[i].str);
+    }
+  /* Kick out the last item */
+  if(c->size == c->alloc)
+    {
+    free(c->items[c->size - 1].str);
+    c->size--;
+    }
+  if(c->size)
+    memmove(c->items + 1, c->items, sizeof(*c->items) * c->size);
+  
+  c->items[0].str = bg_sqlite_id_to_string(db, c->table, c->str_col, c->id_col, id);
+  c->items[0].id = id;
+  c->size++;
+  return gavl_strdup(c->items[0].str);
+  }

gmerlin-4256.tar.gz/lib/db_thumbnail.c Added

@@ -0,0 +1,283 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#define LOG_DOMAIN "db.thumbnail"
+
+#define TH_CACHE_SIZE 32
+
+void 
+bg_db_make_thumbnail(bg_db_t * db,
+                     void * obj,
+                     int max_width, int max_height,
+                     const char * mimetype)
+  {
+  bg_db_file_t * thumb;
+  int ret = 0;
+  /* Formats */
+  gavl_video_format_t input_format;
+  
+  /* Frames */
+  gavl_video_frame_t * input_frame = NULL;
+
+  const char * src_ext;
+  bg_db_image_file_t * image = (bg_db_image_file_t *)obj;
+
+  char * path_abs;
+  bg_db_scan_item_t item;
+  
+  char * out_file_base = NULL;
+  
+  src_ext = strrchr(image->file.path, '.');
+  if(src_ext)
+    src_ext++;
+  
+  /* Return early */
+  if(image->file.mimetype &&
+     !strcasecmp(image->file.mimetype, mimetype) &&
+     (image->width <= max_width) &&
+     (image->height <= max_height))
+    return;
+
+  /* Check if a thumbnail already exists */
+
+  thumb = bg_db_get_thumbnail(db, bg_db_object_get_id(obj),
+                              max_width, max_height, 0,
+                              mimetype);
+
+  if(thumb)
+    {
+    bg_db_image_file_t * img = (bg_db_image_file_t *)thumb;
+    if((img->width == max_width) || (img->height == max_height))
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Thumbnail already exists");
+      bg_db_object_unref(thumb);
+      return;
+      }
+    bg_db_object_unref(thumb);
+    }
+
+  /* Generate thumbnail */
+  thumb = bg_db_object_create(db);
+  out_file_base = bg_sprintf("gmerlin-db/thumbnails/%016"PRId64, bg_db_object_get_id(thumb));
+  out_file_base = bg_db_filename_to_abs(db, out_file_base);
+  
+  memset(&input_format, 0, sizeof(input_format));
+  
+  input_frame = bg_plugin_registry_load_image(db->plugin_reg,
+                                              image->file.path,
+                                              &input_format, NULL);
+
+  
+  /* Save image */
+  
+  path_abs = bg_make_thumbnail(db->plugin_reg, input_frame, &input_format,
+                               max_width, max_height,
+                               out_file_base, mimetype);
+  if(!path_abs)
+    goto end;
+  
+  /* Create a new image object */
+
+  memset(&item, 0, sizeof(item));
+  if(!bg_db_scan_item_set(&item, path_abs))
+    goto end;
+  
+  thumb = bg_db_file_create_from_object(db, (bg_db_object_t*)thumb, ~0, &item, -1);
+  if(!thumb)
+    goto end;
+  
+  bg_db_object_set_type(thumb, BG_DB_OBJECT_THUMBNAIL);
+  thumb->obj.ref_id = bg_db_object_get_id(image);
+  bg_db_object_set_parent_id(db, thumb, -1);
+  
+  
+  bg_db_scan_item_free(&item);
+  
+  ret = 1;
+  
+  end:
+  
+  if(out_file_base)
+    free(out_file_base);
+  if(input_frame)
+    gavl_video_frame_destroy(input_frame);
+  
+  if(!ret)
+    {
+    bg_db_object_delete(db, thumb);
+    return;
+    }
+  bg_db_object_unref(thumb);
+  }
+
+void bg_db_browse_thumbnails(bg_db_t * db, int64_t id, 
+                             bg_db_query_callback cb, void * data)
+  {
+  char * sql;
+  int i;
+  bg_db_object_t * image;
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_init(&tab);
+  
+  image = bg_db_object_query(db, id);
+  cb(data, image);
+  bg_db_object_unref(image);
+  
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (REF_ID = %"PRId64");",
+                        BG_DB_OBJECT_THUMBNAIL, id);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    image = bg_db_object_query(db, tab.val[i]);
+    cb(data, image);
+    bg_db_object_unref(image);
+    }
+
+  bg_sqlite_id_tab_free(&tab);
+  
+  }
+
+typedef struct
+  {
+  int max_width;
+  int max_height;
+  int max_size;
+  const char * mimetype;
+  bg_db_image_file_t * ret;
+  } browse_t;
+
+static void browse_callback(void * data, void * obj)
+  {
+  browse_t * b = data;
+  bg_db_image_file_t * image = obj;
+  
+  if(b->mimetype && strcmp(image->file.mimetype, b->mimetype))
+    return;
+  
+  if((image->width > b->max_width) || (image->height > b->max_height))
+    return;
+
+  if((b->max_size > 0) && (image->file.obj.size > b->max_size))
+    return;
+  
+  if(!b->ret || (b->ret->width < image->width))
+    {
+    if(b->ret)
+      bg_db_object_unref(b->ret);
+    b->ret = image;
+    bg_db_object_ref(b->ret);
+    }
+  }
+
+
+void bg_db_thumbnail_cache_init(bg_db_thumbnail_cache_t * c)
+  {
+  c->alloc = TH_CACHE_SIZE;
+  c->items = calloc(c->alloc, sizeof(*c->items));
+  }
+
+void bg_db_thumbnail_cache_free(bg_db_thumbnail_cache_t * c)
+  {
+  int i;
+  for(i = 0; i < c->size; i++)
+    {
+    if(c->items[i].mimetype)
+      free(c->items[i].mimetype);
+    }
+  free(c->items);
+  }
+
+static int64_t cache_get(bg_db_thumbnail_cache_t * c,
+                         int64_t id,
+                         int max_width, int max_height, int max_size,
+                         const char * mimetype)
+  {
+  int i;
+  for(i = 0; i < c->size; i++)
+    {
+    if((c->items[i].ref_id == id) &&
+       (c->items[i].max_width == max_width) &&
+       (c->items[i].max_height == max_height) &&
+       (c->items[i].max_size == max_size) &&
+       !(strcmp(c->items[i].mimetype, mimetype)))
+      return c->items[i].thumb_id;
+    }
+  return -1;
+  }
+
+static void cache_put(bg_db_thumbnail_cache_t * c,
+                      int64_t id,
+                      int max_width, int max_height, int max_size,
+                      const char * mimetype, int thumb_id)
+  {
+  if(c->size == c->alloc)
+    {
+    if(c->items[c->size - 1].mimetype)
+      free(c->items[c->size - 1].mimetype);
+    c->size--;
+    memmove(c->items + 1, c->items, c->size * sizeof(*c->items));
+    }
+  c->items[0].ref_id = id;
+  c->items[0].thumb_id = thumb_id;
+  c->items[0].max_width = max_width;
+  c->items[0].max_height = max_height;
+  c->items[0].max_size = max_size;
+  c->items[0].mimetype = gavl_strdup(mimetype);
+  c->size++;
+  }
+  
+void * bg_db_get_thumbnail(bg_db_t * db, int64_t id,
+                           int max_width, int max_height, int max_size,
+                           const char * mimetype)
+  {
+  browse_t b;
+  int64_t thumb_id;
+
+  if((thumb_id = cache_get(&db->th_cache, id, max_width, max_height, max_size,
+                           mimetype)) > 0)
+    return bg_db_object_query(db, thumb_id);
+  
+  memset(&b, 0, sizeof(b));
+  b.max_width = max_width;
+  b.max_height = max_height;
+  b.max_size = max_size;
+  b.mimetype = mimetype;
+
+  bg_db_browse_thumbnails(db, id, browse_callback, &b);
+  
+  if(b.ret)
+    {
+    cache_put(&db->th_cache, id, max_width, max_height, max_size,
+              mimetype, bg_db_object_get_id(b.ret));
+    }
+  return b.ret;
+  }
+

gmerlin-4256.tar.gz/lib/db_url.c Added

@@ -0,0 +1,279 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <string.h>
+
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/tree.h>
+
+#include <gavl/metatags.h>
+
+#define LOG_DOMAIN "db_url"
+
+#define STREAM_URL_COL    1
+#define STATION_URL_COL   2
+#define MIMETYPE_COL      3
+
+static int query_url(bg_db_t * db, void * file1)
+  {
+  int result;
+  bg_db_url_t * f = file1;
+  int found = 0;
+
+  sqlite3_stmt * st = db->q_urls;
+
+  sqlite3_bind_int64(st, 1, f->obj.id);
+  
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_STRING(STREAM_URL_COL, f->stream_url);
+    BG_DB_GET_COL_STRING(STATION_URL_COL, f->station_url);
+    BG_DB_GET_COL_INT(MIMETYPE_COL, f->mimetype_id);
+    found = 1;
+    }
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return 0;
+  
+  f->mimetype = bg_db_string_cache_get(db->mimetypes, db->db,
+                                       f->mimetype_id);
+  return 1;
+  }
+
+static void del_url(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_sqlite_delete_by_id(db->db, "URLS", obj->id);
+  }
+
+static void free_url(void * obj)
+  {
+  bg_db_url_t * f = obj;
+  if(f->stream_url)
+    free(f->stream_url);
+  if(f->station_url)
+    free(f->station_url);
+  if(f->mimetype)
+    free(f->mimetype);
+  }
+
+const bg_db_object_class_t bg_db_radio_url_class =
+  {
+    .name = "Radio URL",
+    .del = del_url,
+    .free = free_url,
+    .query = query_url,
+    // .update = update_audioalbum,
+    // .dump = dump_audioalbum,
+    // .get_children = get_children_root,
+    .parent = NULL, // Object
+  };
+
+
+void * bg_db_get_radio_url_folder(bg_db_t * db, const char * path1)
+  {
+  void * ret;
+  void * parent = bg_db_get_radio_url_root_folder(db);
+  ret = bg_db_container_get(db, parent, path1);
+  bg_db_object_unref(parent);
+  return ret;
+  }
+
+void bg_db_add_radio_url(bg_db_t * db, void * parent,
+                         const char * url, const char * label)
+  {
+  bg_plugin_handle_t * h = NULL;
+  bg_input_plugin_t * plugin = NULL;
+  bg_track_info_t * ti;
+  gavl_metadata_t * m;
+  bg_db_object_t * obj;
+  bg_db_url_t * u;
+  const char * str;
+  char * sql;
+  
+  /* Open URL and fetch metadata */
+
+  if(!bg_input_plugin_load(db->plugin_reg, url, NULL, &h, NULL, 0))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Open URL %s failed", url);
+    goto fail;
+    }
+  plugin = (bg_input_plugin_t *)h->plugin;
+  
+  /* Only one track supported */
+  if(plugin->get_num_tracks && (plugin->get_num_tracks(h->priv) < 1))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "URL %s contains no tracks", url);
+    goto fail;
+    }
+  ti = plugin->get_track_info(h->priv, 0);
+  
+  if((ti->num_audio_streams != 1) || (ti->num_video_streams))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "URL %s is no radio stream", url);
+    goto fail;
+    }
+  
+  m = &ti->metadata;
+  
+  /* Create object */
+  obj = bg_db_object_create(db);
+  
+  bg_db_object_set_type(obj, BG_DB_OBJECT_RADIO_URL);
+  u = (bg_db_url_t *)obj;
+
+  u->stream_url = gavl_strdup(url);
+  u->station_url = gavl_strdup(gavl_metadata_get(m, GAVL_META_URL));
+
+  if(label)
+    bg_db_object_set_label(u, label);
+  else if((str = gavl_metadata_get(m, GAVL_META_STATION)))
+    bg_db_object_set_label(u, str);
+  else
+    bg_db_object_set_label(u, url);
+
+  u->mimetype =
+    gavl_strdup(gavl_metadata_get(m, GAVL_META_MIMETYPE));
+  
+  /* Add to db */
+
+  if(u->mimetype)
+    {
+    u->mimetype_id = 
+      bg_sqlite_string_to_id_add(db->db, "MIMETYPES",
+                                 "ID", "NAME", u->mimetype);
+    }
+
+  sql = sqlite3_mprintf("INSERT INTO URLS ( ID, STREAM_URL, STATION_URL, MIMETYPE ) VALUES ( %"PRId64", %Q, %Q, %"PRId64" );",
+                        u->obj.id, u->stream_url, u->station_url, u->mimetype_id);
+  
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  bg_db_object_set_parent(db, u, parent);
+
+  bg_db_object_unref(u);
+  
+  fail:
+
+  if(plugin)
+    plugin->close(h->priv);
+
+  if(h)
+    bg_plugin_unref(h);
+  
+  }
+
+
+void bg_db_add_radio_album(bg_db_t * db, const char * album_file)
+  {
+  bg_album_entry_t * entries;
+  bg_album_entry_t * e;
+  bg_album_entry_t * before;
+  char * album_xml;
+  char * name;
+  bg_db_object_t * container;
+  bg_sqlite_id_tab_t tab;
+  bg_db_url_t * u;
+  int i;
+  
+  album_xml = bg_read_file(album_file, NULL);
+  if(!album_xml)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s could not be opened", album_file);
+    return;
+    }
+
+  entries = bg_album_entries_new_from_xml(album_xml);
+  free(album_xml);
+
+  if(!entries)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Album file %s contains no entries",
+           album_file);
+    return;
+    }
+
+  name = bg_path_to_label(album_file);
+
+  /* Get parent container */
+  container = bg_db_get_radio_url_folder(db, name);
+  free(name);
+
+  /* Query children and check if the entries are in the album */
+  bg_sqlite_id_tab_init(&tab);
+  bg_db_get_children(db, bg_db_object_get_id(container), &tab);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    u = bg_db_object_query(db, tab.val[i]);
+    e = entries;
+    while(e)
+      {
+      if(!strcmp(e->location, u->stream_url))
+        break;
+      else
+        e = e->next;
+      }
+
+    if(e)
+      {
+      /* Remove album entry */
+      if(e == entries)
+        entries = entries->next;
+      else
+        {
+        before = entries;
+        while(before->next != e)
+          before = before->next;
+        before->next = e->next;
+        }
+      bg_album_entry_destroy(e);
+      bg_db_object_unref(u);
+      }
+    else
+      bg_db_object_delete(db, u);
+    }
+  
+  /* Add stations */
+  e = entries;
+  
+  while(e)
+    {
+    if(*(char*)(e->location) == '/') // Absolute path
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported location %s",
+             (char*)e->location);
+      }
+    else
+      bg_db_add_radio_url(db, container, e->location, e->name);
+    e = e->next;
+    }
+
+  bg_db_object_unref(container);
+  bg_album_entries_destroy(entries);
+  }

gmerlin-4256.tar.gz/lib/db_vfolder.c Added

@@ -0,0 +1,1886 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+#define LOG_DOMAIN "db.vfolder"
+
+typedef struct
+  {
+  const char * name;
+  bg_db_object_type_t type;
+  bg_db_category_t cats[BG_DB_VFOLDER_MAX_DEPTH + 1];
+  } vfolder_type_t;
+
+static const vfolder_type_t vfolder_types[] =
+  {
+#if 1
+    {
+      .type = BG_DB_OBJECT_AUDIO_ALBUM,
+      .name = "Genre/Artist",
+      .cats = { BG_DB_CAT_GENRE,
+                BG_DB_CAT_ARTIST,
+              },
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_ALBUM,
+      .name = "Genre/Year",
+      .cats = { BG_DB_CAT_GENRE,
+                BG_DB_CAT_YEAR,
+              },
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_ALBUM,
+      .name = "Artist",
+      .cats = { BG_DB_CAT_GROUP,
+                BG_DB_CAT_ARTIST,
+              },
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_FILE,
+      .name = "Artist",
+      .cats = { BG_DB_CAT_GROUP,
+                BG_DB_CAT_ARTIST },
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_FILE,
+      .name = "Genre",
+      .cats = { BG_DB_CAT_GENRE,
+                BG_DB_CAT_GROUP },
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_FILE,
+      .name = "Genre/Artist",
+      .cats = { BG_DB_CAT_GENRE,
+                BG_DB_CAT_ARTIST },
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_FILE,
+      .name = "Genre/Year",
+      .cats = { BG_DB_CAT_GENRE,
+                BG_DB_CAT_YEAR },
+    },
+    {
+      .type = BG_DB_OBJECT_PLAYLIST,
+      .name = "Playlist",
+    },
+#endif
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .name = "Genre",
+      .cats = { BG_DB_CAT_GENRE,
+                BG_DB_CAT_GROUP },
+    },
+#if 1
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .name = "Actor",
+      .cats = { BG_DB_CAT_GROUP,
+                BG_DB_CAT_ACTOR },
+    },
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .name = "Director",
+      .cats = { BG_DB_CAT_GROUP, 
+                BG_DB_CAT_DIRECTOR },
+    },
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .name = "Year",
+      .cats = { BG_DB_CAT_YEAR },
+    },
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .name = "Country",
+      .cats = { BG_DB_CAT_COUNTRY,
+                BG_DB_CAT_GROUP },
+    },
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .name = "All",
+      .cats = { BG_DB_CAT_GROUP },
+    },
+#endif
+    {
+      .type = BG_DB_OBJECT_TVSERIES,
+      .name = "All",
+      .cats = { BG_DB_CAT_GROUP },
+    },
+    {
+      .type = BG_DB_OBJECT_TVSERIES,
+      .name = "Genre",
+      .cats = { BG_DB_CAT_GENRE },
+    },
+    { /* End */ }
+  };
+
+static int get_num_cats(const vfolder_type_t * t)
+  {
+  int ret = 0;
+  while(t->cats[ret])
+    ret++;
+  return ret;
+  }
+
+static void dump_vfolder(void * obj)
+  {
+  int i;
+  bg_db_vfolder_t * f = obj;
+
+  gavl_diprintf(2, "Type:    %d\n", f->type);
+  gavl_diprintf(2, "Depth:   %d\n", f->depth);
+  for(i = 0; i < BG_DB_VFOLDER_MAX_DEPTH; i++)
+    {
+    if(!f->path[i].cat)
+      break;
+    gavl_diprintf(4, "Cat %d: %"PRId64"\n", f->path[i].cat, f->path[i].val);
+    }
+  }
+
+static void del_vfolder(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_sqlite_delete_by_id(db->db, "VFOLDERS", obj->id);
+  }
+
+static int vfolder_query_callback(void * data, int argc,
+                                  char **argv, char **azColName)
+  {
+  int i;
+  bg_db_vfolder_t * ret = data;
+  
+  for(i = 0; i < argc; i++)
+    {
+    BG_DB_SET_QUERY_INT("TYPE",      type);
+    BG_DB_SET_QUERY_INT("DEPTH",     depth);
+
+    if(!strncmp(azColName[i], "CAT_", 4))
+      ret->path[atoi(azColName[i] + 4)-1].cat = atoi(argv[i]);
+    if(!strncmp(azColName[i], "VAL_", 4))
+      ret->path[atoi(azColName[i] + 4)-1].val = strtoll(argv[i], NULL, 10);
+    }
+  ret->obj.found = 1;
+  return 0;
+  }
+
+static int query_vfolder(bg_db_t * db, void * obj)
+  {
+  char * sql;
+  int result;
+  bg_db_vfolder_t * f = obj;
+  
+  f->obj.found = 0;
+  sql =
+    sqlite3_mprintf("select * from VFOLDERS where ID = %"PRId64";",
+                    bg_db_object_get_id(f));
+  result = bg_sqlite_exec(db->db, sql, vfolder_query_callback, f);
+  sqlite3_free(sql);
+  if(!result || !f->obj.found)
+    return 0;
+  return 1;
+  }
+
+const bg_db_object_class_t bg_db_vfolder_class =
+  {
+  .name = "Virtual folder",
+  .del = del_vfolder,
+  .query = query_vfolder,
+  .dump = &dump_vfolder,
+  .parent = NULL,
+  };
+
+/* Utilities */
+
+static int has_cat(bg_db_vfolder_t * f, bg_db_category_t cat)
+  {
+  int i = 0;
+  for(i = 0; i < BG_DB_VFOLDER_MAX_DEPTH; i++)
+    {
+    if(!f->path[i].cat)
+      return 0;
+    if(f->path[i].cat == cat)
+      return 1;
+    }
+  return 0;
+  }
+
+static int compare_vfolder_by_path(const bg_db_object_t * obj,
+                                   const void * data)
+  {
+  const bg_db_vfolder_t * f1 = data;
+  const bg_db_vfolder_t * f2;
+
+  if((obj->type == BG_DB_OBJECT_VFOLDER) ||
+     (obj->type == BG_DB_OBJECT_VFOLDER_LEAF))
+    {
+    f2 = (bg_db_vfolder_t*)obj;
+
+    // fprintf(stderr, "Compare vfolder\n");
+    // dump_vfolder(f1);
+    // dump_vfolder(f2);
+    
+    if((f1->depth == f2->depth) &&
+       (f1->type == f2->type) &&
+       !memcmp(f1->path, f2->path,
+               BG_DB_VFOLDER_MAX_DEPTH * sizeof(f1->path[0])))
+      return 1;
+    //    else
+    //      fprintf(stderr, "Result: 0\n");
+    }
+  return 0;
+  }
+
+static void 
+vfolder_set(bg_db_t * db,
+            bg_db_vfolder_t * f, int type, int depth,
+            bg_db_vfolder_path_t * path)
+  {
+  char * sql;
+  int i;
+  char tmp_string[256];
+  f->type = type;
+  f->depth = depth;
+  memcpy(&f->path[0], path, BG_DB_VFOLDER_MAX_DEPTH * sizeof(path[0]));
+
+  sql = gavl_strdup("INSERT INTO VFOLDERS ( ID, TYPE, DEPTH");
+  
+  for(i = 0; i < BG_DB_VFOLDER_MAX_DEPTH; i++)
+    {
+    snprintf(tmp_string, 256, ", CAT_%d, VAL_%d", i+1, i+1);
+    sql = gavl_strcat(sql, tmp_string);
+    }
+  snprintf(tmp_string, 256, ") VALUES ( %"PRId64", %d, %d", 
+           bg_db_object_get_id(f), f->type, f->depth);
+  sql = gavl_strcat(sql, tmp_string);
+
+  for(i = 0; i < BG_DB_VFOLDER_MAX_DEPTH; i++)
+    {
+    snprintf(tmp_string, 256, ", %d, %"PRId64"", f->path[i].cat, f->path[i].val);
+    sql = gavl_strcat(sql, tmp_string);
+    }
+  sql = gavl_strcat(sql, ");");
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  free(sql);
+
+  if(bg_db_object_get_type(f) == BG_DB_OBJECT_VFOLDER_LEAF)
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Created vfolder leaf %s",
+           bg_db_object_get_label(f));
+  else
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Created vfolder %s",
+           bg_db_object_get_label(f));
+  
+  //  fprintf(stderr, "Created vfolder\n");
+  //  bg_db_object_dump(f);
+  
+  }
+
+
+static int64_t
+vfolder_by_path(bg_db_t * db, int type, int depth, 
+                bg_db_vfolder_path_t * path)
+  {
+  int64_t id;
+  char * sql;
+  char tmp_string[64];
+  int i;  
+
+  bg_db_vfolder_t f;
+  memset(&f, 0, sizeof(f));
+  f.depth = depth;
+  f.type = type;
+  memcpy(f.path, path, BG_DB_VFOLDER_MAX_DEPTH * sizeof(path[0]));
+	
+  /* Look in cache */
+  id = bg_db_cache_search(db, compare_vfolder_by_path, &f);
+  if(id > 0)
+    return id;
+
+  /* Do a real lookup */
+  id = -1;
+
+  sql = bg_sprintf("SELECT ID FROM VFOLDERS WHERE (TYPE = %d) & (DEPTH = %d)", type, depth);
+  for(i = 0; i < BG_DB_VFOLDER_MAX_DEPTH; i++)
+    {
+    snprintf(tmp_string, 64, "& (CAT_%d = %d) & (VAL_%d =  %"PRId64")",
+             i+1, path[i].cat, i+1, path[i].val);
+    sql = gavl_strcat(sql, tmp_string);
+    }
+  sql = gavl_strcat(sql, ";");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &id);
+  free(sql);
+  return id;  
+  }
+
+static void *
+get_root_vfolder(bg_db_t * db, const vfolder_type_t * t)
+  {
+  bg_db_vfolder_t * parent;
+  bg_db_vfolder_t * child;
+  int64_t id;
+  int type;
+  int depth;
+  int i;
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+
+  /* Root Folder  */
+  memset(path, 0, sizeof(path));
+  type = 0;
+  depth = 0;
+  
+  id = vfolder_by_path(db, type, depth, path);
+  if(id < 0)
+    {
+    parent = bg_db_object_create(db);
+    bg_db_object_set_type(parent, BG_DB_OBJECT_VFOLDER);
+    bg_db_object_set_label(parent, "Media");
+    bg_db_object_set_parent_id(db, parent, 0);
+    vfolder_set(db, parent, type, depth, path);
+    }
+  else
+    parent = bg_db_object_query(db, id);
+
+  /* Type folder */
+  
+  type = t->type;
+ 
+  id = vfolder_by_path(db, type, depth, path);
+  if(id < 0)
+    {
+    child = bg_db_object_create(db);
+    
+    switch(type)
+      {
+      case BG_DB_OBJECT_AUDIO_FILE:
+        bg_db_object_set_label(child, "Songs");
+        bg_db_object_set_type(child, BG_DB_OBJECT_VFOLDER);
+        break;
+      case BG_DB_OBJECT_AUDIO_ALBUM:
+        bg_db_object_set_label(child, "Albums");
+        bg_db_object_set_type(child, BG_DB_OBJECT_VFOLDER);
+        break;
+      case BG_DB_OBJECT_PLAYLIST:
+        bg_db_object_set_label(child, "Playlists");
+        bg_db_object_set_type(child, BG_DB_OBJECT_VFOLDER_LEAF);
+        break;
+      case BG_DB_OBJECT_MOVIE:
+        bg_db_object_set_label(child, "Movies");
+        bg_db_object_set_type(child, BG_DB_OBJECT_VFOLDER);
+        break;
+      case BG_DB_OBJECT_TVSERIES:
+        bg_db_object_set_label(child, "TV Shows");
+        bg_db_object_set_type(child, BG_DB_OBJECT_VFOLDER);
+        break;
+      case BG_DB_OBJECT_RADIO_URL:
+        bg_db_object_set_label(child, "Webradio");
+        bg_db_object_set_type(child, BG_DB_OBJECT_CONTAINER);
+        break;
+      }
+    bg_db_object_set_parent(db, child, parent);
+    vfolder_set(db, child, type, depth, path);
+    }
+  else
+    child = bg_db_object_query(db, id);
+  
+  bg_db_object_unref(parent);
+  parent = child;
+  child = NULL;
+
+  if(!t->cats[0])
+    return parent;
+  
+  /* Folder for this specific path */
+  
+  i = 0;
+  while(t->cats[i])
+    {
+    path[i].cat = t->cats[i];
+    i++;
+    }
+  
+  id = vfolder_by_path(db, type, depth, path);
+  if(id < 0)
+    {
+    child = bg_db_object_create(db);
+    bg_db_object_set_type(child, BG_DB_OBJECT_VFOLDER);
+    bg_db_object_set_label(child, t->name);
+    bg_db_object_set_parent(db, child, parent);
+    vfolder_set(db, child, type, depth, path);
+    }
+  else
+    child = bg_db_object_query(db, id);
+
+  bg_db_object_unref(parent);
+  return child;
+  }
+
+    /* Radio streams are handled differently */
+static const vfolder_type_t radio_url_type =
+  {
+    .type = BG_DB_OBJECT_RADIO_URL,
+    .name = "Webradio",
+  };
+
+void * bg_db_get_radio_url_root_folder(bg_db_t * db)
+  {
+  return get_root_vfolder(db, &radio_url_type);
+  }
+
+static void * get_vfolder(bg_db_t * db,
+                          void * parent, const char * label,
+                          bg_db_object_type_t folder_type,
+                          bg_db_object_type_t object_type,
+                          bg_db_vfolder_path_t * path,
+                          int depth)
+  {
+  int64_t id;
+  bg_db_object_t * child;
+  
+  id = vfolder_by_path(db, object_type, depth, path);
+  if(id > 0)
+    return bg_db_object_query(db, id);
+
+  child = bg_db_object_create(db);
+
+
+  bg_db_object_set_label(child, label);
+  bg_db_object_set_type(child, folder_type);
+  vfolder_set(db, (bg_db_vfolder_t*)child, object_type, depth, path);
+  bg_db_object_set_parent(db, child, parent);
+  return child;
+  }
+
+/* Functions for vfolders */
+
+typedef struct
+  {
+  bg_db_object_type_t type;
+  void (*create_vfolders)(bg_db_t * db, const vfolder_type_t * t, void * obj);
+  void (*get_children)(bg_db_t * db, bg_db_vfolder_t * vf,
+                       bg_sqlite_id_tab_t * tab);
+  
+  } vfolder_funcs_t;
+
+/* Playlist */
+
+static void create_vfolders_playlist(bg_db_t * db, const vfolder_type_t * t,
+                                     void * obj)
+  {
+  void * parent;
+  if(t->type != BG_DB_OBJECT_PLAYLIST)
+    return;
+
+  /* We have no playlist categories yet */
+  parent = get_root_vfolder(db, t);
+  bg_db_object_add_child(db, parent, obj); 
+  bg_db_object_unref(parent);
+  }
+
+static void get_children_playlist(bg_db_t * db, bg_db_vfolder_t * vf,
+                                  bg_sqlite_id_tab_t * tab)
+  {
+  char * sql =
+    bg_sprintf("SELECT ID FROM OBJECTS WHERE TYPE = %d ORDER BY LABEL;",
+               BG_DB_OBJECT_PLAYLIST);
+
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  free(sql);
+  }
+
+/* Audio file */
+
+static void create_vfolders_audio_file(bg_db_t * db, const vfolder_type_t * t,
+                                       void * obj)
+  {
+  int num_cats, i;
+  bg_db_audio_file_t * f = obj;
+  bg_db_object_t * folder;
+  bg_db_object_t * parent;
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+  const char * label;
+  bg_db_object_type_t folder_type = BG_DB_OBJECT_VFOLDER;
+  
+  if(t->type != BG_DB_OBJECT_AUDIO_FILE)
+    return;
+
+  memset(path, 0, sizeof(path));
+  num_cats = get_num_cats(t);
+
+
+  parent = get_root_vfolder(db, t);
+
+  for(i = 0; i < num_cats; i++)
+    path[i].cat = t->cats[i];
+
+  i = 0;
+  
+  while(i < num_cats)
+    {
+    if(i == num_cats - 1)
+      folder_type = BG_DB_OBJECT_VFOLDER_LEAF;
+    
+    switch(t->cats[i])
+      {
+      case BG_DB_CAT_YEAR:
+        {
+        char year_str[16];
+        path[i].val = f->date.year;
+          
+        if(f->date.year == 9999)
+          label = "Unknown";
+        else
+          {
+          sprintf(year_str, "%04d", f->date.year);
+          label = year_str;
+          }
+        folder = get_vfolder(db, parent, label,
+                             folder_type,
+                             BG_DB_OBJECT_AUDIO_FILE,
+                             path, i+1);
+        }
+        break;
+      case BG_DB_CAT_ARTIST:
+        path[i].val = f->artist_id;
+        folder = get_vfolder(db, parent, f->artist,
+                             folder_type,
+                             BG_DB_OBJECT_AUDIO_FILE,
+                             path, i+1);
+        break;
+      case BG_DB_CAT_GENRE:
+        path[i].val = f->genre_id;
+        folder = get_vfolder(db, parent, f->genre,
+                             folder_type,
+                             BG_DB_OBJECT_AUDIO_FILE,
+                             path, i+1);
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == num_cats - 1)
+          {
+          label = bg_db_get_group(f->search_title, &path[i].val);
+          folder = get_vfolder(db, parent, label, folder_type,
+                               BG_DB_OBJECT_AUDIO_FILE,
+                               path, i+1);
+          }
+        else
+          {
+          switch(t->cats[i+1])
+            {
+            case BG_DB_CAT_ARTIST:
+              label = bg_db_get_group(f->artist, &path[i].val);
+              folder = get_vfolder(db, parent, label, folder_type,
+                                   BG_DB_OBJECT_AUDIO_FILE,
+                                   path, i+1);
+              break;
+            default:
+              bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+                     "Unsupported category for audio file");
+              break;
+            }
+          }
+        break;
+      default:
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported category for audio file");
+        break;
+      }
+    i++;
+
+    bg_db_object_unref(parent);
+    parent = folder;
+    }
+  bg_db_object_add_child(db, parent, obj);
+  bg_db_object_unref(parent);
+  }
+
+static void get_children_audio_file(bg_db_t * db, bg_db_vfolder_t * vf,
+                                    bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  char * cond;
+  int i;
+  int num_conditions = 0;
+  sql = bg_sprintf("SELECT ID FROM AUDIO_FILES WHERE ");
+
+  for(i = 0; i < vf->depth; i++)
+    {
+    cond = NULL;
+    switch(vf->path[i].cat)
+      {
+      case BG_DB_CAT_YEAR:
+        cond = bg_sprintf("(SUBSTR(DATE, 1, 4) = '%"PRId64"')",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GENRE:
+        cond = bg_sprintf("(GENRE = %"PRId64")",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_ARTIST:
+        cond = bg_sprintf("(ARTIST = %"PRId64")",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == vf->depth - 1)
+          cond = bg_db_get_group_condition("SEARCH_TITLE",
+                                           vf->path[i].val);
+        break;
+      default:
+        break;
+      }
+
+    if(cond)
+      {
+      if(num_conditions)
+        sql = gavl_strcat(sql, "&");
+      sql = gavl_strcat(sql, cond);
+      num_conditions++;
+      free(cond);
+      }
+    }
+  
+  sql = gavl_strcat(sql, " ORDER BY SEARCH_TITLE;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  free(sql);
+  }
+
+/* Audio album  */
+
+static void create_vfolders_audio_album(bg_db_t * db, const vfolder_type_t * t,
+                                        void * obj)
+  {
+  int num_cats, i;
+  bg_db_audio_album_t * f = obj;
+  bg_db_object_t * folder;
+  bg_db_object_t * parent;
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+  const char * label;
+  bg_db_object_type_t folder_type = BG_DB_OBJECT_VFOLDER;
+
+  if(t->type != BG_DB_OBJECT_AUDIO_ALBUM)
+    return;
+
+  memset(path, 0, sizeof(path));
+  num_cats = get_num_cats(t);
+
+  parent = get_root_vfolder(db, t);
+
+  for(i = 0; i < num_cats; i++)
+    path[i].cat = t->cats[i];
+
+  i = 0;
+  while(i < num_cats)
+    {
+    if(i == num_cats - 1)
+      folder_type = BG_DB_OBJECT_VFOLDER_LEAF;
+
+    switch(t->cats[i])
+      {
+      case BG_DB_CAT_YEAR:
+        {
+        char year_str[16];
+        path[i].val = f->date.year;
+
+        if(f->date.year == 9999)
+          label = "Unknown";
+        else
+          {
+          sprintf(year_str, "%04d", f->date.year);
+          label = year_str;
+          }
+        folder = get_vfolder(db, parent, label,
+                             folder_type,
+                             BG_DB_OBJECT_AUDIO_ALBUM,
+                             path, i+1);
+        }
+        break;
+      case BG_DB_CAT_ARTIST:
+        path[i].val = f->artist_id;
+        folder = get_vfolder(db, parent, f->artist,
+                             folder_type,
+                             BG_DB_OBJECT_AUDIO_ALBUM,
+                             path, i+1);
+        break;
+      case BG_DB_CAT_GENRE:
+        path[i].val = f->genre_id;
+        folder = get_vfolder(db, parent, f->genre,
+                             folder_type,
+                             BG_DB_OBJECT_AUDIO_ALBUM,
+                             path, i+1);
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == num_cats - 1)
+          {
+          label = bg_db_get_group(f->search_title, &path[i].val);
+          folder = get_vfolder(db, parent, label, folder_type,
+                               BG_DB_OBJECT_AUDIO_ALBUM,
+                               path, i+1);
+          }
+        else
+          {
+          switch(t->cats[i+1])
+            {
+            case BG_DB_CAT_ARTIST:
+              label = bg_db_get_group(f->artist, &path[i].val);
+              folder = get_vfolder(db, parent, label, folder_type,
+                                   BG_DB_OBJECT_AUDIO_ALBUM,
+                                   path, i+1);
+              break;
+            default:
+              bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+                     "Unsupported category for audio album");
+              break;
+            }
+          }
+        break;
+      default:
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+               "Unsupported category for audio album");
+        break;
+      }
+    i++;
+
+    bg_db_object_unref(parent);
+    parent = folder;
+    }
+  bg_db_object_add_child(db, parent, obj);
+  bg_db_object_unref(parent);
+  }
+
+static void get_children_audio_album(bg_db_t * db, bg_db_vfolder_t * vf,
+                                     bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  char * cond;
+  int i;
+  int num_conditions = 0;
+  sql = bg_sprintf("SELECT ID FROM AUDIO_ALBUMS WHERE ");
+
+  for(i = 0; i < vf->depth; i++)
+    {
+    cond = NULL;
+    switch(vf->path[i].cat)
+      {
+      case BG_DB_CAT_YEAR:
+        cond = bg_sprintf("(SUBSTR(DATE, 1, 4) = '%"PRId64"')",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GENRE:
+        cond = bg_sprintf("(GENRE = %"PRId64")",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_ARTIST:
+        cond = bg_sprintf("(ARTIST = %"PRId64")",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == vf->depth - 1)
+          cond = bg_db_get_group_condition("SEARCH_TITLE",
+                                           vf->path[i].val);
+        break;
+      default:
+        break;
+      }
+
+    if(cond)
+      {
+      if(num_conditions)
+        sql = gavl_strcat(sql, "&");
+      sql = gavl_strcat(sql, cond);
+      num_conditions++;
+      free(cond);
+      }
+    }
+
+  if(has_cat(vf, BG_DB_CAT_ARTIST))
+    sql = gavl_strcat(sql, " ORDER BY DATE, SEARCH_TITLE");
+  else
+    sql = gavl_strcat(sql, " ORDER BY SEARCH_TITLE");
+  
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  free(sql);
+  
+  }
+
+/* Movie */
+
+static void create_vfolders_movie_internal(bg_db_t * db,
+                                           const vfolder_type_t * t,
+                                           void * obj, 
+                                           int depth, bg_db_object_t * parent)
+  {
+  int num_cats, i, j;
+  bg_db_video_info_t * info;
+  bg_db_object_t * folder;
+  const char * label;
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+  bg_db_object_type_t folder_type = BG_DB_OBJECT_VFOLDER;
+  
+  if(t->type != BG_DB_OBJECT_MOVIE)
+    return;
+  num_cats = get_num_cats(t);
+  memset(path, 0, sizeof(path));
+
+  if(bg_db_object_get_type(obj) == BG_DB_OBJECT_MOVIE)
+    {
+    bg_db_movie_t * f = obj;
+    info = &f->info;
+    }
+  else
+    {
+    bg_db_video_container_t * f = obj;
+    info = &f->info;
+    }
+
+  for(i = 0; i < num_cats; i++)
+    path[i].cat = t->cats[i];
+
+  if(!parent)
+    {
+    parent = get_root_vfolder(db, t);
+    i = 0;
+    }
+  else
+    {
+    bg_db_vfolder_t * vf = (bg_db_vfolder_t *)parent;
+    
+    for(i = 0; i < depth; i++)
+      path[i].val = vf->path[i].val;
+
+    /* Set i for later loop */
+    i = depth;
+    bg_db_object_ref(parent);
+    } 
+
+  while(i < num_cats)
+    {
+    if(i == num_cats - 1)
+      folder_type = BG_DB_OBJECT_VFOLDER_LEAF;
+
+    switch(t->cats[i])
+      {
+      case BG_DB_CAT_YEAR:
+        {
+        char year_str[16];
+        path[i].val = info->date.year;
+
+        if(info->date.year == 9999)
+          label = "Unknown";
+        else
+          {
+          sprintf(year_str, "%04d", info->date.year);
+          label = year_str;
+          }
+        folder = get_vfolder(db, parent, label,
+                             folder_type,
+                             BG_DB_OBJECT_MOVIE,
+                             path, i+1);
+        }
+        break;
+      case BG_DB_CAT_GENRE:
+        j = 0;
+
+        if(!info->genres)
+          {
+          bg_db_object_unref(parent);
+          return;
+          }
+        
+        while(info->genres[j])
+          {
+          path[i].val = info->genre_ids[j];
+          folder = get_vfolder(db, parent, info->genres[j],
+                               folder_type,
+                               BG_DB_OBJECT_MOVIE,
+                               path, i+1);
+          create_vfolders_movie_internal(db, t, obj, i+1, folder);
+          bg_db_object_unref(folder);
+          j++;
+          }
+        bg_db_object_unref(parent);
+        return;
+        break;
+      case BG_DB_CAT_ACTOR:
+        break;
+      case BG_DB_CAT_DIRECTOR:
+        break;
+      case BG_DB_CAT_COUNTRY:
+        j = 0;
+
+        if(!info->countries)
+          {
+          bg_db_object_unref(parent);
+          return;
+          }
+
+        while(info->countries[j])
+          {
+          path[i].val = info->country_ids[j];
+          folder = get_vfolder(db, parent, info->countries[j],
+                               folder_type,
+                               BG_DB_OBJECT_MOVIE,
+                               path, i+1);
+
+          if(i == num_cats - 1) // Done here
+            bg_db_object_add_child(db, folder, obj);
+          else
+            create_vfolders_movie_internal(db, t, obj, i+1, folder); // Subcategories
+          bg_db_object_unref(folder);
+          j++;
+          }
+        bg_db_object_unref(parent);
+        return;
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == num_cats - 1)
+          {
+          label = bg_db_get_group(info->search_title, &path[i].val);
+          folder = get_vfolder(db, parent, label, folder_type,
+                               BG_DB_OBJECT_MOVIE,
+                               path, i+1);
+          }
+        else
+          {
+          bg_db_object_t * child;
+          switch(t->cats[i+1])
+            {
+            case BG_DB_CAT_ACTOR:
+              j = 0;
+
+              if(!info->actors)
+                {
+                bg_db_object_unref(parent);
+                return;
+                }
+
+              while(info->actors[j])
+                {
+                label = bg_db_get_group(info->actors[j], &path[i].val);
+                path[i+1].val = 0;
+                folder = get_vfolder(db, parent, label, folder_type,
+                                     BG_DB_OBJECT_MOVIE,
+                                     path, i+1);
+                path[i+1].val = info->actor_ids[j];
+
+                if(i == num_cats - 2)
+                  {
+                  child = get_vfolder(db, folder, info->actors[j],
+                                      BG_DB_OBJECT_VFOLDER_LEAF,
+                                      BG_DB_OBJECT_MOVIE,
+                                      path, i+2);
+                  bg_db_object_add_child(db, child, obj);
+                  }
+                else
+                  {
+                  child = get_vfolder(db, folder, info->actors[j],
+                                      BG_DB_OBJECT_VFOLDER,
+                                      BG_DB_OBJECT_MOVIE,
+                                      path, i+2);
+                  create_vfolders_movie_internal(db, t, obj, i+2, child); // Subcategories
+                  }
+                bg_db_object_unref(child);
+                bg_db_object_unref(folder);
+                j++;
+                }
+              bg_db_object_unref(parent);
+              return;
+              break;
+            case BG_DB_CAT_DIRECTOR:
+
+              if(!info->directors)
+                {
+                bg_db_object_unref(parent);
+                return;
+                }
+
+              j = 0;
+              while(info->directors[j])
+                {
+                label = bg_db_get_group(info->directors[j], &path[i].val);
+                path[i+1].val = 0;
+                folder = get_vfolder(db, parent, label, folder_type,
+                                     BG_DB_OBJECT_MOVIE,
+                                     path, i+1);
+                path[i+1].val = info->director_ids[j];
+                if(i == num_cats - 2)
+                  {
+                  child = get_vfolder(db, folder, info->directors[j],
+                                      BG_DB_OBJECT_VFOLDER_LEAF,
+                                      BG_DB_OBJECT_MOVIE,
+                                      path, i+2);
+                  bg_db_object_add_child(db, child, obj);
+                  }
+                else
+                  {
+                  child = get_vfolder(db, folder, info->directors[j],
+                                      BG_DB_OBJECT_VFOLDER,
+                                      BG_DB_OBJECT_MOVIE,
+                                      path, i+2);
+                  create_vfolders_movie_internal(db, t, obj, i+2, child); // Subcategories
+                  }
+                bg_db_object_unref(child);
+                bg_db_object_unref(folder);
+                j++;
+                }
+              bg_db_object_unref(parent);
+              return;
+              break;
+            default:
+              bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported category for movie");
+            }
+          }
+        break;
+      default:
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported category for movie");
+        break;
+      }
+    
+    i++;
+    bg_db_object_unref(parent);
+    parent = folder;
+    }
+
+  bg_db_object_add_child(db, parent, obj);
+  bg_db_object_unref(parent);
+
+  
+  }
+
+static void create_vfolders_movie(bg_db_t * db, const vfolder_type_t * t,
+                                  void * obj)
+  {
+  create_vfolders_movie_internal(db, t, obj,  0, NULL);
+  }
+
+static void get_children_movie(bg_db_t * db, bg_db_vfolder_t * vf,
+                               bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  char * cond;
+  int i;
+  sql = bg_sprintf("SELECT ID FROM VIDEO_INFOS WHERE "
+                   "((VIDEO_TYPE = %d) | (VIDEO_TYPE = %d))",
+                   BG_DB_OBJECT_MOVIE, BG_DB_OBJECT_MOVIE_MULTIPART);
+  
+  for(i = 0; i < vf->depth; i++)
+    {
+    cond = NULL;
+    switch(vf->path[i].cat)
+      {
+      case BG_DB_CAT_YEAR:
+        cond = bg_sprintf("& (SUBSTR(DATE, 1, 4) = '%"PRId64"')",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GENRE:
+        cond = bg_sprintf("& (ID IN (SELECT VIDEO_ID FROM VIDEO_GENRES_VIDEOS WHERE GENRE_ID = %"PRId64"))",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_ACTOR:
+        cond = bg_sprintf("& (ID IN (SELECT VIDEO_ID FROM VIDEO_ACTORS_VIDEOS WHERE PERSON_ID = %"PRId64"))",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_DIRECTOR:
+        cond = bg_sprintf("& (ID IN (SELECT VIDEO_ID FROM VIDEO_DIRECTORS_VIDEOS WHERE PERSON_ID = %"PRId64"))",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == vf->depth - 1)
+          {
+          sql = gavl_strcat(sql, "&");
+          cond = bg_db_get_group_condition("SEARCH_TITLE",
+                                           vf->path[i].val);
+          }
+        break;
+      case BG_DB_CAT_COUNTRY:
+        cond = bg_sprintf("& (ID IN (SELECT VIDEO_ID FROM VIDEO_COUNTRIES_VIDEOS WHERE COUNTRY_ID = %"PRId64"))",
+                          vf->path[i].val);
+        break;
+        
+      default:
+        break;
+      }
+
+    if(cond)
+      {
+      sql = gavl_strcat(sql, cond);
+      free(cond);
+      }
+    }
+
+  if(has_cat(vf, BG_DB_CAT_DIRECTOR))
+    sql = gavl_strcat(sql, " ORDER BY DATE, SEARCH_TITLE;");
+  else
+    sql = gavl_strcat(sql, " ORDER BY SEARCH_TITLE;");
+
+  // fprintf(stderr, "SQL: %s\n", sql);
+
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  free(sql);
+  }
+
+// TV Show
+
+static void create_vfolders_tvseries_internal(bg_db_t * db,
+                                           const vfolder_type_t * t,
+                                           void * obj, 
+                                           int depth, bg_db_object_t * parent)
+  {
+  int num_cats, i, j;
+  bg_db_video_info_t * info;
+  bg_db_object_t * folder;
+  const char * label;
+  bg_db_video_container_t * f;
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+  bg_db_object_type_t folder_type = BG_DB_OBJECT_VFOLDER;
+  
+  if(t->type != BG_DB_OBJECT_TVSERIES)
+    return;
+  num_cats = get_num_cats(t);
+  memset(path, 0, sizeof(path));
+
+  f = obj;
+  info = &f->info;
+  
+  for(i = 0; i < num_cats; i++)
+    path[i].cat = t->cats[i];
+
+  if(!parent)
+    {
+    parent = get_root_vfolder(db, t);
+    i = 0;
+    }
+  else
+    {
+    bg_db_vfolder_t * vf = (bg_db_vfolder_t *)parent;
+    
+    for(i = 0; i < depth; i++)
+      path[i].val = vf->path[i].val;
+
+    /* Set i for later loop */
+    i = depth;
+    bg_db_object_ref(parent);
+    } 
+
+  while(i < num_cats)
+    {
+    if(i == num_cats - 1)
+      folder_type = BG_DB_OBJECT_VFOLDER_LEAF;
+
+    switch(t->cats[i])
+      {
+      case BG_DB_CAT_YEAR:
+        {
+        char year_str[16];
+        path[i].val = info->date.year;
+
+        if(info->date.year == 9999)
+          label = "Unknown";
+        else
+          {
+          sprintf(year_str, "%04d", info->date.year);
+          label = year_str;
+          }
+        folder = get_vfolder(db, parent, label,
+                             folder_type,
+                             BG_DB_OBJECT_TVSERIES,
+                             path, i+1);
+        }
+        break;
+      case BG_DB_CAT_GENRE:
+        j = 0;
+
+        if(!info->genres)
+          {
+          bg_db_object_unref(parent);
+          return;
+          }
+        
+        while(info->genres[j])
+          {
+          path[i].val = info->genre_ids[j];
+          folder = get_vfolder(db, parent, info->genres[j],
+                               folder_type,
+                               BG_DB_OBJECT_TVSERIES,
+                               path, i+1);
+          create_vfolders_tvseries_internal(db, t, obj, i+1, folder);
+          bg_db_object_unref(folder);
+          j++;
+          }
+        bg_db_object_unref(parent);
+        return;
+        break;
+      case BG_DB_CAT_ACTOR:
+        break;
+      case BG_DB_CAT_DIRECTOR:
+        break;
+      case BG_DB_CAT_COUNTRY:
+        j = 0;
+
+        if(!info->countries)
+          {
+          bg_db_object_unref(parent);
+          return;
+          }
+
+        while(info->countries[j])
+          {
+          path[i].val = info->country_ids[j];
+          folder = get_vfolder(db, parent, info->countries[j],
+                               folder_type,
+                               BG_DB_OBJECT_TVSERIES,
+                               path, i+1);
+
+          if(i == num_cats - 1) // Done here
+            bg_db_object_add_child(db, folder, obj);
+          else
+            create_vfolders_tvseries_internal(db, t, obj, i+1, folder); // Subcategories
+          bg_db_object_unref(folder);
+          j++;
+          }
+        bg_db_object_unref(parent);
+        return;
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == num_cats - 1)
+          {
+          label = bg_db_get_group(info->search_title, &path[i].val);
+          folder = get_vfolder(db, parent, label, folder_type,
+                               BG_DB_OBJECT_TVSERIES,
+                               path, i+1);
+          }
+        else
+          {
+          bg_db_object_t * child;
+          switch(t->cats[i+1])
+            {
+            case BG_DB_CAT_ACTOR:
+              j = 0;
+
+              if(!info->actors)
+                {
+                bg_db_object_unref(parent);
+                return;
+                }
+
+              while(info->actors[j])
+                {
+                label = bg_db_get_group(info->actors[j], &path[i].val);
+                path[i+1].val = 0;
+                folder = get_vfolder(db, parent, label, folder_type,
+                                     BG_DB_OBJECT_TVSERIES,
+                                     path, i+1);
+                path[i+1].val = info->actor_ids[j];
+
+                if(i == num_cats - 2)
+                  {
+                  child = get_vfolder(db, folder, info->actors[j],
+                                      BG_DB_OBJECT_VFOLDER_LEAF,
+                                      BG_DB_OBJECT_TVSERIES,
+                                      path, i+2);
+                  bg_db_object_add_child(db, child, obj);
+                  }
+                else
+                  {
+                  child = get_vfolder(db, folder, info->actors[j],
+                                      BG_DB_OBJECT_VFOLDER,
+                                      BG_DB_OBJECT_TVSERIES,
+                                      path, i+2);
+                  create_vfolders_tvseries_internal(db, t, obj, i+2, child); // Subcategories
+                  }
+                bg_db_object_unref(child);
+                bg_db_object_unref(folder);
+                j++;
+                }
+              bg_db_object_unref(parent);
+              return;
+              break;
+            case BG_DB_CAT_DIRECTOR:
+
+              if(!info->directors)
+                {
+                bg_db_object_unref(parent);
+                return;
+                }
+
+              j = 0;
+              while(info->directors[j])
+                {
+                label = bg_db_get_group(info->directors[j], &path[i].val);
+                path[i+1].val = 0;
+                folder = get_vfolder(db, parent, label, folder_type,
+                                     BG_DB_OBJECT_TVSERIES,
+                                     path, i+1);
+                path[i+1].val = info->director_ids[j];
+                if(i == num_cats - 2)
+                  {
+                  child = get_vfolder(db, folder, info->directors[j],
+                                      BG_DB_OBJECT_VFOLDER_LEAF,
+                                      BG_DB_OBJECT_TVSERIES,
+                                      path, i+2);
+                  bg_db_object_add_child(db, child, obj);
+                  }
+                else
+                  {
+                  child = get_vfolder(db, folder, info->directors[j],
+                                      BG_DB_OBJECT_VFOLDER,
+                                      BG_DB_OBJECT_TVSERIES,
+                                      path, i+2);
+                  create_vfolders_tvseries_internal(db, t, obj, i+2, child); // Subcategories
+                  }
+                bg_db_object_unref(child);
+                bg_db_object_unref(folder);
+                j++;
+                }
+              bg_db_object_unref(parent);
+              return;
+              break;
+            default:
+              bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported category for tvseries");
+            }
+          }
+        break;
+      default:
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unsupported category for tvseries");
+        break;
+      }
+    
+    i++;
+    bg_db_object_unref(parent);
+    parent = folder;
+    }
+
+  bg_db_object_add_child(db, parent, obj);
+  bg_db_object_unref(parent);
+
+  
+  }
+
+static void create_vfolders_tvseries(bg_db_t * db, const vfolder_type_t * t,
+                                  void * obj)
+  {
+  create_vfolders_tvseries_internal(db, t, obj,  0, NULL);
+  }
+
+static void get_children_tvseries(bg_db_t * db, bg_db_vfolder_t * vf,
+                                  bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  char * cond;
+  int i;
+  sql = bg_sprintf("SELECT ID FROM VIDEO_INFOS WHERE "
+                   "(VIDEO_TYPE = %d)", BG_DB_OBJECT_TVSERIES);
+  
+  for(i = 0; i < vf->depth; i++)
+    {
+    cond = NULL;
+    switch(vf->path[i].cat)
+      {
+      case BG_DB_CAT_GENRE:
+        cond = bg_sprintf("& (ID IN (SELECT VIDEO_ID FROM VIDEO_GENRES_VIDEOS WHERE GENRE_ID = %"PRId64"))",
+                          vf->path[i].val);
+        break;
+      case BG_DB_CAT_GROUP:
+        if(i == vf->depth - 1)
+          {
+          sql = gavl_strcat(sql, "&");
+          cond = bg_db_get_group_condition("SEARCH_TITLE",
+                                           vf->path[i].val);
+          }
+        break;
+      default:
+        break;
+      }
+
+    if(cond)
+      {
+      sql = gavl_strcat(sql, cond);
+      free(cond);
+      }
+    }
+
+  sql = gavl_strcat(sql, " ORDER BY SEARCH_TITLE;");
+  
+  // fprintf(stderr, "SQL: %s\n", sql);
+
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  free(sql);
+  }
+
+/* End */
+
+static vfolder_funcs_t funcs[] =
+  {
+    {
+      .type = BG_DB_OBJECT_PLAYLIST,
+      .create_vfolders = create_vfolders_playlist,
+      .get_children = get_children_playlist,
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_FILE,
+      .create_vfolders = create_vfolders_audio_file,
+      .get_children = get_children_audio_file,
+    },
+    {
+      .type = BG_DB_OBJECT_AUDIO_ALBUM,
+      .create_vfolders = create_vfolders_audio_album,
+      .get_children = get_children_audio_album,
+    },
+    {
+      .type = BG_DB_OBJECT_MOVIE,
+      .create_vfolders = create_vfolders_movie,
+      .get_children = get_children_movie,
+    },
+    {
+      .type = BG_DB_OBJECT_MOVIE_MULTIPART,
+      .create_vfolders = create_vfolders_movie,
+      .get_children = get_children_movie,
+    },
+    {
+      .type = BG_DB_OBJECT_TVSERIES,
+      .create_vfolders = create_vfolders_tvseries,
+      .get_children = get_children_tvseries,
+    },
+    { /* End */ }
+    
+  };
+
+static vfolder_funcs_t * get_funcs(bg_db_object_type_t t)
+  {
+  int i = 0;
+  while(funcs[i].create_vfolders)
+    {
+    if(funcs[i].type == t)
+      return &funcs[i];
+    i++;
+    }
+  return NULL;
+  }
+
+/*
+ *  Query children of a vfolder leaf
+ */
+
+/* We assume that columns for the same category are names identically
+   in different tables */
+
+#if 0
+static char * get_sql_condition(bg_db_category_t cat, int64_t val, int last)
+  {
+  switch(cat)
+    {
+    case BG_DB_CAT_YEAR:
+      return bg_sprintf("(SUBSTR(DATE, 1, 4) = '%"PRId64"')", val);
+      break;
+    case BG_DB_CAT_GENRE:
+      return bg_sprintf("(GENRE = %"PRId64")", val);
+      break;
+    case BG_DB_CAT_ARTIST:
+      return bg_sprintf("(ARTIST = %"PRId64")", val);
+      break;
+    case BG_DB_CAT_GROUP:
+      if(last)
+        return bg_db_get_group_condition("SEARCH_TITLE", val);
+      else
+        return NULL;
+      break;
+    default:
+      // BG_DB_CAT_GROUP,
+      // BG_DB_CAT_TITLE,
+      break;
+    }
+  return NULL;
+  }
+static void get_children_vfolder_leaf(bg_db_t * db, void * obj,
+                                      bg_sqlite_id_tab_t * tab)
+  {
+  char * sql = NULL;
+  int result;
+  bg_db_vfolder_t * f = obj;
+  int i;
+  char * condition;
+  int num;
+  int last;
+  
+  switch(f->type)
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      sql = bg_sprintf("SELECT ID FROM AUDIO_FILES WHERE ");
+      break;
+    case BG_DB_OBJECT_AUDIO_ALBUM:
+      sql = bg_sprintf("SELECT ID FROM AUDIO_ALBUMS WHERE ");
+      break;
+    case BG_DB_OBJECT_PLAYLIST:
+      sql = bg_sprintf("SELECT ID FROM OBJECTS WHERE TYPE = %d ORDER BY LABEL;", BG_DB_OBJECT_PLAYLIST);
+      break;
+    default:
+      goto fail;
+      break;
+    }
+
+  if(f->type != BG_DB_OBJECT_PLAYLIST)
+    {
+    /* Go through conditions */
+    num = 0;
+    i = 0;
+    while(f->path[i].cat)
+      {
+      if((i == BG_DB_VFOLDER_MAX_DEPTH-1) ||
+         !f->path[i+1].cat)
+        last = 1;
+      else
+        last = 0;
+    
+      condition = get_sql_condition(f->path[i].cat, f->path[i].val, last);
+
+      if(condition)
+        {
+        if(num)
+          sql = gavl_strcat(sql, " & ");
+        sql = gavl_strcat(sql, condition);
+        num++;
+        free(condition);
+        }
+      i++;
+      }
+
+    /* Figure out the sort string */
+    switch(f->type)
+      {
+      case BG_DB_OBJECT_AUDIO_FILE:
+        sql = gavl_strcat(sql, " ORDER BY SEARCH_TITLE");
+        break;
+      case BG_DB_OBJECT_AUDIO_ALBUM:
+        if(has_cat(f, BG_DB_CAT_ARTIST))
+          sql = gavl_strcat(sql, " ORDER BY DATE, SEARCH_TITLE");
+        else
+          sql = gavl_strcat(sql, " ORDER BY SEARCH_TITLE");
+        break;
+      default:
+        goto fail;
+        break;
+      }
+    sql = gavl_strcat(sql, ";");
+    }
+  
+  //  fprintf(stderr, "SQL: %s\n", sql);
+  
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+
+  fail:
+  if(sql)
+    free(sql);
+  }
+#endif
+
+
+static void get_children_vfolder_leaf(bg_db_t * db, void * obj,
+                                      bg_sqlite_id_tab_t * tab)
+  {
+  bg_db_vfolder_t * vf = obj;
+  vfolder_funcs_t * funcs = get_funcs(vf->type);
+  if(funcs)
+    funcs->get_children(db, vf, tab);
+  }
+
+
+const bg_db_object_class_t bg_db_vfolder_leaf_class =
+  {
+  .name = "Virtual folder (leaf)",
+  .del =   del_vfolder,
+  .query = query_vfolder,
+  .dump =  dump_vfolder,
+  .get_children = get_children_vfolder_leaf,
+  .parent = NULL,
+  };
+
+#if 0
+
+static char * get_cat_value(bg_db_t * db,
+                            void * obj, bg_db_category_t cat, int64_t * val_i)
+  {
+  int group_index;
+  char * ret;
+  switch(bg_db_object_get_type(obj))
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      {
+      bg_db_audio_file_t * f = obj;
+
+      switch(cat)
+        {
+        case BG_DB_CAT_YEAR:
+          *val_i = f->date.year;
+          if(f->date.year == 9999)
+            return gavl_strdup("Unknown");
+          else
+            return bg_sprintf("%04d", f->date.year);
+          break;
+        case BG_DB_CAT_ARTIST:
+          *val_i = f->artist_id;
+          return gavl_strdup(f->artist);
+          break;
+        case BG_DB_CAT_GENRE:
+          *val_i = f->genre_id;
+          return gavl_strdup(f->genre);
+        case BG_DB_CAT_GROUP:
+          ret = gavl_strdup(bg_db_get_group(f->search_title, val_i));
+          return ret;
+        }
+      }
+      break;
+    case BG_DB_OBJECT_AUDIO_ALBUM:
+      {
+      bg_db_audio_album_t * f = obj;
+
+      switch(cat)
+        {
+        case BG_DB_CAT_YEAR:
+          *val_i = f->date.year;
+          if(f->date.year == 9999)
+            return gavl_strdup("Unknown");
+          else
+            return bg_sprintf("%04d", f->date.year);
+          break;
+        case BG_DB_CAT_ARTIST:
+          *val_i = f->artist_id;
+          return bg_sqlite_id_to_string(db->db, "AUDIO_ARTISTS",
+                                        "NAME", "ID", f->artist_id);
+          break;
+        case BG_DB_CAT_GENRE:
+          *val_i = f->genre_id;
+          return bg_sqlite_id_to_string(db->db, "AUDIO_GENRES",
+                                        "NAME", "ID", f->genre_id);
+          break;
+        case BG_DB_CAT_GROUP:
+          ret = gavl_strdup(bg_db_get_group(f->search_title, val_i));
+          return ret;
+        }
+      }
+    case BG_DB_OBJECT_PLAYLIST:
+      
+      break;
+    case BG_DB_OBJECT_OBJECT:
+    case BG_DB_OBJECT_FILE:
+    case BG_DB_OBJECT_VIDEO_FILE:
+    case BG_DB_OBJECT_IMAGE_FILE:
+    case BG_DB_OBJECT_CONTAINER:
+    case BG_DB_OBJECT_DIRECTORY: 
+    case BG_DB_OBJECT_VFOLDER:
+    case BG_DB_OBJECT_VFOLDER_LEAF:
+    case BG_DB_OBJECT_PHOTO:
+    case BG_DB_OBJECT_ALBUM_COVER:
+    case BG_DB_OBJECT_VIDEO_PREVIEW:
+    case BG_DB_OBJECT_MOVIE_ART:
+    case BG_DB_OBJECT_THUMBNAIL:
+    case BG_DB_OBJECT_ROOT:
+      break;
+    }
+  return 0;
+  }
+
+static bg_db_object_t *
+get_vfolder_child(bg_db_t * db, bg_db_object_t * parent,
+                  bg_db_vfolder_path_t * path, 
+                  int last,
+                  bg_db_object_type_t object_type,
+                  int depth, char * name)
+  {
+  bg_db_object_t * child;
+  int64_t id = vfolder_by_path(db, object_type, depth, path);
+    
+  if(id < 0)
+    {
+    bg_db_object_type_t folder_type;
+    
+    folder_type = last ? BG_DB_OBJECT_VFOLDER_LEAF : BG_DB_OBJECT_VFOLDER;
+
+    child = bg_db_object_create(db);
+    bg_db_object_set_label_nocpy(child, name);
+    bg_db_object_set_type(child, folder_type);
+    vfolder_set(db, (bg_db_vfolder_t*)child, object_type, depth, path);
+    bg_db_object_set_parent(db, child, parent);
+    }
+  else
+    {
+    free(name);
+    child = bg_db_object_query(db, id);
+    }
+  bg_db_object_unref(parent);
+  return child;
+  }
+
+void
+bg_db_create_vfolders(bg_db_t * db, void * obj)
+  {
+  int i = 0;
+  int j;
+  int num_cats;
+  int type;
+  char * name;
+  bg_db_vfolder_path_t path[BG_DB_VFOLDER_MAX_DEPTH];
+  bg_db_object_t * parent;
+
+  int64_t val_i;
+  int do_group = 0;
+  int last = 0;
+  type = bg_db_object_get_type(obj);
+  
+  while(vfolder_types[i].type)
+    {
+    if(vfolder_types[i].type != type)
+      {
+      i++;
+      continue;
+      }
+
+    last = 0;
+    num_cats = 0;
+    while(vfolder_types[i].cats[num_cats])
+      num_cats++;
+
+    parent = get_root_vfolder(db, &vfolder_types[i]);
+
+    memset(path, 0, sizeof(path));    
+    
+    for(j = 0; j < num_cats; j++)
+      path[j].cat = vfolder_types[i].cats[j];
+    
+    for(j = 0; j < num_cats; j++)
+      {
+      if(j == num_cats-1)
+        last = 1;
+      
+      if((path[j].cat == BG_DB_CAT_GROUP) && !last)
+        {
+        do_group = 1;
+        continue;
+        }
+
+      name = get_cat_value(db, obj, path[j].cat, &val_i);
+
+      if(do_group)
+        {
+        /* Create the group folder */
+        char * group_name = gavl_strdup(bg_db_get_group(name, &path[j-1].val));
+        parent = get_vfolder_child(db, parent, path, 
+                                   0, type, j, group_name);
+        do_group = 0;
+        }
+      path[j].val = val_i;
+      parent = get_vfolder_child(db, parent, path, 
+                                 last, type, j+1, name);
+      }
+    bg_db_object_add_child(db, parent, obj); 
+    bg_db_object_unref(parent);
+    i++;
+    }
+  
+  }
+
+#endif
+
+
+void
+bg_db_create_vfolders(bg_db_t * db, void * obj)
+  {
+  int i = 0;
+  vfolder_funcs_t * funcs = get_funcs(bg_db_object_get_type(obj));
+  
+  if(!funcs)
+    return;
+    
+  while(vfolder_types[i].type)
+    {
+    funcs->create_vfolders(db, &vfolder_types[i], obj);
+    i++;
+    }
+
+  }
+
+void
+bg_db_cleanup_vfolders(bg_db_t * db)
+  {
+  int i;
+  char * sql = NULL;
+  int result;
+  bg_db_object_t * vfolder;
+  bg_sqlite_id_tab_t vfolders_tab;
+  bg_sqlite_id_tab_t children_tab;
+
+  bg_sqlite_id_tab_init(&children_tab);
+  bg_sqlite_id_tab_init(&vfolders_tab);
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up vfolders");
+
+  sql = sqlite3_mprintf("select ID from OBJECTS where TYPE = %d;", BG_DB_OBJECT_VFOLDER_LEAF);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &vfolders_tab);
+  sqlite3_free(sql);
+
+  if(!result)
+    goto end;
+
+  for(i = 0; i < vfolders_tab.num_val; i++)
+    {
+    vfolder = bg_db_object_query(db, vfolders_tab.val[i]);
+    get_children_vfolder_leaf(db, vfolder, &children_tab);
+
+    if(children_tab.num_val)
+      {
+      vfolder->children = children_tab.num_val;
+      bg_db_object_unref(vfolder);
+      }
+    else
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Deleting empty vfolder %s", vfolder->label);
+      bg_db_object_delete(db, vfolder);
+      // bg_db_object_unref(vfolder);
+      }
+    bg_sqlite_id_tab_reset(&children_tab);
+    }
+  
+  end:
+  bg_sqlite_id_tab_free(&children_tab);
+  bg_sqlite_id_tab_free(&vfolders_tab);
+  }
+
+void
+bg_db_create_tables_vfolders(bg_db_t * db)
+  {
+  int i;
+  char * str = gavl_strdup("CREATE TABLE VFOLDERS ( ID INTEGER PRIMARY KEY,"
+                           "TYPE INTEGER, "
+                           "DEPTH INTEGER" );
+  char tmp_string[32];
+  
+  for(i = 0; i < BG_DB_VFOLDER_MAX_DEPTH; i++)
+    {
+    snprintf(tmp_string, 32, ", CAT_%d INTEGER", i+1);
+    str = gavl_strcat(str, tmp_string);
+    snprintf(tmp_string, 32, ", VAL_%d INTEGER", i+1);
+    str = gavl_strcat(str, tmp_string);
+    }
+
+  str = gavl_strcat(str, ");");
+  bg_sqlite_exec(db->db, str, NULL, NULL);
+  free(str);
+  }
+

gmerlin-4256.tar.gz/lib/db_video.c Added

@@ -0,0 +1,836 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+#include <math.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <gavl/metatags.h>
+
+#define LOG_DOMAIN "db.videofile"
+
+// "Unidentified","0","Movie (Single File)","1","TV Series","2","TV Episode","3","Home Video","4","TV Season","5","Movie (Multiple Files)","6");
+
+static void free_video_file(void * obj)
+  {
+  bg_db_video_file_t * file = obj;
+  if(file->video_codec)
+    free(file->video_codec);
+  }
+
+static void dump_video_file(void * obj)
+  {
+  bg_db_video_file_t * file = obj;
+  gavl_diprintf(2, "Video codec: %s\n", file->video_codec);
+  
+  }
+
+static void del_video_file(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_sqlite_delete_by_id(db->db, "VIDEO_FILES", obj->id);
+  }
+
+#define WIDTH_COL           1
+#define HEIGHT_COL          2
+#define ASPECT_COL          3
+#define TIMESCALE_COL       4
+#define FRAME_DURATION_COL  5
+#define VIDEO_CODEC_COL     6
+#define COLLECTION_COL      7
+#define IDX_COL             8
+
+static int query_video_file(bg_db_t * db, void * obj)
+  {
+  int result;
+  int found = 0;
+  const char * val;
+  bg_db_video_file_t * f = obj;
+
+  sqlite3_stmt * st = db->q_video_files;
+  
+  sqlite3_bind_int64(st, 1, f->file.obj.id);
+  
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_INT(WIDTH_COL, f->width);
+    BG_DB_GET_COL_INT(HEIGHT_COL, f->height);
+    
+    val = (const char*)sqlite3_column_text(st, ASPECT_COL);
+    sscanf(val, "%d:%d", &f->aspect_num, &f->aspect_den);
+
+    BG_DB_GET_COL_INT(TIMESCALE_COL, f->timescale);
+    BG_DB_GET_COL_INT(FRAME_DURATION_COL, f->frame_duration);
+    BG_DB_GET_COL_STRING(VIDEO_CODEC_COL, f->video_codec);    
+    BG_DB_GET_COL_INT(COLLECTION_COL, f->collection);
+    BG_DB_GET_COL_INT(IDX_COL, f->index);
+    found = 1;
+    }
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return 0;
+  return 1;
+  }
+
+const bg_db_object_class_t bg_db_video_file_class =
+  {
+  .name = "Video file",
+  .del = del_video_file,
+  .free = free_video_file,
+  .query = query_video_file,
+  .dump = &dump_video_file,
+  .parent = &bg_db_file_class,
+  };
+
+static void
+del_movie_part(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_db_video_container_t * movie;
+  bg_db_video_file_t * part = (bg_db_video_file_t *)obj;
+  
+  if(part->collection > 0)
+    {
+    movie = bg_db_object_query(db, part->collection);
+    if(movie)
+      {
+      bg_db_object_remove_child(db, movie, part);
+      if(!movie->obj.children)
+        {
+        bg_log(BG_LOG_INFO, LOG_DOMAIN,
+               "Removing empty multipart movie %s", movie->info.title);
+        bg_db_object_delete(db, movie);
+        }
+      else
+        bg_db_object_unref(movie);
+      }
+    }
+  }
+
+const bg_db_object_class_t bg_db_movie_part_class =
+  {
+  .name = "Movie part",
+  .del = del_movie_part,
+  .parent = &bg_db_video_file_class,
+  };
+
+static void insert_video_file(bg_db_t * db, void * obj)
+  {
+  char * sql;
+  bg_db_video_file_t * f = obj;
+
+  char * aspect_string = bg_sprintf("%d:%d", f->aspect_num, f->aspect_den);
+  
+  sql = sqlite3_mprintf("INSERT INTO VIDEO_FILES ( "
+                        "ID, "
+                        "WIDTH, "
+                        "HEIGHT, "
+                        "ASPECT, "
+                        "TIMESCALE, "
+                        "FRAME_DURATION, "
+                        "VIDEO_CODEC, "
+                        "COLLECTION, "
+                        "IDX"
+                        ") VALUES ("
+                        "%"PRId64","
+                        "%d,"
+                        "%d,"
+                        "%Q,"
+                        "%d,"
+                        "%d,"
+                        "%Q,"
+                        "%"PRId64","
+                        "%d"
+                        ");",
+                        bg_db_object_get_id(obj),
+                        f->width,
+                        f->height,
+                        aspect_string,
+                        f->timescale,
+                        f->frame_duration,
+                        f->video_codec,
+                        f->collection,
+                        f->index);
+
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  free(aspect_string);
+  }
+
+/* Movie / episode */
+
+static void del_movie(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_db_video_info_delete(db, obj);
+  }
+
+static void free_movie(void * obj)
+  {
+  bg_db_movie_t * file = obj;
+  bg_db_video_info_free(&file->info);
+  }
+
+static int query_movie(bg_db_t * db, void * obj)
+  {
+  bg_db_movie_t * file = obj;
+  bg_db_video_info_query(db, &file->info, obj);
+  return 1;
+  }
+
+static void dump_movie(void * obj)
+  {
+  bg_db_movie_t * file = obj;
+  bg_db_video_info_dump(&file->info);
+  }
+
+static void update_movie(bg_db_t * db, void * obj)
+  {
+  bg_db_movie_t * file = obj;
+  bg_db_video_info_update(db, &file->info, obj);
+  }
+
+const bg_db_object_class_t bg_db_movie_class =
+  {
+  .name = "Movie",
+  .del = del_movie,
+  .free = free_movie,
+  .query = query_movie,
+  .dump = dump_movie,
+  .update = update_movie,
+  .parent = &bg_db_video_file_class,
+  };
+
+const bg_db_object_class_t bg_db_episode_class =
+  {
+  .name = "Episode",
+  .del = del_movie,
+  .free = free_movie,
+  .query = query_movie,
+  .dump = dump_movie,
+  .update = update_movie,
+  .parent = &bg_db_video_file_class,
+  };
+
+static const struct
+  {
+  int num;
+  int den;
+  }
+aspect_ratios[] = 
+  {
+    { 4,  3 },
+    { 16, 9 },
+    { /* End */ }
+  };
+  
+static void guess_aspect(gavl_video_format_t * format, int * num, int * den)
+  {
+  int min_index = 0;
+  double min_diff = 1.0;
+  double test_aspect = 1.0;
+  int i = 0;
+
+  double aspect = (double)(format->image_width * format->pixel_width) /
+    (double)(format->image_height * format->pixel_height);
+  
+  while(aspect_ratios[i].num)
+    {
+    test_aspect = (double)aspect_ratios[i].num / (double)aspect_ratios[i].den;
+    if(!i || (fabs(test_aspect - aspect) < min_diff))
+      {
+      min_index = i;
+      min_diff = fabs(test_aspect - aspect);
+      }
+    i++;
+    }
+  *num = aspect_ratios[min_index].num;
+  *den = aspect_ratios[min_index].den;
+  }
+
+static int is_skip_char(char c)
+  {
+  return isspace(c) || (c == '_') || (c == '-');
+  }
+
+static const char * detect_date(const char * filename, bg_db_date_t * date)
+  {
+  const char * pos = strrchr(filename, '(');
+  if(!pos)
+    return NULL;
+  
+  bg_db_date_set_invalid(date);
+  
+  if(sscanf(pos, "(%d-%d-%d)", &date->year, &date->month, &date->day) < 3)
+    {
+    date->month = 0;
+    date->day = 0;
+    bg_db_date_set_invalid(date);
+    if(sscanf(pos, "(%d)", &date->year) < 1)
+      {
+      bg_db_date_set_invalid(date);
+      return NULL;
+      }
+    }
+  pos--;
+  while(is_skip_char(*pos) && (pos > filename))
+    pos--;
+  pos++;
+  return pos;
+  }
+
+static const char * detect_episode_tag(const char * filename, const char * end, 
+                                       int * season_p, int * idx_p)
+  {
+  const char * pos;
+  int season, idx;
+  if(!end)
+    end = filename + strlen(filename);
+
+  pos = filename;
+  
+  while(pos < end)
+    {
+    if((sscanf(pos, "S%dE%d", &season, &idx) == 2) ||
+       (sscanf(pos, "s%de%d", &season, &idx) == 2))
+      {
+      if(season_p)
+        *season_p = season;
+      if(idx_p)
+        *idx_p = idx;
+      return pos;
+      }
+    pos++;
+    }
+  return NULL;
+  }
+
+static const char * detect_multipart_tag(const char * filename, int * part)
+  {
+  const char * pos = filename + strlen(filename) - 3;
+
+  while(pos > filename)
+    {
+    if(!strncasecmp(pos, "CD", 2) && isdigit(pos[2]))
+      {
+      if(part)
+        *part = atoi(pos+2);
+      return pos;
+      }
+    else if(!strncasecmp(pos, "part", 4) && isdigit(pos[4]))
+      {
+      if(part)
+        *part = atoi(pos+4);
+      return pos;
+      }
+    pos--;
+    }
+  return NULL;
+  }
+
+/* "Movie title (1990)" */
+
+static int detect_movie_singlefile(const char * filename,
+                                   char ** title, bg_db_date_t * date)
+  {
+  const char * end = detect_date(filename, date);
+  if(!end)
+    end = filename + strlen(filename);
+  *title = gavl_strndup(filename, end);
+  return 1;
+  }
+
+/* "Movie title (1990) CD1" */
+
+static int detect_movie_multifile(const char * filename,
+                                  char ** label, char ** title,
+                                  bg_db_date_t * date, int * idx)
+  {
+  const char * pos;
+  const char * end = filename + strlen(filename);
+
+  pos = detect_multipart_tag(filename, idx);
+
+  if(!pos)
+    return 0;
+  
+  end = detect_date(filename, date);
+  if(!end)
+    {
+    end = pos;
+    end--;
+ 
+    while(is_skip_char(*end) && (end > filename))
+      end--;
+    end++;
+    }
+
+  *title = gavl_strndup(filename, end); 
+
+  pos--;
+  
+  while(is_skip_char(*pos) && (pos > filename))
+    pos--;
+  
+  pos++;
+  *label = gavl_strndup(filename, pos);
+  
+  return 1;
+  }
+
+/* "Show - S1E2 - Episode (1990)" */
+
+static int detect_episode(const char * filename, 
+                          char ** show, int * season,
+                          int * idx, char ** title, bg_db_date_t * date)
+  {
+  const char * tag;
+  const char * pos;
+  const char * end = detect_date(filename, date);
+  if(!end)
+    end = filename + strlen(filename);
+
+  tag = detect_episode_tag(filename, end, season, idx);
+  if(!tag)
+    return 0;
+
+  pos = tag;
+  while(!is_skip_char(*pos) && (pos < end))
+    pos++;
+  if(pos == end)
+    return 0;
+  while(is_skip_char(*pos) && (pos < end))
+    pos++;
+
+  if(pos == end)
+    return 0;
+  
+  *title = gavl_strndup(pos, end);
+
+  pos = tag;
+  pos--;
+
+  while(is_skip_char(*pos) && (pos > filename))
+    pos--;
+
+  if(pos == filename)
+    {
+    free(*title);
+    return 0;
+    }
+  pos++;
+  *show = gavl_strndup(filename, pos);
+  return 1;  
+  }
+
+static void detect_languages(bg_db_t * db, bg_track_info_t * t, bg_db_video_info_t * info)
+  {
+  int i, idx;
+  const char * var;
+  /* Get audio languages */
+  if(t->num_audio_streams)
+    {
+    info->audio_languages = calloc((t->num_audio_streams + 1), sizeof(*info->audio_languages));
+
+    for(i = 0; i < t->num_audio_streams; i++)
+      {
+      var = gavl_metadata_get(&t->audio_streams[i].m, GAVL_META_LANGUAGE);
+      if(!var)
+        var = "und";
+      info->audio_languages[i] = gavl_strdup(bg_iso639_t_to_b(var));
+      }
+
+    /* Strings -> ID */
+
+    info->audio_language_ids = malloc((t->num_audio_streams+1)*sizeof(*info->audio_language_ids));
+    for(i = 0; i < t->num_audio_streams; i++)
+      info->audio_language_ids[i] =
+        bg_sqlite_string_to_id_add(db->db, "VIDEO_LANGUAGES",
+                                   "ID", "NAME", info->audio_languages[i]);
+    info->audio_language_ids[t->num_audio_streams] = -1;
+    }
+  
+  /* Get languages */
+  if(t->num_text_streams || t->num_overlay_streams)
+    {
+    info->subtitle_languages =
+      calloc(t->num_text_streams + t->num_overlay_streams + 1, sizeof(*info->subtitle_languages));
+    
+    for(i = 0; i < t->num_text_streams; i++)
+      {
+      var = gavl_metadata_get(&t->text_streams[i].m, GAVL_META_LANGUAGE);
+      if(!var)
+        var = "und";
+      info->subtitle_languages[i] = gavl_strdup(bg_iso639_t_to_b(var));
+      }
+
+    idx = t->num_text_streams;
+
+    for(i = 0; i < t->num_overlay_streams; i++)
+      {
+      var = gavl_metadata_get(&t->overlay_streams[i].m, GAVL_META_LANGUAGE);
+      if(!var)
+        var = "und";
+      info->subtitle_languages[idx] = gavl_strdup(bg_iso639_t_to_b(var));
+      idx++;
+      }
+    
+    /* Strings -> ID */
+
+    info->subtitle_language_ids = malloc((t->num_text_streams+t->num_overlay_streams+1)*
+                                         sizeof(*info->subtitle_language_ids));
+    for(i = 0; i < t->num_text_streams+t->num_overlay_streams; i++)
+      info->subtitle_language_ids[i] =
+        bg_sqlite_string_to_id_add(db->db, "VIDEO_LANGUAGES",
+                                   "ID", "NAME", info->subtitle_languages[i]);
+    info->subtitle_language_ids[t->num_text_streams+t->num_overlay_streams] = -1;
+    }
+  }
+
+void bg_db_video_file_create(bg_db_t * db, void * obj, bg_track_info_t * t)
+  {
+  const char * val;
+  bg_db_date_t date;
+  char * show_name = NULL;
+  char * title = NULL;
+  char * label = NULL;
+  int season_idx;
+  int idx; 
+
+  bg_db_video_file_t * f = obj;
+
+  bg_db_date_set_invalid(&date);
+  
+  /* Get technical aspects */
+  bg_db_object_set_type(obj, BG_DB_OBJECT_VIDEO_FILE);
+  
+  f->width  = t->video_streams[0].format.image_width;
+  f->height = t->video_streams[0].format.image_height;
+  guess_aspect(&t->video_streams[0].format, &f->aspect_num, &f->aspect_den);
+  
+  f->timescale = t->video_streams[0].format.timescale;
+  f->frame_duration =
+    (t->video_streams[0].format.framerate_mode == GAVL_FRAMERATE_VARIABLE) ? 0 :
+    t->video_streams[0].format.frame_duration;
+  
+  val = gavl_metadata_get(&t->video_streams[0].m, GAVL_META_FORMAT);
+  if(val)
+    f->video_codec = gavl_strdup(val);
+  
+  /* Get logical aspects */
+  
+  if(detect_episode(f->file.obj.label, &show_name, &season_idx,
+                    &idx, &title, &date))
+    {
+    bg_db_object_t * show;
+    bg_db_object_t * season;
+    char * season_name;
+    const char * pos;
+
+    bg_db_movie_t * m = (bg_db_movie_t *)f;
+
+    //    fprintf(stderr,
+    //            "Detected Episode\nShow: %s\nSeason: %d\nEpisode: %d\nTitle: %s\nYear: %d\n",
+    //            show_name, season_idx, idx, title, date.year);
+    bg_db_video_info_init(&m->info);
+    bg_db_video_info_set_title_nocpy(&m->info, title);
+
+    memcpy(&m->info.date, &date, sizeof(date));
+    detect_languages(db, t, &m->info);
+    
+    bg_db_object_set_type(m, BG_DB_OBJECT_VIDEO_EPISODE);
+
+    /* Lookup show */
+    show = bg_db_tvseries_query(db, show_name);
+
+    /* Lookup season */
+    pos = detect_episode_tag(f->file.obj.label, NULL, NULL, NULL);
+    while(tolower(*pos) != 'e')
+      pos++;
+    season_name = gavl_strndup(f->file.obj.label, pos);
+    season = bg_db_season_query(db, show, season_name, season_idx);
+    free(season_name);
+    f->collection = season->id;
+    f->index = idx;
+
+    bg_db_video_info_insert(db, &m->info, m);
+
+    bg_db_object_unref(show);
+    bg_db_object_unref(season);
+    }
+  else if(detect_movie_multifile(f->file.obj.label, &label, &title, &date, &idx))
+    {
+    bg_db_video_container_t * m;
+    bg_db_object_set_type(f, BG_DB_OBJECT_MOVIE_PART);
+#if 0
+    fprintf(stderr,
+            "Detected multifile movie\nTitle: %s\nYear: %d\nLabel: %s\n",
+            title, date.year, label);
+#endif
+    m = (bg_db_video_container_t *)bg_db_movie_multipart_query(db,
+                                                               label, title);
+
+    if(!m)
+      {
+      /* Create object */
+      m = bg_db_object_create(db);
+      bg_db_object_set_type(m, BG_DB_OBJECT_MOVIE_MULTIPART);
+      bg_db_video_info_init(&m->info);
+      detect_languages(db, t, &m->info);
+      
+      bg_db_object_set_parent_id(db, m, -1);
+      bg_db_object_set_label(m, label);
+
+      bg_db_video_info_set_title(&m->info, title);
+      memcpy(&m->info.date, &date, sizeof(date));
+      bg_db_video_info_insert(db, &m->info, m);
+      bg_db_create_vfolders(db, m);
+      }
+    
+    f->collection = bg_db_object_get_id(m);
+    f->index = idx;
+    bg_db_object_add_child(db, m, f);
+    bg_db_object_unref(m);
+    }
+  else if(detect_movie_singlefile(f->file.obj.label, &title, &date))
+    {
+    bg_db_movie_t * m = (bg_db_movie_t *)f;
+
+    //    fprintf(stderr,
+    //            "Detected Singlefile movie\nTitle: %s\nYear: %d\n",
+    //            title, date.year);
+
+    bg_db_video_info_init(&m->info);
+    detect_languages(db, t, &m->info);
+
+    bg_db_video_info_set_title_nocpy(&m->info, title);
+    
+    memcpy(&m->info.date, &date, sizeof(date));
+    
+    bg_db_object_set_type(m, BG_DB_OBJECT_MOVIE);
+    bg_db_video_info_insert(db, &m->info, m);
+    bg_db_create_vfolders(db, m);
+    }
+  
+  insert_video_file(db, f);
+  }
+
+
+void bg_db_cleanup_video(bg_db_t * db)
+  {
+  bg_sqlite_id_tab_t tab;
+  char * sql = NULL;
+  int64_t count;
+  int64_t total;
+  int i;
+  bg_sqlite_id_tab_init(&tab);
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Cleaning up video data");
+
+  /* Clean up empty genres */
+  sql = sqlite3_mprintf("select ID from VIDEO_GENRES;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    count = 0;
+    sql = sqlite3_mprintf("select count(*) from VIDEO_GENRES_VIDEOS where GENRE_ID = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    if(!count)
+      {
+      char * name;
+      name = bg_sqlite_id_to_string(db->db, "VIDEO_GENRES", "NAME", "ID", tab.val[i]);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty video genre %s", name);
+      free(name);
+      bg_sqlite_delete_by_id(db->db, "VIDEO_GENRES", tab.val[i]);
+      }
+    }
+
+  /* Clean up empty countries */
+  bg_sqlite_id_tab_reset(&tab);
+
+  sql = sqlite3_mprintf("select ID from VIDEO_COUNTRIES;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    count = 0;
+    sql = sqlite3_mprintf("select count(*) from VIDEO_COUNTRIES_VIDEOS where COUNTRY_ID = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    if(!count)
+      {
+      char * name;
+      name = bg_sqlite_id_to_string(db->db, "VIDEO_COUNTRIES", "NAME", "ID", tab.val[i]);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty video country %s", name);
+      free(name);
+      bg_sqlite_delete_by_id(db->db, "VIDEO_COUNTRIES", tab.val[i]);
+      }
+    }
+
+  /* Clean up empty persons */
+  bg_sqlite_id_tab_reset(&tab);
+
+  sql = sqlite3_mprintf("select ID from VIDEO_PERSONS;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    count = 0;
+    total = 0;
+    sql = sqlite3_mprintf("select count(*) from VIDEO_ACTORS_VIDEOS where PERSON_ID = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total += count;
+    count = 0;
+
+    sql = sqlite3_mprintf("select count(*) from VIDEO_DIRECTORS_VIDEOS where PERSON_ID = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total += count;
+    
+    if(!total)
+      {
+      char * name;
+      name = bg_sqlite_id_to_string(db->db, "VIDEO_PERSONS", "NAME", "ID", tab.val[i]);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty video person %s", name);
+      free(name);
+      bg_sqlite_delete_by_id(db->db, "VIDEO_PERSONS", tab.val[i]);
+      }
+    }
+
+  /* Clean up empty languages */
+  bg_sqlite_id_tab_reset(&tab);
+  
+  sql = sqlite3_mprintf("select ID from VIDEO_LANGUAGES;");
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    count = 0;
+    total = 0;
+    sql = sqlite3_mprintf("select count(*) from VIDEO_AUDIO_LANGUAGES_VIDEOS where LANGUAGE_ID = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total += count;
+    count = 0;
+
+    sql = sqlite3_mprintf("select count(*) from VIDEO_SUBTITLE_LANGUAGES_VIDEOS where LANGUAGE_ID = %"PRId64";",
+                          tab.val[i]);
+    bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &count);
+    sqlite3_free(sql);
+
+    total += count;
+    
+    if(!total)
+      {
+      char * name;
+      name = bg_sqlite_id_to_string(db->db, "VIDEO_LANGUAGES", "NAME", "ID", tab.val[i]);
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing empty video language %s", name);
+      free(name);
+      bg_sqlite_delete_by_id(db->db, "VIDEO_LANGUAGES", tab.val[i]);
+      }
+    }
+  bg_sqlite_id_tab_free(&tab);
+
+  
+  }
+
+void bg_db_cleanup_tvseries(bg_db_t * db)
+  {
+  bg_sqlite_id_tab_t tab;
+  char * sql = NULL;
+  int i;
+  char * date = NULL;
+  bg_db_video_container_t * c;
+  
+  bg_sqlite_id_tab_init(&tab);
+
+  /* Get the year for seasons */
+  sql = sqlite3_mprintf("select ID from VIDEO_INFOS where VIDEO_TYPE = %d;", BG_DB_OBJECT_SEASON);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  for(i = 0; i < tab.num_val; i++)
+    {
+    c = bg_db_object_query(db, tab.val[i]);
+    
+    sql = sqlite3_mprintf("SELECT date from VIDEO_INFOS WHERE ID IN "
+                          "(SELECT ID FROM VIDEO_FILES WHERE COLLECTION = %"PRId64") "
+                          "order by date limit 1;", tab.val[i]);
+    date = NULL;
+    bg_sqlite_exec(db->db, sql, bg_sqlite_string_callback, &date);
+    sqlite3_free(sql);
+
+    if(date)
+      {
+      bg_db_string_to_date(date, &c->info.date);
+      free(date);
+      }
+    bg_db_object_unref(c);
+    }
+
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Get the year for shows */
+  sql = sqlite3_mprintf("select ID from VIDEO_INFOS where VIDEO_TYPE = %d;", BG_DB_OBJECT_TVSERIES);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    c = bg_db_object_query(db, tab.val[i]);
+    
+    sql = sqlite3_mprintf("SELECT date from VIDEO_INFOS WHERE ID IN "
+                          "(SELECT ID FROM OBJECTS WHERE PARENT_ID = %"PRId64") "
+                          "order by date limit 1;", tab.val[i]);
+    date = NULL;
+    bg_sqlite_exec(db->db, sql, bg_sqlite_string_callback, &date);
+    sqlite3_free(sql);
+    
+    bg_db_string_to_date(date, &c->info.date);
+    free(date);
+    bg_db_object_unref(c);
+    }
+  
+  
+  bg_sqlite_id_tab_free(&tab);
+
+  }

gmerlin-4256.tar.gz/lib/db_videocontainer.c Added

@@ -0,0 +1,223 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+#include <math.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <string.h>
+
+static void free_video_container(void * obj)
+  {
+  bg_db_video_container_t * c = obj;
+  bg_db_video_info_free(&c->info);
+  }
+
+static int query_video_container(bg_db_t * db, void * obj)
+  {
+  bg_db_video_container_t * c = obj;
+  bg_db_video_info_query(db, &c->info, obj);
+  return 1;
+  }
+
+static void dump_video_container(void * obj)
+  {
+  bg_db_video_container_t * c = obj;
+  bg_db_video_info_dump(&c->info);
+  }
+
+static void del_video_container(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  bg_db_video_info_delete(db, obj);
+  }
+
+static void update_video_container(bg_db_t * db, void * obj)
+  {
+  bg_db_video_container_t * c = obj;
+  bg_db_video_info_update(db, &c->info, obj);
+  }
+
+static void get_children_video_container(bg_db_t * db, void * obj, bg_sqlite_id_tab_t * tab)
+  {
+  char * sql;
+  sql = sqlite3_mprintf("SELECT ID FROM VIDEO_FILES WHERE COLLECTION = %"PRId64" ORDER BY IDX;",
+                        bg_db_object_get_id(obj));
+  bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, tab);
+  sqlite3_free(sql);
+  }
+
+
+const bg_db_object_class_t bg_db_series_class =
+  {
+  .name = "Series",
+  .del = del_video_container,
+  .free = free_video_container,
+  .query = query_video_container,
+  .dump = dump_video_container,
+  .update = update_video_container,
+  .parent = NULL,
+  };
+
+const bg_db_object_class_t bg_db_season_class =
+  {
+  .name = "Season",
+  .del = del_video_container,
+  .free = free_video_container,
+  .query = query_video_container,
+  .dump = dump_video_container,
+  .update = update_video_container,
+  .get_children = get_children_video_container,
+  .parent = NULL,
+  };
+
+const bg_db_object_class_t bg_db_multipart_movie_class =
+  {
+  .name = "Multipart movie",
+  .del = del_video_container,
+  .free = free_video_container,
+  .query = query_video_container,
+  .dump = dump_video_container,
+  .update = update_video_container,
+  .get_children = get_children_video_container,
+  .parent = NULL,
+  };
+
+static int compare_show(const bg_db_object_t * obj, const void * data)
+  {
+  if((obj->type == BG_DB_OBJECT_TVSERIES) && !strcmp(obj->label, data))
+    return 1;
+  return 0;
+  }
+
+
+bg_db_object_t * bg_db_tvseries_query(bg_db_t * db, const char * label)
+  {
+  int64_t ret;
+  char * sql;
+  bg_db_video_container_t * obj;
+
+  /* Query cache */
+  ret = bg_db_cache_search(db, compare_show, label);
+  if(ret > 0)
+    return bg_db_object_query(db, ret);
+
+  /* Query db */
+  ret = -1;
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (LABEL = %Q);",
+                        BG_DB_OBJECT_TVSERIES, label);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &ret);
+  sqlite3_free(sql);
+
+  if(ret > 0)
+    return bg_db_object_query(db, ret);
+
+  /* Create object */
+  obj = bg_db_object_create(db);
+  bg_db_object_set_type(obj, BG_DB_OBJECT_TVSERIES);
+  bg_db_object_set_parent_id(db, obj, -1);
+  bg_db_object_set_label(obj, label);
+  bg_db_video_info_init(&obj->info);
+  bg_db_video_info_set_title(&obj->info, label);
+  bg_db_video_info_insert(db, &obj->info, obj);
+
+  return (bg_db_object_t *)obj;
+  }
+
+static int compare_season(const bg_db_object_t * obj, const void * data)
+  {
+  if((obj->type == BG_DB_OBJECT_SEASON) && !strcmp(obj->label, data))
+    return 1;
+  return 0;
+  }
+
+
+bg_db_object_t * bg_db_season_query(bg_db_t * db,
+                                    bg_db_object_t * show,
+                                    const char * label, int idx)
+  {
+  int64_t ret;
+  char * sql;
+  bg_db_video_container_t * obj;
+
+  /* Query cache */
+  ret = bg_db_cache_search(db, compare_season, label);
+  if(ret > 0)
+    return bg_db_object_query(db, ret);
+
+  /* Query db */
+  ret = -1;
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (LABEL = %Q);",
+                        BG_DB_OBJECT_SEASON, label);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &ret);
+  sqlite3_free(sql);
+  
+  if(ret > 0)
+    return bg_db_object_query(db, ret);
+
+  /* Create object */
+  obj = bg_db_object_create(db);
+  bg_db_object_set_type(obj, BG_DB_OBJECT_SEASON);
+  bg_db_object_set_parent(db, obj, show);
+  bg_db_object_set_label(obj, label);
+
+  /* Set friendly title */
+  bg_db_video_info_set_title_nocpy(&obj->info, bg_sprintf("Season %d", idx));
+  
+  bg_db_video_info_insert(db, &obj->info, obj);
+  return (bg_db_object_t*)obj;
+  }
+
+static int compare_multipart(const bg_db_object_t * obj, const void * data)
+  {
+  if((obj->type == BG_DB_OBJECT_MOVIE_MULTIPART) && !strcmp(obj->label, data))
+    return 1;
+  return 0;
+  }
+
+
+bg_db_object_t *
+bg_db_movie_multipart_query(bg_db_t * db, const char * label,
+                            const char * title)
+  {
+  int64_t ret;
+  char * sql;
+  
+  /* Query cache */
+  ret = bg_db_cache_search(db, compare_multipart, label);
+  if(ret > 0)
+    return bg_db_object_query(db, ret);
+
+  /* Query db */
+  ret = -1;
+  sql = sqlite3_mprintf("SELECT ID FROM OBJECTS WHERE (TYPE = %d) & (LABEL = %Q);",
+                        BG_DB_OBJECT_MOVIE_MULTIPART, label);
+  bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &ret);
+  sqlite3_free(sql);
+
+  if(ret > 0)
+    return bg_db_object_query(db, ret);
+
+  return NULL;
+  }
+

gmerlin-4256.tar.gz/lib/db_videoinfo.c Added

@@ -0,0 +1,892 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <unistd.h>
+
+#include <mediadb_private.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/xmlutils.h>
+
+#include <string.h>
+
+#define LOG_DOMAIN "db.videoinfo"
+
+static void del_nfo(bg_db_t * db, bg_db_object_t * obj) // Delete from db
+  {
+  /* Get associated object and free it's info */
+  bg_db_object_t * vi;
+  char * sql;
+  int result;
+  int64_t id = -1;
+  sql = sqlite3_mprintf("SELECT ID FROM VIDEO_INFOS WHERE NFO_FILE = %"PRId64";",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_int_callback, &id);
+  sqlite3_free(sql);
+
+  if(!result || (id <= 0))
+    return;
+
+  vi = bg_db_object_query(db, id);
+  if(!vi)
+    return;  
+
+  bg_db_video_info_clear(db, bg_db_object_get_video_info(vi), vi);
+  bg_db_object_unref(vi);
+  }
+
+const bg_db_object_class_t bg_db_nfo_class =
+  {
+    .name = "NFO",
+    .del = del_nfo,
+    .parent = &bg_db_file_class,
+  };
+
+
+#define MY_FREE(ptr) if(ptr) free(ptr)
+#define MY_FREE_ARR(arr) \
+  if(arr)           \
+    {               \
+    i = 0;          \
+    while(arr[i])   \
+      {             \
+      free(arr[i]); \
+      i++;          \
+      }             \
+    free(arr);      \
+    }           
+
+
+void bg_db_video_info_free(bg_db_video_info_t* info)
+  {
+  int i;
+  MY_FREE(info->title);
+  MY_FREE(info->search_title);
+  MY_FREE(info->title_orig);
+  
+  MY_FREE(info->rating);
+  MY_FREE(info->parental_control);
+  MY_FREE(info->director_ids);
+  MY_FREE(info->actor_ids);
+  MY_FREE(info->genre_ids);
+  MY_FREE(info->country_ids);
+  MY_FREE(info->audio_language_ids);
+  MY_FREE(info->subtitle_language_ids);
+  
+  MY_FREE_ARR(info->directors);
+  MY_FREE_ARR(info->actors);
+  MY_FREE_ARR(info->genres);
+  MY_FREE_ARR(info->countries);
+  MY_FREE_ARR(info->audio_languages);
+  MY_FREE_ARR(info->subtitle_languages);
+  
+  MY_FREE(info->plot);
+  }
+
+#define TITLE_COL            1
+#define SEARCH_TITLE_COL     2
+#define TITLE_ORIG_COL       3
+#define RATING_COL           4
+#define PARENTAL_CONTROL_COL 5
+#define DATE_COL             6
+#define PLOT_COL             7
+#define POSTER_COL           8
+#define FANART_COL           9
+#define NFO_FILE_COL         10
+
+static int64_t * copy_ids(bg_sqlite_id_tab_t * tab)
+  {
+  int64_t * ret = malloc((tab->num_val+1) * sizeof(*ret));
+  memcpy(ret, tab->val, tab->num_val * sizeof(*ret));
+  ret[tab->num_val] = -1;
+  return ret;
+  }
+
+static char ** ids_2_strings(bg_db_t * db, bg_sqlite_id_tab_t * tab, bg_db_string_cache_t * c)
+  {
+  int i;
+  char ** ret = calloc(tab->num_val+1, sizeof(*ret));
+  for(i = 0; i < tab->num_val; i++)
+    ret[i] = bg_db_string_cache_get(c, db->db, tab->val[i]);
+  return ret;
+  }
+
+void bg_db_video_info_dump(bg_db_video_info_t * info)
+  {
+
+  }
+
+void bg_db_video_info_init(bg_db_video_info_t * info)
+  {
+  bg_db_date_set_invalid(&info->date);
+  }
+
+void bg_db_video_info_query(bg_db_t * db, bg_db_video_info_t * ret,
+                            bg_db_object_t * obj)
+  {
+  int result;
+  int found = 0;
+  char * sql;
+  bg_sqlite_id_tab_t tab;
+  sqlite3_stmt * st = db->q_video_infos;
+
+  bg_sqlite_id_tab_init(&tab);
+  
+  sqlite3_bind_int64(st, 1, obj->id);
+
+  if((result = sqlite3_step(st)) == SQLITE_ROW)
+    {
+    BG_DB_GET_COL_STRING(TITLE_COL, ret->title);
+    BG_DB_GET_COL_STRING(SEARCH_TITLE_COL, ret->search_title);
+    BG_DB_GET_COL_STRING(TITLE_ORIG_COL, ret->title_orig);
+    BG_DB_GET_COL_STRING(RATING_COL, ret->rating);
+    BG_DB_GET_COL_STRING(PARENTAL_CONTROL_COL, ret->parental_control);
+    BG_DB_GET_COL_DATE(DATE_COL, ret->date);
+    BG_DB_GET_COL_STRING(PLOT_COL, ret->plot);
+    BG_DB_GET_COL_INT(POSTER_COL, ret->poster_id);
+    BG_DB_GET_COL_INT(FANART_COL, ret->fanart_id);
+    BG_DB_GET_COL_INT(NFO_FILE_COL, ret->nfo_file);
+    found = 1;
+    }
+
+  sqlite3_reset(st);
+  sqlite3_clear_bindings(st);
+  
+  if(!found)
+    return;
+
+  /* Directors */
+  sql = sqlite3_mprintf("SELECT PERSON_ID FROM VIDEO_DIRECTORS_VIDEOS WHERE VIDEO_ID = %"PRId64" ORDER BY ID;",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(result)
+    {
+    ret->director_ids = copy_ids(&tab);
+    ret->directors = ids_2_strings(db, &tab, db->video_persons);
+    }
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Actors */
+  
+  sql = sqlite3_mprintf("SELECT PERSON_ID FROM VIDEO_ACTORS_VIDEOS WHERE VIDEO_ID = %"PRId64" ORDER BY ID;",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(result)
+    {
+    ret->actor_ids = copy_ids(&tab);
+    ret->actors = ids_2_strings(db, &tab, db->video_persons);
+    }
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Genres */
+  sql = sqlite3_mprintf("SELECT GENRE_ID FROM VIDEO_GENRES_VIDEOS WHERE VIDEO_ID = %"PRId64" ORDER BY ID;",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(result)
+    {
+    ret->genre_ids = copy_ids(&tab);
+    ret->genres = ids_2_strings(db, &tab, db->video_genres);
+    }
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Countries */
+  sql = sqlite3_mprintf("SELECT COUNTRY_ID FROM VIDEO_COUNTRIES_VIDEOS WHERE VIDEO_ID = %"PRId64" ORDER BY ID;",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(result)
+    {
+    ret->country_ids = copy_ids(&tab);
+    ret->countries = ids_2_strings(db, &tab, db->video_countries);
+    }
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Audio languages */
+  sql = sqlite3_mprintf("SELECT LANGUAGE_ID FROM VIDEO_AUDIO_LANGUAGES_VIDEOS WHERE VIDEO_ID = %"PRId64" ORDER BY ID;",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(result)
+    {
+    ret->audio_language_ids = copy_ids(&tab);
+    ret->audio_languages = ids_2_strings(db, &tab, db->video_languages);
+    }
+  bg_sqlite_id_tab_reset(&tab);
+
+  /* Subtitle languages */
+  sql = sqlite3_mprintf("SELECT LANGUAGE_ID FROM VIDEO_SUBTITLE_LANGUAGES_VIDEOS WHERE VIDEO_ID = %"PRId64" ORDER BY ID;",
+                        bg_db_object_get_id(obj));
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+  
+  if(result)
+    {
+    ret->subtitle_language_ids = copy_ids(&tab);
+    ret->subtitle_languages = ids_2_strings(db, &tab, db->video_languages);
+    }
+  
+  bg_sqlite_id_tab_free(&tab);
+  }
+
+static void delete_arrays(bg_db_t * db, bg_db_object_t * obj)
+  {
+  char * sql;
+  sql = sqlite3_mprintf("DELETE FROM VIDEO_DIRECTORS_VIDEOS WHERE VIDEO_ID = %"PRId64";", obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  sql = sqlite3_mprintf("DELETE FROM VIDEO_ACTORS_VIDEOS WHERE VIDEO_ID = %"PRId64";", obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  sql = sqlite3_mprintf("DELETE FROM VIDEO_GENRES_VIDEOS WHERE VIDEO_ID = %"PRId64";", obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  
+  sql = sqlite3_mprintf("DELETE FROM VIDEO_COUNTRIES_VIDEOS WHERE VIDEO_ID = %"PRId64";", obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  sql = sqlite3_mprintf("DELETE FROM VIDEO_AUDIO_LANGUAGES_VIDEOS WHERE VIDEO_ID = %"PRId64";", obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  sql = sqlite3_mprintf("DELETE FROM VIDEO_SUBTITLE_LANGUAGES_VIDEOS WHERE VIDEO_ID = %"PRId64";", obj->id);
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+static void add_arrays(bg_db_t * db, bg_db_video_info_t * info,
+                       bg_db_object_t * obj)
+  {
+  int i;
+  int64_t id;
+  char * sql;
+  int result;
+  /* Add directors */
+  if(info->director_ids)
+    {
+    i = 0;
+    id = bg_sqlite_get_next_id(db->db, "VIDEO_DIRECTORS_VIDEOS");
+    while(info->director_ids[i] > 0)
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_DIRECTORS_VIDEOS ("
+                            "ID, VIDEO_ID, PERSON_ID"
+                            ") VALUES ( "
+                            "%"PRId64", %"PRId64", %"PRId64");",
+                            id, bg_db_object_get_id(obj), info->director_ids[i]);
+
+      result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+
+      if(!result)
+        return;
+      i++;
+      id++;
+      }
+
+    }
+
+  if(info->actor_ids)
+    {
+    /* Add actors */
+    i = 0;
+    id = bg_sqlite_get_next_id(db->db, "VIDEO_ACTORS_VIDEOS");
+    while(info->actor_ids[i] > 0)
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_ACTORS_VIDEOS ("
+                            " ID, VIDEO_ID, PERSON_ID"
+                            ") VALUES ( "
+                            "%"PRId64", %"PRId64", %"PRId64");",
+                            id, bg_db_object_get_id(obj),
+                            info->actor_ids[i]);
+
+      result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+
+      if(!result)
+        return;
+      i++;
+      id++;
+      }
+    }
+  
+  if(info->genre_ids)
+    {
+    /* Add genres */
+    i = 0;
+    id = bg_sqlite_get_next_id(db->db, "VIDEO_GENRES_VIDEOS");
+    while(info->genre_ids[i] > 0)
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_GENRES_VIDEOS ( "
+                            "ID, VIDEO_ID, GENRE_ID"
+                            ") VALUES ( "
+                            "%"PRId64", %"PRId64", %"PRId64");",
+                            id, bg_db_object_get_id(obj),
+                            info->genre_ids[i]);
+      result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+
+      if(!result)
+        return;
+      i++;
+      id++;
+      }
+    }
+
+  if(info->country_ids)
+    {
+    /* Add countries */
+    i = 0;
+    id = bg_sqlite_get_next_id(db->db, "VIDEO_COUNTRIES_VIDEOS");
+    while(info->country_ids[i] > 0)
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_COUNTRIES_VIDEOS ( "
+                            "ID, VIDEO_ID, COUNTRY_ID"
+                            ") VALUES ( "
+                            "%"PRId64", %"PRId64", %"PRId64");",
+                            id, bg_db_object_get_id(obj), info->country_ids[i]);
+      result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+    
+      if(!result)
+        return;
+      i++;
+      id++;
+      }
+    }
+
+  if(info->audio_language_ids)
+    {
+    /* Add audio languages */
+    i = 0;
+    id = bg_sqlite_get_next_id(db->db, "VIDEO_AUDIO_LANGUAGES_VIDEOS");
+    while(info->audio_language_ids[i] > 0)
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_AUDIO_LANGUAGES_VIDEOS ( "
+                            "ID, VIDEO_ID, LANGUAGE_ID"
+                            ") VALUES ( "
+                            "%"PRId64", %"PRId64", %"PRId64");",
+                            id, bg_db_object_get_id(obj), info->audio_language_ids[i]);
+      result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+    
+      if(!result)
+        return;
+      i++;
+      id++;
+      }
+    }
+
+  if(info->subtitle_language_ids)
+    {
+    /* Add aubtitle languages */
+    i = 0;
+    id = bg_sqlite_get_next_id(db->db, "VIDEO_SUBTITLE_LANGUAGES_VIDEOS");
+    while(info->subtitle_language_ids[i] > 0)
+      {
+      sql = sqlite3_mprintf("INSERT OR IGNORE INTO VIDEO_SUBTITLE_LANGUAGES_VIDEOS ( "
+                            "ID, VIDEO_ID, LANGUAGE_ID"
+                            ") VALUES ( "
+                            "%"PRId64", %"PRId64", %"PRId64");",
+                            id, bg_db_object_get_id(obj), info->subtitle_language_ids[i]);
+      result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+      sqlite3_free(sql);
+    
+      if(!result)
+        return;
+      i++;
+      id++;
+      }
+    }
+
+  }
+
+void bg_db_video_info_delete(bg_db_t * db,
+                             bg_db_object_t * obj)
+  {
+  bg_db_video_info_t * vi;
+  bg_db_object_t * file;
+  vi = bg_db_object_get_video_info(obj);
+  if((vi->nfo_file > 0) && (file = bg_db_object_query(db, vi->nfo_file)))
+    {
+    bg_db_object_set_type(file, BG_DB_OBJECT_FILE);
+    bg_db_object_unref(file);
+    }
+  if((vi->poster_id > 0) && (file = bg_db_object_query(db, vi->poster_id)))
+    {
+    bg_db_object_set_type(file, BG_DB_OBJECT_IMAGE_FILE);
+    bg_db_object_unref(file);
+    }
+  if((vi->fanart_id > 0) && (file = bg_db_object_query(db, vi->fanart_id)))
+    {
+    bg_db_object_set_type(file, BG_DB_OBJECT_IMAGE_FILE);
+    bg_db_object_unref(file);
+    }
+
+  bg_sqlite_delete_by_id(db->db, "VIDEO_INFOS", obj->id);
+  delete_arrays(db, obj);
+
+  }
+
+void bg_db_video_info_clear(bg_db_t * db, bg_db_video_info_t * info,
+                            void * obj)
+  {
+  int64_t fanart = info->fanart_id;
+  int64_t poster = info->poster_id;
+  char * title = info->title;
+  char * search_title = info->search_title;
+
+  /* Prevent these from being free()d */
+  info->title = NULL;
+  info->search_title = NULL;
+  
+  bg_db_video_info_free(info);
+  memset(info, 0, sizeof(*info));
+
+  info->fanart_id = fanart;
+  info->poster_id = poster;
+  info->title = title;
+  info->search_title = search_title;
+
+  delete_arrays(db, obj);  
+  }
+
+void bg_db_video_info_insert(bg_db_t * db, bg_db_video_info_t * info,
+                             void * obj)
+  {
+  int result;
+  char * sql;
+  
+  char date_string[BG_DB_DATE_STRING_LEN];
+  
+  sql = sqlite3_mprintf("INSERT INTO VIDEO_INFOS ( "
+                        "ID, "
+                        "TITLE, "
+                        "SEARCH_TITLE, "
+                        "TITLE_ORIG, "
+                        "RATING, "
+                        "PARENTAL_CONTROL, "
+                        "DATE, "
+                        "PLOT, "
+                        "POSTER, "
+                        "FANART, "
+                        "NFO_FILE, "
+                        "VIDEO_TYPE "
+                        ") VALUES ( "
+                        "%"PRId64", "
+                        "%Q, "
+                        "%Q, "
+                        "%Q, "
+                        "%Q, "
+                        "%Q, "
+                        "%Q, "
+                        "%Q, "
+                        "%"PRId64", "
+                        "%"PRId64", "
+                        "%"PRId64", "
+                        "%d"
+                        ");",
+                        bg_db_object_get_id(obj),
+                        info->title,
+                        info->search_title,
+                        info->title_orig,
+                        info->rating,
+                        info->parental_control,
+                        bg_db_date_to_string(&info->date, date_string),
+                        info->plot,
+                        info->poster_id,
+                        info->fanart_id,
+                        info->nfo_file,
+                        bg_db_object_get_type(obj)
+                        );
+
+  result = bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  add_arrays(db, info, obj);
+  
+  if(!result)
+    return;
+
+  }
+
+void bg_db_video_info_update(bg_db_t * db, bg_db_video_info_t * info,
+                             void * obj)
+  {
+  char * sql;
+  char date_string[BG_DB_DATE_STRING_LEN];
+  sql = sqlite3_mprintf("UPDATE VIDEO_INFOS SET "
+                        "TITLE = %Q, "
+                        "SEARCH_TITLE = %Q, "
+                        "TITLE_ORIG = %Q, "
+                        "RATING = %Q, "
+                        "PARENTAL_CONTROL = %Q, "
+                        "DATE = %Q, "
+                        "PLOT = %Q,"
+                        "POSTER = %"PRId64","
+                        "FANART = %"PRId64", "
+                        "NFO_FILE = %"PRId64" "
+                        "WHERE ID = %"PRId64";",
+                        info->title,
+                        info->search_title,
+                        info->title_orig,
+                        info->rating,
+                        info->parental_control,
+                        bg_db_date_to_string(&info->date, date_string),
+                        info->plot,
+                        info->poster_id,
+                        info->fanart_id,
+                        info->nfo_file,
+                        bg_db_object_get_id(obj));
+
+  // fprintf(stderr, "%s\n", sql);
+  
+  bg_sqlite_exec(db->db, sql, NULL, NULL);
+  sqlite3_free(sql);
+
+  delete_arrays(db, obj);
+  add_arrays(db, info, obj);
+  }
+
+/* */
+
+bg_db_video_info_t * bg_db_object_get_video_info(void * obj)
+  {
+  switch(bg_db_object_get_type(obj))
+    {
+    case BG_DB_OBJECT_TVSERIES:
+    case BG_DB_OBJECT_SEASON:
+    case BG_DB_OBJECT_MOVIE_MULTIPART:
+      {
+      bg_db_video_container_t * c = obj;
+      return &c->info;
+      }
+      break;
+    case BG_DB_OBJECT_VIDEO_EPISODE:
+    case BG_DB_OBJECT_MOVIE:
+      {
+      bg_db_movie_t * m = obj;
+      return &m->info;
+      }
+      break;
+    default:
+      break;
+    }
+  return NULL;
+  }
+
+static char * normalize_genre(char * genre)
+  {
+  char * pos = genre;
+
+  while(*pos != '\0')
+    {
+    if(*pos == '-')
+      *pos = ' ';
+    pos++;
+    }
+  return bg_capitalize(genre);
+  }
+
+/* Read a video info from an xml file */
+int bg_db_video_info_load(bg_db_t * db, bg_db_video_info_t * info,
+                          bg_db_object_t * obj, bg_db_file_t * nfo_file)
+  {
+  FILE * in = NULL;
+  xmlDocPtr doc = NULL;
+  xmlNodePtr root;
+  xmlNodePtr node;
+  int num_countries = 0;
+  int num_actors    = 0;
+  int num_directors = 0;
+  int ret = 0;
+  int i;
+  int num = 0;
+  
+  in = fopen(nfo_file->path, "r");
+  if(!in)
+    goto fail;
+
+  doc = bg_xml_load_FILE(in);
+  if(!doc)
+    goto fail;
+  
+  root = bg_xml_find_doc_child(doc, "movie");
+  if(!root)
+    root = bg_xml_find_doc_child(doc, "tvshow");
+
+  if(!root)
+    goto fail;
+  
+  node = root->children;
+
+  while(node)
+    {
+    if(!node->name)
+      {
+      node = node->next;
+      continue;
+      }
+    if(!BG_XML_STRCMP(node->name, "originaltitle"))
+      info->title_orig = gavl_strdup(bg_xml_node_get_text_content(node));
+    else if(!BG_XML_STRCMP(node->name, "rating"))
+      {
+      char * pos;
+      info->rating = gavl_strdup(bg_xml_node_get_text_content(node));
+      if((pos = strchr(info->rating, ',')))
+        *pos = '.';
+      }
+    else if(!BG_XML_STRCMP(node->name, "outline") || !BG_XML_STRCMP(node->name, "plot"))
+      info->plot = gavl_strrep(info->plot, bg_xml_node_get_text_content(node));
+    else if(!BG_XML_STRCMP(node->name, "mpaa"))
+      info->parental_control = gavl_strdup(bg_xml_node_get_text_content(node));
+    else if(!BG_XML_STRCMP(node->name, "year"))
+      {
+      info->date.year = atoi(bg_xml_node_get_text_content(node));
+      info->date.month = 1;
+      info->date.day   = 1;
+      }
+    else if(!BG_XML_STRCMP(node->name, "genre"))
+      {
+      char ** genres;
+
+      genres = bg_strbreak(bg_xml_node_get_text_content(node), ',');
+
+      if(genres)
+        {
+        num = 0;
+        while(genres[num])
+          num++;
+
+        info->genres = calloc(num+1, sizeof(*genres));
+        for(i = 0; i < num; i++)
+          info->genres[i] = normalize_genre(genres[i]);
+        bg_strbreak_free(genres);
+        }
+
+      }
+    else if(!BG_XML_STRCMP(node->name, "director"))
+      {
+      info->directors = realloc(info->directors,
+                               (num_directors+2)*sizeof(*info->directors));
+      info->directors[num_directors] =
+        bg_strip_space(gavl_strdup(bg_xml_node_get_text_content(node)));
+      num_directors++;
+      info->directors[num_directors] = NULL;
+      }
+    else if(!BG_XML_STRCMP(node->name, "actor"))
+      {
+      xmlNodePtr child = bg_xml_find_node_child(node, "name");
+      if(child)
+        {
+        info->actors = realloc(info->actors,
+                              (num_actors+2)*sizeof(*info->actors));
+        info->actors[num_actors] =
+          bg_strip_space(gavl_strdup(bg_xml_node_get_text_content(child)));
+        num_actors++;
+        info->actors[num_actors] = NULL;
+        }
+      }
+    else if(!BG_XML_STRCMP(node->name, "country"))
+      {
+      info->countries = realloc(info->countries,
+                               (num_countries+2)*sizeof(*info->countries));
+      info->countries[num_countries] = gavl_strdup(bg_xml_node_get_text_content(node));
+      num_countries++;
+      info->countries[num_countries] = NULL;
+      }
+
+    node = node->next;
+    }
+
+  /* Get IDs */
+
+  if(info->directors)
+    {
+    i = 0;
+    num = 0;
+    while(info->directors[num])
+      num++;
+    info->director_ids = malloc((num+1)*sizeof(*info->director_ids));
+
+    for(i = 0; i < num; i++)
+      info->director_ids[i] =
+        bg_sqlite_string_to_id_add(db->db, "VIDEO_PERSONS",
+                                   "ID", "NAME", info->directors[i]);
+    info->director_ids[num] = -1;
+    }
+
+  if(info->actors)
+    {
+    i = 0;
+    num = 0;
+    while(info->actors[num])
+      num++;
+
+    info->actor_ids = malloc((num+1)*sizeof(*info->actor_ids));
+
+    for(i = 0; i < num; i++)
+      info->actor_ids[i] =
+        bg_sqlite_string_to_id_add(db->db, "VIDEO_PERSONS",
+                                   "ID", "NAME", info->actors[i]);
+    info->actor_ids[num] = -1;
+    }
+  
+  if(info->genres)
+    {
+    i = 0;
+    num = 0;
+    while(info->genres[num])
+      num++;
+
+    info->genre_ids = malloc((num+1)*sizeof(*info->genre_ids));
+
+    for(i = 0; i < num; i++)
+      info->genre_ids[i] =
+        bg_sqlite_string_to_id_add(db->db, "VIDEO_GENRES",
+                                   "ID", "NAME", info->genres[i]);
+
+    info->genre_ids[num] = -1;
+    }
+
+  if(info->countries)
+    {
+    i = 0;
+    num = 0;
+    while(info->countries[num])
+      num++;
+    info->country_ids = malloc((num+1)*sizeof(*info->country_ids));
+
+    for(i = 0; i < num; i++)
+      info->country_ids[i] =
+        bg_sqlite_string_to_id_add(db->db, "VIDEO_COUNTRIES",
+                                   "ID", "NAME", info->countries[i]);
+    info->country_ids[num] = -1;
+    }
+ 
+  info->nfo_file = bg_db_object_get_id(nfo_file);
+  bg_db_create_vfolders(db, obj);
+  
+  ret = 1;
+  fail:
+  if(in)
+    fclose(in);
+  if(doc)
+    xmlFreeDoc(doc);
+  return ret;  
+  }
+
+void bg_db_video_info_set_title_nocpy(bg_db_video_info_t* info, char * title)
+  {
+  info->title = title;
+  info->search_title = gavl_strdup(bg_db_get_search_string(info->title));
+  }
+
+void bg_db_video_info_set_title(bg_db_video_info_t* info, const char * title)
+  {
+  bg_db_video_info_set_title_nocpy(info, gavl_strdup(title));
+  }
+
+
+void bg_db_identify_nfo(bg_db_t * db, int64_t scan_dir_id)
+  {
+  int result;
+  char * sql;
+  int64_t mimetype;
+  void * obj;
+  int i;
+  bg_db_file_t * f;
+  bg_sqlite_id_tab_t tab;
+  bg_sqlite_id_tab_t tab1;
+  bg_sqlite_id_tab_init(&tab);
+  bg_sqlite_id_tab_init(&tab1);
+
+  mimetype = bg_sqlite_string_to_id(db->db, "MIMETYPES", "ID", "NAME", "text/x-nfo");
+
+  sql = sqlite3_mprintf("select ID from OBJECTS where TYPE = %d;", BG_DB_OBJECT_FILE);
+  result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab);
+  sqlite3_free(sql);
+
+  if(!result)
+    return;
+
+  for(i = 0; i < tab.num_val; i++)
+    {
+    bg_sqlite_id_tab_reset(&tab1);
+
+    f = bg_db_object_query(db, tab.val[i]);
+
+    if((f->scan_dir_id != scan_dir_id) || (f->mimetype_id != mimetype))
+      {
+      bg_db_object_unref(f);
+      continue;
+      }
+
+    sql = sqlite3_mprintf("select ID from OBJECTS where (LABEL = %Q) & "
+                          "((TYPE = %d) | "
+                          "(TYPE = %d) | "
+                          "(TYPE = %d) | "
+                          "(TYPE = %d) | "
+                          "(TYPE = %d));",
+                          f->obj.label, 
+                          BG_DB_OBJECT_MOVIE, 
+                          BG_DB_OBJECT_TVSERIES, 
+                          BG_DB_OBJECT_SEASON, 
+                          BG_DB_OBJECT_VIDEO_EPISODE,
+                          BG_DB_OBJECT_MOVIE_MULTIPART);
+ 
+    result = bg_sqlite_exec(db->db, sql, bg_sqlite_append_id_callback, &tab1);
+    sqlite3_free(sql);
+    if(!result)
+      continue;
+
+    if(tab1.num_val > 1)
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "nfo file %s matches for more than one object, taking only the first one", f->path);
+    
+    if(tab1.num_val > 0)
+      {
+      obj = bg_db_object_query(db, tab1.val[0]);
+      if(bg_db_video_info_load(db, bg_db_object_get_video_info(obj), obj, f))
+        {
+        bg_db_object_set_type(f, BG_DB_OBJECT_VIDEO_NFO);
+        bg_log(BG_LOG_INFO, LOG_DOMAIN, "Using %s as nfo", f->path);
+        }
+      bg_db_object_unref(obj);
+      }
+
+    
+    bg_db_object_unref(f);
+    }
+  
+  bg_sqlite_id_tab_free(&tab1);
+  bg_sqlite_id_tab_free(&tab);
+
+  }

gmerlin-1.2.0.tar.gz/lib/device.c -> gmerlin-4256.tar.gz/lib/device.c Changed

gmerlin-1.2.0.tar.gz/lib/edl.c -> gmerlin-4256.tar.gz/lib/edl.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -25,337 +25,241 @@
 #include <stdio.h>
 
 #include <gavl/gavl.h>
+#include <gavl/metadata.h>
+#include <gavl/metatags.h>
+#include <gavl/edl.h>
+
 #include <gmerlin/edl.h>
 #include <gmerlin/utils.h>
 
-bg_edl_t * bg_edl_create()
-  {
-  bg_edl_t * ret;
-  ret = calloc(1, sizeof(*ret));
-  return ret;
-  }
-
-bg_edl_track_t * bg_edl_add_track(bg_edl_t * e)
-  {
-  e->tracks = realloc(e->tracks, (e->num_tracks+1)*sizeof(*e->tracks));
-  memset(e->tracks + e->num_tracks, 0, sizeof(*e->tracks));
-  e->num_tracks++;
-  return e->tracks + (e->num_tracks-1);
-  }
-
-bg_edl_stream_t * bg_edl_add_audio_stream(bg_edl_track_t * t)
-  {
-  t->audio_streams = realloc(t->audio_streams, (t->num_audio_streams+1)*sizeof(*t->audio_streams));
-  memset(t->audio_streams + t->num_audio_streams, 0, sizeof(*t->audio_streams));
-  t->num_audio_streams++;
-  return t->audio_streams + (t->num_audio_streams-1);
-  }
-
-bg_edl_stream_t * bg_edl_add_video_stream(bg_edl_track_t * t)
-  {
-  t->video_streams = realloc(t->video_streams, (t->num_video_streams+1)*sizeof(*t->video_streams));
-  memset(t->video_streams + t->num_video_streams, 0, sizeof(*t->video_streams));
-  t->num_video_streams++;
-  return t->video_streams + (t->num_video_streams-1);
-  
-  }
-
-bg_edl_stream_t * bg_edl_add_subtitle_text_stream(bg_edl_track_t * t)
-  {
-  t->subtitle_text_streams = realloc(t->subtitle_text_streams, (t->num_subtitle_text_streams+1)*sizeof(*t->subtitle_text_streams));
-  memset(t->subtitle_text_streams + t->num_subtitle_text_streams, 0, sizeof(*t->subtitle_text_streams));
-  t->num_subtitle_text_streams++;
-  return t->subtitle_text_streams + (t->num_subtitle_text_streams-1);
-  }
-
-bg_edl_stream_t * bg_edl_add_subtitle_overlay_stream(bg_edl_track_t * t)
+static void set_segment(gavl_edl_segment_t * seg,
+                        const char * url, int track, int stream)
   {
-  t->subtitle_overlay_streams = realloc(t->subtitle_overlay_streams, (t->num_subtitle_overlay_streams+1)*sizeof(*t->subtitle_overlay_streams));
-  memset(t->subtitle_overlay_streams + t->num_subtitle_overlay_streams, 0, sizeof(*t->subtitle_overlay_streams));
-  t->num_subtitle_overlay_streams++;
-  return t->subtitle_overlay_streams + (t->num_subtitle_overlay_streams-1);
+  seg->speed_num = 1;
+  seg->speed_den = 1;
+  seg->url = gavl_strdup(url);
+  seg->track = track;
+  seg->stream = stream;
   }
 
-bg_edl_segment_t * bg_edl_add_segment(bg_edl_stream_t * s)
-  {
-  s->segments = realloc(s->segments, (s->num_segments+1)*sizeof(*s->segments));
-  memset(s->segments + s->num_segments, 0, sizeof(*s->segments));
-  s->num_segments++;
-  return s->segments + (s->num_segments-1);
-  }
-
-static bg_edl_segment_t * copy_segments(const bg_edl_segment_t * src, int len)
+void bg_edl_append_track_info(gavl_edl_t * e, const bg_track_info_t * info,
+                              const char * url, int index, int total_tracks,
+                              const char * name)
   {
+  gavl_edl_track_t * t;
+  gavl_edl_stream_t * s;
+  gavl_edl_segment_t * seg;
   int i;
-  bg_edl_segment_t * ret;
-  ret = calloc(len, sizeof(*ret));
-
-  /* Copy integers */
-  memcpy(ret, src, len * sizeof(*ret));
+  char * real_name;
+  gavl_time_t duration;
   
-  for(i = 0; i < len; i++)
-    {
-    /* Copy pointers */
-    ret[i].url = bg_strdup(NULL, src[i].url);
-    }
-  return ret;
-  }
+  t = gavl_edl_add_track(e);
 
-
-static bg_edl_stream_t * copy_streams(const bg_edl_stream_t * src, int len)
-  {
-  int i;
-  bg_edl_stream_t * ret;
-  ret = calloc(len, sizeof(*ret));
+  if(name)
+    real_name = gavl_strdup(name);
+  else
+    real_name = bg_get_track_name_default(url, index, total_tracks);
   
-  /* Copy integers */
-  memcpy(ret, src, len * sizeof(*ret));
+  gavl_metadata_copy(&t->metadata, &info->metadata);
+  gavl_metadata_set_nocpy(&t->metadata, GAVL_META_LABEL, real_name);
   
-  for(i = 0; i < len; i++)
+  for(i = 0; i < info->num_audio_streams; i++)
     {
-    /* Copy pointers */
-    ret[i].segments = copy_segments(src[i].segments, src[i].num_segments);
-    }
-  return ret;
-  }
+    s = gavl_edl_add_audio_stream(t);
+    seg = gavl_edl_add_segment(s);
+    s->timescale = info->audio_streams[i].format.samplerate;
+    seg->timescale = s->timescale;
+    
+    if(info->audio_streams[i].duration)
+      seg->dst_duration = info->audio_streams[i].duration;
+    else
+      {
 
-static bg_edl_track_t * copy_tracks(const bg_edl_track_t * src, int len)
-  {
-  int i;
-  bg_edl_track_t * ret;
-  ret = calloc(len, sizeof(*ret));
-  
-  /* Copy integers */
-  memcpy(ret, src, len * sizeof(*ret));
-  
-  for(i = 0; i < len; i++)
+      if(gavl_metadata_get_long(&info->metadata, GAVL_META_APPROX_DURATION, &duration))
+        seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, duration);
+      }
+    set_segment(seg, url, index, i);
+    }
+  for(i = 0; i < info->num_video_streams; i++)
     {
-    /* Copy pointers */
-
-    ret[i].name = bg_strdup(NULL, src[i].name);
+    s = gavl_edl_add_video_stream(t);
+    seg = gavl_edl_add_segment(s);
+    s->timescale = info->video_streams[i].format.timescale;
+    seg->timescale = s->timescale;
 
-    memset(&ret[i].metadata, 0, sizeof(ret[i].metadata));
-    
-    gavl_metadata_copy(&ret[i].metadata, &src[i].metadata);
-    
-    ret[i].audio_streams = copy_streams(src[i].audio_streams,
-                                        src[i].num_audio_streams);
-    ret[i].video_streams = copy_streams(src[i].video_streams,
-                                        src[i].num_video_streams);
-    ret[i].subtitle_text_streams = copy_streams(src[i].subtitle_text_streams,
-                                           src[i].num_subtitle_text_streams);
-    ret[i].subtitle_overlay_streams = copy_streams(src[i].subtitle_overlay_streams,
-                                           src[i].num_subtitle_overlay_streams);
+    if(info->video_streams[i].duration)
+      seg->dst_duration = info->video_streams[i].duration;
+    else
+      {
+      if(gavl_metadata_get_long(&info->metadata, GAVL_META_APPROX_DURATION, &duration))
+        seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, duration);
+      }
+    set_segment(seg, url, index, i);
     }
-  return ret;
-  }
-
-bg_edl_t * bg_edl_copy(const bg_edl_t * e)
-  {
-  bg_edl_t * ret;
-  ret = calloc(1, sizeof(*ret));
-
-  /* Copy integers */
-  memcpy(ret, e, sizeof(*ret));
   
-  /* Copy pointers */
-  ret->tracks = copy_tracks(e->tracks, e->num_tracks);
-  ret->url = bg_strdup(NULL, e->url);
-  return ret;
-  }
-
-static void free_segments(bg_edl_segment_t * s, int len)
-  {
-  int i;
-  for(i = 0; i < len; i++)
+  for(i = 0; i < info->num_text_streams; i++)
     {
-    if(s[i].url) free(s[i].url);
-    }
-  free(s);
-  }
+    s = gavl_edl_add_text_stream(t);
+    seg = gavl_edl_add_segment(s);
+    s->timescale = info->text_streams[i].timescale;
+    seg->timescale = s->timescale;
 
-static void free_streams(bg_edl_stream_t * s, int len)
-  {
-  int i;
-  for(i = 0; i < len; i++)
-    {
-    if(s[i].segments) free_segments(s[i].segments, s[i].num_segments);
+    if(info->text_streams[i].duration)
+      seg->dst_duration = info->text_streams[i].duration;
+    else
+      {
+      if(gavl_metadata_get_long(&info->metadata, GAVL_META_APPROX_DURATION, &duration))
+        seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE,
+                                              s->timescale,
+                                              duration);
+      }
+    set_segment(seg, url, index, i);
     }
-  free(s);
-  }
 
-static void free_tracks(bg_edl_track_t * s, int len)
-  {
-  int i;
-  if(s->name)
-    free(s->name);
-  for(i = 0; i < len; i++)
+  for(i = 0; i < info->num_overlay_streams; i++)
     {
-    gavl_metadata_free(&s[i].metadata);
-    
-    if(s[i].audio_streams)
-      free_streams(s[i].audio_streams, s[i].num_audio_streams);
-    if(s[i].video_streams)
-      free_streams(s[i].video_streams,
-                   s[i].num_video_streams);
-    if(s[i].subtitle_text_streams)
-      free_streams(s[i].subtitle_text_streams,
-                   s[i].num_subtitle_text_streams);
-    if(s[i].subtitle_overlay_streams)
-      free_streams(s[i].subtitle_overlay_streams,
-                   s[i].num_subtitle_overlay_streams);
-    }
-  free(s);
-  }
-
-void bg_edl_destroy(bg_edl_t * e)
-  {
-  if(e->tracks)
-    free_tracks(e->tracks, e->num_tracks);
-  if(e->url)
-    free(e->url);
-  free(e);
-  }
+    s = gavl_edl_add_overlay_stream(t);
+    seg = gavl_edl_add_segment(s);
+    s->timescale = info->overlay_streams[i].format.timescale;
+    seg->timescale = s->timescale;
 
-static void dump_stream(const bg_edl_stream_t* s)
-  {
-  int i;
-  bg_edl_segment_t * seg;
-  bg_diprintf(8, "Timescale: %d\n", s->timescale);
-  bg_diprintf(8, "Segments:  %d\n", s->num_segments);
-  for(i = 0; i < s->num_segments; i++)
-    {
-    seg = &s->segments[i];
-    bg_diprintf(8, "Segment\n");
-    bg_diprintf(10, "URL:                  %s\n", (seg->url ? seg->url : "(null)"));
-    bg_diprintf(10, "Track:                %d\n", seg->track);
-    bg_diprintf(10, "Stream index:         %d\n", seg->stream);
-    bg_diprintf(10, "Source timescale:     %d\n", seg->timescale);
-    bg_diprintf(10, "Source time:          %" PRId64 "\n", seg->src_time);
-    bg_diprintf(10, "Destination time:     %" PRId64 "\n", seg->dst_time);
-    bg_diprintf(10, "Destination duration: %" PRId64 "\n", seg->dst_duration);
-    bg_diprintf(10, "Playback speed:       %.3f [%d/%d]\n",
-                  (float)(seg->speed_num) / (float)(seg->speed_den),
-                  seg->speed_num, seg->speed_den);
+    if(info->overlay_streams[i].duration)
+      seg->dst_duration = info->overlay_streams[i].duration;
+    else
+      {
+      if(gavl_metadata_get_long(&info->metadata, GAVL_META_APPROX_DURATION, &duration))
+        seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE,
+                                              s->timescale,
+                                              duration);
+      }
+    set_segment(seg, url, index, i);
     }
   }
 
-static void dump_track(const bg_edl_track_t * t)
+static int64_t get_segment_duration(const bg_track_info_t * info,
+                                    gavl_time_t stream_duration,
+                                    int segment_scale, int stream_scale)
   {
-  int i;
-  bg_diprintf(2, "Track: %s\n", t->name);
-  bg_diprintf(4, "Audio streams: %d\n", t->num_audio_streams);
-  for(i = 0; i < t->num_audio_streams; i++)
-    {
-    bg_diprintf(6, "Audio stream\n");
-    dump_stream(&t->audio_streams[i]);
-    }
+  gavl_time_t track_duration;
   
-  bg_diprintf(4, "Video streams: %d\n", t->num_video_streams);
-  for(i = 0; i < t->num_video_streams; i++)
-    {
-    bg_diprintf(6, "Video stream\n");
-    dump_stream(&t->video_streams[i]);
-    }
-
-  bg_diprintf(4, "Subtitle text streams: %d\n", t->num_subtitle_text_streams);
-  for(i = 0; i < t->num_subtitle_text_streams; i++)
-    {
-    bg_diprintf(6, "Subtitle text stream\n");
-    dump_stream(&t->subtitle_text_streams[i]);
-    }
-  bg_diprintf(4, "Subtitle overlay streams: %d\n", t->num_subtitle_overlay_streams);
-  for(i = 0; i < t->num_subtitle_overlay_streams; i++)
-    {
-    bg_diprintf(6, "Subtitle overlay stream\n");
-    dump_stream(&t->subtitle_overlay_streams[i]);
-    }
-  }
+  if(stream_duration)
+    return gavl_time_rescale(segment_scale, stream_scale, stream_duration);
 
-void bg_edl_dump(const bg_edl_t * e)
-  {
-  int i;
-  bg_dprintf("EDL\n");
-  bg_diprintf(2, "URL:    %s\n", (e->url ? e->url : "(null)"));
-  bg_diprintf(2, "Tracks: %d\n", e->num_tracks);
-  for(i = 0; i < e->num_tracks; i++)
-    {
-    dump_track(&e->tracks[i]);
-    }
+  gavl_metadata_get_long(&info->metadata, GAVL_META_APPROX_DURATION, &track_duration);
+  return gavl_time_rescale(GAVL_TIME_SCALE, stream_scale, track_duration);
   }
 
-void bg_edl_append_track_info(bg_edl_t * e, const bg_track_info_t * info,
-                              const char * url, int index, int total_tracks,
-                              const char * name)
+void bg_edl_track_append_track_info(gavl_edl_t * e, gavl_edl_track_t * t,
+                                    const bg_track_info_t * info,
+                                    const char * url, int index, int total_tracks,
+                                    const char * name)
   {
-  bg_edl_track_t * t;
-  bg_edl_stream_t * s;
-  bg_edl_segment_t * seg;
+  gavl_edl_stream_t * s;
+  gavl_edl_segment_t * seg;
   int i;
+  char * real_name;
+  gavl_time_t track_duration;
   
-  t = bg_edl_add_track(e);
-
   if(name)
-    t->name = bg_strdup(t->name, name);
-  else if(info->name)
-    t->name = bg_strdup(t->name, info->name);
+    real_name = gavl_strdup(name);
   else
-    t->name = bg_get_track_name_default(url, index, total_tracks);
+    real_name = bg_get_track_name_default(url, index, total_tracks);
+  
+  gavl_metadata_copy(&t->metadata, &info->metadata);
+  gavl_metadata_set_nocpy(&t->metadata, GAVL_META_LABEL, real_name);
+
+  track_duration = gavl_edl_track_get_duration(t);
   
   for(i = 0; i < info->num_audio_streams; i++)
     {
-    s = bg_edl_add_audio_stream(t);
-    seg = bg_edl_add_segment(s);
-    s->timescale = info->audio_streams[i].format.samplerate;
-    seg->timescale = s->timescale;
-    
-    if(info->audio_streams[i].duration)
-      seg->dst_duration = info->audio_streams[i].duration;
+    if(i >= t->num_audio_streams)
+      {
+      s = gavl_edl_add_audio_stream(t);
+      s->timescale = info->audio_streams[i].format.samplerate;
+      }
     else
-      seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, info->duration);
-    seg->speed_num = 1;
-    seg->speed_den = 1;
-    seg->url = bg_strdup(NULL, url);
-    seg->track = index;
-    seg->stream = i;
+      s = t->audio_streams + i;
+    
+    seg = gavl_edl_add_segment(s);
+    seg->timescale = info->audio_streams[i].format.samplerate;
+
+    seg->src_time = info->audio_streams[i].pts_offset;
+    seg->dst_time =
+      gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, track_duration) +
+      gavl_time_rescale(seg->timescale, s->timescale, seg->src_time);
+
+    seg->dst_duration = get_segment_duration(info, info->audio_streams[i].duration,
+                                             seg->timescale, s->timescale);
+    set_segment(seg, url, index, i);
     }
   for(i = 0; i < info->num_video_streams; i++)
     {
-    s = bg_edl_add_video_stream(t);
-    seg = bg_edl_add_segment(s);
-    s->timescale = info->video_streams[i].format.timescale;
-    seg->timescale = s->timescale;
-
-    if(info->video_streams[i].duration)
-      seg->dst_duration = info->video_streams[i].duration;
+    if(i >= t->num_video_streams)
+      {
+      s = gavl_edl_add_video_stream(t);
+      s->timescale = info->video_streams[i].format.timescale;
+      }
     else
-      seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, info->duration);
-    seg->speed_num = 1;
-    seg->speed_den = 1;
-    seg->url = bg_strdup(NULL, url);
-    seg->track = index;
-    seg->stream = i;
+      s = t->video_streams + i;
+
+    seg = gavl_edl_add_segment(s);
+    seg->timescale = info->video_streams[i].format.timescale;
+
+    seg->src_time = info->video_streams[i].pts_offset;
+    seg->dst_time =
+      gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, track_duration) +
+      gavl_time_rescale(seg->timescale, s->timescale, seg->src_time);
+
+    seg->dst_duration = get_segment_duration(info, info->video_streams[i].duration,
+                                             seg->timescale, s->timescale);
+    
+    set_segment(seg, url, index, i);
     }
-  for(i = 0; i < info->num_subtitle_streams; i++)
+  
+  for(i = 0; i < info->num_text_streams; i++)
     {
-    if(info->subtitle_streams[i].is_text)
-      s = bg_edl_add_subtitle_text_stream(t);
+    if(i >= t->num_text_streams)
+      {
+      s = gavl_edl_add_text_stream(t);
+      s->timescale = info->text_streams[i].timescale;
+      }
     else
-      s = bg_edl_add_subtitle_overlay_stream(t);
-    seg = bg_edl_add_segment(s);
-    s->timescale = info->subtitle_streams[i].format.timescale;
-    seg->timescale = s->timescale;
+      s = t->text_streams + i;
+    
+    seg = gavl_edl_add_segment(s);
+    seg->timescale = info->text_streams[i].timescale;
+
+    seg->src_time = 0;
+    seg->dst_time =
+      gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, track_duration);
+
+    seg->dst_duration = get_segment_duration(info, 0,
+                                             seg->timescale, s->timescale);
+    
+    set_segment(seg, url, index, i);
+    }
 
-    if(info->subtitle_streams[i].duration)
-      seg->dst_duration = info->subtitle_streams[i].duration;
+  for(i = 0; i < info->num_overlay_streams; i++)
+    {
+    if(i >= t->num_overlay_streams)
+      {
+      s = gavl_edl_add_overlay_stream(t);
+      s->timescale = info->overlay_streams[i].format.timescale;
+      }
     else
-      seg->dst_duration = gavl_time_rescale(GAVL_TIME_SCALE,
-                                            s->timescale,
-                                            info->duration);
-    seg->speed_num = 1;
-    seg->speed_den = 1;
-    seg->url = bg_strdup(NULL, url);
-    seg->track = index;
-    seg->stream = i;
+      s = t->overlay_streams + i;
+    
+    seg = gavl_edl_add_segment(s);
+    seg->timescale = info->overlay_streams[i].format.timescale;
+
+    seg->src_time = 0;
+    seg->dst_time =
+      gavl_time_rescale(GAVL_TIME_SCALE, s->timescale, track_duration);
+
+    seg->dst_duration = get_segment_duration(info, 0,
+                                             seg->timescale, s->timescale);
+    
+    set_segment(seg, url, index, i);
     }
+  
   }

gmerlin-1.2.0.tar.gz/lib/edl_xml.c -> gmerlin-4256.tar.gz/lib/edl_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -43,13 +43,15 @@
 static const char * const dst_time_key     = "dtime";
 static const char * const dst_duration_key = "duration";
 static const char * const speed_key        = "speed";
+static const char * const metadata_key     = "metadata";
+
 
 static void load_segments(xmlDocPtr doc, 
                           xmlNodePtr node,
-                          bg_edl_stream_t * s)
+                          gavl_edl_stream_t * s)
   {
   char * tmp_string;
-  bg_edl_segment_t * seg;
+  gavl_edl_segment_t * seg;
   xmlNodePtr child_node;
 
   node = node->children;
@@ -63,7 +65,7 @@
       }
     if(!BG_XML_STRCMP(node->name, segment_key))
       {
-      seg = bg_edl_add_segment(s);
+      seg = gavl_edl_add_segment(s);
       tmp_string = BG_XML_GET_PROP(node, "scale");
       if(tmp_string)
         {
@@ -87,7 +89,7 @@
         if(!BG_XML_STRCMP(child_node->name, url_key))
           {
           tmp_string = (char*)xmlNodeListGetString(doc, child_node->children, 1);
-          seg->url = bg_strdup(seg->url, tmp_string);
+          seg->url = gavl_strrep(seg->url, tmp_string);
           xmlFree(tmp_string);
           }
         if(!BG_XML_STRCMP(child_node->name, stream_index_key))
@@ -132,11 +134,11 @@
 
 static void load_streams(xmlDocPtr doc, 
                          xmlNodePtr node,
-                         bg_edl_stream_t * (*add_func)(bg_edl_track_t *),
-                         bg_edl_track_t * t)
+                         gavl_edl_stream_t * (*add_func)(gavl_edl_track_t *),
+                         gavl_edl_track_t * t)
   {
   char * tmp_string;
-  bg_edl_stream_t * s;
+  gavl_edl_stream_t * s;
   xmlNodePtr child_node;
 
   node = node->children;
@@ -180,19 +182,11 @@
   }
 
 static void load_track(xmlDocPtr doc, xmlNodePtr node,
-                       bg_edl_t * ret)
+                       gavl_edl_t * ret)
   {
-  bg_edl_track_t * et;
-  char * tmp_string;
-
-  et = bg_edl_add_track(ret);
+  gavl_edl_track_t * et;
   
-  tmp_string = BG_XML_GET_PROP(node, "name");
-  if(tmp_string)
-    {
-    et->name = bg_strdup(et->name, tmp_string);
-    xmlFree(tmp_string);
-    }
+  et = gavl_edl_add_track(ret);
   
   node = node->children;
   
@@ -205,28 +199,30 @@
       continue;
       }
     if(!BG_XML_STRCMP(node->name, audio_streams_key))
-      load_streams(doc, node, bg_edl_add_audio_stream, et);
+      load_streams(doc, node, gavl_edl_add_audio_stream, et);
     else if(!BG_XML_STRCMP(node->name, video_streams_key))
-      load_streams(doc, node, bg_edl_add_video_stream, et);
+      load_streams(doc, node, gavl_edl_add_video_stream, et);
     else if(!BG_XML_STRCMP(node->name, subtitle_text_streams_key))
-      load_streams(doc, node, bg_edl_add_subtitle_text_stream, et);
+      load_streams(doc, node, gavl_edl_add_text_stream, et);
     else if(!BG_XML_STRCMP(node->name, subtitle_overlay_streams_key))
-      load_streams(doc, node, bg_edl_add_subtitle_overlay_stream, et);
+      load_streams(doc, node, gavl_edl_add_overlay_stream, et);
+    else if(!BG_XML_STRCMP(node->name, metadata_key))
+      bg_xml_2_metadata(doc, node, &et->metadata);
     
     node = node->next;
     }
   
   }
 
-bg_edl_t * bg_edl_load(const char * filename)
+gavl_edl_t * bg_edl_load(const char * filename)
   {
-  bg_edl_t * ret;
+  gavl_edl_t * ret;
   char * tmp_string;
   xmlDocPtr xml_doc;
   xmlNodePtr node;
   xmlNodePtr child_node;
   
-  xml_doc = bg_xml_parse_file(filename);
+  xml_doc = bg_xml_parse_file(filename, 1);
 
   if(!xml_doc)
     return NULL;
@@ -241,7 +237,7 @@
 
   node = node->children;
   
-  ret = bg_edl_create();
+  ret = gavl_edl_create();
   
   while(node)
     {
@@ -254,7 +250,7 @@
     if(!BG_XML_STRCMP(node->name, url_key))
       {
       tmp_string = (char*)xmlNodeListGetString(xml_doc, node->children, 1);
-      ret->url = bg_strdup(ret->url, tmp_string);
+      ret->url = gavl_strrep(ret->url, tmp_string);
       xmlFree(tmp_string);
       }
     else if(!BG_XML_STRCMP(node->name, tracks_key))
@@ -281,7 +277,7 @@
   return ret;
   }
 
-static void save_streams(xmlNodePtr parent, const bg_edl_stream_t * s, int num)
+static void save_streams(xmlNodePtr parent, const gavl_edl_stream_t * s, int num)
   {
   int i, j;
   xmlNodePtr stream_node;
@@ -376,14 +372,14 @@
   
   }
 
-void bg_edl_save(const bg_edl_t * edl, const char * filename)
+void bg_edl_save(const gavl_edl_t * edl, const char * filename)
   {
   int i;
   xmlDocPtr  xml_doc;
   xmlNodePtr xml_edl;
   xmlNodePtr node;
+  xmlNodePtr track_node;
   xmlNodePtr child_node;
-  xmlNodePtr streams_node;
   
   xml_doc = xmlNewDoc((xmlChar*)"1.0");
   xml_edl = xmlNewDocRawNode(xml_doc, NULL, (xmlChar*)edl_key, NULL);
@@ -404,50 +400,50 @@
     xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
     for(i = 0; i < edl->num_tracks; i++)
       {
-      child_node = xmlNewTextChild(node, NULL, (xmlChar*)track_key, NULL);
-      xmlAddChild(child_node, BG_XML_NEW_TEXT("\n"));
+      track_node = xmlNewTextChild(node, NULL, (xmlChar*)track_key, NULL);
+      xmlAddChild(track_node, BG_XML_NEW_TEXT("\n"));
       xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
-
-      if(edl->tracks[i].name)
-        BG_XML_SET_PROP(child_node, "name", edl->tracks[i].name);
+      
+      child_node = xmlNewTextChild(track_node, NULL, (xmlChar*)metadata_key, NULL);
+      bg_metadata_2_xml(child_node, &edl->tracks[i].metadata);
       
       if(edl->tracks[i].num_audio_streams)
         {
-        streams_node = xmlNewTextChild(child_node, NULL, (xmlChar*)audio_streams_key, NULL);
-        xmlAddChild(streams_node, BG_XML_NEW_TEXT("\n"));
+        child_node = xmlNewTextChild(track_node, NULL, (xmlChar*)audio_streams_key, NULL);
         xmlAddChild(child_node, BG_XML_NEW_TEXT("\n"));
+        xmlAddChild(track_node, BG_XML_NEW_TEXT("\n"));
 
-        save_streams(streams_node, edl->tracks[i].audio_streams,
+        save_streams(child_node, edl->tracks[i].audio_streams,
                      edl->tracks[i].num_audio_streams);
         }
       if(edl->tracks[i].num_video_streams)
         {
-        streams_node = xmlNewTextChild(child_node, NULL, (xmlChar*)video_streams_key, NULL);
-        xmlAddChild(streams_node, BG_XML_NEW_TEXT("\n"));
+        child_node = xmlNewTextChild(track_node, NULL, (xmlChar*)video_streams_key, NULL);
         xmlAddChild(child_node, BG_XML_NEW_TEXT("\n"));
+        xmlAddChild(track_node, BG_XML_NEW_TEXT("\n"));
 
-        save_streams(streams_node, edl->tracks[i].video_streams,
+        save_streams(child_node, edl->tracks[i].video_streams,
                      edl->tracks[i].num_video_streams);
 
         }
-      if(edl->tracks[i].num_subtitle_text_streams)
+      if(edl->tracks[i].num_text_streams)
         {
-        streams_node = xmlNewTextChild(child_node, NULL, (xmlChar*)subtitle_text_streams_key, NULL);
-        xmlAddChild(streams_node, BG_XML_NEW_TEXT("\n"));
+        child_node = xmlNewTextChild(track_node, NULL, (xmlChar*)subtitle_text_streams_key, NULL);
         xmlAddChild(child_node, BG_XML_NEW_TEXT("\n"));
+        xmlAddChild(track_node, BG_XML_NEW_TEXT("\n"));
 
-        save_streams(streams_node, edl->tracks[i].subtitle_text_streams,
-                     edl->tracks[i].num_subtitle_text_streams);
+        save_streams(child_node, edl->tracks[i].text_streams,
+                     edl->tracks[i].num_text_streams);
 
         }
-      if(edl->tracks[i].num_subtitle_overlay_streams)
+      if(edl->tracks[i].num_overlay_streams)
         {
-        streams_node = xmlNewTextChild(child_node, NULL, (xmlChar*)subtitle_overlay_streams_key, NULL);
-        xmlAddChild(streams_node, BG_XML_NEW_TEXT("\n"));
+        child_node = xmlNewTextChild(track_node, NULL, (xmlChar*)subtitle_overlay_streams_key, NULL);
         xmlAddChild(child_node, BG_XML_NEW_TEXT("\n"));
+        xmlAddChild(track_node, BG_XML_NEW_TEXT("\n"));
 
-        save_streams(streams_node, edl->tracks[i].subtitle_overlay_streams,
-                     edl->tracks[i].num_subtitle_overlay_streams);
+        save_streams(child_node, edl->tracks[i].overlay_streams,
+                     edl->tracks[i].num_overlay_streams);
         }
       
       xmlAddChild(xml_edl, BG_XML_NEW_TEXT("\n"));
@@ -455,6 +451,7 @@
     }
   
   //  xmlAddChild(xml_edl, BG_XML_NEW_TEXT("\n"));
-  xmlSaveFile(filename, xml_doc);
+
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   }

gmerlin-1.2.0.tar.gz/lib/edldec.c -> gmerlin-4256.tar.gz/lib/edldec.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,8 +22,11 @@
 #include <string.h>
 
 #include <config.h>
+#include <gavl/metatags.h>
+
 #include <gmerlin/translation.h>
 
+
 #include <gmerlin/pluginregistry.h>
 #include <gmerlin/converters.h>
 #include <gmerlin/utils.h>
@@ -34,1333 +37,939 @@
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "edldec"
 
-#define PTS_UNDEFINED 0x8000000000000000LL
-
-/* Sources */
+typedef struct edldec_s edldec_t;
 
 typedef struct
   {
-  bg_plugin_handle_t * handle;
+  bg_plugin_handle_t * h;
   bg_input_plugin_t * plugin;
-  const char * url;
   int track;
+  const char * location;
+  int refcount;
   int stream;
+  bg_stream_type_t type;  
+  } source_t;
+
+static int source_init(source_t * s, 
+                       bg_plugin_registry_t * plugin_reg,
+                       const gavl_edl_t * edl, 
+                       const gavl_edl_segment_t * seg,
+                       bg_stream_type_t type)
+  {
   bg_track_info_t * ti;
-  
-  int read_stream;
-  void * read_data;
+  s->location = seg->url ? seg->url : edl->url;
 
-  } source_common_t;
+  if(!bg_input_plugin_load(plugin_reg,
+                           s->location,
+                           NULL,
+                           &s->h,
+                           NULL, 0))
+    return 0;
+  
+  s->track = seg->track;
+  s->stream = seg->stream;
+  s->type = type;
 
-typedef struct
-  {
-  source_common_t com;
-  bg_audio_converter_t * cnv;
+  s->plugin = (bg_input_plugin_t*)(s->h->plugin);
+  if(s->plugin->set_track && !s->plugin->set_track(s->h->priv, s->track))
+    return 0;
+  
+  ti = s->plugin->get_track_info(s->h->priv, s->track);
 
-  bg_read_audio_func_t read_func;
+  if(!(ti->flags & BG_TRACK_SEEKABLE))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "EDL only works with seekable sources");
+    return 0;
+    }
 
-  gavl_audio_format_t * format;
+  switch(type)
+    {
+    case BG_STREAM_AUDIO:
+      s->plugin->set_audio_stream(s->h->priv, s->stream,
+                                  BG_STREAM_ACTION_DECODE);
+      break;
+    case BG_STREAM_VIDEO:
+      s->plugin->set_video_stream(s->h->priv, s->stream,
+                                  BG_STREAM_ACTION_DECODE);
+      break;
+    case BG_STREAM_TEXT:
+      s->plugin->set_text_stream(s->h->priv, s->stream,
+                                 BG_STREAM_ACTION_DECODE);
+      break;
+    case BG_STREAM_OVERLAY:
+      s->plugin->set_overlay_stream(s->h->priv, s->stream,
+                                    BG_STREAM_ACTION_DECODE);
+      break;
+    }
+  
+  if(s->plugin->start && !s->plugin->start(s->h->priv))
+    return 0;
 
-  } audio_source_t;
+  return 1;
+  }
 
-typedef struct
+static void source_cleanup(source_t * s)
   {
-  source_common_t com;
-  bg_video_converter_t * cnv;
-
-  bg_read_video_func_t read_func;
-
-  gavl_video_format_t * format;
-  
-  } video_source_t;
+  if(s->h)
+    bg_plugin_unref(s->h);
+  memset(s, 0, sizeof(*s));
+  }
 
-typedef struct
+static void source_ref(source_t * s)
   {
-  source_common_t com;
-  /* Rest is only for overlays */
-  gavl_video_converter_t * cnv;
-  gavl_overlay_t ovl;
-  int (*read_func)(void * priv, gavl_overlay_t*ovl, int stream);
-  gavl_video_format_t * format;
-  } subtitle_source_t;
-
-/* Segments */
+  s->refcount++;
+  }
 
-typedef struct
+static void source_unref(source_t * s)
   {
-  source_common_t * src;
-  const bg_edl_segment_t * seg;
-  int64_t mute_start;
-  int64_t mute_duration;
-  } segment_t;
-
-/* Streams */
+  s->refcount--;
+  }
 
 typedef struct
   {
-  int num_segments;
-  segment_t * segments;
-  int current_segment;
+  gavl_audio_source_t * asrc_ext;
+  gavl_audio_source_t * asrc_int;
 
-  int num_sources;
-  audio_source_t * sources;
+  gavl_video_source_t * vsrc_ext;
+  gavl_video_source_t * vsrc_int;
+
+  gavl_packet_source_t * psrc_ext;
+  gavl_packet_source_t * psrc_int;
 
-  gavl_audio_format_t * format;
-  
   bg_stream_action_t action;
 
-  int64_t out_time;
-  int64_t segment_end_time;
-  
+  const gavl_edl_stream_t * s;
+  const gavl_edl_segment_t * seg;
 
-  const bg_edl_stream_t * es;
+  source_t * src;
   
-  gavl_audio_frame_t * frame;
-  } audio_stream_t;
+  int64_t mute_time;
+  int64_t pts;
 
-typedef struct
-  {
-  int num_segments;
-  segment_t * segments;
-  int current_segment;
+  struct edldec_s * dec;
 
-  gavl_video_format_t * format;
-  
-  int num_sources;
-  video_source_t * sources;
+  const gavl_audio_format_t * afmt;
+  const gavl_video_format_t * vfmt;
+  } stream_t;
 
-  bg_stream_action_t action;
-  
-  int64_t out_time;
-  int64_t segment_end_time;
-  
-  const bg_edl_stream_t * es;
-  } video_stream_t;
-
-typedef struct
+static void stream_init(stream_t * s, gavl_edl_stream_t * es,
+                        struct edldec_s * dec)
   {
-  int num_segments;
-  segment_t * segments;
-  int current_segment;
-
-  int num_sources;
-  subtitle_source_t * sources;
-  
-  gavl_video_format_t * format;
-  bg_stream_action_t action;
-  int64_t out_time;
-  int64_t segment_end_time;
-  int64_t time_offset;      /* In output tics */
-  
-  const bg_edl_stream_t * es;
-  } subtitle_stream_t;
+  s->s = es;
+  s->dec = dec;
+  }
 
-typedef struct
+static void stream_cleanup(stream_t * s)
   {
-  audio_stream_t * audio_streams;
-  video_stream_t * video_streams;
-  subtitle_stream_t * subtitle_text_streams;
-  subtitle_stream_t * subtitle_overlay_streams;
-  } track_t;
+  if(s->asrc_ext)
+    gavl_audio_source_destroy(s->asrc_ext);
+  if(s->vsrc_ext)
+    gavl_video_source_destroy(s->vsrc_ext);
+  if(s->psrc_ext)
+    gavl_packet_source_destroy(s->psrc_ext);
+  }
 
-typedef struct
+struct edldec_s
   {
-  int current_track;
-  track_t * tracks;
-  
-  bg_track_info_t * track_info;
-  const bg_edl_t * edl;
-
-  bg_plugin_registry_t * plugin_reg;
-  bg_input_callbacks_t * callbacks;
-
-  gavl_audio_options_t * a_opt;
-  gavl_video_options_t * v_opt;
-  
-  } edl_dec_t;
-
-/* Timing functions */
+  int num_sources;
+  source_t * sources;
 
-/*
-  |---------------------------------> out_time
-  |               |-----------------> in_time
+  stream_t * audio_streams;
+  stream_t * video_streams; 
+  stream_t * text_streams; 
+  stream_t * overlay_streams; 
 
-  0             dst_time
-*/
-  
-static int64_t get_source_offset(const bg_edl_stream_t * st,
-                                 segment_t * s, int64_t out_time, int64_t out_scale)
-  {
-  int64_t seg_offset;    /* in out timescale */
-  int64_t source_offset; /* in out timescale */
-  seg_offset = out_time - gavl_time_rescale(st->timescale,
-                                            out_scale,
-                                            s->seg->dst_time);
-  
-  source_offset = gavl_time_rescale(s->seg->timescale,
-                                    out_scale, s->seg->src_time);
-  return source_offset + seg_offset;
-  }
+  const gavl_edl_t * edl;
+  const gavl_edl_track_t * t;
 
-static int seek_segment(const bg_edl_stream_t * st,
-                        segment_t * segs, int nsegs, int64_t out_time,
-                        int out_scale)
-  {
-  /* Rescale to edit granularity */
-  int64_t t = gavl_time_rescale(out_scale, st->timescale, out_time);
-  int i;
-  for(i = 0; i < nsegs; i++)
-    {
-    if(segs[i].src)
-      {
-      if((segs[i].seg->dst_time <= t) &&
-         (segs[i].seg->dst_time + segs[i].seg->dst_duration > t))
-        return i;
-      }
-    else
-      {
-      if((segs[i].mute_start <= t) &&
-         (segs[i].mute_start + segs[i].mute_duration > t))
-        return i;
-      }
-    }
-  return -1;
-  }
+  bg_track_info_t * ti;
+  bg_track_info_t * ti_cur;
 
-/* Stream initialization */
+  bg_plugin_registry_t * plugin_reg;
+  };
 
-static const bg_edl_segment_t *
-find_same_source(const bg_edl_segment_t * segments,
-                 const bg_edl_segment_t * seg)
-  {
-  while(segments < seg)
-    {
-    /* url mismatch */
-    if((!segments->url && seg->url) ||
-       (segments->url && !seg->url) ||
-       (segments->url && seg->url &&
-        strcmp(segments->url, seg->url)))
-      {
-      segments++;
-      continue;
-      }
-    /* track/stream mismatch */
-    if((segments->track != seg->track) ||
-       (segments->stream != seg->stream))
-      {
-      segments++;
-      continue;
-      }
-    return segments;
-    }
-  return NULL;
-  }
-                           
-static void add_audio_segment(edl_dec_t * dec, int track, int stream,
-                              const bg_edl_segment_t * seg)
+static source_t * get_source(edldec_t * dec, bg_stream_type_t type,
+                             const gavl_edl_segment_t * seg,
+                             int64_t src_time)
   {
   int i;
-  audio_source_t * source = NULL;
-  const bg_edl_segment_t * same_source_seg;
-  
-  bg_audio_info_t * ai;
-  audio_stream_t * s = &dec->tracks[track].audio_streams[stream];
-  segment_t * as;
-  ai = &dec->track_info[track].audio_streams[stream];
+  source_t * ret = NULL;
+  const char * location = seg->url ? seg->url : dec->edl->url;
 
-  if(seg->dst_time > ai->duration)
+  /* Find a cached source */
+  for(i = 0; i < dec->num_sources; i++)
     {
-    /* Insert mute segment */
-    s->segments = realloc(s->segments, sizeof(*s->segments) * (s->num_segments+2));
-    memset(s->segments + s->num_segments, 0, sizeof(*s->segments) * 2);
-    s->num_segments += 2;
-    as = s->segments + (s->num_segments-2);
-    as->mute_start    = ai->duration;
-    as->mute_duration = seg->dst_time - ai->duration;
-    as++;
+    source_t * s = dec->sources + i;
+
+    if(s->location &&
+       !strcmp(s->location, location) &&
+       (s->track == seg->track) &&
+       (s->type == type) &&
+       (s->stream == seg->stream) &&
+       !s->refcount)
+      ret = s;
     }
-  else
-    {
-    s->segments = realloc(s->segments, sizeof(*s->segments) * (s->num_segments+1));
-    memset(s->segments + s->num_segments, 0, sizeof(*s->segments));
-    s->num_segments++;
-    as = s->segments + (s->num_segments-1);
-    }
-  same_source_seg =
-    find_same_source(dec->edl->tracks[track].audio_streams[stream].segments, seg);
   
-  if(same_source_seg)
+  /* Find an empty slot */
+  if(!ret)
     {
-    for(i = 0; i < s->num_segments; i++)
+    for(i = 0; i < dec->num_sources; i++)
       {
-      if(same_source_seg == s->segments[i].seg)
+      source_t * s = dec->sources + i;
+      if(!s->location)
         {
-        source = (audio_source_t*)s->segments[i].src;
+        ret = s;
         break;
         }
       }
     }
-  else
-    {
-    source = s->sources + s->num_sources;
-    s->num_sources++;
-    
-    source->com.url   = seg->url ? seg->url : dec->edl->url;
-    source->com.track = seg->track;
-    source->com.stream = seg->stream;
-    source->cnv = bg_audio_converter_create(dec->a_opt);
-    }
-  as->src = (source_common_t*)source;
-  as->seg = seg;
-  ai->duration = seg->dst_time + seg->dst_duration;
-  }
 
-static int add_video_segment(edl_dec_t * dec, int track, int stream,
-                             const bg_edl_segment_t * seg)
-  {
-  int i;
-  video_source_t * source = NULL;
-  const bg_edl_segment_t * same_source_seg;
-  
-  bg_video_info_t * vi;
-  video_stream_t * s = &dec->tracks[track].video_streams[stream];
-  segment_t * vs;
-  vi = &dec->track_info[track].video_streams[stream];
-  
-  if(seg->dst_time > vi->duration)
+  /* Free an existing slot */
+  if(!ret)
     {
-    /* Insert mute segment */
-    s->segments = realloc(s->segments, sizeof(*s->segments) * (s->num_segments+2));
-    memset(s->segments + s->num_segments, 0, sizeof(*s->segments) * 2);
-    s->num_segments += 2;
-    vs = s->segments + (s->num_segments-2);
-    vs->mute_start    = vi->duration;
-    vs->mute_duration = seg->dst_time - vi->duration;
-    vs++;
-    }
-  else
-    {
-    s->segments = realloc(s->segments, sizeof(*s->segments) * (s->num_segments+1));
-    memset(s->segments + s->num_segments, 0, sizeof(*s->segments));
-    s->num_segments++;
-    vs = s->segments + (s->num_segments-1);
-    }
-  same_source_seg =
-    find_same_source(dec->edl->tracks[track].video_streams[stream].segments, seg);
-  
-  if(same_source_seg)
-    {
-    for(i = 0; i < s->num_segments; i++)
+    for(i = 0; i < dec->num_sources; i++)
       {
-      if(same_source_seg == s->segments[i].seg)
+      source_t * s = dec->sources + i;
+      if(!s->refcount)
         {
-        source = (video_source_t*)s->segments[i].src;
+        ret = s;
+        source_cleanup(ret);
         break;
         }
       }
     }
-  else
+
+  if(!ret->location)
     {
-    source = s->sources + s->num_sources;
-    s->num_sources++;
-    
-    source->com.url   = seg->url ? seg->url : dec->edl->url;
-    source->com.track = seg->track;
-    source->com.stream = seg->stream;
-    source->cnv = bg_video_converter_create(dec->v_opt);
+    if(!source_init(ret, dec->plugin_reg, dec->edl, seg, type))
+      return NULL;
     }
-  vs->src = (source_common_t*)source;
-  vs->seg = seg;
-  vi->duration = seg->dst_time + seg->dst_duration;
-  return 1;
+
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Seeking to %"PRId64, src_time);
+  ret->plugin->seek(ret->h->priv, &src_time, seg->timescale);
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Seeked to %"PRId64, src_time);
+  
+  return ret;  
+  }
+
+static void set_callbacks_edl(void * priv, bg_input_callbacks_t * cb)
+  {
+
+  }
+
+static int get_num_tracks_edl(void * priv)
+  {
+  edldec_t * ed = priv;
+  return ed->edl->num_tracks;
+  }
+
+static bg_track_info_t * get_track_info_edl(void * priv, int track)
+  {
+  edldec_t * ed = priv;
+  return &ed->ti[track];
   }
 
-static int add_subtitle_overlay_segment(edl_dec_t * dec, int track, int stream,
-                                        const bg_edl_segment_t * seg)
+static stream_t * streams_create(edldec_t * dec,
+                                 gavl_edl_stream_t * es, int num)
   {
   int i;
-  subtitle_source_t * source = NULL;
-  const bg_edl_segment_t * same_source_seg;
-  
-  bg_subtitle_info_t * vi;
-  subtitle_stream_t * s = &dec->tracks[track].subtitle_overlay_streams[stream];
-  segment_t * vs;
-  
-  vi =
-    &dec->track_info[track].subtitle_streams[stream +
-                                             dec->edl->tracks[track].num_subtitle_text_streams];
-  
-  s->segments = realloc(s->segments, sizeof(*s->segments) * (s->num_segments+1));
-  memset(s->segments + s->num_segments, 0, sizeof(*s->segments));
-  s->num_segments++;
-  vs = s->segments + (s->num_segments-1);
-  
-  same_source_seg =
-    find_same_source(dec->edl->tracks[track].subtitle_overlay_streams[stream].segments, seg);
+  stream_t * ret;
+
+  if(!num)
+    return NULL;
+
+  ret = calloc(num, sizeof(*ret));
+
+  for(i = 0; i < num; i++)
+    stream_init(&ret[i], &es[i], dec);
+
+  return ret;
+  }
+
+static void streams_destroy(stream_t * s, int num)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    stream_cleanup(&s[i]);
+  if(s)
+    free(s);
+  }
+
+static int set_track_edl(void * priv, int track)
+  {
+  int i;
+  edldec_t * ed = priv;
+  /* Reset sources */
+  for(i = 0; i < ed->num_sources; i++)
+    ed->sources[i].refcount = 0;
   
-  if(same_source_seg)
-    {
-    for(i = 0; i < s->num_segments; i++)
-      {
-      if(same_source_seg == s->segments[i].seg)
-        {
-        source = (subtitle_source_t*)s->segments[i].src;
-        break;
-        }
-      }
-    }
-  else
+  /* Clean up earlier streams */
+  if(ed->t)
     {
-    source = s->sources + s->num_sources;
-    s->num_sources++;
-    
-    source->com.url   = seg->url ? seg->url : dec->edl->url;
-    source->com.track = seg->track;
-    source->com.stream = seg->stream;
-    source->cnv = gavl_video_converter_create();
+    streams_destroy(ed->audio_streams, ed->t->num_audio_streams);
+    streams_destroy(ed->video_streams, ed->t->num_video_streams);
+    streams_destroy(ed->text_streams, ed->t->num_text_streams);
+    streams_destroy(ed->overlay_streams, ed->t->num_overlay_streams);
     }
-  vs->src = (source_common_t*)source;
-  vs->seg = seg;
-  vi->duration = seg->dst_time + seg->dst_duration;
+
+  ed->t = &ed->edl->tracks[track];
+  ed->ti_cur = &ed->ti[track];
+  /* Create streams */
+
+  ed->audio_streams   =
+    streams_create(ed, ed->t->audio_streams,   ed->t->num_audio_streams);
+  ed->video_streams   =
+    streams_create(ed, ed->t->video_streams,   ed->t->num_video_streams);
+  ed->text_streams    =
+    streams_create(ed, ed->t->text_streams,    ed->t->num_text_streams);
+  ed->overlay_streams =
+    streams_create(ed, ed->t->overlay_streams, ed->t->num_overlay_streams);
   return 1;
   }
 
-static int add_subtitle_text_segment(edl_dec_t * dec, int track, int stream,
-                                     const bg_edl_segment_t * seg)
+static void destroy_edl(void * priv)
   {
   int i;
-  subtitle_source_t * source = NULL;
-  const bg_edl_segment_t * same_source_seg;
-  
-  bg_subtitle_info_t * vi;
-  subtitle_stream_t * s = &dec->tracks[track].subtitle_text_streams[stream];
-  segment_t * vs;
-  
-  vi = &dec->track_info[track].subtitle_streams[stream];
-  
-  s->segments = realloc(s->segments, sizeof(*s->segments) *
-                        (s->num_segments+1));
-  memset(s->segments + s->num_segments, 0, sizeof(*s->segments));
-  s->num_segments++;
-  vs = s->segments + (s->num_segments-1);
-  
-  same_source_seg =
-    find_same_source(dec->edl->tracks[track].subtitle_text_streams[stream].segments, seg);
-  
-  if(same_source_seg)
+  edldec_t * ed = priv;
+  if(ed->t)
     {
-    for(i = 0; i < s->num_segments; i++)
-      {
-      if(same_source_seg == s->segments[i].seg)
-        {
-        source = (subtitle_source_t*)s->segments[i].src;
-        break;
-        }
-      }
+    streams_destroy(ed->audio_streams, ed->t->num_audio_streams);
+    streams_destroy(ed->video_streams, ed->t->num_video_streams);
+    streams_destroy(ed->text_streams, ed->t->num_text_streams);
+    streams_destroy(ed->overlay_streams, ed->t->num_overlay_streams);
     }
-  else
+
+  if(ed->sources)
     {
-    source = (subtitle_source_t*)s->sources + s->num_sources;
-    s->num_sources++;
-    
-    source->com.url   = seg->url ? seg->url : dec->edl->url;
-    source->com.track = seg->track;
-    source->com.stream = seg->stream;
+    for(i = 0; i < ed->num_sources; i++)
+      source_cleanup(&ed->sources[i]);
+    free(ed->sources);
     }
-  vs->src = (source_common_t*)source;
-  vs->seg = seg;
-  vi->duration = seg->dst_time + seg->dst_duration;
-  return 1;
+
+  if(ed->ti)
+    {
+    for(i = 0; i < ed->edl->num_tracks; i++)
+      bg_track_info_free(ed->ti + i);
+    free(ed->ti);
+    }
+  
+  free(ed);
   }
 
-/* Initialize segments for immediate playback. out_time must be set before */
 
-static void init_audio_segment(audio_stream_t * as)
+static int set_audio_stream_edl(void * priv, int stream,
+                                bg_stream_action_t action)
   {
-  segment_t * seg;
-  int64_t t;
-  audio_source_t * src;
-  seg = &as->segments[as->current_segment];
-  if(seg->seg)
+  edldec_t * ed = priv;
+  if((action != BG_STREAM_ACTION_OFF) && (action != BG_STREAM_ACTION_DECODE))
     {
-    as->segment_end_time =
-      gavl_time_rescale(as->es->timescale, as->format->samplerate,
-                        seg->seg->dst_time + seg->seg->dst_duration);
-    t = get_source_offset(as->es, seg, as->out_time, as->format->samplerate);
-    
-    seg->src->plugin->seek(seg->src->handle->priv, &t, as->format->samplerate);
-    src = (audio_source_t *)(seg->src);
-    if(src->cnv)
-      bg_audio_converter_reset(src->cnv);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid action for audio stream");
+    return 0;
     }
-  else
-    as->segment_end_time =
-      gavl_time_rescale(as->es->timescale, as->format->samplerate,
-                        seg->mute_start + seg->mute_duration);
+  ed->audio_streams[stream].action = action;
+  return 1;
   }
 
-static void init_video_segment(video_stream_t * vs)
+static int set_video_stream_edl(void * priv, int stream,
+                                bg_stream_action_t action)
   {
-  segment_t * seg;
-  int64_t t;
-  video_source_t * src;
-  seg = &vs->segments[vs->current_segment];
-  if(seg->seg)
+  edldec_t * ed = priv;
+  if((action != BG_STREAM_ACTION_OFF) && (action != BG_STREAM_ACTION_DECODE))
     {
-    vs->segment_end_time =
-      gavl_time_rescale(vs->es->timescale, vs->format->timescale,
-                        seg->seg->dst_time + seg->seg->dst_duration);
-    t = get_source_offset(vs->es, seg, vs->out_time, vs->format->timescale);
-    
-    seg->src->plugin->seek(seg->src->handle->priv, &t, vs->format->timescale);
-
-    src = (video_source_t *)(seg->src);
-    if(src->cnv)
-      bg_video_converter_reset(src->cnv);
-    }
-  else
-    {
-    vs->segment_end_time   =
-      gavl_time_rescale(vs->es->timescale, vs->format->timescale,
-                        seg->mute_start + seg->mute_duration);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid action for video stream");
+    return 0;
     }
+  ed->video_streams[stream].action = action;
+  return 1;
   }
 
-static void init_subtitle_segment(subtitle_stream_t * vs)
+static int set_text_stream_edl(void * priv, int stream,
+                               bg_stream_action_t action)
   {
-  segment_t * seg;
-  int64_t t1, t2;
-  seg = &vs->segments[vs->current_segment];
-
-  vs->segment_end_time =
-    gavl_time_rescale(vs->es->timescale, vs->format->timescale,
-                      seg->seg->dst_time + seg->seg->dst_duration);
-
-  /*
-   *     |---------------|------------------------|---------------> 
-   *     0   src_start/seg->timescale     *time_1 / src_scale
-   *                     |
-   *  |--|---------------|------------------------|--------------->  
-   *  0  ?   dst_start/s->timescale       *time_2 / dst_scale
-   *
-   */
-  
-  t1 = gavl_time_rescale(seg->seg->timescale,
-                         vs->format->timescale,
-                         seg->seg->src_time);
-  t2 = gavl_time_rescale(vs->es->timescale,
-                         vs->format->timescale,
-                         seg->seg->dst_time);
-  
-  vs->time_offset = t2 - t1;
-  
-  t1 = get_source_offset(vs->es, seg, vs->out_time, vs->format->timescale);
-  
-  seg->src->plugin->seek(seg->src->handle->priv, &t1, vs->format->timescale);
+  edldec_t * ed = priv;
+  ed->text_streams[stream].action = action;
+  return 1;
   }
 
-static void set_callbacks_edl(void * priv, bg_input_callbacks_t * callbacks)
+static int set_overlay_stream_edl(void * priv, int stream,
+                                  bg_stream_action_t action)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
+  edldec_t * ed = priv;
+  if((action != BG_STREAM_ACTION_OFF) && (action != BG_STREAM_ACTION_DECODE))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid action for overlay stream");
+    return 0;
+    }
+  ed->overlay_streams[stream].action = action;
+  return 1;
   }
 
-static int get_num_tracks_edl(void * priv)
+static gavl_audio_source_t * get_audio_source(edldec_t * ed,
+                                              const gavl_edl_segment_t * seg,
+                                              source_t ** src,
+                                              int64_t src_time)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-  return dec->edl->num_tracks;
+  if(*src)
+    source_unref(*src);
+  if(!(*src = get_source(ed, BG_STREAM_AUDIO, seg, src_time)))
+    return NULL;
+  source_ref(*src);
+  return (*src)->plugin->get_audio_source((*src)->h->priv, seg->stream);
   }
 
-static bg_track_info_t * get_track_info_edl(void * priv, int track)
+static gavl_video_source_t * get_video_source(edldec_t * ed,
+                                              const gavl_edl_segment_t * seg,
+                                              source_t ** src,
+                                              int64_t src_time)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-  return &dec->track_info[track];
+  if(*src)
+    source_unref(*src);
+  if(!(*src = get_source(ed, BG_STREAM_VIDEO, seg, src_time)))
+    return NULL;
+  source_ref(*src);
+  return (*src)->plugin->get_video_source((*src)->h->priv, seg->stream);
   }
 
-static int set_track_edl(void * priv, int track)
+static gavl_packet_source_t * get_text_source(edldec_t * ed,
+                                              const gavl_edl_segment_t * seg,
+                                              source_t ** src,
+                                              int64_t src_time)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-  dec->current_track = track;
-  return 1;
+  if(*src)
+    source_unref(*src);
+  if(!(*src = get_source(ed, BG_STREAM_TEXT, seg, src_time)))
+    return NULL;
+  source_ref(*src);
+  return (*src)->plugin->get_text_source((*src)->h->priv, seg->stream);
   }
 
-static int set_audio_stream_edl(void * priv, int stream, bg_stream_action_t action)
+static gavl_video_source_t * get_overlay_source(edldec_t * ed,
+                                                const gavl_edl_segment_t * seg,
+                                                source_t ** src,
+                                                int64_t src_time)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-  dec->tracks[dec->current_track].audio_streams[stream].action = action;
-  return 1;
+  if(*src)
+    source_unref(*src);
+
+  if(!(*src = get_source(ed, BG_STREAM_OVERLAY, seg, src_time)))
+    return NULL;
+  source_ref(*src);
+  return (*src)->plugin->get_overlay_source((*src)->h->priv, seg->stream);
   }
 
-static int set_video_stream_edl(void * priv, int stream, bg_stream_action_t action)
+static gavl_source_status_t read_audio(void * priv,
+                                       gavl_audio_frame_t ** frame)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-  dec->tracks[dec->current_track].video_streams[stream].action = action;
-  return 1;
-  }
+  gavl_source_status_t st;
+  stream_t * s = priv;
+
+  /* Early return */
+  if(!s->seg && !s->mute_time)
+    return GAVL_SOURCE_EOF;
   
-static int set_subtitle_stream_edl(void * priv, int stream, bg_stream_action_t action)
-  {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
+  /* Check for segment end */
+  if(s->seg && (s->pts >= s->seg->dst_time + s->seg->dst_duration))
+    {
+    int64_t src_time;
+
+    s->seg = gavl_edl_dst_time_to_src(s->dec->t, s->s, s->pts,
+                                      &src_time, &s->mute_time);
 
-  if(stream >= dec->edl->tracks[dec->current_track].num_subtitle_text_streams)
+    if(!s->seg && !s->mute_time)
+      return GAVL_SOURCE_EOF;
+
+    if(s->seg)
+      {
+      if(!(s->asrc_int = get_audio_source(s->dec, s->seg, &s->src, src_time)))
+        return GAVL_SOURCE_EOF;
+      gavl_audio_source_set_dst(s->asrc_int, 0, s->afmt);
+      }
+    else
+      s->asrc_int = NULL;
+    }
+  
+  /* Check for mute */
+  if(s->mute_time)
     {
-    dec->tracks[dec->current_track].subtitle_overlay_streams[stream -
-                                                             dec->edl->tracks[dec->current_track].num_subtitle_text_streams].action = action;
+    gavl_audio_frame_mute(*frame, s->afmt);
+    if((*frame)->valid_samples > s->mute_time)
+      (*frame)->valid_samples = s->mute_time;
+    s->mute_time -= (*frame)->valid_samples;
+    (*frame)->timestamp = s->pts;
+    s->pts += (*frame)->valid_samples;
+    return GAVL_SOURCE_OK;
+    }
+  
+  /* Read audio */
+  st = gavl_audio_source_read_frame(s->asrc_int, frame);
+  if(st != GAVL_SOURCE_OK)
+    {
+    gavl_audio_frame_mute(*frame, s->afmt);
+    (*frame)->valid_samples =
+      s->seg->dst_time + s->seg->dst_duration - s->pts;
+    if((*frame)->valid_samples > s->afmt->samples_per_frame)
+      (*frame)->valid_samples = s->afmt->samples_per_frame;
     }
   else
     {
-    dec->tracks[dec->current_track].subtitle_text_streams[stream].action = action;
+    /* Limit duration */ 
+    if(s->pts + (*frame)->valid_samples >
+       s->seg->dst_time + s->seg->dst_duration)
+      {
+      (*frame)->valid_samples =
+        s->seg->dst_time + s->seg->dst_duration - s->pts;
+      }
     }
-  return 1;
+  
+  /* Set PTS */
+  (*frame)->timestamp = s->pts;
+  s->pts += (*frame)->valid_samples;
+  return GAVL_SOURCE_OK;
   }
 
-/* Start streams */
-
-static int init_source_common(edl_dec_t * dec,
-                              source_common_t * com)
+static int start_audio_stream(edldec_t * ed, stream_t * s, bg_audio_info_t * ai)
   {
-  if(!bg_input_plugin_load(dec->plugin_reg,
-                           com->url,
-                           NULL,
-                           &com->handle,
-                           dec->callbacks, 0))
+  int64_t src_time;
+  if(s->action == BG_STREAM_ACTION_OFF)
+    return 1;
+  if(!(s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, 0,
+                                         &src_time, &s->mute_time)))
     return 0;
-  
-  com->plugin = (bg_input_plugin_t*)(com->handle->plugin);
-  if(com->plugin->set_track && !com->plugin->set_track(com->handle->priv, com->track))
-    return 0;
-  com->ti = com->plugin->get_track_info(com->handle->priv, com->track);
 
-  if(!(com->ti->flags & BG_TRACK_SEEKABLE))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "EDL only works with seekable sources");
+  if(!(s->asrc_int = get_audio_source(ed, s->seg, &s->src, src_time)))
     return 0;
-    }
-  com->read_stream = com->stream;
-  com->read_data = com->handle->priv;
-  return 1;
-  }
-
-static void cleanup_source_common(source_common_t * com)
-  {
-  if(com->handle)
-    bg_plugin_unref(com->handle);
-  }
-
-static int read_subtitle_overlay_convert(void * priv, gavl_overlay_t*ovl, int stream)
-  {
-  subtitle_source_t * sosrc;
-  sosrc = (subtitle_source_t*)priv;
 
-  if(!sosrc->ovl.frame)
-    sosrc->ovl.frame = gavl_video_frame_create(sosrc->format);
+  /* Get format */
+  gavl_audio_format_copy(&ai->format,
+                         gavl_audio_source_get_src_format(s->asrc_int));
+  s->afmt = &ai->format;
   
-  if(!sosrc->com.plugin->read_subtitle_overlay(sosrc->com.handle->priv,
-                                               &sosrc->ovl,
-                                               sosrc->com.stream))
-    return 0;
+  /* Adjust format */
+  ai->format.samplerate = s->s->timescale;
+  ai->format.samples_per_frame = 1024;
   
-  gavl_video_convert(sosrc->cnv, sosrc->ovl.frame, ovl->frame);
-
-  /* TODO: Scale coordinates if source- and destination  sizes are different */
-  gavl_rectangle_i_copy(&ovl->ovl_rect, &sosrc->ovl.ovl_rect);
-  ovl->dst_x = sosrc->ovl.dst_x;
-  ovl->dst_y = sosrc->ovl.dst_y;
+  /* Set destination format */
+  gavl_audio_source_set_dst(s->asrc_int, 0, &ai->format);
 
-  /* Need to undo the timescale and duration scaling */
-  ovl->frame->timestamp = sosrc->ovl.frame->timestamp;
-  ovl->frame->duration  = sosrc->ovl.frame->duration;
+  /* Create external source */
+  s->asrc_ext = gavl_audio_source_create(read_audio, s,
+                                         GAVL_SOURCE_SRC_FRAMESIZE_MAX,
+                                         &ai->format);
   
   return 1;
   }
 
-static int start_edl(void * priv)
+static gavl_source_status_t read_video(void * priv,
+                                       gavl_video_frame_t ** frame)
   {
-  int i, j;
-  edl_dec_t * dec;
-  
-  bg_track_info_t * ti;
-  
-  dec = (edl_dec_t*)priv;
+  gavl_source_status_t st;
+  stream_t * s = priv;
 
-  ti = &dec->track_info[dec->current_track];
+  /* Early return */
+  if(!s->seg && !s->mute_time)
+    return GAVL_SOURCE_EOF;
+
+  // fprintf(stderr, "read_video %"PRId64" %"PRId64"\n", s->pts, s->seg->dst_time + s->seg->dst_duration);
   
-  for(i = 0; i < dec->edl->tracks[dec->current_track].num_audio_streams; i++)
+  /* Check for segment end */
+  if(s->seg && (s->pts >= s->seg->dst_time + s->seg->dst_duration))
     {
-    audio_source_t * asrc;
-    audio_stream_t * as;
-    
-    as = &dec->tracks[dec->current_track].audio_streams[i];
-    if(as->action != BG_STREAM_ACTION_DECODE)
-      continue;
+    int64_t src_time;
+
+    s->seg = gavl_edl_dst_time_to_src(s->dec->t, s->s, s->pts,
+                                      &src_time, &s->mute_time);
 
-    /* Fire up the sources */
+    if(!s->seg && !s->mute_time)
+      return GAVL_SOURCE_EOF;
     
-    for(j = 0; j < as->num_sources; j++)
+    if(s->seg)
       {
-      asrc = &as->sources[j];
-      if(!init_source_common(dec, &asrc->com))
-        return 0;
-
-      if(asrc->com.plugin->set_audio_stream &&
-         !asrc->com.plugin->set_audio_stream(asrc->com.handle->priv,
-                                             asrc->com.stream,
-                                             BG_STREAM_ACTION_DECODE))
-        return 0;
-      if(asrc->com.plugin->start &&
-         !asrc->com.plugin->start(asrc->com.handle->priv))
-        return 0;
-      asrc->read_func = asrc->com.plugin->read_audio;
-      asrc->format    =
-        &asrc->com.ti->audio_streams[asrc->com.stream].format;
-      
-      if(!j)
-        {
-        gavl_audio_format_copy(&ti->audio_streams[i].format, asrc->format);
-        as->format = &ti->audio_streams[i].format;
-        }
-      else
-        {
-        if(bg_audio_converter_init(asrc->cnv, asrc->format, as->format))
-          {
-          bg_audio_converter_connect_input(asrc->cnv, asrc->read_func,
-                                           asrc->com.read_data,
-                                           asrc->com.read_stream);
-          asrc->read_func = bg_audio_converter_read;
-          asrc->com.read_data = asrc->cnv;
-          asrc->com.read_stream = 0;
-          }
-        }
-      as->frame = gavl_audio_frame_create(as->format);
+      if(!(s->vsrc_int = get_video_source(s->dec, s->seg, &s->src, src_time)))
+        return GAVL_SOURCE_EOF;
+      gavl_video_source_set_dst(s->vsrc_int, 0, s->vfmt);
       }
-    /* Initialize first segment */
-    as->current_segment = 0;
-    init_audio_segment(as);
+    else
+      s->vsrc_int = NULL;
+    }
 
+  /* Check for mute */
+
+  if(s->mute_time > 0)
+    {
+    gavl_video_frame_clear(*frame, s->vfmt);
+    (*frame)->timestamp = s->pts;
+    (*frame)->duration = s->mute_time;
+
+    /* TODO: Limit frame duration */
+    (*frame)->timestamp = s->pts;
+    s->pts += (*frame)->duration;
+    s->mute_time -= (*frame)->duration;
+    return GAVL_SOURCE_OK;
     }
   
-  for(i = 0; i < dec->edl->tracks[dec->current_track].num_video_streams; i++)
+  /* Read video */
+  st = gavl_video_source_read_frame(s->vsrc_int, frame);
+  if(st != GAVL_SOURCE_OK)
     {
-    video_stream_t * vs;
-    video_source_t * vsrc;
-    
-    vs = &dec->tracks[dec->current_track].video_streams[i];
-    if(vs->action != BG_STREAM_ACTION_DECODE)
-      continue;
-    
-    /* Fire up the sources */
-    
-    for(j = 0; j < vs->num_sources; j++)
+    /* Can happen due to some inaccuracies */
+    gavl_video_frame_clear(*frame, s->vfmt);
+    (*frame)->duration =
+      s->seg->dst_time + s->seg->dst_duration - s->pts;
+    }
+  else
+    {
+    /* Limit duration */ 
+    if(s->pts + (*frame)->duration >
+       s->seg->dst_time + s->seg->dst_duration)
       {
-      vsrc = &vs->sources[j];
-
-      if(!init_source_common(dec, &vs->sources[j].com))
-        return 0;
-
-      if(vsrc->com.plugin->set_video_stream &&
-         !vsrc->com.plugin->set_video_stream(vsrc->com.handle->priv,
-                                             vsrc->com.stream,
-                                             BG_STREAM_ACTION_DECODE))
-        return 0;
-      if(vsrc->com.plugin->start &&
-         !vsrc->com.plugin->start(vsrc->com.handle->priv))
-        return 0;
-      vsrc->read_func = vsrc->com.plugin->read_video;
-      vsrc->format    =
-        &vsrc->com.ti->video_streams[vsrc->com.stream].format;
-
-      if(!j)
-        {
-        gavl_video_format_copy(&ti->video_streams[i].format, vsrc->format);
-        vs->format = &ti->video_streams[i].format;
-        }
-      else
-        {
-        if(bg_video_converter_init(vsrc->cnv, vsrc->format, vs->format))
-          {
-          bg_video_converter_connect_input(vsrc->cnv, vsrc->read_func,
-                                           vsrc->com.read_data,
-                                           vsrc->com.read_stream);
-          vsrc->read_func = bg_video_converter_read;
-          vsrc->com.read_data = vsrc->cnv;
-          vsrc->com.read_stream = 0;
-          }
-        }
+      (*frame)->duration =
+        s->seg->dst_time + s->seg->dst_duration - s->pts;
       }
-    /* Initialize first segment */
-    vs->current_segment = 0;
-    init_video_segment(vs);
     }
+  
+  /* Set PTS */
+  (*frame)->timestamp = s->pts;
+  s->pts += (*frame)->duration;
+  return GAVL_SOURCE_OK;
+  }
+
+static int start_video_stream(edldec_t * ed, stream_t * s, bg_video_info_t * vi)
+  {
+  int64_t src_time;
+  if(s->action == BG_STREAM_ACTION_OFF)
+    return 1;
+
+  if(!(s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, 0,
+                                         &src_time, &s->mute_time)))
+    return 0;
+  
+  if(!(s->vsrc_int = get_video_source(ed, s->seg, &s->src, src_time)))
+    return 0;
+
+  /* Get format */
+  gavl_video_format_copy(&vi->format,
+                         gavl_video_source_get_src_format(s->vsrc_int));
+  s->vfmt = &vi->format;
+
+  /* Adjust format */
+  vi->format.timescale = s->s->timescale;
+  vi->format.frame_duration = 0;
+  vi->format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+  
+  /* Set destination format */
+  gavl_video_source_set_dst(s->vsrc_int, 0, &vi->format);
+
+  /* Create external source */
+  s->vsrc_ext = gavl_video_source_create(read_video, s, 0, &vi->format);
+  
+  return 1;
+  }
+
+static gavl_source_status_t read_text(void * priv,
+                                      gavl_packet_t ** p)
+  {
+  int64_t src_time;
+  gavl_source_status_t st;
+  stream_t * s = priv;
 
-  for(i = 0; i < dec->edl->tracks[dec->current_track].num_subtitle_text_streams; i++)
+  /* Early return */
+  if(!s->seg)
+    return GAVL_SOURCE_EOF;
+
+  while(1)
     {
-    subtitle_stream_t * sts;
-    subtitle_source_t * stsrc;
-    bg_subtitle_info_t * si;
-    
-    si = &ti->subtitle_streams[i];
-    
-    sts = &dec->tracks[dec->current_track].subtitle_text_streams[i];
-    if(sts->action != BG_STREAM_ACTION_DECODE)
-      continue;
+    /* Read text */
+    st = gavl_packet_source_read_packet(s->psrc_int, p);
     
-    /* Fire up the sources */
-    for(j = 0; j < sts->num_sources; j++)
+    if(st == GAVL_SOURCE_OK)
       {
-      stsrc = &sts->sources[j];
+      (*p)->pts = gavl_edl_src_time_to_dst(s->s, s->seg, (*p)->pts);
+      (*p)->duration = gavl_time_rescale(s->seg->timescale, s->s->timescale, (*p)->duration);
       
-      if(!init_source_common(dec, &sts->sources[j].com))
-        return 0;
-      if(stsrc->com.plugin->set_subtitle_stream &&
-         !stsrc->com.plugin->set_subtitle_stream(stsrc->com.handle->priv,
-                                                 stsrc->com.stream,
-                                                 BG_STREAM_ACTION_DECODE))
-        return 0;
-      if(stsrc->com.plugin->start &&
-         !stsrc->com.plugin->start(stsrc->com.handle->priv))
-        return 0;
-
-      stsrc->format    =
-        &stsrc->com.ti->subtitle_streams[stsrc->com.stream].format;
-      if(!j)
+      /* Check for segment end */
+      if((*p)->pts < s->seg->dst_time + s->seg->dst_duration)
         {
-        gavl_video_format_copy(&si->format, stsrc->format);
-        sts->format = &si->format;
+        /* Adjust duration to the segment end */
+        if((*p)->pts + (*p)->duration > s->seg->dst_time + s->seg->dst_duration)
+          (*p)->duration = s->seg->dst_time + s->seg->dst_duration - (*p)->pts;
+        return GAVL_SOURCE_OK;
         }
       }
-    /* Initialize first segment */
-    sts->current_segment = 0;
-    init_subtitle_segment(sts);
-    }
-  
-  for(i = 0; i < dec->edl->tracks[dec->current_track].num_subtitle_overlay_streams; i++)
-    {
-    subtitle_stream_t * sos;
-    subtitle_source_t * sosrc;
-    bg_subtitle_info_t * si;
     
-    sos = &dec->tracks[dec->current_track].subtitle_overlay_streams[i];
-    if(sos->action != BG_STREAM_ACTION_DECODE)
-      continue;
+    /* Get next segment */
     
-    si = &ti->subtitle_streams[i + dec->edl->tracks[dec->current_track].num_subtitle_text_streams];
+    s->seg = gavl_edl_dst_time_to_src(s->dec->t, s->s, s->seg->dst_time + s->seg->dst_duration,
+                                      &src_time, &s->mute_time);
     
-    /* Fire up the sources */
-    for(j = 0; j < sos->num_sources; j++)
-      {
-      sosrc = &sos->sources[j];
-      
-      if(!init_source_common(dec, &sos->sources[j].com))
-        return 0;
-      
-      if(sosrc->com.plugin->set_subtitle_stream &&
-         !sosrc->com.plugin->set_subtitle_stream(sosrc->com.handle->priv,
-                                                 sosrc->com.stream,
-                                                 BG_STREAM_ACTION_DECODE))
-        return 0;
-      if(sosrc->com.plugin->start &&
-         !sosrc->com.plugin->start(sosrc->com.handle->priv))
-        return 0;
-      sosrc->read_func = sosrc->com.plugin->read_subtitle_overlay;
-      sosrc->format    =
-        &sosrc->com.ti->subtitle_streams[sosrc->com.stream].format;
-      
-      if(!j)
-        {
-        gavl_video_format_copy(&si->format, sosrc->format);
-        sos->format = &si->format;
-        }
-      else
-        {
-        if(gavl_video_converter_init(sosrc->cnv, sosrc->format, sos->format))
-          {
-          sosrc->read_func = read_subtitle_overlay_convert;
-          sosrc->com.read_data = sosrc;
-          // sosrc->com.read_stream must be unchanged
-          }
-        }
-      }
-    /* Initialize first segment */
-    sos->current_segment = 0;
-    init_subtitle_segment(sos);
+    if(!s->seg)
+      break;
+    
+    if(!(s->psrc_int = get_text_source(s->dec, s->seg, &s->src, src_time)))
+      return GAVL_SOURCE_EOF;
     }
   
-  return 1;
+  return GAVL_SOURCE_EOF;
   }
 
-static int read_audio_edl(void * priv, gavl_audio_frame_t* frame, int stream,
-                          int num_samples)
+static int start_text_stream(edldec_t * ed, stream_t * s, bg_text_info_t * ti)
   {
-  int samples_decoded = 0;
-  edl_dec_t * dec;
-  audio_stream_t * as;
-  int num;
-  segment_t * seg;
-  audio_source_t * src;
-  dec = (edl_dec_t*)priv;
-  as = &dec->tracks[dec->current_track].audio_streams[stream];
-
-  if(as->current_segment >= as->num_segments)
+  int64_t src_time;
+  if(s->action == BG_STREAM_ACTION_OFF)
+    return 1;
+  s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, 0, &src_time, &s->mute_time);
+  if(!s->seg)
     return 0;
   
-  while(samples_decoded < num_samples)
-    {
-    num = as->format->samples_per_frame;
-    
-    /* Check for end of frame */
-    if(samples_decoded + num > num_samples)
-      num = num_samples - samples_decoded;
+  if(!(s->psrc_int = get_text_source(ed, s->seg, &s->src, src_time)))
+    return 0;
+
+  /* Create external source */
+  s->psrc_ext = gavl_packet_source_create_text(read_text, s, 0,
+                                               s->s->timescale);
+  ti->timescale = s->s->timescale;
+  
+  return 1;
+  }
+
+static gavl_source_status_t read_overlay(void * priv,
+                                         gavl_video_frame_t ** f)
+  {
+  int64_t src_time;
+  gavl_source_status_t st;
+  gavl_video_format_t fmt;
+  stream_t * s = priv;
+
+  /* Early return */
+  if(!s->seg)
+    return GAVL_SOURCE_EOF;
 
-    /* Check for end of segment */
-    if(as->out_time + samples_decoded + num > as->segment_end_time)
-      num = as->segment_end_time - (as->out_time + samples_decoded);
+  while(1)
+    {
+    /* Read text */
+    st = gavl_video_source_read_frame(s->vsrc_int, f);
     
-    while(!num)
+    if(st == GAVL_SOURCE_OK)
       {
-      /* End of segment */
-      as->current_segment++;
-      if(as->current_segment >= as->num_segments)
-        {
-        /* End of stream */
-        break;
-        }
-      else /* New segment (skip empty ones) */
+      (*f)->timestamp = gavl_edl_src_time_to_dst(s->s, s->seg, (*f)->timestamp);
+      (*f)->duration = gavl_time_rescale(s->seg->timescale, s->s->timescale, (*f)->duration);
+      
+      /* Check for segment end */
+      if((*f)->timestamp < s->seg->dst_time + s->seg->dst_duration)
         {
-        init_audio_segment(as);
-
-        num = as->format->samples_per_frame;
-        
-        /* Check for end of frame */
-        if(samples_decoded + num > num_samples)
-          num = num_samples - samples_decoded;
-        
-        /* Check for end of segment */
-        if(as->out_time + samples_decoded + num > as->segment_end_time)
-          num = as->segment_end_time - (as->out_time + samples_decoded);
-        
+        /* Adjust duration to the segment end */
+        if((*f)->timestamp + (*f)->duration > s->seg->dst_time + s->seg->dst_duration)
+          (*f)->duration = s->seg->dst_time + s->seg->dst_duration - (*f)->timestamp;
+        return GAVL_SOURCE_OK;
         }
       }
-
-    if(!num)
+    
+    /* Get next segment */
+    
+    s->seg = gavl_edl_dst_time_to_src(s->dec->t, s->s, s->seg->dst_time + s->seg->dst_duration,
+                                      &src_time, &s->mute_time);
+    
+    if(!s->seg)
       break;
     
-    seg = &as->segments[as->current_segment];
-    if(!seg->src)
-      {
-      gavl_audio_frame_mute_samples(as->frame, as->format, num);
-      }
-    else
-      {
-      src = (audio_source_t *)(seg->src);
-      if(!src->read_func(seg->src->read_data,
-                         as->frame,
-                         seg->src->read_stream,
-                         num))
-        return samples_decoded;
-      }
-    num = gavl_audio_frame_copy(as->format,
-                                frame,
-                                as->frame,
-                                samples_decoded /* dst_pos */,
-                                0 /* 	src_pos */ ,
-                                num_samples - samples_decoded,
-                                as->frame->valid_samples);
-    samples_decoded += num;
+    if(!(s->vsrc_int = get_overlay_source(s->dec, s->seg, &s->src, src_time)))
+      return GAVL_SOURCE_EOF;
+    
+    gavl_video_format_copy(&fmt, s->vfmt);
+    fmt.timescale = s->seg->timescale;
+
+    /* Set destination format */
+    gavl_video_source_set_dst(s->vsrc_int, 0, &fmt);
     }
-  frame->timestamp = as->out_time;
-  frame->valid_samples = samples_decoded;
-  as->out_time += samples_decoded;
-  return samples_decoded;
+  
+  return GAVL_SOURCE_EOF;
+
+  
   }
 
-static int read_video_edl(void * priv, gavl_video_frame_t* frame, int stream)
+static int start_overlay_stream(edldec_t * ed, stream_t * s,
+                                bg_overlay_info_t * oi)
   {
-  edl_dec_t * dec;
-  video_stream_t * vs;
-  segment_t * seg;
-  video_source_t * src;
-  dec = (edl_dec_t*)priv;
-  vs = &dec->tracks[dec->current_track].video_streams[stream];
-
-  if(vs->current_segment >= vs->num_segments)
+  int64_t src_time;
+  gavl_video_format_t fmt;
+
+  if(s->action == BG_STREAM_ACTION_OFF)
+    return 1;
+  s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, 0, &src_time, &s->mute_time);
+  if(!s->seg)
     return 0;
   
-  while(vs->out_time >= vs->segment_end_time)
-    {
-    vs->current_segment++;
+  if(!(s->vsrc_int = get_overlay_source(ed, s->seg, &s->src, src_time)))
+    return 0;
+
+  /* Get format */
+  gavl_video_format_copy(&oi->format,
+                         gavl_video_source_get_src_format(s->vsrc_int));
+
+  s->vfmt = &oi->format;
+
+  oi->format.timescale = s->s->timescale;
+  oi->format.frame_duration = 0;
+  oi->format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+
+  gavl_video_format_copy(&fmt, s->vfmt);
+  fmt.timescale = s->seg->timescale;
+
+  /* Set destination format */
+  gavl_video_source_set_dst(s->vsrc_int, 0, &fmt);
+  
+  /* Create external source */
+  s->vsrc_ext = gavl_video_source_create(read_overlay, s, 0, &fmt);
+  return 1;
+  }
 
-    if(vs->current_segment >= vs->num_segments)
+static int start_edl(void * priv)
+  {
+  int i;
+  edldec_t * ed = priv;
+
+  for(i = 0; i < ed->t->num_audio_streams; i++)
+    {
+    if(!start_audio_stream(ed, &ed->audio_streams[i],
+                           &ed->ti_cur->audio_streams[i]))
       return 0;
-    init_video_segment(vs);
     }
-  
-  seg = &vs->segments[vs->current_segment];
-  if(!seg->src)
+  for(i = 0; i < ed->t->num_video_streams; i++)
     {
-    gavl_video_frame_clear(frame, vs->format);
-    
-    frame->timestamp = vs->out_time;
-    frame->duration = vs->format->frame_duration;
-    vs->out_time += vs->format->frame_duration;
+    if(!start_video_stream(ed, &ed->video_streams[i],
+                           &ed->ti_cur->video_streams[i]))
+      return 0;
     }
-  else
+  for(i = 0; i < ed->t->num_text_streams; i++)
     {
-    src = (video_source_t *)seg->src;
-    
-    if(!src->read_func(src->com.read_data, frame, src->com.read_stream))
-      {
-      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Unexpected EOF, clearing frame");
-      gavl_video_frame_clear(frame, vs->format);
-      }
-    
-    frame->timestamp = vs->out_time;
-    //    vs->out_time = frame->timestamp + frame->duration;
-    vs->out_time += frame->duration;
+    if(!start_text_stream(ed, &ed->text_streams[i],
+                          &ed->ti_cur->text_streams[i]))
+      return 0;
+    }
+  for(i = 0; i < ed->t->num_overlay_streams; i++)
+    {
+    if(!start_overlay_stream(ed, &ed->overlay_streams[i],
+                             &ed->ti_cur->overlay_streams[i]))
+      return 0;
     }
   return 1;
   }
 
-static int has_subtitle_edl(void * priv, int stream)
-  {
-  //  edl_dec_t * dec;
-  //  dec = (edl_dec_t*)priv;
-  return 1;
-  }
-
-
-typedef struct
-  {
-  gavl_overlay_t * ovl;
-  char ** text;
-  int * text_alloc;
-  int64_t * start_time;
-  int64_t * duration;
-  subtitle_stream_t * s;
-  } decode_subtitle_data;
-
-static int
-decode_subtitle_text(decode_subtitle_data * d)
+static gavl_audio_source_t * get_audio_source_edl(void * priv, int stream)
   {
-  subtitle_source_t * src;
-  src = (subtitle_source_t*)(d->s->segments[d->s->current_segment].src);
-  return src->com.plugin->read_subtitle_text(src->com.handle->priv,
-                                             d->text, d->text_alloc,
-                                             d->start_time,
-                                             d->duration, src->com.stream);
+  edldec_t * ed = priv;
+  return ed->audio_streams[stream].asrc_ext;
   }
 
-static int
-decode_subtitle_overlay(decode_subtitle_data * d)
+static gavl_video_source_t * get_video_source_edl(void * priv, int stream)
   {
-  subtitle_source_t * src;
-  src = (subtitle_source_t*)(d->s->segments[d->s->current_segment].src);
-  return src->read_func(src->com.read_data, d->ovl, src->com.stream);
-  }
-
-/* Here, the actual magic happens */
-static int
-decode_subtitle(int (*decode_func)(decode_subtitle_data*),
-                decode_subtitle_data * d)
-  {
-  if(d->s->current_segment >= d->s->es->num_segments)
-    return 0;
-  
-  while(1)
-    {
-    /* Check is segment is finished */
-    if(d->s->out_time >= d->s->segment_end_time)
-      {
-      d->s->current_segment++;
-      if(d->s->current_segment >= d->s->es->num_segments)
-        return 0;
-      init_subtitle_segment(d->s);
-      }
-    
-    /* Decode one subtitle */
-    if(!decode_func(d))
-      {
-      d->s->current_segment++;
-      if(d->s->current_segment >= d->s->es->num_segments)
-        return 0;
-      init_subtitle_segment(d->s);
-      continue;
-      }
-    /* Correct timestamps */
-    
-    *d->start_time =
-      gavl_time_rescale(((subtitle_source_t*)(d->s->segments[d->s->current_segment].src))->format->timescale,
-                        d->s->format->timescale, *d->start_time) + d->s->time_offset;
-    *d->duration =
-      gavl_time_rescale(((subtitle_source_t*)(d->s->segments[d->s->current_segment].src))->format->timescale,
-                        d->s->format->timescale, *d->duration);
-
-    /* Still inside the segment */
-
-    if(*d->start_time < d->s->segment_end_time)
-      {
-      if(*d->start_time + *d->duration > d->s->segment_end_time)
-        *d->duration = d->s->segment_end_time - *d->start_time;
-      
-      d->s->out_time = *d->start_time + *d->duration;
-      break;
-      }
-    /* Subtitle there but after segment */
-    else
-      {
-      d->s->out_time = d->s->segment_end_time;
-      }
-    }
-  return 1;
+  edldec_t * ed = priv;
+  return ed->video_streams[stream].vsrc_ext;
   }
 
-static int read_subtitle_overlay_edl(void * priv,
-                                     gavl_overlay_t*ovl, int stream)
+static gavl_packet_source_t * get_text_source_edl(void * priv, int stream)
   {
-  edl_dec_t * dec;
-  decode_subtitle_data d;
-  dec = (edl_dec_t*)priv;
-  
-  d.ovl = ovl;
-  d.start_time = &ovl->frame->timestamp;
-  d.duration   = &ovl->frame->duration;
-
-  d.s =
-    &dec->tracks[dec->current_track].subtitle_overlay_streams[stream -
-                                                             dec->edl->tracks[dec->current_track].num_subtitle_text_streams];
-  return decode_subtitle(decode_subtitle_overlay, &d);
+  edldec_t * ed = priv;
+  return ed->text_streams[stream].psrc_ext;
   }
 
-static int read_subtitle_text_edl(void * priv,
-                                  char ** text, int * text_alloc,
-                                  int64_t * start_time,
-                                  int64_t * duration, int stream)
+static gavl_video_source_t * get_overlay_source_edl(void * priv, int stream)
   {
-  edl_dec_t * dec;
-  decode_subtitle_data d;
-
-  dec = (edl_dec_t*)priv;
-
-  d.text = text;
-  d.text_alloc = text_alloc;
-
-  d.start_time = start_time;
-  d.duration   = duration;
-
-  d.s =
-    &dec->tracks[dec->current_track].subtitle_text_streams[stream];
-  
-  return decode_subtitle(decode_subtitle_text, &d);
+  edldec_t * ed = priv;
+  return ed->overlay_streams[stream].vsrc_ext;
   }
 
 static void seek_edl(void * priv, int64_t * time, int scale)
   {
-  edl_dec_t * dec;
   int i;
-  track_t * t;
-  bg_edl_track_t * et;
-  int64_t time_scaled;
-  dec = (edl_dec_t*)priv;
-  t = &dec->tracks[dec->current_track];
-  et = &dec->edl->tracks[dec->current_track];
+  int64_t src_time;
+  int time_scaled;
+  stream_t * s;
+  edldec_t * ed = priv;
   
-  for(i = 0; i < et->num_audio_streams; i++)
+  for(i = 0; i < ed->t->num_audio_streams; i++)
     {
-    if(t->audio_streams[i].action != BG_STREAM_ACTION_DECODE)
-      continue;
-    time_scaled = gavl_time_rescale(scale, t->audio_streams[i].format->samplerate,
-                                    *time);
-    t->audio_streams[i].current_segment =
-      seek_segment(t->audio_streams[i].es,
-                   t->audio_streams[i].segments,
-                   t->audio_streams[i].num_segments,
-                   time_scaled, t->audio_streams[i].format->samplerate);
-    if(t->audio_streams[i].current_segment < 0)
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Seeked audio out of range");
-      return;
-      }
-    t->audio_streams[i].out_time = time_scaled;
-    init_audio_segment(&t->audio_streams[i]);
-    }
-  for(i = 0; i < et->num_video_streams; i++)
-    {
-    if(t->video_streams[i].action != BG_STREAM_ACTION_DECODE)
+    s = ed->audio_streams + i;
+
+    if(s->action == BG_STREAM_ACTION_OFF)
       continue;
+    
+    time_scaled = gavl_time_rescale(scale, s->s->timescale, *time);
 
-    time_scaled = gavl_time_rescale(scale, t->video_streams[i].format->timescale,
-                                    *time);
-    t->video_streams[i].current_segment =
-      seek_segment(t->video_streams[i].es,
-                   t->video_streams[i].segments,
-                   t->video_streams[i].num_segments,
-                   time_scaled, t->video_streams[i].format->timescale);
-    if(t->video_streams[i].current_segment < 0)
+    s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, time_scaled,
+                                      &src_time, &s->mute_time);
+    
+    if(s->seg)
       {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Seeked video out of range");
-      return;
+      if((s->asrc_int = get_audio_source(s->dec, s->seg, &s->src, src_time)))
+        gavl_audio_source_set_dst(s->asrc_int, 0, s->afmt);
       }
-    t->video_streams[i].out_time = time_scaled;
-    init_video_segment(&t->video_streams[i]);
-    
+    else
+      s->asrc_int = NULL;
+    s->pts = time_scaled;
     }
-  for(i = 0; i < et->num_subtitle_text_streams; i++)
+  for(i = 0; i < ed->t->num_video_streams; i++)
     {
-    if(t->subtitle_text_streams[i].action != BG_STREAM_ACTION_DECODE)
+    s = ed->video_streams + i;
+
+    if(s->action == BG_STREAM_ACTION_OFF)
       continue;
 
-    time_scaled = gavl_time_rescale(scale, t->subtitle_text_streams[i].format->timescale,
-                                    *time);
+    time_scaled = gavl_time_rescale(scale, s->s->timescale, *time);
+
+    s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, time_scaled,
+                                      &src_time, &s->mute_time);
     
-    t->subtitle_text_streams[i].current_segment =
-      seek_segment(t->subtitle_text_streams[i].es,
-                   t->subtitle_text_streams[i].segments,
-                   t->subtitle_text_streams[i].num_segments,
-                   time_scaled, t->subtitle_text_streams[i].format->timescale);
-    if(t->subtitle_text_streams[i].current_segment < 0)
+    if(s->seg)
       {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Seeked text subtitles out of range");
-      return;
+      if((s->vsrc_int = get_video_source(s->dec, s->seg, &s->src, src_time)))
+        gavl_video_source_set_dst(s->vsrc_int, 0, s->vfmt);
       }
-    t->subtitle_text_streams[i].out_time = time_scaled;
-    init_subtitle_segment(&t->subtitle_text_streams[i]);
+    else
+      s->vsrc_int = NULL;
+    s->pts = time_scaled;
     }
-  for(i = 0; i < et->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ed->t->num_text_streams; i++)
     {
-    if(t->subtitle_overlay_streams[i].action != BG_STREAM_ACTION_DECODE)
+    s = ed->text_streams + i;
+    if(s->action == BG_STREAM_ACTION_OFF)
       continue;
+    time_scaled = gavl_time_rescale(scale, s->s->timescale, *time);
 
-    time_scaled = gavl_time_rescale(scale, t->subtitle_overlay_streams[i].format->timescale,
-                                    *time);
+    s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, time_scaled,
+                                      &src_time, &s->mute_time);
     
-    t->subtitle_overlay_streams[i].current_segment =
-      seek_segment(t->subtitle_overlay_streams[i].es,
-                   t->subtitle_overlay_streams[i].segments,
-                   t->subtitle_overlay_streams[i].num_segments,
-                   time_scaled, t->subtitle_overlay_streams[i].format->timescale);
-    if(t->subtitle_overlay_streams[i].current_segment < 0)
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Seeked text subtitles out of range");
-      return;
-      }
-    t->subtitle_overlay_streams[i].out_time = time_scaled;
-    init_subtitle_segment(&t->subtitle_overlay_streams[i]);
-    }
-        
-  }
-
-static void close_edl(void * priv)
-  {
-  int i, j, k;
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-
-  for(i = 0; i < dec->edl->num_tracks; i++)
-    {
-    for(j = 0; j < dec->edl->tracks[i].num_audio_streams; j++)
-      {
-      /* Close sources */
-      for(k = 0; k < dec->tracks[i].audio_streams[j].num_sources; k++)
-        {
-        cleanup_source_common(&dec->tracks[i].audio_streams[j].sources[k].com);
-        if(dec->tracks[i].audio_streams[j].sources[k].cnv)
-          bg_audio_converter_destroy(dec->tracks[i].audio_streams[j].sources[k].cnv);
-        }
-      if(dec->tracks[i].audio_streams[j].sources)
-        free(dec->tracks[i].audio_streams[j].sources);
-      
-      if(dec->tracks[i].audio_streams[j].segments)
-        free(dec->tracks[i].audio_streams[j].segments);
-      if(dec->tracks[i].audio_streams[j].frame)
-        gavl_audio_frame_destroy(dec->tracks[i].audio_streams[j].frame);
-      }
-    if(dec->tracks[i].audio_streams)
-      free(dec->tracks[i].audio_streams);
+    if(s->seg)
+      s->psrc_int = get_text_source(s->dec, s->seg, &s->src, src_time);
+    else
+      s->psrc_int = NULL;
+    s->pts = time_scaled;
     
-    for(j = 0; j < dec->edl->tracks[i].num_video_streams; j++)
-      {
-      /* Close sources */
-      for(k = 0; k < dec->tracks[i].video_streams[j].num_sources; k++)
-        {
-        cleanup_source_common(&dec->tracks[i].video_streams[j].sources[k].com);
-        if(dec->tracks[i].video_streams[j].sources[k].cnv)
-          bg_video_converter_destroy(dec->tracks[i].video_streams[j].sources[k].cnv);
-        }
-      if(dec->tracks[i].video_streams[j].sources)
-        free(dec->tracks[i].video_streams[j].sources);
-
-      if(dec->tracks[i].video_streams[j].segments)
-        free(dec->tracks[i].video_streams[j].segments);
-      }
-    if(dec->tracks[i].video_streams)
-      free(dec->tracks[i].video_streams);
-
-    for(j = 0; j < dec->edl->tracks[i].num_subtitle_text_streams; j++)
-      {
-      /* Close sources */
-      for(k = 0; k < dec->tracks[i].subtitle_text_streams[j].num_sources; k++)
-        cleanup_source_common(&dec->tracks[i].subtitle_text_streams[j].sources[k].com);
-      if(dec->tracks[i].subtitle_text_streams[j].sources)
-        free(dec->tracks[i].subtitle_text_streams[j].sources);
-      if(dec->tracks[i].subtitle_text_streams[j].segments)
-        free(dec->tracks[i].subtitle_text_streams[j].segments);
-      }
-    if(dec->tracks[i].subtitle_text_streams)
-      free(dec->tracks[i].subtitle_text_streams);
-
-    for(j = 0; j < dec->edl->tracks[i].num_subtitle_overlay_streams; j++)
-      {
-      /* Close sources */
-      for(k = 0; k < dec->tracks[i].subtitle_overlay_streams[j].num_sources; k++)
-        {
-        cleanup_source_common(&dec->tracks[i].subtitle_overlay_streams[j].sources[k].com);
-        if(dec->tracks[i].subtitle_overlay_streams[j].sources[k].cnv)
-          gavl_video_converter_destroy(dec->tracks[i].subtitle_overlay_streams[j].sources[k].cnv);
-        }
-      if(dec->tracks[i].subtitle_overlay_streams[j].sources)
-        free(dec->tracks[i].subtitle_overlay_streams[j].sources);
-
-      if(dec->tracks[i].subtitle_overlay_streams[j].segments)
-        free(dec->tracks[i].subtitle_overlay_streams[j].segments);
-      
-      }
-    if(dec->tracks[i].subtitle_overlay_streams)
-      free(dec->tracks[i].subtitle_overlay_streams);
     }
-  if(dec->tracks)
+  for(i = 0; i < ed->t->num_overlay_streams; i++)
     {
-    free(dec->tracks);
-    dec->tracks = NULL;
-    }
-  if(dec->track_info)
-    {
-    for(i = 0; i < dec->edl->num_tracks; i++)
+    s = ed->overlay_streams + i;
+    if(s->action == BG_STREAM_ACTION_OFF)
+      continue;
+    time_scaled = gavl_time_rescale(scale, s->s->timescale, *time);
+
+    s->seg = gavl_edl_dst_time_to_src(ed->t, s->s, time_scaled,
+                                      &src_time, &s->mute_time);
+    
+    if(s->seg)
       {
-      bg_track_info_free(&dec->track_info[i]);
+      if((s->vsrc_int = get_overlay_source(s->dec, s->seg, &s->src, src_time)))
+        gavl_video_source_set_dst(s->vsrc_int, 0, s->vfmt);
       }
-    free(dec->track_info);
-    dec->track_info = NULL;
-    
+    else
+      s->vsrc_int = NULL;
+    s->pts = time_scaled;
     }
   
   }
 
-static void destroy_edl(void * priv)
+static void close_edl(void * priv)
   {
-  edl_dec_t * dec;
-  dec = (edl_dec_t*)priv;
-  if(dec->tracks)
-    close_edl(priv);
-
-  gavl_audio_options_destroy(dec->a_opt);
-  gavl_video_options_destroy(dec->v_opt);
 
-  free(priv);
   }
 
 static const bg_input_plugin_t edl_plugin =
@@ -1387,7 +996,8 @@
     /* Set streams */
     .set_video_stream =         set_video_stream_edl,
     .set_audio_stream =         set_audio_stream_edl,
-    .set_subtitle_stream =      set_subtitle_stream_edl,
+    .set_text_stream =      set_text_stream_edl,
+    .set_overlay_stream =      set_overlay_stream_edl,
     /*
      *  Start decoding.
      *  Track info is the track, which should be played.
@@ -1396,12 +1006,10 @@
      */
     .start =                 start_edl,
     /* Read one video frame (returns FALSE on EOF) */
-    .read_video =      read_video_edl,
-    .read_audio =      read_audio_edl,
-    .has_subtitle = has_subtitle_edl,
-    .read_subtitle_text =      read_subtitle_text_edl,
-    .read_subtitle_overlay =      read_subtitle_overlay_edl,
-
+    .get_audio_source = get_audio_source_edl,
+    .get_video_source = get_video_source_edl,
+    .get_text_source = get_text_source_edl,
+    .get_overlay_source = get_overlay_source_edl,
     /*
      *  Do percentage seeking (can be NULL)
      *  Media streams are supposed to be seekable, if this
@@ -1420,28 +1028,23 @@
   }
 
 int bg_input_plugin_load_edl(bg_plugin_registry_t * reg,
-                             const bg_edl_t * edl,
+                             const gavl_edl_t * edl,
                              const bg_plugin_info_t * info,
                              bg_plugin_handle_t ** ret1,
                              bg_input_callbacks_t * callbacks)
   {
-  int i, j, k;
-  const bg_edl_track_t * track;
-  const bg_edl_stream_t * stream;
-  bg_track_info_t * ti;
-  track_t * t;
-  edl_dec_t * priv;
+  int i;
+  int max_streams = 0;
   bg_plugin_handle_t * ret;
-  gavl_time_t test_duration;
+  edldec_t * priv;
+
   if(*ret1)
     bg_plugin_unref(*ret1);
   
   ret = calloc(1, sizeof(*ret));
   *ret1 = ret;
     
-  //  ret->plugin_reg = reg;
   ret->plugin = (bg_plugin_common_t*)(&edl_plugin);
-
   ret->info = info;
   
   pthread_mutex_init(&ret->mutex, NULL);
@@ -1449,138 +1052,51 @@
   priv = calloc(1, sizeof(*priv));
   ret->priv = priv;
   ret->refcount = 1;
-  
   priv->edl = edl;
   priv->plugin_reg = reg;
-  priv->callbacks = callbacks;
   
-  priv->track_info = calloc(edl->num_tracks, sizeof(*priv->track_info));
-  priv->tracks = calloc(edl->num_tracks, sizeof(*priv->tracks));
-
-  priv->a_opt = gavl_audio_options_create();
-  priv->v_opt = gavl_video_options_create();
+  /* Create track info */
+  
+  priv->ti = calloc(priv->edl->num_tracks, sizeof(*priv->ti));
   
-  for(i = 0; i < edl->num_tracks; i++)
+  for(i = 0; i < priv->edl->num_tracks; i++)
     {
-    track = &edl->tracks[i];
-    ti    = &priv->track_info[i];
-    t     = &priv->tracks[i];
-    
-    ti->name = bg_strdup(ti->name, track->name);
-
-    gavl_metadata_copy(&ti->metadata, &track->metadata);
-    
-    ti->flags |= (BG_TRACK_SEEKABLE|BG_TRACK_PAUSABLE);
-    
-    ti->num_audio_streams = track->num_audio_streams;
-    
-    ti->audio_streams = calloc(ti->num_audio_streams,
-                               sizeof(*ti->audio_streams));
-    t->audio_streams = calloc(ti->num_audio_streams,
-                              sizeof(*t->audio_streams));
-    
-    /* Audio streams */
-    for(j = 0; j < track->num_audio_streams; j++)
-      {
-      stream = &track->audio_streams[j];
+    gavl_edl_track_t * track;
+    bg_track_info_t * ti;
+    int total_streams;
 
-      t->audio_streams[j].sources = calloc(stream->num_segments,
-                                           sizeof(*t->audio_streams[j].sources));
-      
-      t->audio_streams[j].es = stream;
-      for(k = 0; k < stream->num_segments; k++)
-        {
-        add_audio_segment(priv, i, j, &stream->segments[k]);
-        }
-      test_duration = gavl_time_unscale(stream->timescale, ti->audio_streams[j].duration);
-      if(ti->duration < test_duration)
-        ti->duration = test_duration;
-      }
-    
-    /* Video streams */
-
-    ti->num_video_streams = track->num_video_streams;
-    
-    ti->video_streams = calloc(ti->num_video_streams,
-                               sizeof(*ti->video_streams));
-    t->video_streams = calloc(ti->num_video_streams,
-                              sizeof(*t->video_streams));
-
-    for(j = 0; j < track->num_video_streams; j++)
-      {
-      stream = &track->video_streams[j];
-
-      t->video_streams[j].sources =
-        calloc(stream->num_segments,
-               sizeof(*t->video_streams[j].sources));
-      
-      t->video_streams[j].es = stream;
-      for(k = 0; k < stream->num_segments; k++)
-        {
-        add_video_segment(priv, i, j, &stream->segments[k]);
-        }
-      test_duration =
-        gavl_time_unscale(stream->timescale, ti->video_streams[j].duration);
-      if(ti->duration < test_duration)
-        ti->duration = test_duration;
-
-      }
-    /* Subtitle text streams */
-
-    ti->num_subtitle_streams = track->num_subtitle_text_streams +
-      track->num_subtitle_overlay_streams;
+    track = priv->edl->tracks + i;
+    ti = priv->ti + i;
 
-    ti->subtitle_streams = calloc(ti->num_subtitle_streams,
-                                  sizeof(*ti->subtitle_streams));
+    gavl_metadata_copy(&ti->metadata, &track->metadata);
 
-    t->subtitle_text_streams = calloc(track->num_subtitle_text_streams,
-                                      sizeof(*t->subtitle_text_streams));
-    t->subtitle_overlay_streams = calloc(track->num_subtitle_overlay_streams,
-                                      sizeof(*t->subtitle_overlay_streams));
+    ti->num_audio_streams   = track->num_audio_streams;
+    ti->num_video_streams   = track->num_video_streams;
+    ti->num_text_streams    = track->num_text_streams;
+    ti->num_overlay_streams = track->num_overlay_streams;
     
-    for(j = 0; j < track->num_subtitle_text_streams; j++)
-      {
-      stream = &track->subtitle_text_streams[j];
+    ti->audio_streams = calloc(ti->num_audio_streams, sizeof(*ti->audio_streams));
+    ti->video_streams = calloc(ti->num_video_streams, sizeof(*ti->video_streams));
+    ti->text_streams  = calloc(ti->num_text_streams,  sizeof(*ti->text_streams));
+    ti->overlay_streams = calloc(ti->num_overlay_streams, sizeof(*ti->overlay_streams));
 
-      t->subtitle_text_streams[j].sources =
-        calloc(stream->num_segments,
-               sizeof(*t->subtitle_text_streams[j].sources));
+    total_streams = 
+      ti->num_audio_streams +
+      ti->num_video_streams +
+      ti->num_text_streams +
+      ti->num_overlay_streams;
 
-      t->subtitle_text_streams[j].es = stream;
-
-      for(k = 0; k < stream->num_segments; k++)
-        {
-        add_subtitle_text_segment(priv, i, j, &stream->segments[k]);
-        }
-      test_duration =
-        gavl_time_unscale(stream->timescale,
-                          ti->subtitle_streams[j].duration);
-      if(ti->duration < test_duration)
-        ti->duration = test_duration;
-      ti->subtitle_streams[j].is_text = 1;
-      }
-    /* Subtitle overlay streams */
-    for(j = 0; j < track->num_subtitle_overlay_streams; j++)
-      {
-      stream = &track->subtitle_overlay_streams[j];
-      
-      t->subtitle_overlay_streams[j].sources =
-        calloc(stream->num_segments,
-               sizeof(*t->subtitle_overlay_streams[j].sources));
+    if(total_streams > max_streams)
+      max_streams = total_streams;
 
-      t->subtitle_overlay_streams[j].es = stream;
+    gavl_metadata_set_long(&ti->metadata, GAVL_META_APPROX_DURATION,
+                           gavl_edl_track_get_duration(track));
 
-
-      for(k = 0; k < stream->num_segments; k++)
-        {
-        add_subtitle_overlay_segment(priv, i, j, &stream->segments[k]);
-        }
-      test_duration =
-        gavl_time_unscale(stream->timescale,
-                          ti->subtitle_streams[j+track->num_subtitle_text_streams].duration);
-      if(ti->duration < test_duration)
-        ti->duration = test_duration;
-      }
+    ti->flags |= (BG_TRACK_SEEKABLE|BG_TRACK_PAUSABLE);
     }
+
+  priv->num_sources = max_streams * 2; // We can keep twice as many files open than we have streams
+  priv->sources = calloc(priv->num_sources, sizeof(*priv->sources));
   return 1;
   }
+

gmerlin-1.2.0.tar.gz/lib/encoder.c -> gmerlin-4256.tar.gz/lib/encoder.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <string.h>
+#include <unistd.h> // isatty
 
 #include <gmerlin/pluginregistry.h>
 #include <gmerlin/encoder.h>
@@ -38,78 +39,51 @@
   bg_encoder_plugin_t * plugin;
   void * priv;
   bg_plugin_handle_t * h;
+  const gavl_metadata_t * m;
   
-  gavl_audio_format_t format;
+  gavl_packet_sink_t * psink;
 
   bg_cfg_section_t * section;
+  bg_cfg_section_t * section_priv; // If copied
+  
   const bg_parameter_info_t * parameters;
 
-  const gavl_metadata_t * m;
-
   const gavl_compression_info_t * ci;
-  
-  } audio_stream_t;
+  } stream_common_t;
 
 typedef struct
   {
-  int in_index;
-  int out_index;
+  stream_common_t com;
+  gavl_audio_format_t format;
+  gavl_audio_sink_t * sink;
+  } audio_stream_t;
 
-  bg_encoder_plugin_t * plugin;
-  void * priv;
-  bg_plugin_handle_t * h;
+typedef struct
+  {
+  stream_common_t com;
   
   gavl_video_format_t format;
   
-  bg_cfg_section_t * section;
-  const bg_parameter_info_t * parameters;
-
   int pass;
   int total_passes;
   char * stats_file;
-
-  const gavl_metadata_t * m;
-
-  //  int64_t last_timestamp;
-  const gavl_compression_info_t * ci;
   
+  //  int64_t last_timestamp;
+  gavl_video_sink_t * sink;
   } video_stream_t;
 
 typedef struct
   {
-  int in_index;
-  int out_index;
-
-  bg_encoder_plugin_t * plugin;
-  void * priv;
-  bg_plugin_handle_t * h;
-
-  int timescale;
-  
-  bg_cfg_section_t * section;
-  const bg_parameter_info_t * parameters;
-
-  const gavl_metadata_t * m;
-  
-  } subtitle_text_stream_t;
+  stream_common_t com;
+  uint32_t timescale;
+  } text_stream_t;
 
 typedef struct
   {
-  int in_index;
-  int out_index;
-
-  bg_encoder_plugin_t * plugin;
-  void * priv;
-  bg_plugin_handle_t * h;
-
+  stream_common_t com;
   gavl_video_format_t format;
-
-  bg_cfg_section_t * section;
-  const bg_parameter_info_t * parameters;
-
-  const gavl_metadata_t * m;
-  
-  } subtitle_overlay_stream_t;
+  gavl_video_sink_t * sink;
+  } overlay_stream_t;
 
 typedef struct
   {
@@ -126,30 +100,31 @@
   {
   plugin_config_t audio_plugin;
   plugin_config_t video_plugin;
-  plugin_config_t subtitle_text_plugin;
-  plugin_config_t subtitle_overlay_plugin;
+  plugin_config_t text_plugin;
+  plugin_config_t overlay_plugin;
 
   stream_config_t audio_stream;
   stream_config_t video_stream;
-  stream_config_t subtitle_text_stream;
-  stream_config_t subtitle_overlay_stream;
+  stream_config_t text_stream;
+  stream_config_t overlay_stream;
   
   int num_audio_streams;
   int num_video_streams;
-  int num_subtitle_text_streams;
-  int num_subtitle_overlay_streams;
+  int num_text_streams;
+  int num_overlay_streams;
 
   int total_streams;
   
   audio_stream_t * audio_streams;
   video_stream_t * video_streams;
-  subtitle_text_stream_t * subtitle_text_streams;
-  subtitle_overlay_stream_t * subtitle_overlay_streams;
+  text_stream_t * text_streams;
+  overlay_stream_t * overlay_streams;
   
   int num_plugins;
   bg_plugin_handle_t ** plugins;
 
   int separate;
+  int is_stdout;
   
   bg_plugin_registry_t * plugin_reg;
 
@@ -165,7 +140,7 @@
   char * filename_base;
 
   const gavl_metadata_t * metadata;
-  const bg_chapter_list_t * chapter_list;
+  const gavl_chapter_list_t * chapter_list;
   
   };
 
@@ -232,19 +207,15 @@
     init_plugin_from_section(e, &e->audio_plugin, BG_STREAM_AUDIO);
     init_stream_from_section(e, &e->audio_stream, BG_STREAM_AUDIO);
     }
-  if(e->stream_mask & BG_STREAM_SUBTITLE_TEXT)
+  if(e->stream_mask & BG_STREAM_TEXT)
     {
-    init_plugin_from_section(e, &e->subtitle_text_plugin,
-                             BG_STREAM_SUBTITLE_TEXT);
-    init_stream_from_section(e, &e->subtitle_text_stream,
-                             BG_STREAM_SUBTITLE_TEXT);
+    init_plugin_from_section(e, &e->text_plugin, BG_STREAM_TEXT);
+    init_stream_from_section(e, &e->text_stream, BG_STREAM_TEXT);
     }
-  if(e->stream_mask & BG_STREAM_SUBTITLE_OVERLAY)
+  if(e->stream_mask & BG_STREAM_OVERLAY)
     {
-    init_plugin_from_section(e, &e->subtitle_overlay_plugin,
-                             BG_STREAM_SUBTITLE_OVERLAY);
-    init_stream_from_section(e, &e->subtitle_overlay_stream,
-                             BG_STREAM_SUBTITLE_OVERLAY);
+    init_plugin_from_section(e, &e->overlay_plugin, BG_STREAM_OVERLAY);
+    init_stream_from_section(e, &e->overlay_stream, BG_STREAM_OVERLAY);
     }
   if(e->stream_mask & BG_STREAM_VIDEO)
     {
@@ -275,19 +246,19 @@
     }
   
   /* Subtitle text plugin */
-  plugin_name = bg_transcoder_track_get_subtitle_text_encoder(e->tt);
+  plugin_name = bg_transcoder_track_get_text_encoder(e->tt);
   if(plugin_name)
     {
-    e->subtitle_text_plugin.info = bg_plugin_find_by_name(e->plugin_reg, plugin_name);
-    e->subtitle_text_plugin.section    = e->tt->subtitle_text_encoder_section;
+    e->text_plugin.info = bg_plugin_find_by_name(e->plugin_reg, plugin_name);
+    e->text_plugin.section    = e->tt->text_encoder_section;
     }
   
   /* Subtitle overlay plugin */
-  plugin_name = bg_transcoder_track_get_subtitle_overlay_encoder(e->tt);
+  plugin_name = bg_transcoder_track_get_overlay_encoder(e->tt);
   if(plugin_name)
     {
-    e->subtitle_overlay_plugin.info = bg_plugin_find_by_name(e->plugin_reg, plugin_name);
-    e->subtitle_overlay_plugin.section    = e->tt->subtitle_overlay_encoder_section;
+    e->overlay_plugin.info = bg_plugin_find_by_name(e->plugin_reg, plugin_name);
+    e->overlay_plugin.section    = e->tt->overlay_encoder_section;
     }  
   
   }
@@ -339,6 +310,30 @@
     encoder->close(enc->plugins[i]->priv, do_delete);
     bg_plugin_unref(enc->plugins[i]);
     }
+
+  for(i = 0; i < enc->num_audio_streams; i++)
+    {
+    if(enc->audio_streams[i].com.section_priv)
+      bg_cfg_section_destroy(enc->audio_streams[i].com.section_priv);
+    }
+
+  for(i = 0; i < enc->num_video_streams; i++)
+    {
+    if(enc->video_streams[i].com.section_priv)
+      bg_cfg_section_destroy(enc->video_streams[i].com.section_priv);
+    }
+
+  for(i = 0; i < enc->num_text_streams; i++)
+    {
+    if(enc->text_streams[i].com.section_priv)
+      bg_cfg_section_destroy(enc->text_streams[i].com.section_priv);
+    }
+  for(i = 0; i < enc->num_overlay_streams; i++)
+    {
+    if(enc->overlay_streams[i].com.section_priv)
+      bg_cfg_section_destroy(enc->overlay_streams[i].com.section_priv);
+    }
+  
   if(enc->plugins)
     free(enc->plugins);
   
@@ -349,10 +344,10 @@
     free(enc->audio_streams);
   if(enc->video_streams)
     free(enc->video_streams);
-  if(enc->subtitle_text_streams)
-    free(enc->subtitle_text_streams);
-  if(enc->subtitle_overlay_streams)
-    free(enc->subtitle_overlay_streams);
+  if(enc->text_streams)
+    free(enc->text_streams);
+  if(enc->overlay_streams)
+    free(enc->overlay_streams);
   
   
   free(enc);
@@ -360,9 +355,19 @@
 
 int bg_encoder_open(bg_encoder_t * enc, const char * filename_base,
                     const gavl_metadata_t * metadata,
-                    const bg_chapter_list_t * chapter_list)
+                    const gavl_chapter_list_t * chapter_list)
   {
-  enc->filename_base = bg_strdup(enc->filename_base, filename_base);
+  enc->filename_base = gavl_strrep(enc->filename_base, filename_base);
+
+  if(enc->filename_base && !strcmp(enc->filename_base, "-"))
+    {
+    if(isatty(fileno(stdout)))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Won't write media file to a TTY");
+      return 0;
+      }
+    enc->is_stdout = 1;
+    }
   enc->metadata = metadata;
   enc->chapter_list = chapter_list;
   return 1;
@@ -376,6 +381,41 @@
   bg_plugin_handle_t * ret;
   bg_encoder_plugin_t * plugin;
   
+  if(enc->is_stdout)
+    {
+    if(enc->num_plugins)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Writing to stdout is only supported for single file output");
+      return NULL;
+      }
+    else if(!(info->flags & BG_PLUGIN_PIPE))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Plugin %s cannot write to stdout", info->name);
+      return NULL;
+      }
+    }
+
+  /* For file output we need to be careful about the filename */
+  
+  if(info->flags & BG_PLUGIN_FILE)
+    {
+    if(!filename_base)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "No filename base specified");
+      return NULL;
+      }
+    else if(bg_string_is_url(filename_base))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Invalid filename base: %s", filename_base);
+      return NULL;
+      }
+    }
+
+  
   enc->plugins = realloc(enc->plugins,
                          (enc->num_plugins+1)* sizeof(enc->plugins));
 
@@ -388,7 +428,7 @@
   if(plugin->set_callbacks)
     plugin->set_callbacks(ret->priv, &enc->cb_int);
 
-  if(plugin->common.set_parameter)
+  if(plugin->common.set_parameter && section)
     bg_cfg_section_apply(section,
                          info->parameters,
                          plugin->common.set_parameter,
@@ -417,22 +457,22 @@
     }
   
   /* Check for separate subtitle text streams */
-  if(enc->num_subtitle_text_streams)
+  if(enc->num_text_streams)
     {
-    if((enc->subtitle_text_plugin.info) ||
-       ((enc->video_plugin.info->max_subtitle_text_streams > 0) &&
-        (enc->num_subtitle_text_streams > enc->video_plugin.info->max_subtitle_text_streams)))
-      enc->separate |= BG_STREAM_SUBTITLE_TEXT;
+    if((enc->text_plugin.info) ||
+       ((enc->video_plugin.info->max_text_streams > 0) &&
+        (enc->num_text_streams > enc->video_plugin.info->max_text_streams)))
+      enc->separate |= BG_STREAM_TEXT;
     }
 
   /* Check for separate subtitle overlay streams */
-  if(enc->num_subtitle_overlay_streams)
+  if(enc->num_overlay_streams)
     {
-    if((enc->subtitle_overlay_plugin.info) ||
-       ((enc->video_plugin.info->max_subtitle_overlay_streams > 0) &&
-        (enc->num_subtitle_overlay_streams >
-         enc->video_plugin.info->max_subtitle_overlay_streams)))
-      enc->separate |= BG_STREAM_SUBTITLE_OVERLAY;
+    if((enc->overlay_plugin.info) ||
+       ((enc->video_plugin.info->max_overlay_streams > 0) &&
+        (enc->num_overlay_streams >
+         enc->video_plugin.info->max_overlay_streams)))
+      enc->separate |= BG_STREAM_OVERLAY;
     }
   
   /* Check for separate video streams */
@@ -447,15 +487,15 @@
   /* If video is separate, all other streams get separate as well */
   if(enc->separate & BG_STREAM_VIDEO)
     {
-    enc->separate |= BG_STREAM_SUBTITLE_OVERLAY |
-      BG_STREAM_SUBTITLE_TEXT |
+    enc->separate |= BG_STREAM_OVERLAY |
+      BG_STREAM_TEXT |
       BG_STREAM_AUDIO;
     }
   else
     {
     /* Under some conditions, we want the video to be marked as separate as well */
-    if(((enc->separate & BG_STREAM_SUBTITLE_OVERLAY) || !enc->num_subtitle_overlay_streams) &&
-       ((enc->separate & BG_STREAM_SUBTITLE_TEXT) || !enc->num_subtitle_text_streams) &&
+    if(((enc->separate & BG_STREAM_OVERLAY) || !enc->num_overlay_streams) &&
+       ((enc->separate & BG_STREAM_TEXT) || !enc->num_text_streams) &&
        ((enc->separate & BG_STREAM_AUDIO) || !enc->num_audio_streams))
       enc->separate |= BG_STREAM_VIDEO;
     }
@@ -504,21 +544,25 @@
         info = enc->video_plugin.info;
         section = enc->video_plugin.section;
         break;
-      case BG_STREAM_SUBTITLE_TEXT:
+      case BG_STREAM_TEXT:
         type_string = "subtext";
-        info = enc->subtitle_text_plugin.info;
-        section = enc->subtitle_text_plugin.section;
+        info = enc->text_plugin.info;
+        section = enc->text_plugin.section;
         break;
-      case BG_STREAM_SUBTITLE_OVERLAY:
+      case BG_STREAM_OVERLAY:
         type_string = "subovl";
-        info = enc->subtitle_overlay_plugin.info;
-        section = enc->subtitle_overlay_plugin.section;
+        info = enc->overlay_plugin.info;
+        section = enc->overlay_plugin.section;
         break;
       }
 
     if(enc->total_streams > 1)
       {
-      filename_base = bg_sprintf("%s_%s_%02d", enc->filename_base, type_string, in_index+1);
+      if(strcmp(enc->filename_base, "-"))
+        filename_base = bg_sprintf("%s_%s_%02d", enc->filename_base, type_string, in_index+1);
+      else
+        filename_base = gavl_strdup(enc->filename_base);
+
       ret = load_encoder(enc, info, section, filename_base);
       free(filename_base);
       }
@@ -547,42 +591,42 @@
 
   /* Get handle */
 
-  h = get_stream_handle(enc, BG_STREAM_AUDIO, stream, s->in_index);
+  h = get_stream_handle(enc, BG_STREAM_AUDIO, stream, s->com.in_index);
 
   if(!h)
     return 0;
   
-  s->plugin = (bg_encoder_plugin_t*)h->plugin;
-  s->priv = h->priv;
-  s->h = h;
+  s->com.plugin = (bg_encoder_plugin_t*)h->plugin;
+  s->com.priv = h->priv;
+  s->com.h = h;
   
   /* Add stream */
 
-  if(s->ci)
+  if(s->com.ci)
     {
-    s->out_index =
-      s->plugin->add_audio_stream_compressed(s->priv, s->m,
-                                             &s->format, s->ci);
-    if(s->out_index < 0)
+    s->com.out_index =
+      s->com.plugin->add_audio_stream_compressed(s->com.priv, s->com.m,
+                                                 &s->format, s->com.ci);
+    if(s->com.out_index < 0)
       return 0;
     }
   else
     {
-    s->out_index =
-      s->plugin->add_audio_stream(s->priv, s->m, &s->format);
-    if(s->out_index < 0)
+    s->com.out_index =
+      s->com.plugin->add_audio_stream(s->com.priv, s->com.m, &s->format);
+    if(s->com.out_index < 0)
       return 0;
   
     /* Apply parameters */ 
 
-    if(s->plugin->set_audio_parameter)
+    if(s->com.plugin->set_audio_parameter)
       {
-      st.func =  s->plugin->set_audio_parameter;
-      st.data =  s->priv;
-      st.index = s->out_index;
+      st.func =  s->com.plugin->set_audio_parameter;
+      st.data =  s->com.priv;
+      st.index = s->com.out_index;
     
-      bg_cfg_section_apply(s->section,
-                           s->parameters,
+      bg_cfg_section_apply(s->com.section,
+                           s->com.parameters,
                            set_stream_param,
                            &st);
       }
@@ -600,41 +644,41 @@
   s = &enc->video_streams[stream];
 
   /* Get handle */
-  h = get_stream_handle(enc, BG_STREAM_VIDEO, stream, s->in_index);
+  h = get_stream_handle(enc, BG_STREAM_VIDEO, stream, s->com.in_index);
 
   if(!h)
     return 0;
   
-  s->plugin = (bg_encoder_plugin_t*)h->plugin;
-  s->priv = h->priv;
-  s->h = h;
+  s->com.plugin = (bg_encoder_plugin_t*)h->plugin;
+  s->com.priv = h->priv;
+  s->com.h = h;
   
   /* Add stream */
   
-  if(s->ci)
+  if(s->com.ci)
     {
-    s->out_index =
-      s->plugin->add_video_stream_compressed(s->priv, s->m,
-                                             &s->format, s->ci);
-    if(s->out_index < 0)
+    s->com.out_index =
+      s->com.plugin->add_video_stream_compressed(s->com.priv, s->com.m,
+                                                 &s->format, s->com.ci);
+    if(s->com.out_index < 0)
       return 0;
     }
   else
     {
-    s->out_index = s->plugin->add_video_stream(s->priv, s->m,
-                                               &s->format);
-    if(s->out_index < 0)
+    s->com.out_index = s->com.plugin->add_video_stream(s->com.priv, s->com.m,
+                                                       &s->format);
+    if(s->com.out_index < 0)
       return 0;
   
     /* Apply parameters */ 
-    if(s->plugin->set_video_parameter)
+    if(s->com.plugin->set_video_parameter)
       {
-      st.func =  s->plugin->set_video_parameter;
-      st.data =  s->priv;
-      st.index = s->out_index;
+      st.func =  s->com.plugin->set_video_parameter;
+      st.data =  s->com.priv;
+      st.index = s->com.out_index;
       
-      bg_cfg_section_apply(s->section,
-                           s->parameters,
+      bg_cfg_section_apply(s->com.section,
+                           s->com.parameters,
                            set_stream_param,
                            &st);
       }
@@ -643,8 +687,8 @@
     
     if(s->total_passes)
       {
-      if(!s->plugin->set_video_pass ||
-         !s->plugin->set_video_pass(s->priv, s->out_index, s->pass, s->total_passes,
+      if(!s->com.plugin->set_video_pass ||
+         !s->com.plugin->set_video_pass(s->com.priv, s->com.out_index, s->pass, s->total_passes,
                                     s->stats_file))
         {
         bg_log(BG_LOG_ERROR, LOG_DOMAIN,
@@ -657,38 +701,38 @@
   return 1;
   }
 
-static int start_subtitle_text(bg_encoder_t * enc, int stream)
+static int start_text(bg_encoder_t * enc, int stream)
   {
-  subtitle_text_stream_t * s;
+  text_stream_t * s;
   bg_plugin_handle_t * h;
   set_stream_param_struct_t st;
 
-  s = &enc->subtitle_text_streams[stream];
+  s = &enc->text_streams[stream];
 
   /* Get handle */
-  h = get_stream_handle(enc, BG_STREAM_SUBTITLE_TEXT, stream, s->in_index);
+  h = get_stream_handle(enc, BG_STREAM_TEXT, stream, s->com.in_index);
 
   if(!h)
     return 0;
   
-  s->plugin = (bg_encoder_plugin_t*)h->plugin;
-  s->priv = h->priv;
-  s->h = h;
+  s->com.plugin = (bg_encoder_plugin_t*)h->plugin;
+  s->com.priv = h->priv;
+  s->com.h = h;
   /* Add stream */
   
-  s->out_index = s->plugin->add_subtitle_text_stream(s->priv, s->m, &s->timescale);
-  if(s->out_index < 0)
+  s->com.out_index = s->com.plugin->add_text_stream(s->com.priv, s->com.m, &s->timescale);
+  if(s->com.out_index < 0)
     return 0;
 
   /* Apply parameters */ 
-  if(s->plugin->set_subtitle_text_parameter)
+  if(s->com.plugin->set_text_parameter)
     {
-    st.func =  s->plugin->set_subtitle_text_parameter;
-    st.data =  s->priv;
-    st.index = s->out_index;
+    st.func =  s->com.plugin->set_text_parameter;
+    st.data =  s->com.priv;
+    st.index = s->com.out_index;
     
-    bg_cfg_section_apply(s->section,
-                         s->parameters,
+    bg_cfg_section_apply(s->com.section,
+                         s->com.parameters,
                          set_stream_param,
                          &st);
     }
@@ -696,48 +740,58 @@
   return 1;
   }
 
-static int start_subtitle_overlay(bg_encoder_t * enc, int stream)
+static int start_overlay(bg_encoder_t * enc, int stream)
   {
-  subtitle_overlay_stream_t * s;
+  overlay_stream_t * s;
   bg_plugin_handle_t * h;
   set_stream_param_struct_t st;
 
-  s = &enc->subtitle_overlay_streams[stream];
+  s = &enc->overlay_streams[stream];
 
   /* Get handle */
-  h = get_stream_handle(enc, BG_STREAM_SUBTITLE_OVERLAY, stream, s->in_index);
+  h = get_stream_handle(enc, BG_STREAM_OVERLAY, stream, s->com.in_index);
 
   if(!h)
     return 0;
   
-  s->plugin = (bg_encoder_plugin_t*)h->plugin;
-  s->priv = h->priv;
-  s->h = h;
+  s->com.plugin = (bg_encoder_plugin_t*)h->plugin;
+  s->com.priv = h->priv;
+  s->com.h = h;
   
   /* Add stream */
-  s->out_index =
-    s->plugin->add_subtitle_overlay_stream(s->priv,
-                                           s->m, &s->format);
-  if(s->out_index < 0)
+
+  if(s->com.ci)
+    {
+    s->com.out_index =
+      s->com.plugin->add_overlay_stream_compressed(s->com.priv, s->com.m,
+                                                   &s->format, s->com.ci);
+    if(s->com.out_index < 0)
+      return 0;
+    return 1;
+    }
+  
+  s->com.out_index =
+    s->com.plugin->add_overlay_stream(s->com.priv,
+                                      s->com.m, &s->format);
+  if(s->com.out_index < 0)
     return 0;
   
   /* Apply parameters */ 
-  if(s->plugin->set_subtitle_overlay_parameter)
+  if(s->com.plugin->set_overlay_parameter)
     {
-    st.func =  s->plugin->set_subtitle_overlay_parameter;
-    st.data =  s->priv;
-    st.index = s->out_index;
+    st.func =  s->com.plugin->set_overlay_parameter;
+    st.data =  s->com.priv;
+    st.index = s->com.out_index;
     
-    bg_cfg_section_apply(s->section,
-                         s->parameters,
+    bg_cfg_section_apply(s->com.section,
+                         s->com.parameters,
                          set_stream_param,
                          &st);
     }
   
   return 1;
   }
-     
-     
+
 /* Start encoding */
 int bg_encoder_start(bg_encoder_t * enc)
   {
@@ -747,9 +801,9 @@
   
   enc->total_streams = enc->num_audio_streams + 
     enc->num_video_streams +
-    enc->num_subtitle_text_streams +
-    enc->num_subtitle_overlay_streams;
-  
+    enc->num_text_streams +
+    enc->num_overlay_streams;
+
   /* We make sure, that for the case of combined streams the
      video is always the first one */
 
@@ -765,15 +819,15 @@
       return 0;
     }
 
-  for(i = 0; i < enc->num_subtitle_text_streams; i++)
+  for(i = 0; i < enc->num_text_streams; i++)
     {
-    if(!start_subtitle_text(enc, i))
+    if(!start_text(enc, i))
       return 0;
     }
   
-  for(i = 0; i < enc->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < enc->num_overlay_streams; i++)
     {
-    if(!start_subtitle_overlay(enc, i))
+    if(!start_overlay(enc, i))
       return 0;
     }
 
@@ -785,11 +839,135 @@
     if(plugin->start && !plugin->start(enc->plugins[i]->priv))
       return 0;
     }
+
+  /* Get sinks */
+
+  for(i = 0; i < enc->num_audio_streams; i++)
+    {
+    audio_stream_t * as = &enc->audio_streams[i];
+    if(!as->com.ci)
+      {
+      as->sink = as->com.plugin->get_audio_sink(as->com.priv, as->com.out_index);
+      gavl_audio_sink_set_lock_funcs(as->sink, bg_plugin_lock, bg_plugin_unlock, as->com.h);
+      }
+    else
+      {
+      as->com.psink = as->com.plugin->get_audio_packet_sink(as->com.priv, as->com.out_index);
+      gavl_packet_sink_set_lock_funcs(as->com.psink, bg_plugin_lock, bg_plugin_unlock, as->com.h);
+      }
+    }
+
+  
+  for(i = 0; i < enc->num_video_streams; i++)
+    {
+    video_stream_t * vs = &enc->video_streams[i];
+    if(!vs->com.ci)
+      {
+      vs->sink =
+        vs->com.plugin->get_video_sink(vs->com.priv, vs->com.out_index);
+      gavl_video_sink_set_lock_funcs(vs->sink, bg_plugin_lock, bg_plugin_unlock, vs->com.h);
+      }
+    else
+      {
+      vs->com.psink = vs->com.plugin->get_video_packet_sink(vs->com.priv,
+                                                            vs->com.out_index);
+      gavl_packet_sink_set_lock_funcs(vs->com.psink,
+                                      bg_plugin_lock,
+                                      bg_plugin_unlock,
+                                      vs->com.h);
+      }
+    }
+
+  for(i = 0; i < enc->num_text_streams; i++)
+    {
+    text_stream_t * ts = &enc->text_streams[i];
+    ts->com.psink = ts->com.plugin->get_text_sink(ts->com.priv,
+                                                  ts->com.out_index);
+    gavl_packet_sink_set_lock_funcs(ts->com.psink,
+                                    bg_plugin_lock,
+                                    bg_plugin_unlock,
+                                    ts->com.h);
+    }
+
+  for(i = 0; i < enc->num_overlay_streams; i++)
+    {
+    overlay_stream_t * os = &enc->overlay_streams[i];
+
+    if(!os->com.ci)
+      {
+      os->sink = os->com.plugin->get_overlay_sink(os->com.priv,
+                                                  os->com.out_index);
+      gavl_video_sink_set_lock_funcs(os->sink,
+                                     bg_plugin_lock,
+                                     bg_plugin_unlock,
+                                     os->com.h);
+      }
+    else
+      {
+      os->com.psink =
+        os->com.plugin->get_overlay_packet_sink(os->com.priv,
+                                                os->com.out_index);
+      gavl_packet_sink_set_lock_funcs(os->com.psink,
+                                     bg_plugin_lock,
+                                     bg_plugin_unlock,
+                                     os->com.h);
+      }
+    }
+  
   
   return 1;
   }
 
+int bg_encoder_write_audio_frame(bg_encoder_t * enc, gavl_audio_frame_t * f,
+                                 int stream)
+  {
+  audio_stream_t * as = &enc->audio_streams[stream];
+  return (gavl_audio_sink_put_frame(as->sink, f) == GAVL_SINK_OK);
+  }
+
+int bg_encoder_write_video_frame(bg_encoder_t * enc, gavl_video_frame_t * f,
+                                 int stream)
+  {
+  video_stream_t * vs = &enc->video_streams[stream];
+  return (gavl_video_sink_put_frame(vs->sink, f) == GAVL_SINK_OK);
+  }
+
+int bg_encoder_write_audio_packet(bg_encoder_t * enc,
+                                  gavl_packet_t * p, int stream)
+  {
+  audio_stream_t * s = &enc->audio_streams[stream];
+  return (gavl_packet_sink_put_packet(s->com.psink, p) == GAVL_SINK_OK);
+  }
+
+int bg_encoder_write_video_packet(bg_encoder_t * enc,
+                                  gavl_packet_t * p, int stream)
+  {
+  video_stream_t * s = &enc->video_streams[stream];
+  return (gavl_packet_sink_put_packet(s->com.psink, p) == GAVL_SINK_OK);
+  }
+
+int bg_encoder_write_text(bg_encoder_t * enc,
+                                   const char * text,
+                                   int64_t start,
+                                   int64_t duration, int stream)
+  {
+  gavl_packet_t p;
+  text_stream_t * s = &enc->text_streams[stream];
+
+  gavl_packet_init(&p);
+  p.data = (uint8_t*)text;
+  p.data_len = strlen(text);
+  p.pts = start;
+  p.duration = duration;
+  return (gavl_packet_sink_put_packet(s->com.psink, &p) == GAVL_SINK_OK);
+  }
 
+int bg_encoder_write_overlay(bg_encoder_t * enc,
+                                      gavl_overlay_t * ovl, int stream)
+  {
+  overlay_stream_t * os = &enc->overlay_streams[stream];
+  return (gavl_video_sink_put_frame(os->sink, ovl) == GAVL_SINK_OK);
+  }
 
 /* Add streams */
 
@@ -798,12 +976,65 @@
   s = &streams[num]; \
   memset(s, 0, sizeof(*s));
 
+/* Obtain sections */
+
+const bg_cfg_section_t * bg_encoder_get_stream_section(bg_encoder_t * enc,
+                                                       bg_stream_type_t type)
+  {
+  switch(type)
+    {
+    case BG_STREAM_AUDIO:
+      return enc->audio_stream.section;
+      break;
+    case BG_STREAM_VIDEO:
+      return enc->video_stream.section;
+      break;
+    case BG_STREAM_TEXT:
+      return enc->text_stream.section;
+      break;
+    case BG_STREAM_OVERLAY:
+      return enc->overlay_stream.section;
+      break;
+    }
+  return NULL;
+  }
+
+const bg_parameter_info_t * bg_encoder_get_stream_parameters(bg_encoder_t * enc,
+                                                             bg_stream_type_t type)
+  {
+  switch(type)
+    {
+    case BG_STREAM_AUDIO:
+      if(enc->audio_plugin.info)
+        return enc->audio_plugin.info->audio_parameters;
+      else if(enc->video_plugin.info)
+        return enc->video_plugin.info->audio_parameters;
+      break;
+    case BG_STREAM_VIDEO:
+      return enc->video_plugin.info->video_parameters;
+      break;
+    case BG_STREAM_TEXT:
+      if(enc->text_plugin.info)
+        return enc->text_plugin.info->text_parameters;
+      else if(enc->video_plugin.info)
+        return enc->video_plugin.info->text_parameters;
+      break;
+    case BG_STREAM_OVERLAY:
+      if(enc->overlay_plugin.info)
+        return enc->overlay_plugin.info->overlay_parameters;
+      else if(enc->video_plugin.info)
+        return enc->video_plugin.info->overlay_parameters;
+      break;
+    }
+  return NULL;
+  }
+  
 
 /* Add streams */
 int bg_encoder_add_audio_stream(bg_encoder_t * enc,
                                 const gavl_metadata_t * m,
                                 const gavl_audio_format_t * format,
-                                int source_index)
+                                int source_index, const bg_cfg_section_t * sec)
   {
   int ret;
   audio_stream_t * s;
@@ -812,19 +1043,21 @@
                  enc->num_audio_streams);
 
   gavl_audio_format_copy(&s->format, format);
-  s->in_index = source_index;
+  s->com.in_index = source_index;
 
-  if(enc->tt)
-    s->section = enc->tt->audio_streams[source_index].encoder_section;
+  if(sec)
+    {
+    s->com.section_priv = bg_cfg_section_copy(sec);
+    s->com.section = s->com.section_priv;
+    }
+  else if(enc->tt)
+    s->com.section = enc->tt->audio_streams[source_index].encoder_section;
   else
-    s->section = enc->audio_stream.section;
-
-  if(enc->audio_plugin.info)
-    s->parameters = enc->audio_plugin.info->audio_parameters;
-  else if(enc->video_plugin.info)
-    s->parameters = enc->video_plugin.info->audio_parameters;
+    s->com.section = enc->audio_stream.section;
 
-  s->m = m;
+  s->com.parameters = bg_encoder_get_stream_parameters(enc, BG_STREAM_AUDIO);
+  
+  s->com.m = m;
   
   ret = enc->num_audio_streams;
   enc->num_audio_streams++;
@@ -834,7 +1067,7 @@
 int bg_encoder_add_video_stream(bg_encoder_t * enc,
                                 const gavl_metadata_t * m,
                                 const gavl_video_format_t * format,
-                                int source_index)
+                                int source_index, const bg_cfg_section_t * sec)
   {
   int ret;
   video_stream_t * s;
@@ -843,16 +1076,20 @@
                  enc->num_video_streams);
 
   gavl_video_format_copy(&s->format, format);
-  s->in_index = source_index;
+  s->com.in_index = source_index;
 
-  if(enc->tt)
-    s->section = enc->tt->video_streams[source_index].encoder_section;
+  if(sec)
+    {
+    s->com.section_priv = bg_cfg_section_copy(sec);
+    s->com.section = s->com.section_priv;
+    }
+  else if(enc->tt)
+    s->com.section = enc->tt->video_streams[source_index].encoder_section;
   else
-    s->section = enc->video_stream.section;
-
-  s->parameters = enc->video_plugin.info->video_parameters;
+    s->com.section = enc->video_stream.section;
 
-  s->m = m;
+  s->com.parameters = bg_encoder_get_stream_parameters(enc, BG_STREAM_VIDEO);
+  s->com.m = m;
   
   ret = enc->num_video_streams;
   enc->num_video_streams++;
@@ -872,10 +1109,10 @@
                  enc->num_audio_streams);
 
   gavl_audio_format_copy(&s->format, format);
-  s->in_index = source_index;
+  s->com.in_index = source_index;
   
-  s->ci = info;
-  s->m = m;
+  s->com.ci = info;
+  s->com.m = m;
   
   ret = enc->num_audio_streams;
   enc->num_audio_streams++;
@@ -896,81 +1133,109 @@
                  enc->num_video_streams);
 
   gavl_video_format_copy(&s->format, format);
-  s->in_index = source_index;
+  s->com.in_index = source_index;
   
-  s->ci = info;
-  s->m = m;
+  s->com.ci = info;
+  s->com.m = m;
   ret = enc->num_video_streams;
   enc->num_video_streams++;
   return ret;
   }
 
+int bg_encoder_add_overlay_stream_compressed(bg_encoder_t * enc,
+                                             const gavl_metadata_t * m,
+                                             const gavl_video_format_t * format,
+                                             const gavl_compression_info_t * info,
+                                             int source_index)
+  {
+  int ret;
+  overlay_stream_t * s;
 
-int bg_encoder_add_subtitle_text_stream(bg_encoder_t * enc,
-                                        const gavl_metadata_t * m,
-                                        int timescale,
-                                        int source_index)
+  REALLOC_STREAM(enc->overlay_streams,
+                 enc->num_overlay_streams);
+
+  gavl_video_format_copy(&s->format, format);
+  s->com.in_index = source_index;
+  
+  s->com.ci = info;
+  s->com.m = m;
+  ret = enc->num_overlay_streams;
+  enc->num_overlay_streams++;
+  return ret;
+  }
+
+
+int bg_encoder_add_text_stream(bg_encoder_t * enc,
+                               const gavl_metadata_t * m,
+                               int timescale,
+                               int source_index, const bg_cfg_section_t * sec)
   {
   int ret;
-  subtitle_text_stream_t * s;
+  text_stream_t * s;
 
-  REALLOC_STREAM(enc->subtitle_text_streams,
-                 enc->num_subtitle_text_streams);
+  REALLOC_STREAM(enc->text_streams,
+                 enc->num_text_streams);
 
   s->timescale = timescale;
-  s->in_index = source_index;
+  s->com.in_index = source_index;
 
-  s->m = m;
-  
-  if(enc->tt)
-    s->section = enc->tt->subtitle_text_streams[source_index].encoder_section_text;
+  s->com.m = m;
+
+  if(sec)
+    {
+    s->com.section_priv = bg_cfg_section_copy(sec);
+    s->com.section = s->com.section_priv;
+    }
+  else if(enc->tt)
+    s->com.section = enc->tt->text_streams[source_index].encoder_section_text;
   else
-    s->section = enc->subtitle_text_stream.section;
+    s->com.section = enc->text_stream.section;
 
-  if(enc->subtitle_text_plugin.info)
-    s->parameters = enc->subtitle_text_plugin.info->subtitle_text_parameters;
-  else if(enc->video_plugin.info)
-    s->parameters = enc->video_plugin.info->subtitle_text_parameters;
+  s->com.parameters = bg_encoder_get_stream_parameters(enc, BG_STREAM_TEXT);
 
   
-  ret = enc->num_subtitle_text_streams;
-  enc->num_subtitle_text_streams++;
+  ret = enc->num_text_streams;
+  enc->num_text_streams++;
   return ret;
 
   }
 
-int bg_encoder_add_subtitle_overlay_stream(bg_encoder_t * enc,
-                                           const gavl_metadata_t * m,
-                                           const gavl_video_format_t * format,
-                                           int source_index, bg_stream_type_t source_format)
+int bg_encoder_add_overlay_stream(bg_encoder_t * enc,
+                                  const gavl_metadata_t * m,
+                                  const gavl_video_format_t * format,
+                                  int source_index,
+                                  bg_stream_type_t source_format,
+                                  const bg_cfg_section_t * sec)
   {
   int ret;
-  subtitle_overlay_stream_t * s;
+  overlay_stream_t * s;
 
-  REALLOC_STREAM(enc->subtitle_overlay_streams,
-                 enc->num_subtitle_overlay_streams);
+  REALLOC_STREAM(enc->overlay_streams,
+                 enc->num_overlay_streams);
 
   gavl_video_format_copy(&s->format, format);
-  s->in_index = source_index;
-  s->m = m;
-  if(enc->tt)
+  s->com.in_index = source_index;
+  s->com.m = m;
+
+  if(sec)
     {
-    if(source_format == BG_STREAM_SUBTITLE_TEXT)
-      s->section = enc->tt->subtitle_text_streams[source_index].encoder_section_overlay;
+    s->com.section_priv = bg_cfg_section_copy(sec);
+    s->com.section = s->com.section_priv;
+    }
+  else if(enc->tt)
+    {
+    if(source_format == BG_STREAM_TEXT)
+      s->com.section = enc->tt->text_streams[source_index].encoder_section_overlay;
     else
-      s->section = enc->tt->subtitle_overlay_streams[source_index].encoder_section;
+      s->com.section = enc->tt->overlay_streams[source_index].encoder_section;
     }
   else
-    s->section = enc->subtitle_overlay_stream.section;
-
-  if(enc->subtitle_overlay_plugin.info)
-    s->parameters = enc->subtitle_overlay_plugin.info->subtitle_overlay_parameters;
-  else if(enc->video_plugin.info)
-    s->parameters = enc->video_plugin.info->subtitle_overlay_parameters;
+    s->com.section = enc->overlay_stream.section;
 
+  s->com.parameters = bg_encoder_get_stream_parameters(enc, BG_STREAM_OVERLAY);
   
-  ret = enc->num_subtitle_overlay_streams;
-  enc->num_subtitle_overlay_streams++;
+  ret = enc->num_overlay_streams;
+  enc->num_overlay_streams++;
   return ret;
   }
 
@@ -983,7 +1248,7 @@
 
   s->pass = pass;
   s->total_passes = total_passes;
-  s->stats_file = bg_strdup(s->stats_file, stats_file);
+  s->stats_file = gavl_strrep(s->stats_file, stats_file);
   
   }
 
@@ -994,7 +1259,7 @@
                                  gavl_audio_format_t*ret)
   {
   audio_stream_t * s = &enc->audio_streams[stream];
-  s->plugin->get_audio_format(s->priv, s->out_index, ret);
+  gavl_audio_format_copy(ret, gavl_audio_sink_get_format(s->sink));
   }
 
 void bg_encoder_get_video_format(bg_encoder_t * enc,
@@ -1002,88 +1267,25 @@
                                  gavl_video_format_t*ret)
   {
   video_stream_t * s = &enc->video_streams[stream];
-  s->plugin->get_video_format(s->priv, s->out_index, ret);
+  gavl_video_format_copy(ret, gavl_video_sink_get_format(s->sink));
   }
 
-void bg_encoder_get_subtitle_overlay_format(bg_encoder_t * enc,
+void bg_encoder_get_overlay_format(bg_encoder_t * enc,
                                             int stream,
                                             gavl_video_format_t*ret)
   {
-  subtitle_overlay_stream_t * s = &enc->subtitle_overlay_streams[stream];
-  s->plugin->get_subtitle_overlay_format(s->priv, s->out_index, ret);
+  overlay_stream_t * s = &enc->overlay_streams[stream];
+  gavl_video_format_copy(ret, gavl_video_sink_get_format(s->sink));
   }
 
-void bg_encoder_get_subtitle_text_timescale(bg_encoder_t * enc,
+void bg_encoder_get_text_timescale(bg_encoder_t * enc,
                                             int stream,
-                                            int * ret)
+                                            uint32_t * ret)
   {
-  subtitle_text_stream_t * s = &enc->subtitle_text_streams[stream];
+  text_stream_t * s = &enc->text_streams[stream];
   *ret = s->timescale;
   }
 
-/* Write frame */
-int bg_encoder_write_audio_frame(bg_encoder_t * enc,
-                                 gavl_audio_frame_t * frame,
-                                 int stream)
-  {
-  int ret;
-  audio_stream_t * s = &enc->audio_streams[stream];
-
-  bg_plugin_lock(s->h);
-  ret = s->plugin->write_audio_frame(s->priv, frame, s->out_index);
-  bg_plugin_unlock(s->h);
-  return ret;
-  }
-  
-
-int bg_encoder_write_video_frame(bg_encoder_t * enc,
-                                 gavl_video_frame_t * frame,
-                                 int stream)
-  {
-  int ret;
-  video_stream_t * s = &enc->video_streams[stream];
-#if 0  
-  fprintf(stderr, "Write video frame %"PRId64"\n", frame->timestamp);
-
-  if(frame->timestamp < s->last_timestamp)
-    {
-    fprintf(stderr, "Error: %"PRId64" < %"PRId64"\n",
-            frame->timestamp, s->last_timestamp);
-    }
-  s->last_timestamp = frame->timestamp;
-#endif
-  bg_plugin_lock(s->h);
-  ret = s->plugin->write_video_frame(s->priv, frame, s->out_index);
-  bg_plugin_unlock(s->h);
-  return ret;
-  }
-
-int bg_encoder_write_subtitle_text(bg_encoder_t * enc,
-                                   const char * text,
-                                   int64_t start,
-                                   int64_t duration, int stream)
-  {
-  int ret;
-  subtitle_text_stream_t * s = &enc->subtitle_text_streams[stream];
-
-  bg_plugin_lock(s->h);
-  ret = s->plugin->write_subtitle_text(s->priv, text,
-                                       start, duration, s->out_index);
-  bg_plugin_unlock(s->h);
-  return ret;
-  }
-
-int bg_encoder_write_subtitle_overlay(bg_encoder_t * enc,
-                                      gavl_overlay_t * ovl, int stream)
-  {
-  int ret;
-  subtitle_overlay_stream_t * s = &enc->subtitle_overlay_streams[stream];
-
-  bg_plugin_lock(s->h);
-  ret = s->plugin->write_subtitle_overlay(s->priv, ovl, s->out_index);
-  bg_plugin_unlock(s->h);
-  return ret;
-  }
 
 static bg_plugin_handle_t *
 open_dummy_encoder(bg_encoder_t * enc,
@@ -1097,7 +1299,7 @@
   plugin = (bg_encoder_plugin_t *)ret->plugin;
 
   
-  if(plugin->common.set_parameter)
+  if(plugin_info->parameters && plugin->common.set_parameter)
     bg_cfg_section_apply(plugin_section,
                          plugin_info->parameters,
                          plugin->common.set_parameter,
@@ -1140,6 +1342,42 @@
   return ret;
   }
 
+int bg_encoder_writes_compressed_overlay(bg_encoder_t * enc,
+                                         const gavl_video_format_t * format,
+                                         const gavl_compression_info_t * info)
+  {
+  int ret;
+  bg_encoder_plugin_t * plugin;
+  const bg_plugin_info_t * plugin_info;
+  bg_plugin_handle_t * h;
+  bg_cfg_section_t * plugin_section;
+
+  if(enc->overlay_plugin.info)
+    {
+    plugin_info = enc->audio_plugin.info;
+    plugin_section = enc->audio_plugin.section;
+    }
+  else if(enc->video_plugin.info)
+    {
+    plugin_info = enc->video_plugin.info;
+    plugin_section = enc->video_plugin.section;
+    }
+  else
+    return 0;
+
+  h = open_dummy_encoder(enc, plugin_info, plugin_section);
+  plugin = (bg_encoder_plugin_t *)h->plugin;
+
+  if(plugin->writes_compressed_overlay)
+    ret = plugin->writes_compressed_overlay(h->priv,
+                                           format, info);
+  else
+    ret = 0;
+  bg_plugin_unref(h);
+  return ret;
+  }
+
+
 int bg_encoder_writes_compressed_video(bg_encoder_t * enc,
                                        const gavl_video_format_t * format,
                                        const gavl_compression_info_t * info)
@@ -1170,31 +1408,49 @@
   return ret;
   }
 
-    
-int bg_encoder_write_audio_packet(bg_encoder_t * enc,
-                                  gavl_packet_t * p, int stream)
+
+
+gavl_audio_sink_t *
+bg_encoder_get_audio_sink(bg_encoder_t * enc, int stream)
   {
-  int ret;
-  audio_stream_t * s = &enc->audio_streams[stream];
-  bg_plugin_lock(s->h);
-  ret = s->plugin->write_audio_packet(s->priv, p, s->out_index);
-  bg_plugin_unlock(s->h);
-  return ret;
+  return enc->audio_streams[stream].sink;
   }
 
-int bg_encoder_write_video_packet(bg_encoder_t * enc,
-                                  gavl_packet_t * p, int stream)
+gavl_video_sink_t *
+bg_encoder_get_video_sink(bg_encoder_t * enc, int stream)
   {
-  int ret;
-  video_stream_t * s = &enc->video_streams[stream];
-  bg_plugin_lock(s->h);
-  ret = s->plugin->write_video_packet(s->priv, p, s->out_index);
-  bg_plugin_unlock(s->h);
-  return ret;
+  return enc->video_streams[stream].sink;
+  }
+
+gavl_packet_sink_t *
+bg_encoder_get_audio_packet_sink(bg_encoder_t * enc, int stream)
+  {
+  return enc->audio_streams[stream].com.psink;
+  }
+
+gavl_packet_sink_t *
+bg_encoder_get_video_packet_sink(bg_encoder_t * enc, int stream)
+  {
+  return enc->video_streams[stream].com.psink;
+  }
+
+gavl_packet_sink_t * bg_encoder_get_text_sink(bg_encoder_t * enc, int stream)
+  {
+  return enc->text_streams[stream].com.psink;
+  }
+
+gavl_video_sink_t * bg_encoder_get_overlay_sink(bg_encoder_t * enc, int stream)
+  {
+  return enc->overlay_streams[stream].sink;
+  }
+
+gavl_packet_sink_t *
+bg_encoder_get_overlay_packet_sink(bg_encoder_t * enc, int stream)
+  {
+  return enc->overlay_streams[stream].com.psink;
   }
 
 void bg_encoder_update_metadata(bg_encoder_t * enc,
-                                const char * name,
                                 const gavl_metadata_t * m)
   {
   int i;
@@ -1205,7 +1461,7 @@
     if(encoder->update_metadata)
       {
       bg_plugin_lock(enc->plugins[i]);
-      encoder->update_metadata(enc->plugins[i]->priv, name, m);
+      encoder->update_metadata(enc->plugins[i]->priv, m);
       bg_plugin_unlock(enc->plugins[i]);
       }
     }

gmerlin-4256.tar.gz/lib/fileutils.c Added

@@ -0,0 +1,126 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <stdio.h>
+
+
+
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "fileutils"
+
+#include <unistd.h>
+#include <fcntl.h>
+
+int bg_lock_file(FILE * f, int wr)
+  {
+  struct flock fl;
+
+  fl.l_type   = wr ? F_WRLCK : F_RDLCK;  /* F_RDLCK, F_WRLCK, F_UNLCK    */
+  fl.l_whence = SEEK_SET; /* SEEK_SET, SEEK_CUR, SEEK_END */
+  fl.l_start  = 0;        /* Offset from l_whence         */
+  fl.l_len    = 0;        /* length, 0 = to EOF           */
+  fl.l_pid    = getpid(); /* our PID                      */
+
+  if(fcntl(fileno(f), F_SETLKW, &fl))
+    return 0;
+  
+  return 1;
+  }
+
+int bg_unlock_file(FILE * f)
+  {
+  struct flock fl;
+
+  fl.l_type   = F_UNLCK;  /* F_RDLCK, F_WRLCK, F_UNLCK    */
+  fl.l_whence = SEEK_SET; /* SEEK_SET, SEEK_CUR, SEEK_END */
+  fl.l_start  = 0;        /* Offset from l_whence         */
+  fl.l_len    = 0;        /* length, 0 = to EOF           */
+  fl.l_pid    = getpid(); /* our PID                      */
+
+  if(fcntl(fileno(f), F_SETLK, &fl))
+    return 0;
+  
+  return 1;
+  
+  }
+
+size_t bg_file_size(FILE * f)
+  {
+  size_t ret;
+  size_t oldpos;
+
+  oldpos = ftell(f);
+
+  fseek(f, 0, SEEK_END);
+  ret = ftell(f);
+  fseek(f, oldpos, SEEK_SET);
+  return ret;
+  }
+
+
+void * bg_read_file(const char * filename, int * len_ret)
+  {
+  uint8_t * ret;
+  FILE * file;
+  size_t len;
+  
+  file = fopen(filename, "r");
+  if(!file)
+    return NULL;
+
+  len = bg_file_size(file);
+  
+  ret = malloc(len + 1);
+
+  if(fread(ret, 1, len, file) < len)
+    {
+    fclose(file);
+    free(ret);
+    return NULL;
+    }
+  ret[len] = '\0';
+  fclose(file);
+
+  if(len_ret)
+    *len_ret = len;
+  
+  return ret;
+  }
+
+
+int bg_write_file(const char * filename, void * data, int len)
+  {
+  FILE * file;
+  
+  file = fopen(filename, "w");
+  if(!file)
+    return 0;
+  
+  if(fwrite(data, 1, len, file) < len)
+    {
+    fclose(file);
+    return 0;
+    }
+  fclose(file);
+  return 1;
+  }

gmerlin-1.2.0.tar.gz/lib/formats.c -> gmerlin-4256.tar.gz/lib/formats.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -30,7 +30,7 @@
 static char * get_dB(float val)
   {
   if(val == 0.0)
-    return bg_strdup(NULL, TR("Zero"));
+    return gavl_strdup(TR("Zero"));
   else
     return bg_sprintf("%02f dB", val);
   }
@@ -53,10 +53,10 @@
 
   for(i = 0; i < f->num_channels; i++)
     {
-    channel_order = bg_strcat(channel_order,
+    channel_order = gavl_strcat(channel_order,
                               TRD(gavl_channel_id_to_string(f->channel_locations[i]), NULL));
     if(i < f->num_channels - 1)
-      channel_order = bg_strcat(channel_order, ", ");
+      channel_order = gavl_strcat(channel_order, ", ");
     }
   
   if(!use_tabs)
@@ -95,7 +95,7 @@
   
   if(format->framerate_mode == GAVL_FRAMERATE_STILL)
     {
-    ret = bg_strcat(ret, TR("Still image\n"));
+    ret = gavl_strcat(ret, TR("Still image\n"));
     }
   else if(!format->frame_duration &&
           (format->framerate_mode == GAVL_FRAMERATE_VARIABLE))
@@ -106,7 +106,7 @@
       s = TR("Framerate:\tVariable (timescale: %d)\n");
 
     str = bg_sprintf(s, format->timescale);
-    ret = bg_strcat(ret, str);
+    ret = gavl_strcat(ret, str);
     free(str);
     }
   else
@@ -123,7 +123,7 @@
                  ((format->framerate_mode == GAVL_FRAMERATE_CONSTANT) ? TR(" (constant)") : 
                   TR(" (variable)")));
 
-    ret = bg_strcat(ret, str);
+    ret = gavl_strcat(ret, str);
     free(str);
     }
   if(!use_tabs)
@@ -134,7 +134,7 @@
   str =
     bg_sprintf(s, TRD(gavl_interlace_mode_to_string(format->interlace_mode),
                       NULL));
-  ret = bg_strcat(ret, str);
+  ret = gavl_strcat(ret, str);
   free(str);
 
   if(format->pixelformat == GAVL_YUV_420_P)
@@ -144,7 +144,7 @@
     else
       s = TR("\nChroma placement:\t%s");
     str = bg_sprintf(s, TRD(gavl_chroma_placement_to_string(format->chroma_placement), NULL));
-    ret = bg_strcat(ret, str);
+    ret = gavl_strcat(ret, str);
     free(str);
     }
 
@@ -155,7 +155,7 @@
     else
       s = TR("\nTimecode rate:\t%d");
     str = bg_sprintf(s, format->timecode_format.int_framerate);
-    ret = bg_strcat(ret, str);
+    ret = gavl_strcat(ret, str);
     free(str);
 
     if(format->timecode_format.flags)
@@ -164,11 +164,11 @@
         s = TR("\nTimecode flags: ");
       else
         s = TR("\nTimecode flags:\t");
-      ret = bg_strcat(ret, s);
+      ret = gavl_strcat(ret, s);
       
       if(format->timecode_format.flags &
          GAVL_TIMECODE_DROP_FRAME)
-        ret = bg_strcat(ret, TR("Drop "));
+        ret = gavl_strcat(ret, TR("Drop "));
       }
     }
   return ret;

gmerlin-4256.tar.gz/lib/frametimer.c Added

@@ -0,0 +1,132 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <gavl/gavl.h>
+#include <gmerlin/frametimer.h>
+
+#define TIME_SCALE 1000
+
+struct bg_frame_timer_s
+  {
+  int frame_duration;
+  
+  gavl_timer_t * timer;
+  int64_t next_pts;
+
+  /* Only used when bg_frame_timer_wait() is used */
+  gavl_time_t capture_start_time;
+  gavl_time_t last_capture_duration;
+  
+  gavl_time_t last_time;
+  
+  };
+
+bg_frame_timer_t * bg_frame_timer_create(float framerate,
+                                         uint32_t * timescale)
+  {
+  bg_frame_timer_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  
+  ret->timer = gavl_timer_create();
+  ret->next_pts = GAVL_TIME_UNDEFINED;
+  ret->frame_duration = (int)(TIME_SCALE / framerate);
+  *timescale = TIME_SCALE;
+  return ret;
+  }
+
+void bg_frame_timer_destroy(bg_frame_timer_t * t)
+  {
+  gavl_timer_destroy(t->timer);
+  free(t);
+  }
+
+void bg_frame_timer_update(bg_frame_timer_t * t,
+                           gavl_video_frame_t * frame)
+  {
+  int64_t diff;
+  gavl_time_t current_time;
+  int64_t real_duration;
+  
+  current_time = gavl_timer_get(t->timer);
+  t->last_capture_duration = current_time - t->capture_start_time;
+  
+  if(t->next_pts == GAVL_TIME_UNDEFINED)
+    {
+    frame->timestamp = 0;
+    frame->duration = t->frame_duration;
+    gavl_timer_start(t->timer);
+    t->next_pts = frame->duration;
+    t->last_time = 0;
+    return;
+    }
+  
+  frame->timestamp = t->next_pts;
+  
+  /*
+   * diff: True time minus guessed time
+   *
+   * Diff < 0 -> frame too early: Guessed duration was too large
+   * Diff > 0 -> frame too late: Guessed duration was too small
+   */
+  
+  diff = gavl_time_scale(TIME_SCALE, current_time) - t->next_pts;
+  
+  /* Real duration of the last frame */ 
+  real_duration =
+    gavl_time_scale(TIME_SCALE, current_time - t->last_time);
+
+  /* Duration of this frame is real duration of the last frame
+     plus the error */
+  
+  frame->duration = real_duration + diff;
+
+  //  fprintf(stderr, "Cur: %"PRId64", Last: %"PRId64", diff: %"PRId64"\n",
+  //          current_time, t->last_time, current_time - t->last_time);
+  
+  if(frame->duration <= 0)
+    frame->duration = TIME_SCALE / 100; // 10 ms/100 fps
+  
+  t->last_time = current_time;
+  t->next_pts += frame->duration;
+  }
+
+void bg_frame_timer_wait(bg_frame_timer_t * t)
+  {
+  gavl_time_t cur, diff;
+  
+  if(t->next_pts == GAVL_TIME_UNDEFINED)
+    return;
+
+  cur = gavl_timer_get(t->timer);
+  diff =
+    gavl_time_unscale(TIME_SCALE, t->frame_duration) - (cur - t->last_time) -
+    t->last_capture_duration;
+  
+  if(diff > 0)
+    gavl_time_delay(&diff);
+  
+  t->capture_start_time = gavl_timer_get(t->timer);
+  }

gmerlin-4256.tar.gz/lib/gavfenc.c Added

@@ -0,0 +1,915 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <stdio.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/pluginfuncs.h>
+#include <gmerlin/pluginregistry.h>
+
+#include <gavfenc.h>
+
+#include <gavl/gavf.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "gavfenc"
+
+typedef struct
+  {
+  int index;
+  gavl_packet_sink_t * psink;
+  bg_plugin_handle_t * plugin;
+  gavl_compression_info_t ci;
+  gavl_metadata_t m;
+  
+  const gavf_stream_header_t * h;
+  } stream_common_t;
+
+
+
+typedef struct
+  {
+  stream_common_t com;
+  gavl_audio_format_t format;
+  gavl_audio_sink_t * sink;
+  } audio_stream_t;
+
+typedef struct
+  {
+  stream_common_t com;
+  gavl_video_format_t format;
+  gavl_video_sink_t * sink;
+  } video_stream_t;
+
+typedef struct
+  {
+  stream_common_t com;
+  int timescale;
+  } text_stream_t;
+
+typedef struct
+  {
+  stream_common_t com;
+  gavl_video_format_t format;
+  gavl_video_sink_t * sink;
+  } overlay_stream_t;
+
+typedef struct
+  {
+  int num_audio_streams;
+  int num_video_streams;
+  int num_text_streams;
+  int num_overlay_streams;
+  
+  audio_stream_t * audio_streams;
+  video_stream_t * video_streams;
+  text_stream_t * text_streams;
+  overlay_stream_t * overlay_streams;
+  
+  int flags;
+  
+  gavf_t * enc;
+  gavf_io_t * io;
+
+  bg_encoder_callbacks_t * cb;
+  gavf_options_t * opt;
+
+  FILE * output;
+  char * filename;
+
+  bg_plugin_registry_t * plugin_reg;
+
+  bg_parameter_info_t * audio_parameters;
+  bg_parameter_info_t * video_parameters;
+  bg_parameter_info_t * overlay_parameters;
+  
+  gavf_program_header_t * ph;
+  } bg_gavf_t;
+
+void * bg_gavfenc_create(bg_plugin_registry_t * plugin_reg)
+  {
+  bg_gavf_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  ret->enc = gavf_create();
+
+  ret->ph = gavf_get_program_header(ret->enc);
+  
+  ret->opt = gavf_get_options(ret->enc);
+  ret->plugin_reg = plugin_reg;
+  
+  return ret;
+  }
+
+static void bg_gavf_destroy(void * data)
+  {
+  bg_gavf_t * f = data;
+
+  if(f->audio_streams)
+    free(f->audio_streams);
+  if(f->video_streams)
+    free(f->video_streams);
+  if(f->text_streams)
+    free(f->text_streams);
+  if(f->overlay_streams)
+    free(f->overlay_streams);
+  
+  if(f->enc)
+    gavf_close(f->enc);
+  
+  free(f);
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name      = "format",
+      .long_name = TRS("Format"),
+      .type      = BG_PARAMETER_STRINGLIST,
+      .multi_names  = (const char*[]){ "disk", NULL },
+      .multi_labels = (const char*[]){ TRS("Disk"), NULL },
+    },
+    {
+      .name        = "sync_distance",
+      .long_name   = TRS("Sync distance (ms)"),
+      .type        = BG_PARAMETER_INT,
+      .val_min     = { .val_i = 20 },
+      .val_max     = { .val_i = 10000 },
+      .val_default = { .val_i = 500 },
+      .help_string = TRS("Distance between sync headers if no stream has keyframes. Smaller distances produce larger overhead but speed up seeking"),
+    },
+    {
+      .name        = "sync_index",
+      .long_name   = TRS("Write sync index"),
+      .type        = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Write a synchronisation index to enable seeking"),
+      .val_default = { .val_i = 1 },
+    },
+    {
+      .name        = "packet_index",
+      .long_name   = TRS("Write packet index"),
+      .type        = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Write a packet index to enable faster seeking"),
+      .val_default = { .val_i = 1 },
+    },
+    {
+      .name        = "interleave",
+      .long_name   = TRS("Interleave"),
+      .type        = BG_PARAMETER_CHECKBUTTON,
+      .help_string = TRS("Take care of proper interleaving. Enabling this increases encoding latency and memory usage. Disable this if the packets are already properly interleaved."),
+      .val_default = { .val_i = 1 },
+    },
+    { /* End */ }
+  };
+
+static const bg_parameter_info_t *
+bg_gavf_get_parameters(void * data)
+  {
+  return parameters;
+  }
+
+static void
+bg_gavf_set_parameter(void * data, const char * name,
+                      const bg_parameter_value_t * val)
+  {
+  bg_gavf_t * f = data;
+
+  if(!name)
+    {
+    gavf_options_set_flags(f->opt, f->flags);
+    return;
+    }
+  else if(!strcmp(name, "sync_distance"))
+    gavf_options_set_sync_distance(f->opt, val->val_i * 1000);
+  else if(!strcmp(name, "sync_index"))
+    {
+    if(val->val_i)
+      f->flags |= GAVF_OPT_FLAG_SYNC_INDEX;
+    else
+      f->flags &= ~GAVF_OPT_FLAG_SYNC_INDEX;
+    }
+  else if(!strcmp(name, "packet_index"))
+    {
+    if(val->val_i)
+      f->flags |= GAVF_OPT_FLAG_PACKET_INDEX;
+    else
+      f->flags &= ~GAVF_OPT_FLAG_PACKET_INDEX;
+    }
+  else if(!strcmp(name, "interleave"))
+    {
+
+    }
+  }
+
+/* Codec parameters */
+
+static const bg_parameter_info_t *
+bg_gavf_get_audio_parameters(void * data)
+  {
+  bg_gavf_t * f = data;
+
+  if(!f->audio_parameters)
+    {
+    f->audio_parameters =
+      bg_plugin_registry_create_compressor_parameters(f->plugin_reg,
+                                                      BG_PLUGIN_AUDIO_COMPRESSOR);
+    }
+  return f->audio_parameters;
+  }
+
+static const bg_parameter_info_t *
+bg_gavf_get_video_parameters(void * data)
+  {
+  bg_gavf_t * f = data;
+
+  if(!f->video_parameters)
+    {
+    f->video_parameters =
+      bg_plugin_registry_create_compressor_parameters(f->plugin_reg,
+                                                      BG_PLUGIN_VIDEO_COMPRESSOR);
+    }
+  return f->video_parameters;
+  }
+
+static const bg_parameter_info_t *
+bg_gavf_get_subtitle_overlay_parameters(void * data)
+  {
+  bg_gavf_t * f = data;
+
+  if(!f->overlay_parameters)
+    {
+    f->overlay_parameters =
+      bg_plugin_registry_create_compressor_parameters(f->plugin_reg,
+                                                      BG_PLUGIN_OVERLAY_COMPRESSOR);
+    }
+  return f->video_parameters;
+  }
+
+
+/* Set parameters */
+
+static void
+bg_gavf_set_audio_parameter(void * data, int stream, const char * name,
+                            const bg_parameter_value_t * val)
+  {
+  bg_gavf_t * f = data;
+
+  bg_plugin_registry_set_compressor_parameter(f->plugin_reg,
+                                              &f->audio_streams[stream].com.plugin,
+                                              name, val);
+  }
+
+static void
+bg_gavf_set_video_parameter(void * data, int stream, const char * name,
+                            const bg_parameter_value_t * val)
+  {
+  bg_gavf_t * f = data;
+  bg_plugin_registry_set_compressor_parameter(f->plugin_reg,
+                                              &f->video_streams[stream].com.plugin,
+                                              name, val);
+  }
+
+static void
+bg_gavf_set_overlay_parameter(void * data, int stream, const char * name,
+                            const bg_parameter_value_t * val)
+  {
+  bg_gavf_t * f = data;
+  bg_plugin_registry_set_compressor_parameter(f->plugin_reg,
+                                              &f->overlay_streams[stream].com.plugin,
+                                              name, val);
+  }
+
+static void
+bg_gavf_set_callbacks(void * data,
+                      bg_encoder_callbacks_t * cb)
+  {
+  bg_gavf_t * f = data;
+  f->cb = cb;
+  }
+
+static int
+bg_gavf_open(void * data, const char * filename,
+             const gavl_metadata_t * metadata,
+             const gavl_chapter_list_t * chapter_list)
+  {
+  bg_gavf_t * f = data;
+
+  f->filename = bg_filename_ensure_extension(filename, "gavf");
+
+  if(!bg_encoder_cb_create_output_file(f->cb, f->filename))
+    return 0;
+  
+  if(!(f->output = fopen(f->filename, "wb")))
+    return 0;
+
+  f->io = gavf_io_create_file(f->output, 1, 1, 1);
+
+  if(!gavf_open_write(f->enc, f->io, metadata, chapter_list))
+    return 0;
+  
+  return 1;
+  }
+
+static int
+bg_gavf_writes_compressed_audio(void * priv,
+                                const gavl_audio_format_t * format,
+                                const gavl_compression_info_t * info)
+  {
+  return 1;
+  }
+
+static int
+bg_gavf_writes_compressed_video(void * priv,
+                                const gavl_video_format_t * format,
+                                const gavl_compression_info_t * info)
+  {
+  return 1;
+  }
+
+static int
+bg_gavf_writes_compressed_overlay(void * priv,
+                                  const gavl_video_format_t * format,
+                                  const gavl_compression_info_t * info)
+  {
+  return 1;
+  }
+
+static audio_stream_t * append_audio_stream(bg_gavf_t * f, const gavl_metadata_t * m,
+                                            const gavl_audio_format_t * format)
+  {
+  audio_stream_t * ret;
+
+  f->audio_streams =
+    realloc(f->audio_streams,
+            (f->num_audio_streams+1)*sizeof(*f->audio_streams));
+  ret = f->audio_streams + f->num_audio_streams;
+  f->num_audio_streams++;
+  memset(ret, 0, sizeof(*ret));
+  gavl_audio_format_copy(&ret->format, format);
+  if(m)
+    gavl_metadata_copy(&ret->com.m, m);
+  return ret;
+  }
+
+static video_stream_t * append_video_stream(bg_gavf_t * f, const gavl_metadata_t * m,
+                                            const gavl_video_format_t * format)
+  {
+  video_stream_t * ret;
+
+  f->video_streams =
+    realloc(f->video_streams,
+            (f->num_video_streams+1)*sizeof(*f->video_streams));
+
+  ret = f->video_streams + f->num_video_streams;
+  f->num_video_streams++;
+  memset(ret, 0, sizeof(*ret));
+  gavl_video_format_copy(&ret->format, format);
+  if(m)
+    gavl_metadata_copy(&ret->com.m, m);
+  return ret;
+  }
+
+static text_stream_t *
+append_text_stream(bg_gavf_t * f, const gavl_metadata_t * m)
+  {
+  text_stream_t * ret;
+
+  f->text_streams =
+    realloc(f->text_streams,
+            (f->num_text_streams+1)*sizeof(*f->text_streams));
+
+  ret = f->text_streams + f->num_text_streams;
+  f->num_text_streams++;
+  memset(ret, 0, sizeof(*ret));
+  if(m)
+    gavl_metadata_copy(&ret->com.m, m);
+  return ret;
+  }
+
+static overlay_stream_t *
+append_overlay_stream(bg_gavf_t * f, const gavl_metadata_t * m,
+                      const gavl_video_format_t * format)
+  {
+  overlay_stream_t * ret;
+
+  f->overlay_streams =
+    realloc(f->overlay_streams,
+            (f->num_overlay_streams+1)*sizeof(*f->overlay_streams));
+
+  ret = f->overlay_streams + f->num_overlay_streams;
+  f->num_overlay_streams++;
+  memset(ret, 0, sizeof(*ret));
+  gavl_video_format_copy(&ret->format, format);
+  if(m)
+    gavl_metadata_copy(&ret->com.m, m);
+  return ret;
+  }
+
+static int
+bg_gavf_add_audio_stream(void * data,
+                         const gavl_metadata_t * m,
+                         const gavl_audio_format_t * format)
+  {
+  audio_stream_t * s;
+  bg_gavf_t * f = data;
+  s = append_audio_stream(f, m, format);
+  gavl_metadata_delete_compression_fields(&s->com.m);
+  return f->num_audio_streams-1;
+  }
+
+static int
+bg_gavf_add_video_stream(void * data,
+                         const gavl_metadata_t * m,
+                         const gavl_video_format_t * format)
+  {
+  video_stream_t * s;
+  bg_gavf_t * f = data;
+  s = append_video_stream(f, m, format);
+  gavl_metadata_delete_compression_fields(&s->com.m);
+  return f->num_video_streams-1;
+  }
+
+static int
+bg_gavf_add_text_stream(void * data,
+                        const gavl_metadata_t * m,
+                        uint32_t * timescale)
+  {
+  bg_gavf_t * f = data;
+
+  text_stream_t * s = append_text_stream(f, m);
+  s->timescale = *timescale;
+  return f->num_text_streams-1;
+  }
+
+static int
+bg_gavf_add_overlay_stream(void * data,
+                           const gavl_metadata_t * m,
+                           const gavl_video_format_t * format)
+  {
+  overlay_stream_t * s;
+  bg_gavf_t * f = data;
+  s = append_overlay_stream(f, m, format);
+  gavl_metadata_delete_compression_fields(&s->com.m);
+  return f->num_overlay_streams-1;
+  }
+
+
+static int
+bg_gavf_add_audio_stream_compressed(void * data,
+                                    const gavl_metadata_t * m,
+                                    const gavl_audio_format_t * format,
+                                    const gavl_compression_info_t * info)
+  {
+  audio_stream_t * s;
+  bg_gavf_t * f = data;
+  s = append_audio_stream(f, m, format);
+  gavl_compression_info_copy(&s->com.ci, info);
+  return f->num_audio_streams-1;
+  }
+
+static int
+bg_gavf_add_video_stream_compressed(void * data,
+                                    const gavl_metadata_t * m,
+                                    const gavl_video_format_t * format,
+                                    const gavl_compression_info_t * info)
+  {
+  video_stream_t * s;
+  bg_gavf_t * f = data;
+  s = append_video_stream(f, m, format);
+  gavl_compression_info_copy(&s->com.ci, info);
+  return f->num_video_streams-1;
+  }
+
+static int
+bg_gavf_add_overlay_stream_compressed(void * data,
+                                      const gavl_metadata_t * m,
+                                      const gavl_video_format_t * format,
+                                      const gavl_compression_info_t * info)
+  {
+  overlay_stream_t * s;
+  bg_gavf_t * f = data;
+  s = append_overlay_stream(f, m, format);
+  gavl_compression_info_copy(&s->com.ci, info);
+  return f->num_overlay_streams-1;
+  }
+
+static int bg_gavf_start(void * data)
+  {
+  bg_gavf_t * priv;
+  int i;
+  priv = data;
+  for(i = 0; i < priv->num_audio_streams; i++)
+    {
+    audio_stream_t * s = priv->audio_streams + i;
+
+    if(s->com.plugin && (s->com.ci.id == GAVL_CODEC_ID_NONE))
+      {
+      bg_codec_plugin_t * p = (bg_codec_plugin_t*)s->com.plugin->plugin;
+      /* Switch on codec */
+      
+      s->sink = p->open_encode_audio(s->com.plugin->priv,
+                                     &s->com.ci,
+                                     &s->format,
+                                     &s->com.m);
+      if(!s->sink)
+        return 0;
+      }
+
+    s->com.index =
+      gavf_add_audio_stream(priv->enc, &s->com.ci, &s->format, &s->com.m);
+    
+    }
+  for(i = 0; i < priv->num_video_streams; i++)
+    {
+    video_stream_t * s = priv->video_streams + i;
+
+    if(s->com.plugin && (s->com.ci.id == GAVL_CODEC_ID_NONE))
+      {
+      bg_codec_plugin_t * p = (bg_codec_plugin_t*)s->com.plugin->plugin;
+      /* Switch on codec */
+      s->sink = p->open_encode_video(s->com.plugin->priv,
+                                     &s->com.ci,
+                                     &s->format,
+                                     &s->com.m);
+      if(!s->sink)
+        return 0;
+      }
+    
+    s->com.index = gavf_add_video_stream(priv->enc, &s->com.ci,
+                                         &s->format, &s->com.m);
+
+    
+    }
+  for(i = 0; i < priv->num_text_streams; i++)
+    {
+    text_stream_t * s = priv->text_streams + i;
+    s->com.index = gavf_add_text_stream(priv->enc, s->timescale, &s->com.m);
+    }
+
+  for(i = 0; i < priv->num_overlay_streams; i++)
+    {
+    overlay_stream_t * s = priv->overlay_streams + i;
+
+    if(s->com.plugin && (s->com.ci.id == GAVL_CODEC_ID_NONE))
+      {
+      bg_codec_plugin_t * p = (bg_codec_plugin_t*)s->com.plugin->plugin;
+      /* Switch on codec */
+      s->sink = p->open_encode_overlay(s->com.plugin->priv,
+                                       &s->com.ci,
+                                       &s->format,
+                                       &s->com.m);
+      if(!s->sink)
+        return 0;
+      }
+    s->com.index = gavf_add_overlay_stream(priv->enc, &s->com.ci,
+                                           &s->format, &s->com.m);
+    }
+  
+  if(!gavf_start(priv->enc))
+    return 0;
+
+  for(i = 0; i < priv->num_audio_streams; i++)
+    {
+    audio_stream_t * s = priv->audio_streams + i;
+    s->com.h = priv->ph->streams + s->com.index;
+    if(s->sink) // Codec present and active
+      {
+      bg_codec_plugin_t * p = (bg_codec_plugin_t*)s->com.plugin->plugin;
+      s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+      p->set_packet_sink(s->com.plugin->priv,
+                         s->com.psink);
+      }
+    else if(s->com.ci.id == GAVL_CODEC_ID_NONE) // Write uncompressed
+      s->sink = gavf_get_audio_sink(priv->enc, s->com.h->id);
+    else // Write compressed
+      s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+    }
+  for(i = 0; i < priv->num_video_streams; i++)
+    {
+    video_stream_t * s = priv->video_streams + i;
+    s->com.h = priv->ph->streams + s->com.index;
+    if(s->sink) // Codec present and active
+      {
+      bg_codec_plugin_t * p = (bg_codec_plugin_t*)s->com.plugin->plugin;
+      s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+      p->set_packet_sink(s->com.plugin->priv,s->com.psink);
+      }
+    else if(s->com.ci.id == GAVL_CODEC_ID_NONE) // Write uncompressed
+      s->sink = gavf_get_video_sink(priv->enc, s->com.h->id);
+    else // Write compressed
+      s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+    }
+  for(i = 0; i < priv->num_overlay_streams; i++)
+    {
+    overlay_stream_t * s = priv->overlay_streams + i;
+    s->com.h = priv->ph->streams + s->com.index;
+    if(s->sink) // Codec present and active
+      {
+      bg_codec_plugin_t * p = (bg_codec_plugin_t*)s->com.plugin->plugin;
+      s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+      p->set_packet_sink(s->com.plugin->priv,s->com.psink);
+      }
+    else if(s->com.ci.id == GAVL_CODEC_ID_NONE) // Write uncompressed
+      s->sink = gavf_get_video_sink(priv->enc, s->com.h->id);
+    else // Write compressed
+      s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+    }
+  for(i = 0; i < priv->num_text_streams; i++)
+    {
+    text_stream_t * s = priv->text_streams + i;
+    s->com.h = priv->ph->streams + s->com.index;
+    s->com.psink = gavf_get_packet_sink(priv->enc, s->com.h->id);
+    }
+  
+  
+  return 1;
+  }
+
+/* LEGACY */
+#if 0
+static void
+bg_gavf_get_audio_format(void * data, int stream,
+                         gavl_audio_format_t*ret)
+  {
+  bg_gavf_t * priv;
+  priv = data;
+
+  gavl_audio_format_copy(ret, &priv->audio_streams[stream].format);
+  }
+
+static void
+bg_gavf_get_video_format(void * data, int stream,
+                         gavl_video_format_t*ret)
+  {
+  bg_gavf_t * priv;
+  priv = data;
+
+  gavl_video_format_copy(ret, &priv->video_streams[stream].format);
+  }
+
+static int
+bg_gavf_write_audio_frame(void * data,
+                          gavl_audio_frame_t * frame, int stream)
+  {
+  bg_gavf_t * f = data;
+  return gavl_audio_sink_put_frame(f->audio_streams[stream].sink,
+                                   frame) == GAVL_SINK_OK;
+  }
+
+/* LEGACY */
+static int
+bg_gavf_write_video_frame(void * data,
+                          gavl_video_frame_t * frame, int stream)
+  {
+  bg_gavf_t * f = data;
+  return gavl_video_sink_put_frame(f->video_streams[stream].sink,
+                                   frame) == GAVL_SINK_OK;
+  }
+
+static int
+bg_gavf_write_subtitle_text(void * data, const char * text,
+                            int64_t start,
+                            int64_t duration, int stream)
+  {
+  bg_gavf_t * f = data;
+  gavl_packet_t p;
+  int ret;
+  int len;
+  
+  gavl_packet_init(&p);
+  len = strlen(text);
+
+  gavl_packet_alloc(&p, len);
+  memcpy(p.data, text, len);
+  p.data_len = len;
+  p.pts = start;
+  p.duration = duration;
+  
+  ret = gavl_packet_sink_put_packet(f->text_streams[stream].com.psink, &p);
+  gavl_packet_free(&p);
+  return ret;
+  }
+#endif
+
+static void free_stream_common(stream_common_t * s)
+  {
+  if(s->plugin)
+    bg_plugin_unref(s->plugin);
+  gavl_metadata_free(&s->m);
+  gavl_compression_info_free(&s->ci);
+  }
+
+static int
+bg_gavf_close(void * data, int do_delete)
+  {
+  int i;
+  bg_gavf_t * priv = data;
+
+  /* TODO: Clarify when sinks have to be destroyed */
+  
+  /* Close some encoders, this might flush some more packets */
+  for(i = 0; i < priv->num_audio_streams; i++)
+    {
+    audio_stream_t * s = priv->audio_streams + i;
+    free_stream_common(&s->com);
+    }
+  for(i = 0; i < priv->num_video_streams; i++)
+    {
+    video_stream_t * s = priv->video_streams + i;
+    free_stream_common(&s->com);
+    }
+  for(i = 0; i < priv->num_text_streams; i++)
+    {
+    text_stream_t * s = priv->text_streams + i;
+    free_stream_common(&s->com);
+    }
+  
+  priv->num_audio_streams = 0;
+  priv->num_video_streams = 0;
+  priv->num_text_streams = 0;
+  
+  gavf_close(priv->enc);
+  priv->enc = NULL;
+  
+  gavf_io_destroy(priv->io);
+  
+  return 1;
+  }
+
+#if 0
+/* LEGACY */
+static int
+bg_gavf_write_audio_packet(void * data, gavl_packet_t * packet,
+                           int stream)
+  {
+  bg_gavf_t * f = data;
+  return gavl_packet_sink_put_packet(f->audio_streams[stream].com.psink,
+                                     packet) == GAVL_SINK_OK;
+  }
+
+/* LEGACY */
+static int
+bg_gavf_write_video_packet(void * data, gavl_packet_t * packet,
+                           int stream)
+  {
+  bg_gavf_t * f = data;
+  return gavl_packet_sink_put_packet(f->video_streams[stream].com.psink,
+                                     packet) == GAVL_SINK_OK;
+  }
+#endif
+
+static gavl_audio_sink_t * bg_gavf_get_audio_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->audio_streams[stream].sink;
+  }
+
+static gavl_video_sink_t * bg_gavf_get_video_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->video_streams[stream].sink;
+  }
+
+static gavl_video_sink_t * bg_gavf_get_overlay_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->overlay_streams[stream].sink;
+  }
+
+static gavl_packet_sink_t *
+bg_gavf_get_audio_packet_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->audio_streams[stream].com.psink;
+  }
+
+static gavl_packet_sink_t *
+bg_gavf_get_video_packet_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->video_streams[stream].com.psink;
+  }
+
+static gavl_packet_sink_t *
+bg_gavf_get_overlay_packet_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->overlay_streams[stream].com.psink;
+  }
+
+static gavl_packet_sink_t *
+bg_gavf_get_text_sink(void * data, int stream)
+  {
+  bg_gavf_t * f = data;
+  return f->text_streams[stream].com.psink;
+  }
+
+
+const bg_encoder_plugin_t the_plugin =
+  {
+    .common =
+    {
+      BG_LOCALE,
+      .name =           bg_gavfenc_name,       /* Unique short name */
+      .long_name =      TRS("GAVF encoder"),
+      .description =    TRS("Plugin for encoding the Gmerlin audio video format."),
+      .type =           BG_PLUGIN_ENCODER,
+      .flags =          BG_PLUGIN_FILE,
+      .priority =       5,
+      //      .create =         bg_gavf_create,
+      .destroy =        bg_gavf_destroy,
+      .get_parameters = bg_gavf_get_parameters,
+      .set_parameter =  bg_gavf_set_parameter,
+    },
+    
+    .max_audio_streams =         -1,
+    .max_video_streams =         -1,
+    .max_text_streams = -1,
+    .max_overlay_streams = -1,
+    
+    .get_audio_parameters = bg_gavf_get_audio_parameters,
+    .get_video_parameters = bg_gavf_get_video_parameters,
+    .get_overlay_parameters = bg_gavf_get_subtitle_overlay_parameters,
+    
+    .set_callbacks =        bg_gavf_set_callbacks,
+    
+    .open =                 bg_gavf_open,
+
+    .writes_compressed_audio = bg_gavf_writes_compressed_audio,
+    .writes_compressed_video = bg_gavf_writes_compressed_video,
+    .writes_compressed_overlay = bg_gavf_writes_compressed_overlay,
+    
+    .add_audio_stream =     bg_gavf_add_audio_stream,
+    .add_video_stream =     bg_gavf_add_video_stream,
+    .add_text_stream =     bg_gavf_add_text_stream,
+    .add_overlay_stream =     bg_gavf_add_overlay_stream,
+
+    .add_audio_stream_compressed =     bg_gavf_add_audio_stream_compressed,
+    .add_video_stream_compressed =     bg_gavf_add_video_stream_compressed,
+    .add_overlay_stream_compressed =   bg_gavf_add_overlay_stream_compressed,
+
+    // .set_video_pass =       bg_gavf_set_video_pass,
+    .set_audio_parameter =  bg_gavf_set_audio_parameter,
+    .set_video_parameter =  bg_gavf_set_video_parameter,
+    .set_overlay_parameter =  bg_gavf_set_overlay_parameter,
+    
+    //    .get_audio_format =     bg_gavf_get_audio_format,
+    //    .get_video_format =     bg_gavf_get_video_format,
+
+    .start =                bg_gavf_start,
+
+    .get_audio_sink =        bg_gavf_get_audio_sink,
+    .get_video_sink =        bg_gavf_get_video_sink,
+    .get_audio_packet_sink = bg_gavf_get_audio_packet_sink,
+    .get_video_packet_sink = bg_gavf_get_video_packet_sink,
+    .get_overlay_packet_sink = bg_gavf_get_overlay_packet_sink,
+    .get_text_sink = bg_gavf_get_text_sink,
+    .get_overlay_sink = bg_gavf_get_overlay_sink,
+    //    .get_subtitle__sink = bg_gavf_get_text_sink,
+    
+    .close =                bg_gavf_close,
+  };
+
+bg_plugin_info_t * bg_gavfenc_info(bg_plugin_registry_t * reg)
+  {
+  bg_plugin_info_t * ret;
+
+  ret = bg_plugin_info_create(&the_plugin.common);
+  /* TODO: Create audio and video codec parameters */
+
+  ret->audio_parameters =
+    bg_plugin_registry_create_compressor_parameters(reg, BG_PLUGIN_AUDIO_COMPRESSOR);
+  ret->video_parameters =
+    bg_plugin_registry_create_compressor_parameters(reg, BG_PLUGIN_VIDEO_COMPRESSOR);
+  ret->overlay_parameters =
+    bg_plugin_registry_create_compressor_parameters(reg, BG_PLUGIN_OVERLAY_COMPRESSOR);
+  
+  return ret;
+
+  }
+
+const bg_plugin_common_t * bg_gavfenc_get()
+  {
+  return (const bg_plugin_common_t*)(&the_plugin);
+  }

gmerlin-1.2.0.tar.gz/lib/gtk/Makefile.am -> gmerlin-4256.tar.gz/lib/gtk/Makefile.am Changed

gmerlin-1.2.0.tar.gz/lib/gtk/aboutwindow.c -> gmerlin-4256.tar.gz/lib/gtk/aboutwindow.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/albumentry.c -> gmerlin-4256.tar.gz/lib/gtk/albumentry.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/albumwidget.c -> gmerlin-4256.tar.gz/lib/gtk/albumwidget.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -67,6 +67,9 @@
 static GtkTargetList * target_list = NULL;
 static GtkTargetList * target_list_r = NULL;
 
+/* xml string as clipboard */
+static char * aw_clipboard = NULL;
+
 /* Drag & Drop struff */
 
 /* 0 means unset */
@@ -324,8 +327,6 @@
   /* For inserting */
   int cursor_pos;
 
-  /* xml string as clipboard */
-  char * clipboard;
   GtkAccelGroup * accel_group;
 
   int drag_delete;
@@ -432,7 +433,7 @@
 
   if(!strcmp(name, "open_path"))
     {
-    w->open_path = bg_strdup(w->open_path, val->val_str);
+    w->open_path = gavl_strrep(w->open_path, val->val_str);
     }
   else if(!strcmp(name, "show_toolbar"))
     {
@@ -451,7 +452,7 @@
 
   if(!strcmp(name, "open_path"))
     {
-    val->val_str = bg_strdup(val->val_str, w->open_path);
+    val->val_str = gavl_strrep(val->val_str, w->open_path);
     return 1;
     }
   else if(!strcmp(name, "show_toolbar"))
@@ -471,8 +472,6 @@
 static void set_sensitive(bg_gtk_album_widget_t * w)
   {
   int num_selected;
-  GtkTreeSelection * selection;
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(w->treeview));
   num_selected = bg_album_num_selected(w->album);
   
   if(!num_selected)
@@ -939,26 +938,23 @@
                                gpointer data)
   {
   GdkAtom type_atom;
-  bg_gtk_album_widget_t * w = data;
-
   
   type_atom = gdk_atom_intern("STRING", FALSE);
   //  type_atom = gdk_atom_intern(bg_gtk_atom_entries_name, FALSE);
   if(!type_atom)
     return;
   
-  gtk_selection_data_set(selection_data, type_atom, 8, (uint8_t*)w->clipboard,
-                         strlen(w->clipboard)+1);
+  gtk_selection_data_set(selection_data, type_atom, 8, (uint8_t*)aw_clipboard,
+                         strlen(aw_clipboard)+1);
   }
 
 static void clipboard_clear_func(GtkClipboard *clipboard,
                                  gpointer data)
   {
-  bg_gtk_album_widget_t * w = data;
-  if(w->clipboard)
+  if(aw_clipboard)
     {
-    free(w->clipboard);
-    w->clipboard = NULL;
+    free(aw_clipboard);
+    aw_clipboard = NULL;
     }
   }
 
@@ -996,9 +992,9 @@
                               clipboard_clear_func,
                               (gpointer)w);
   
-  if(w->clipboard)
-    free(w->clipboard);
-  w->clipboard = bg_album_save_selected_to_memory(w->album, 0);
+  if(aw_clipboard)
+    free(aw_clipboard);
+  aw_clipboard = bg_album_save_selected_to_memory(w->album, 0);
   }
 
 static void do_cut(bg_gtk_album_widget_t * w)
@@ -1040,8 +1036,9 @@
 
   gtk_widget_set_sensitive(widget->treeview, 1);
   
-  widget->open_path = bg_strdup(widget->open_path,
-                                bg_gtk_filesel_get_directory(widget->add_files_filesel));
+  widget->open_path =
+    gavl_strrep(widget->open_path,
+              bg_gtk_filesel_get_directory(widget->add_files_filesel));
   }
 
 static void add_urls_callback(char ** urls, const char * plugin,
@@ -1237,6 +1234,12 @@
   free(command);
   }
 
+static void export_edl_cb(GtkWidget * w,
+                          gpointer data)
+  {
+  *(int*)data = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
+  }
+
 static void menu_callback(GtkWidget * w, gpointer data)
   {
   char * tmp_string;
@@ -1342,18 +1345,28 @@
     }
   else if(w == widget->menu.selected_menu.export_edl_item)
     {
-    bg_edl_t * edl;
-
+    GtkWidget * cb;
+    gavl_edl_t * edl;
+    int separate_tracks = 0;
+    
+    cb = gtk_check_button_new_with_label(TR("Separate tracks"));
+    g_signal_connect(G_OBJECT(cb), "toggled",
+                     G_CALLBACK(export_edl_cb), &separate_tracks);
+    
+    gtk_widget_show(cb);
+    
     tmp_string = bg_gtk_get_filename_write("Export edl",
                                            NULL,
-                                           1, widget->treeview);
+                                           1, widget->treeview, cb);
     if(tmp_string)
       {
-      edl = bg_album_selected_to_edl(widget->album);
+      // fprintf(stderr, "Separate tracks: %d\n", separate_tracks);
+      
+      edl = bg_album_selected_to_edl(widget->album, separate_tracks);
       if(edl)
         {
         bg_edl_save(edl, tmp_string);
-        bg_edl_destroy(edl);
+        gavl_edl_destroy(edl);
         }
       free(tmp_string);
       }
@@ -1368,7 +1381,7 @@
     {
     tmp_string = bg_gtk_get_filename_write("Save album as",
                                            NULL,
-                                           1, widget->treeview);
+                                           1, widget->treeview, NULL);
     if(tmp_string)
       {
       bg_album_save(widget->album, tmp_string);
@@ -1895,15 +1908,11 @@
   GtkTreePath * path;
   GtkTreeViewDropPosition pos;
   bg_album_entry_t * entry;
-  GtkTreeModel * model;
   bg_gtk_album_widget_t * aw;
   int do_delete = 0;
   int source_type = 0;
   
   aw = (bg_gtk_album_widget_t *)d;
-
-  
-  model = gtk_tree_view_get_model(GTK_TREE_VIEW(aw->treeview));
   
   gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(aw->treeview),
                                     x, y, &path,
@@ -2477,14 +2486,10 @@
   int i;
   bg_gtk_album_widget_t * w = data;
   GtkTreeIter iter;
-  GtkTreeSelection * selection;
   GtkTreeModel * model;
   int cursor_diff = 0;
   
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(w->treeview));
-  //  g_signal_handler_block(G_OBJECT(selection), w->select_handler_id);
   
   i = 0;
   while(indices[i] >= 0)
@@ -3000,8 +3005,6 @@
   {
   if(w->open_path)
     free(w->open_path);
-  if(w->clipboard)
-    free(w->clipboard);
   bg_gtk_time_display_destroy(w->total_time);
 
 
@@ -3319,3 +3322,15 @@
     }
   find_widget_button_callback(w->find_widget.down_button, w);
   }
+
+#if defined(__GNUC__)
+
+static void cleanup() __attribute__ ((destructor));
+
+static void cleanup()
+  {
+  if(aw_clipboard)
+    free(aw_clipboard);
+  }
+
+#endif

gmerlin-1.2.0.tar.gz/lib/gtk/albumwindow.c -> gmerlin-4256.tar.gz/lib/gtk/albumwindow.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/auth.c -> gmerlin-4256.tar.gz/lib/gtk/auth.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/button.c -> gmerlin-4256.tar.gz/lib/gtk/button.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -102,8 +102,6 @@
 static gboolean motion_callback(GtkWidget * w, GdkEventMotion * evt,
                             gpointer data)
   {
-  bg_gtk_button_t * b;
-  b = (bg_gtk_button_t *)data;
   //  gtk_image_set_from_pixbuf(GTK_IMAGE(b->image), b->pixbuf_normal);
   return TRUE;
   }
@@ -332,11 +330,11 @@
     else if(!BG_XML_STRCMP(node->name, "Y"))
       s->y = atoi(tmp_string);
     else if(!BG_XML_STRCMP(node->name, "NORMAL"))
-      s->pixmap_normal = bg_strdup(s->pixmap_normal, tmp_string);
+      s->pixmap_normal = gavl_strrep(s->pixmap_normal, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "HIGHLIGHT"))
-      s->pixmap_highlight = bg_strdup(s->pixmap_highlight, tmp_string);
+      s->pixmap_highlight = gavl_strrep(s->pixmap_highlight, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "PRESSED"))
-      s->pixmap_pressed = bg_strdup(s->pixmap_pressed, tmp_string);
+      s->pixmap_pressed = gavl_strrep(s->pixmap_pressed, tmp_string);
     node = node->next;
     xmlFree(tmp_string);
     }

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_button.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_button.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_checkbutton.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_checkbutton.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_color.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_color.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_device.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_device.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_dialog.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_dialog.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -216,7 +216,7 @@
          (s->widgets[i].value.val_str) &&
          strchr(s->widgets[i].value.val_str, ':'))
         {
-        val.val_str = bg_strdup(NULL, s->widgets[i].value.val_str);
+        val.val_str = gavl_strdup(s->widgets[i].value.val_str);
         pos = strchr(val.val_str, ':');
         if(pos)
           *pos = '\0';
@@ -286,7 +286,7 @@
          (s->widgets[i].value.val_str) &&
          strchr(s->widgets[i].value.val_str, ':'))
         {
-        val.val_str = bg_strdup(NULL, s->widgets[i].value.val_str);
+        val.val_str = gavl_strdup(s->widgets[i].value.val_str);
         pos = strchr(val.val_str, ':');
         if(pos)
           *pos = '\0';
@@ -664,7 +664,7 @@
                                   bg_cfg_section_t * preset_section)
   {
   int i, count, j;
-  int row, column, num_columns;
+  int row, num_columns;
   bg_cfg_section_t * cfg_subsection;
   
   GtkWidget * table;
@@ -723,7 +723,6 @@
   gtk_container_set_border_width(GTK_CONTAINER(table), 5);
     
   row = 0;
-  column = 0;
   num_columns = 1;
     
   section->widgets = calloc(section->num_widgets, sizeof(bg_gtk_widget_t));

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_file.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_file.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_font.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_font.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_multi_list.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_multi_list.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -82,8 +82,7 @@
   while(w->info->multi_labels[i])
     {
     priv->multi_labels[i] =
-      bg_strdup(NULL,
-                TRD(w->info->multi_labels[i], priv->translation_domain));
+      gavl_strdup(TRD(w->info->multi_labels[i], priv->translation_domain));
     i++;
     }
   
@@ -219,12 +218,12 @@
   while(1)
     {
     gtk_tree_model_get(model, &iter, COLUMN_NAME, &name, -1);
-    ret = bg_strcat(ret, name);
+    ret = gavl_strcat(ret, name);
     
     g_free(name);
     if(!gtk_tree_model_iter_next(model, &iter))
       break;
-    ret = bg_strcat(ret, ",");
+    ret = gavl_strcat(ret, ",");
     }
   return ret;
   }
@@ -852,7 +851,7 @@
     params[0].name               = w->info->name;
     params[0].long_name          = w->info->long_name;
     params[0].type               = BG_PARAMETER_MULTI_MENU;
-    params[0].gettext_domain     = bg_strdup(params[0].gettext_domain,
+    params[0].gettext_domain     = gavl_strrep(params[0].gettext_domain,
                                              priv->translation_domain);
     params[0].multi_names        = w->info->multi_names;
     params[0].multi_labels       = w->info->multi_labels;

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_multi_menu.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_multi_menu.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_position.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_position.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_slider.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_slider.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -43,14 +43,14 @@
 
 static void destroy(bg_gtk_widget_t * w)
   {
-  slider_t * priv = (slider_t*)(w->priv);
+  slider_t * priv = w->priv;
   free(priv);
   }
 
 static void get_value_int(bg_gtk_widget_t * w)
   {
   slider_t * priv;
-  priv = (slider_t*)(w->priv);
+  priv = w->priv;
   gtk_range_set_value(GTK_RANGE(priv->slider),
                       (gdouble)w->value.val_i);
   
@@ -59,7 +59,7 @@
 static void set_value_int(bg_gtk_widget_t * w)
   {
   slider_t * priv;
-  priv = (slider_t*)(w->priv);
+  priv = w->priv;
 
   w->value.val_i =
     (int)(gtk_range_get_value(GTK_RANGE(priv->slider)));
@@ -69,7 +69,7 @@
 static void get_value_float(bg_gtk_widget_t * w)
   {
   slider_t * priv;
-  priv = (slider_t*)(w->priv);
+  priv = w->priv;
   gtk_range_set_value(GTK_RANGE(priv->slider),
                       (gdouble)w->value.val_f);
   
@@ -78,7 +78,7 @@
 static void set_value_float(bg_gtk_widget_t * w)
   {
   slider_t * priv;
-  priv = (slider_t*)(w->priv);
+  priv = w->priv;
   w->value.val_f =
     gtk_range_get_value(GTK_RANGE(priv->slider));
   }
@@ -87,11 +87,9 @@
                                 gpointer data)
   {
   bg_gtk_widget_t * w;
-  slider_t * priv;
+    
+  w = data;
   
-  w = (bg_gtk_widget_t*)data;
-  priv = (slider_t*)(w->priv);
-
   if(evt->type == GDK_2BUTTON_PRESS)
     {
     if(w->info->type == BG_PARAMETER_SLIDER_FLOAT)
@@ -111,7 +109,7 @@
 
 static void attach(void * priv, GtkWidget * table, int * row, int * num_columns)
   {
-  slider_t * s = (slider_t*)priv;
+  slider_t * s = priv;
 
   if(*num_columns < 2)
     *num_columns = 2;

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_spinbutton.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_spinbutton.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_string.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_string.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_stringlist.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_stringlist.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/cfg_time.c -> gmerlin-4256.tar.gz/lib/gtk/cfg_time.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/chapterdialog.c -> gmerlin-4256.tar.gz/lib/gtk/chapterdialog.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -49,7 +49,7 @@
   GtkWidget * ok_button;
   GtkWidget * cancel_button;
     
-  bg_chapter_list_t * cl;
+  gavl_chapter_list_t * cl;
 
   int selected;
   int edited;
@@ -165,7 +165,7 @@
     }
   else if(!strcmp(name, "name"))
     win->cl->chapters[win->edited].name =
-      bg_strdup(win->cl->chapters[win->edited].name, val->val_str);
+      gavl_strrep(win->cl->chapters[win->edited].name, val->val_str);
   else if(!strcmp(name, "time"))
     win->cl->chapters[win->edited].time =
       gavl_time_scale(win->cl->timescale, val->val_time);
@@ -247,7 +247,7 @@
     {
     if(!win->cl)
       {
-      win->cl = bg_chapter_list_create(0);
+      win->cl = gavl_chapter_list_create(0);
       win->selected = 0;
       win->edited = 0;
       win->cl->timescale = GAVL_TIME_SCALE;
@@ -255,13 +255,13 @@
     else
       win->edited = win->selected + 1;
     
-    bg_chapter_list_insert(win->cl, win->edited,
+    gavl_chapter_list_insert(win->cl, win->edited,
                            0,NULL);
     win->is_ok = 0;
     edit_chapter(win);
     
     if(!win->is_ok)
-      bg_chapter_list_delete(win->cl, win->edited);
+      gavl_chapter_list_delete(win->cl, win->edited);
     else
       {
       win->selected = win->edited;
@@ -270,7 +270,7 @@
     }
   else if(w == win->delete_button)
     {
-    bg_chapter_list_delete(win->cl, win->selected);
+    gavl_chapter_list_delete(win->cl, win->selected);
     update_list(win);
     }
   else if(w == win->edit_button)
@@ -318,7 +318,7 @@
   return button;
   }
 
-static bg_gtk_chapter_dialog_t * create_dialog(bg_chapter_list_t * list,
+static bg_gtk_chapter_dialog_t * create_dialog(gavl_chapter_list_t * list,
                                                gavl_time_t duration)
   {
   GtkListStore *store;
@@ -332,7 +332,7 @@
     
   bg_gtk_chapter_dialog_t * ret;
   ret = calloc(1, sizeof(*ret));
-  ret->cl = bg_chapter_list_copy(list);
+  ret->cl = gavl_chapter_list_copy(list);
   ret->duration = duration;
   
   /* Create objects */
@@ -448,11 +448,11 @@
   gtk_widget_destroy(dlg->window);
 
   if(dlg->cl)
-    bg_chapter_list_destroy(dlg->cl);
+    gavl_chapter_list_destroy(dlg->cl);
   free(dlg);
   }
 
-void bg_gtk_chapter_dialog_show(bg_chapter_list_t ** list,
+void bg_gtk_chapter_dialog_show(gavl_chapter_list_t ** list,
                                 gavl_time_t duration, GtkWidget * parent)
   {
   bg_gtk_chapter_dialog_t * dlg;
@@ -468,8 +468,8 @@
 
   if(dlg->is_ok)
     {
-    if(*list) bg_chapter_list_destroy(*list);
-    *list = bg_chapter_list_copy(dlg->cl);
+    if(*list) gavl_chapter_list_destroy(*list);
+    *list = gavl_chapter_list_copy(dlg->cl);
     }
     
   destroy_dialog(dlg);

gmerlin-1.2.0.tar.gz/lib/gtk/display.c -> gmerlin-4256.tar.gz/lib/gtk/display.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/driveselect.c -> gmerlin-4256.tar.gz/lib/gtk/driveselect.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/fileentry.c -> gmerlin-4256.tar.gz/lib/gtk/fileentry.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/fileselect.c -> gmerlin-4256.tar.gz/lib/gtk/fileselect.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -420,7 +420,8 @@
 
 char * bg_gtk_get_filename_write(const char * title,
                                  char ** directory,
-                                 int ask_overwrite, GtkWidget * parent)
+                                 int ask_overwrite, GtkWidget * parent,
+                                 GtkWidget * extra)
   {
   char * ret;
   char * tmp_string;
@@ -438,6 +439,9 @@
                                 GTK_RESPONSE_CANCEL,
                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
                                 NULL);
+  if(extra)
+    gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(f.w), extra);
+  
   if(ask_overwrite)
     gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(f.w),
                                                    TRUE);
@@ -476,7 +480,7 @@
     }
   
   tmp_string = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(f.w));
-  ret = bg_strdup(NULL, tmp_string);
+  ret = gavl_strdup(tmp_string);
   g_free(tmp_string);
   
   /* Update current directory */
@@ -484,7 +488,7 @@
   if(directory)
     {
     tmp_string = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(f.w));
-    *directory = bg_strdup(*directory, tmp_string);
+    *directory = gavl_strrep(*directory, tmp_string);
     g_free(tmp_string);
     }
   
@@ -545,7 +549,7 @@
     }
   
   tmp_string = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(f.w));
-  ret = bg_strdup(NULL, tmp_string);
+  ret = gavl_strdup(tmp_string);
   g_free(tmp_string);
   
   /* Update current directory */
@@ -553,7 +557,7 @@
   if(directory)
     {
     tmp_string = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(f.w));
-    *directory = bg_strdup(*directory, tmp_string);
+    *directory = gavl_strrep(*directory, tmp_string);
     g_free(tmp_string);
     }

gmerlin-1.2.0.tar.gz/lib/gtk/gtk_dialog.h -> gmerlin-4256.tar.gz/lib/gtk/gtk_dialog.h Changed

gmerlin-1.2.0.tar.gz/lib/gtk/gtkutils.c -> gmerlin-4256.tar.gz/lib/gtk/gtkutils.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -40,6 +40,9 @@
 #include <pango/pangofc-fontmap.h>
 
 #include <gmerlin/utils.h>
+#include <gmerlin/http.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "gtkutils"
 
 GdkPixbuf * bg_gtk_pixbuf_scale_alpha(GdkPixbuf * src,
                                       int dest_width,
@@ -138,8 +141,8 @@
   set_default_window_icon(default_window_icon);
 
   /* Set default class hints */
-  default_window_name = bg_strdup(default_window_name, win_name);
-  default_window_class = bg_strdup(default_window_class, win_class);
+  default_window_name = gavl_strrep(default_window_name, win_name);
+  default_window_class = gavl_strrep(default_window_class, win_class);
 
   }
 
@@ -341,7 +344,7 @@
   description = pango_fc_font_description_from_pattern(pattern, TRUE);
 
   tmp = pango_font_description_to_string(description);
-  ret = bg_strdup(NULL, tmp);
+  ret = gavl_strdup(tmp);
   g_free(tmp);
   FcPatternDestroy(pattern);
   pango_font_description_free(description);
@@ -590,3 +593,94 @@
   gtk_combo_box_remove_text(GTK_COMBO_BOX(b), index);
 #endif
   }
+
+typedef struct
+  {
+  int max_width;
+  int max_height;
+  } max_size_t;
+
+static void size_prepared_callback(GdkPixbufLoader * loader, int width, int height, gpointer data)
+  {
+  max_size_t * m = data;
+  int new_width, new_height;
+  double ext_x, ext_y, ar;
+
+  ext_x = m->max_width > 0 ? ((double)width / (double)m->max_width) : 1.0;
+  ext_y = m->max_height > 0 ? ((double)height / (double)m->max_height) : 1.0;
+
+  if((ext_x > 1.0) || (ext_y > 1.0))
+    {
+    ar = (double)width / (double)height;
+
+    if(ext_x > ext_y) // Fit to max_width
+      {
+      new_width  = m->max_width;
+      new_height = (int)((double)m->max_width / ar + 0.5);
+      }
+    else // Fit to max_height
+      {
+      new_height  = m->max_height;
+      new_width = (int)((double)m->max_height * ar + 0.5);
+      }
+    gdk_pixbuf_loader_set_size(loader, new_width, new_height);
+    }
+  }
+
+GdkPixbuf * bg_gtk_pixbuf_from_http(const char * url, int max_width, int max_height)
+  {
+  uint8_t * buf = NULL;
+  int buf_len;
+  GdkPixbuf * ret = NULL;
+  GdkPixbufLoader * loader = NULL;
+  char * mimetype = NULL;
+  max_size_t m;
+  GError *err = NULL;
+  
+  m.max_width = max_width;
+  m.max_height = max_height;
+
+  /* Try to load the data */
+  buf = bg_http_get(url, &buf_len, &mimetype);
+  if(!buf)
+    goto fail;
+
+  loader = gdk_pixbuf_loader_new();
+  g_signal_connect(G_OBJECT(loader), "size-prepared", G_CALLBACK(size_prepared_callback), &m);
+
+  //  fprintf(stderr, "Icon:\n");
+  //  gavl_hexdump(buf, 16, 16);
+  
+  if(!gdk_pixbuf_loader_write(loader, buf, buf_len, &err))
+    {
+    //    fprintf(stderr, "Loading pixbuf failed: %s",
+    //            err->message);
+    
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Loading pixbuf failed: %s",
+           err->message);
+    g_error_free(err);
+    goto fail;
+    }
+  
+  if(!gdk_pixbuf_loader_close(loader, &err))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Closing pixbuf loader failed: %s",
+           err->message);
+    g_error_free(err);
+    goto fail;
+    }
+  
+  ret = gdk_pixbuf_loader_get_pixbuf(loader);
+  g_object_ref(ret);
+
+  fail:
+
+  if(loader)
+    g_object_unref(loader);
+  if(buf)
+    free(buf);
+  if(mimetype)
+    free(mimetype);
+
+  return ret;
+  }

gmerlin-1.2.0.tar.gz/lib/gtk/infowindow.c -> gmerlin-4256.tar.gz/lib/gtk/infowindow.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -54,27 +54,26 @@
   NUM_COLUMNS
 };
 
-#define PATH_NAME             0
-#define PATH_INPUT_PLUGIN     1
-#define PATH_LOCATION         2
-#define PATH_TRACK            3
-#define PATH_METADATA         4
-#define PATH_AUDIO            5
-#define PATH_AUDIO_DESC       6
-#define PATH_AUDIO_FORMAT_I   7
-#define PATH_AUDIO_FORMAT_O   8
+#define PATH_INPUT_PLUGIN     0
+#define PATH_LOCATION         1
+#define PATH_TRACK            2
+#define PATH_METADATA         3
+#define PATH_AUDIO            4
+#define PATH_AUDIO_DESC       5
+#define PATH_AUDIO_FORMAT_I   6
+#define PATH_AUDIO_FORMAT_O   7
 
-#define PATH_VIDEO            9
-#define PATH_VIDEO_DESC      10
-#define PATH_VIDEO_FORMAT_I  11
-#define PATH_VIDEO_FORMAT_O  12
+#define PATH_VIDEO            8
+#define PATH_VIDEO_DESC       9
+#define PATH_VIDEO_FORMAT_I  10
+#define PATH_VIDEO_FORMAT_O  11
 
-#define PATH_SUBTITLE          13
-#define PATH_SUBTITLE_DESC     14
-#define PATH_SUBTITLE_FORMAT_I 15
-#define PATH_SUBTITLE_FORMAT_O 16
+#define PATH_SUBTITLE          12
+#define PATH_SUBTITLE_DESC     13
+#define PATH_SUBTITLE_FORMAT_I 14
+#define PATH_SUBTITLE_FORMAT_O 15
 
-#define PATH_NUM             17
+#define PATH_NUM             16
 
 /* Delay between update calls in Milliseconds */
 
@@ -178,8 +177,8 @@
     EXPANDED_PARAM("exp_13"),
     EXPANDED_PARAM("exp_14"),
     EXPANDED_PARAM("exp_15"),
-    EXPANDED_PARAM("exp_16"),
-    EXPANDED_PARAM("exp_17"),
+    // EXPANDED_PARAM("exp_16"),
+    // EXPANDED_PARAM("exp_17"),
     { /* End of parameters */ }
   };
 
@@ -300,13 +299,13 @@
      */
 
     for(i = 0; i < depth; i++)
-      ret = bg_strcat(ret, "  ");
+      ret = gavl_strcat(ret, "  ");
 
     /* First column */
     gtk_tree_model_get(model, iter, COLUMN_1, &str, -1);
 
     if(*str)
-      ret = bg_strcat(ret, str);
+      ret = gavl_strcat(ret, str);
     else
       {
       g_free(str);
@@ -320,13 +319,13 @@
 
     if(*str)
       {
-      ret = bg_strcat(ret, "\t");
-      ret = bg_strcat(ret, str);
+      ret = gavl_strcat(ret, "\t");
+      ret = gavl_strcat(ret, str);
       }
     
     g_free(str);
 
-    ret = bg_strcat(ret, "\n");
+    ret = gavl_strcat(ret, "\n");
     }
 
   if(!append_children)
@@ -440,18 +439,15 @@
   if(w->expanded[parent_index])
     gtk_tree_view_expand_row(GTK_TREE_VIEW(w->treeview), w->paths[parent_index], 0);
 
-  
   if(tmp_strings)
     bg_strbreak_free(tmp_strings);
-  
   }
-     
+
 static void set_audio_format(bg_gtk_info_window_t * w,
                              int parent_index,
                              gavl_audio_format_t * format)
   {
   char * tmp_string;
-  
   tmp_string = bg_audio_format_to_string(format, 1);
   set_line_multi(w, parent_index, tmp_string);
   free(tmp_string);
@@ -507,18 +503,6 @@
             break;
           }
         break;
-      case BG_PLAYER_MSG_TRACK_NAME:
-
-        arg_str = bg_msg_get_arg_string(msg, 0);
-        
-        if(arg_str)
-          {
-          tmp_string = bg_sprintf(TR("Name:\t%s"), arg_str);
-          set_line_index(w, PATH_NAME, tmp_string, 1);
-          free(tmp_string);
-          free(arg_str);
-          }
-        break;
       case BG_PLAYER_MSG_INPUT:
         arg_str = bg_msg_get_arg_string(msg, 0);
         if(arg_str)
@@ -528,22 +512,6 @@
           free(tmp_string);
           free(arg_str);
           }
-
-        arg_str = bg_msg_get_arg_string(msg, 1);
-        if(arg_str)
-          {
-          tmp_string = bg_sprintf(TR("Location:\t%s"), arg_str);
-          set_line_index(w, PATH_LOCATION, tmp_string, 1);
-          free(tmp_string);
-          free(arg_str);
-          }
-
-        arg_i = bg_msg_get_arg_int(msg, 2);
-
-        tmp_string = bg_sprintf(TR("Track:\t%d"), arg_i+1);
-        set_line_index(w, PATH_TRACK, tmp_string, 1);
-        free(tmp_string);
-        
         break;
       case BG_PLAYER_MSG_TRACK_NUM_STREAMS:
         w->num_audio_streams = bg_msg_get_arg_int(msg, 0);
@@ -592,10 +560,10 @@
         set_line_index(w, PATH_AUDIO, tmp_string, 1);
         free(tmp_string);
         
-        bg_msg_get_arg_audio_format(msg, 1, &arg_af, NULL);
+        bg_msg_get_arg_audio_format(msg, 1, &arg_af);
         set_audio_format(w, PATH_AUDIO_FORMAT_I, &arg_af);
 
-        bg_msg_get_arg_audio_format(msg, 2, &arg_af, NULL);
+        bg_msg_get_arg_audio_format(msg, 2, &arg_af);
         set_audio_format(w, PATH_AUDIO_FORMAT_O, &arg_af);
         
         break;
@@ -608,10 +576,10 @@
         set_line_index(w, PATH_SUBTITLE, tmp_string, 1);
         free(tmp_string);
         
-        bg_msg_get_arg_video_format(msg, 2, &arg_vf, NULL);
+        bg_msg_get_arg_video_format(msg, 2, &arg_vf);
         set_video_format(w, PATH_SUBTITLE_FORMAT_I, &arg_vf);
 
-        bg_msg_get_arg_video_format(msg, 3, &arg_vf, NULL);
+        bg_msg_get_arg_video_format(msg, 3, &arg_vf);
         set_video_format(w, PATH_SUBTITLE_FORMAT_O, &arg_vf);
         
         break;
@@ -622,24 +590,21 @@
         set_line_index(w, PATH_VIDEO, tmp_string, 1);
         free(tmp_string);
         
-        bg_msg_get_arg_video_format(msg, 1, &arg_vf, NULL);
+        bg_msg_get_arg_video_format(msg, 1, &arg_vf);
         set_video_format(w, PATH_VIDEO_FORMAT_I, &arg_vf);
 
-        bg_msg_get_arg_video_format(msg, 2, &arg_vf, NULL);
+        bg_msg_get_arg_video_format(msg, 2, &arg_vf);
         set_video_format(w, PATH_VIDEO_FORMAT_O, &arg_vf);
         
         break;
       case BG_PLAYER_MSG_METADATA:
         gavl_metadata_init(&arg_m);
         bg_msg_get_arg_metadata(msg, 0, &arg_m);
-                
+
         tmp_string = bg_metadata_to_string(&arg_m, 1);
-        
         if(tmp_string)
-          {
           set_line_multi(w, PATH_METADATA, tmp_string);
-          free(tmp_string);
-          }
+        
         gavl_metadata_free(&arg_m);
         break;
       }
@@ -682,7 +647,7 @@
   {
   GtkTreeModel * model;
   GtkTreeIter iter;
-
+  
   g_signal_handler_block(w->treeview, w->collapse_id);
 
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
@@ -760,12 +725,7 @@
   GtkTreeModel * model;
 
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
-
-  /* Name */
-  gtk_tree_store_append(GTK_TREE_STORE(model), &iter, NULL);
-  w->paths[PATH_NAME] = gtk_tree_model_get_path(model, &iter);
-  set_line(w, &iter, TR("Name"), 0);
-
+  
   /* Plugin */
   gtk_tree_store_append(GTK_TREE_STORE(model), &iter, NULL);
   w->paths[PATH_INPUT_PLUGIN] = gtk_tree_model_get_path(model, &iter);
@@ -1145,7 +1105,6 @@
   gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
   
   /* Set callbacks */
-  
   ret->idle_id = g_timeout_add(DELAY_TIME, idle_callback, (gpointer)ret);
   g_signal_connect(G_OBJECT(ret->window), "delete_event",
                    G_CALLBACK(delete_callback), (gpointer)ret);

gmerlin-1.2.0.tar.gz/lib/gtk/logwindow.c -> gmerlin-4256.tar.gz/lib/gtk/logwindow.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -119,7 +119,6 @@
   bg_msg_t * msg;
   bg_gtk_log_window_t * w;
   bg_log_level_t level;
-  const char * level_name;
   char * domain;
   char * message;
   GtkTextTag * tag = NULL;
@@ -138,7 +137,6 @@
       delete_first_line(w);
     
     level = bg_msg_get_id(msg);
-    level_name = bg_log_level_to_string(level);
     domain = bg_msg_get_arg_string(msg, 0);
     message = bg_msg_get_arg_string(msg, 1);
     
@@ -158,7 +156,7 @@
       case BG_LOG_ERROR:
         tag = w->error_tag;
         if(w->show_error) do_log = 1;
-        w->last_error = bg_strdup(w->last_error, message);
+        w->last_error = gavl_strrep(w->last_error, message);
         break;
       case BG_LOG_INFO:
         tag = w->info_tag;

gmerlin-1.2.0.tar.gz/lib/gtk/message.c -> gmerlin-4256.tar.gz/lib/gtk/message.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/multiinfo.c -> gmerlin-4256.tar.gz/lib/gtk/multiinfo.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/plugin_multi.c -> gmerlin-4256.tar.gz/lib/gtk/plugin_multi.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/plugin_single.c -> gmerlin-4256.tar.gz/lib/gtk/plugin_single.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -252,8 +252,8 @@
 
   if(widget->info->type & (BG_PLUGIN_ENCODER_AUDIO|
                            BG_PLUGIN_ENCODER_VIDEO|
-                           BG_PLUGIN_ENCODER_SUBTITLE_TEXT|
-                           BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY|
+                           BG_PLUGIN_ENCODER_TEXT|
+                           BG_PLUGIN_ENCODER_OVERLAY|
                            BG_PLUGIN_ENCODER))
     {
     if(widget->audio_section_priv)
@@ -286,7 +286,7 @@
       widget->subtitle_text_section_priv = 0;
       }
     
-    if(widget->info->subtitle_text_parameters)
+    if(widget->info->text_parameters)
       widget->subtitle_text_section =
         bg_cfg_section_find_subsection(widget->section, "$subtitle_text");
     else
@@ -298,7 +298,7 @@
       widget->subtitle_overlay_section_priv = 0;
       }
     
-    if(widget->info->subtitle_overlay_parameters)
+    if(widget->info->overlay_parameters)
       widget->subtitle_overlay_section =
         bg_cfg_section_find_subsection(widget->section, "$subtitle_overlay");
     else

gmerlin-1.2.0.tar.gz/lib/gtk/plugininfo.c -> gmerlin-4256.tar.gz/lib/gtk/plugininfo.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -158,8 +158,8 @@
     { TRS("Video recorder"), BG_PLUGIN_RECORDER_VIDEO },
     { TRS("Audio encoder"),  BG_PLUGIN_ENCODER_AUDIO },
     { TRS("Video encoder"),  BG_PLUGIN_ENCODER_VIDEO },
-    { TRS("Text subtitle exporter"),  BG_PLUGIN_ENCODER_SUBTITLE_TEXT },
-    { TRS("Overlay subtitle exporter"),  BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY },
+    { TRS("Text subtitle exporter"),  BG_PLUGIN_ENCODER_TEXT },
+    { TRS("Overlay subtitle exporter"),  BG_PLUGIN_ENCODER_OVERLAY },
     { TRS("Audio/Video encoder"),  BG_PLUGIN_ENCODER },
     { TRS("Image reader"),   BG_PLUGIN_IMAGE_READER  },
     { TRS("Image writer"),   BG_PLUGIN_IMAGE_WRITER  },

gmerlin-1.2.0.tar.gz/lib/gtk/pluginmenu.c -> gmerlin-4256.tar.gz/lib/gtk/pluginmenu.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/presetmenu.c -> gmerlin-4256.tar.gz/lib/gtk/presetmenu.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/question.c -> gmerlin-4256.tar.gz/lib/gtk/question.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/scrolltext.c -> gmerlin-4256.tar.gz/lib/gtk/scrolltext.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/slider.c -> gmerlin-4256.tar.gz/lib/gtk/slider.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -752,19 +752,19 @@
     else if(!BG_XML_STRCMP(node->name, "Y"))
       s->y = atoi(tmp_string);
     else if(!BG_XML_STRCMP(node->name, "NORMAL"))
-      s->pixmap_normal = bg_strdup(s->pixmap_normal, tmp_string);
+      s->pixmap_normal = gavl_strrep(s->pixmap_normal, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "HIGHLIGHT"))
-      s->pixmap_highlight = bg_strdup(s->pixmap_highlight, tmp_string);
+      s->pixmap_highlight = gavl_strrep(s->pixmap_highlight, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "PRESSED"))
-      s->pixmap_pressed = bg_strdup(s->pixmap_pressed, tmp_string);
+      s->pixmap_pressed = gavl_strrep(s->pixmap_pressed, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "INACTIVE"))
-      s->pixmap_inactive = bg_strdup(s->pixmap_inactive, tmp_string);
+      s->pixmap_inactive = gavl_strrep(s->pixmap_inactive, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "BACKGROUND"))
-      s->pixmap_background = bg_strdup(s->pixmap_background, tmp_string);
+      s->pixmap_background = gavl_strrep(s->pixmap_background, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "BACKGROUND_L"))
-      s->pixmap_background_l = bg_strdup(s->pixmap_background_l, tmp_string);
+      s->pixmap_background_l = gavl_strrep(s->pixmap_background_l, tmp_string);
     else if(!BG_XML_STRCMP(node->name, "BACKGROUND_R"))
-      s->pixmap_background_r = bg_strdup(s->pixmap_background_r, tmp_string);
+      s->pixmap_background_r = gavl_strrep(s->pixmap_background_r, tmp_string);
     node = node->next;
     xmlFree(tmp_string);
     }

gmerlin-1.2.0.tar.gz/lib/gtk/textview.c -> gmerlin-4256.tar.gz/lib/gtk/textview.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/textwindow.c -> gmerlin-4256.tar.gz/lib/gtk/textwindow.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/treewidget.c -> gmerlin-4256.tar.gz/lib/gtk/treewidget.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -107,6 +107,12 @@
 static void open_album(bg_gtk_tree_widget_t * widget,
                        bg_album_t * album);
 
+static void set_album(bg_gtk_tree_widget_t * widget,
+                      bg_album_t   * album,
+                      GtkTreeIter  * iter,
+                      int set_children);
+
+
 static void load_pixmaps()
   {
   char * filename;
@@ -238,6 +244,8 @@
   COLUMN_PIXMAP,
   COLUMN_WEIGHT,
   COLUMN_COLOR,
+  COLUMN_STYLE,
+  COLUMN_EXPANDED,
   NUM_COLUMNS
 };
 
@@ -394,6 +402,41 @@
   return NULL;
   }
 
+static void destroy_callback(bg_album_t * a, void * data)
+  {
+  bg_gtk_album_window_t * album_window;
+  bg_gtk_tree_widget_t * w = data;
+  if(!(album_window = album_is_open(w, a)))
+    return;
+  w->album_windows = g_list_remove(w->album_windows, album_window);
+  bg_gtk_album_window_destroy(album_window, 0);
+
+  if(a == w->selected_album)
+    w->selected_album = NULL;
+  }
+
+void bg_gtk_tree_widget_open_album_window(bg_gtk_tree_widget_t * w, bg_album_t * a)
+  {
+  bg_gtk_album_window_t * album_window;
+  
+  if(album_is_open(w, a))
+    return;
+
+  album_window = bg_gtk_album_window_create(a,
+                                            w, w->accel_group);
+
+  bg_album_set_destroy_callback(a, destroy_callback, w);
+    
+  w->album_windows = g_list_append(w->album_windows,
+                                   album_window);
+  
+  if(w->tabbed_mode)
+    bg_gtk_album_window_attach(album_window, w->notebook);
+  else
+    bg_gtk_album_window_detach(album_window);
+  }
+
+
 /* Update the menu */
 
 static void rename_item(GtkWidget * w, const char * label)
@@ -506,6 +549,8 @@
         break;
       case BG_ALBUM_TYPE_INCOMING:
       case BG_ALBUM_TYPE_FAVOURITES:
+      case BG_ALBUM_TYPE_UPNP:
+      case BG_ALBUM_TYPE_UPNP_ROOT:
         gtk_widget_hide(w->menu.plugin_item);
         
         rename_item(w->menu.album_item, "Album...");
@@ -540,10 +585,11 @@
 
 /* Utility functions: Convert between GtkTreeIter and bg_album_t */
 
-static void album_2_iter(bg_gtk_tree_widget_t * widget,
+static int album_2_iter(bg_gtk_tree_widget_t * widget,
                          bg_album_t * album,
                          GtkTreeIter * iter)
   {
+  int ret;
   int * indices;
   int i;
   GtkTreeModel *model;
@@ -562,9 +608,9 @@
     i++;
     }
   free(indices);
-
-  gtk_tree_model_get_iter(model, iter, path);
+  ret = gtk_tree_model_get_iter(model, iter, path);
   gtk_tree_path_free(path);
+  return ret;
   }
 
 static bg_album_t * path_2_album(bg_gtk_tree_widget_t * w,
@@ -605,33 +651,99 @@
   return ret;
   }
 
+/* Dummy entry */
+
+static void add_dummy_entry(bg_gtk_tree_widget_t * widget, GtkTreeIter * parent)
+  {
+  GtkTreeIter child_iter;
+  GtkTreeModel * model;
+
+  model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget->treeview));
+  gtk_tree_store_append(GTK_TREE_STORE(model), &child_iter, parent);
+
+  gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COLUMN_NAME, TR("Empty"), -1);
+  gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COLUMN_COLOR, "#808080", -1);
+  gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, -1);
+  gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COLUMN_STYLE, PANGO_STYLE_ITALIC, -1);
+  gtk_tree_store_set(GTK_TREE_STORE(model), &child_iter, COLUMN_EXPANDED, 0, -1);
+  }
+
+static int is_dummy_entry(bg_gtk_tree_widget_t * w, GtkTreeIter * iter)
+  {
+  PangoStyle st;
+  GValue value={0,};
+  GtkTreeModel * model;
+  model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
+  gtk_tree_model_get_value(model, iter, COLUMN_STYLE, &value);
+  st = g_value_get_int(&value);
+  g_value_unset(&value);
+  if(st == PANGO_STYLE_ITALIC)
+    return 1;
+  return 0;
+  }
+
+static void delete_children(bg_gtk_tree_widget_t * w, GtkTreeIter * iter)
+  {
+  GtkTreeIter child_iter;
+  GtkTreeModel * model;
+  model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
+  if(!gtk_tree_model_iter_nth_child(model, &child_iter, iter, 0))
+    return;
+  while(gtk_tree_store_remove(GTK_TREE_STORE(model), &child_iter))
+    ;
+  }
+
+static void delete_dummy_entry(bg_gtk_tree_widget_t * w, GtkTreeIter * iter)
+  {
+  GtkTreeIter child_iter;
+  GtkTreeModel * model;
+  model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
+  if(!gtk_tree_model_iter_nth_child(model, &child_iter, iter, 0))
+    return;
+  if(is_dummy_entry(w, &child_iter))
+    gtk_tree_store_remove(GTK_TREE_STORE(model), &child_iter);
+  }
+
 /* Set one album */
 
+static void set_children(bg_gtk_tree_widget_t * widget,
+                         bg_album_t   * album,
+                         GtkTreeIter  * iter)
+  {
+  int i, num_children;
+  bg_album_t * child;
+  GtkTreeIter child_iter;
+  GtkTreeModel * model;
+  model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget->treeview));
+
+  num_children = bg_album_get_num_children(album);
+
+  for(i = 0; i < num_children; i++)
+    {
+    gtk_tree_store_append(GTK_TREE_STORE(model),
+                          &child_iter,
+                          iter);
+    child = bg_album_get_child(album, i);
+
+    set_album(widget, child, &child_iter, 1);
+    }
+  delete_dummy_entry(widget, iter);
+  }
+
 static void set_album(bg_gtk_tree_widget_t * widget,
                       bg_album_t   * album,
                       GtkTreeIter  * iter,
-                      int set_children,
-                      int open_window)
+                      int do_set_children)
   {
   bg_album_type_t type;
-  int num_children = 0;
-  bg_album_t * child;
-  int i;
-  GtkTreeIter child_iter;
   GtkTreeModel * model;
   bg_album_t * current_album;
   bg_gtk_album_window_t * album_window;
 
+  // fprintf(stderr, "Set album: %s\n", bg_album_get_label(album));
   
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget->treeview));
 
-  /* Open window if necessary */
-  
-  //  if(bg_album_is_open(album))
-  //    open_album(widget, album);
-  
-  /* Set values */
-
   /* Get the appropriate pixmap */
 
   current_album = bg_media_tree_get_current_album(widget->tree);
@@ -645,6 +757,7 @@
     {
     /* Regular album */
     case BG_ALBUM_TYPE_REGULAR:
+    case BG_ALBUM_TYPE_UPNP:
       if(bg_album_is_open(album))
         gtk_tree_store_set(GTK_TREE_STORE(model), iter, COLUMN_PIXMAP,
                            folder_open_pixbuf, -1);
@@ -652,6 +765,33 @@
         gtk_tree_store_set(GTK_TREE_STORE(model), iter, COLUMN_PIXMAP,
                            folder_closed_pixbuf, -1);
       break;
+    case BG_ALBUM_TYPE_UPNP_ROOT: // Server icon
+      {
+      const char * url;
+      GdkPixbuf * pb;
+
+      url = gavl_metadata_get(bg_album_get_metadata(album), BG_ALBUM_ICON_URL);
+      if(url)
+        {
+        pb = bg_gtk_pixbuf_from_http(url, 16, 16);
+
+        if(pb)
+          {
+          gtk_tree_store_set(GTK_TREE_STORE(model), iter, COLUMN_PIXMAP,
+                             pb, -1);
+          g_object_unref(pb);
+          break;
+          }
+        
+        }
+      if(bg_album_is_open(album))
+        gtk_tree_store_set(GTK_TREE_STORE(model), iter, COLUMN_PIXMAP,
+                           folder_open_pixbuf, -1);
+      else
+        gtk_tree_store_set(GTK_TREE_STORE(model), iter, COLUMN_PIXMAP,
+                           folder_closed_pixbuf, -1);
+      }
+      break;
       /* Drive for removable media */
     case BG_ALBUM_TYPE_REMOVABLE:
       if(bg_album_is_open(album))
@@ -722,40 +862,22 @@
                        COLUMN_COLOR,
                        "#000000", -1);
 
-  if(open_window && bg_album_is_open(album) && !album_is_open(widget, album))
-    {
-    album_window = bg_gtk_album_window_create(album,
-                                              widget, widget->accel_group);
-    
-    widget->album_windows = g_list_append(widget->album_windows,
-                                          album_window);
-
-    if(widget->tabbed_mode)
-      bg_gtk_album_window_attach(album_window, widget->notebook);
-    else
-      bg_gtk_album_window_detach(album_window);
-    }
-  else
-    album_window = album_is_open(widget, album);
+  gtk_tree_store_set(GTK_TREE_STORE(model),
+                     iter,
+                     COLUMN_STYLE,
+                     PANGO_STYLE_NORMAL, -1);
 
+  gtk_tree_store_set(GTK_TREE_STORE(model), iter, COLUMN_EXPANDED, 0, -1);
+  
+  album_window = album_is_open(widget, album);
+  
   if(album_window)
     bg_gtk_album_window_set_current(album_window, (album == current_album) ? 1 : 0);
   
   /* Append all subalbums of one album */
 
-  num_children = bg_album_get_num_children(album);
-
-  if(set_children)
-    {
-    for(i = 0; i < num_children; i++)
-      {
-      gtk_tree_store_append(GTK_TREE_STORE(model),
-                            &child_iter,
-                            iter);
-      child = bg_album_get_child(album, i);
-      set_album(widget, child, &child_iter, set_children, open_window);
-      }
-    }
+  if(do_set_children)
+    add_dummy_entry(widget, iter);
   }
 
 static void expand_album(bg_gtk_tree_widget_t * w, bg_album_t * album)
@@ -780,7 +902,9 @@
   
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(w->treeview));
   
-  album_2_iter(w, album, &iter);
+  if(!album_2_iter(w, album, &iter))
+    return;
+  
   path = gtk_tree_model_get_path(model, &iter);
 
   if(selected)
@@ -805,8 +929,7 @@
 
 /* Update the entire tree */
 
-void bg_gtk_tree_widget_update(bg_gtk_tree_widget_t * w,
-                                      int open_albums)
+void bg_gtk_tree_widget_update(bg_gtk_tree_widget_t * w)
   {
   GtkTreeModel * model;
   GtkTreeIter iter;
@@ -845,7 +968,7 @@
                           &iter,
                           &root_iter);
     album = bg_media_tree_get_album(w->tree, i);
-    set_album(w, album, &iter, 1, open_albums);
+    set_album(w, album, &iter, 1);
     }
 
   path = gtk_tree_model_get_path(model, &root_iter);
@@ -867,7 +990,7 @@
 
 void
 bg_gtk_tree_widget_close_album(bg_gtk_tree_widget_t * widget,
-                                bg_gtk_album_window_t * win)
+                               bg_gtk_album_window_t * win)
   {
   bg_album_t * album;
   GtkTreeIter iter;
@@ -876,10 +999,11 @@
 
   album = bg_gtk_album_window_get_album(win);
 
+  bg_album_set_destroy_callback(album, NULL, NULL);
   bg_album_close(album);
   
-  album_2_iter(widget, album, &iter);
-  set_album(widget, album, &iter, 0, 0);
+  if(album_2_iter(widget, album, &iter))
+    set_album(widget, album, &iter, 0);
   update_menu(widget);
   }
 
@@ -907,13 +1031,12 @@
     if(!bg_album_is_open(album))
       {
       result = bg_album_open(album);
-
-
       bg_album_set_error(album, !result);
       }
     
-    album_2_iter(widget, album, &iter);
-    set_album(widget, album, &iter, 0, 1);
+    if(album_2_iter(widget, album, &iter))
+      set_album(widget, album, &iter, 0);
+    bg_gtk_tree_widget_open_album_window(widget, album);
     }
   update_menu(widget);
   }
@@ -939,7 +1062,7 @@
       {
       bg_album_rename(w->selected_album, val->val_str);
       album_2_iter(w, w->selected_album, &iter);
-      set_album(w, w->selected_album, &iter, 0, 0);
+      set_album(w, w->selected_album, &iter, 0);
       }
         
     }
@@ -957,7 +1080,7 @@
   info[0].name                = "album_name";
   info[0].long_name           = TRS("Album name");
   info[0].type                = BG_PARAMETER_STRING;
-  info[0].val_default.val_str = bg_album_get_name(w->selected_album);
+  info[0].val_default.val_str = gavl_strdup(bg_album_get_name(w->selected_album));
 
   dialog = bg_dialog_create(NULL,
                             set_parameter_rename_album,
@@ -970,7 +1093,11 @@
   bg_dialog_destroy(dialog);
 
   album_2_iter(w, w->selected_album, &iter);
-  set_album(w, w->selected_album, &iter, 0, 0);
+  set_album(w, w->selected_album, &iter, 0);
+
+  if(info[0].val_default.val_str)
+    free(info[0].val_default.val_str);
+
   }
 
 static void add_dir_callback(char * dir, int recursive,
@@ -1025,7 +1152,7 @@
     
   w->selected_album = new_album;
   
-  bg_gtk_tree_widget_update(w, 0);
+  bg_gtk_tree_widget_update(w);
     
   rename_selected_album(w);
 
@@ -1033,7 +1160,7 @@
     {
     bg_media_tree_remove_album(w->tree, w->selected_album);
     w->selected_album = NULL;
-    bg_gtk_tree_widget_update(w, 0);
+    bg_gtk_tree_widget_update(w);
     }
   else
     {
@@ -1043,15 +1170,11 @@
 
 static void remove_album(bg_gtk_tree_widget_t * w, bg_album_t * a)
   {
-  int i, num_children;
-  bg_gtk_album_window_t * album_window;
-  bg_album_t * child;
-  
   if(!a)
     return;
-
+#if 0
+  
   /* Delete children as long as the parent still exists */
-
   num_children = bg_album_get_num_children(a);
   for(i = 0; i < num_children; i++)
     {
@@ -1068,6 +1191,7 @@
     }
   if(a == w->selected_album)
     w->selected_album = NULL;
+#endif
   bg_media_tree_remove_album(w->tree, a);
   update_menu(w);
   }
@@ -1093,11 +1217,11 @@
     }
   else if(!strcmp(name, "device"))
     {
-    s->device = bg_strdup(s->device, val->val_str);
+    s->device = gavl_strrep(s->device, val->val_str);
     }
   else if(!strcmp(name, "name"))
     {
-    s->name = bg_strdup(s->name, val->val_str);
+    s->name = gavl_strrep(s->name, val->val_str);
     }
   
   }
@@ -1134,9 +1258,9 @@
   bg_dialog_destroy(dialog);
 
   album_2_iter(w, w->selected_album, &iter);
-  set_album(w, w->selected_album, &iter, 0, 0);
+  set_album(w, w->selected_album, &iter, 0);
   
-  bg_gtk_tree_widget_update(w, 0);
+  bg_gtk_tree_widget_update(w);
 
   if(s.name)
     free(s.name);
@@ -1167,7 +1291,7 @@
   
   /* 3rd step: Make changes visible */
   
-  bg_gtk_tree_widget_update(w, 0);
+  bg_gtk_tree_widget_update(w);
   }
 
 static void attach_func(gpointer data,
@@ -1194,10 +1318,8 @@
                         gpointer user_data)
   {
   bg_gtk_album_window_t * win;
-  bg_gtk_tree_widget_t * widget;
   
   win = (bg_gtk_album_window_t *)data;
-  widget = (bg_gtk_tree_widget_t *)user_data;
   
   bg_gtk_album_window_detach(win);
   }
@@ -1259,7 +1381,7 @@
             (w == widget->remove_button))
       {
       remove_album(widget, widget->selected_album);
-      bg_gtk_tree_widget_update(widget, 0);
+      bg_gtk_tree_widget_update(widget);
       }
     else if(w == widget->menu.album_menu.close_item)
       {
@@ -1549,6 +1671,8 @@
       case BG_ALBUM_TYPE_PLUGIN:
       case BG_ALBUM_TYPE_REMOVABLE:
       case BG_ALBUM_TYPE_TUNER:
+      case BG_ALBUM_TYPE_UPNP:
+      case BG_ALBUM_TYPE_UPNP_ROOT:
         gtk_tree_view_unset_rows_drag_source(GTK_TREE_VIEW(w->treeview));
         break;
       case BG_ALBUM_TYPE_REGULAR:
@@ -1576,11 +1700,14 @@
   
   w = (bg_gtk_tree_widget_t*)user_data;
 
+  //  fprintf(stderr, "Expand\n");
+
   album = iter_2_album(w, arg1);
   if(!album)
     return;
   
   bg_album_set_expanded(album, 1);
+  set_children(w, album, arg1);
   }
 
 static void row_collapsed_callback(GtkTreeView *treeview,
@@ -1598,6 +1725,8 @@
     return;
   
   bg_album_set_expanded(album, 0);
+  delete_children(w, arg1);
+  add_dummy_entry(w, arg1);
   }
 
 static void drag_get_callback(GtkWidget *widget,
@@ -1691,6 +1820,8 @@
       case BG_ALBUM_TYPE_PLUGIN:
       case BG_ALBUM_TYPE_REMOVABLE:
       case BG_ALBUM_TYPE_TUNER:
+      case BG_ALBUM_TYPE_UPNP:
+      case BG_ALBUM_TYPE_UPNP_ROOT:
         return;
       case BG_ALBUM_TYPE_REGULAR:
       case BG_ALBUM_TYPE_INCOMING:
@@ -1733,7 +1864,7 @@
                   TRUE, /* Success */
                   do_delete, /* Delete */
                   w->drop_time);
-  bg_gtk_tree_widget_update(w, 0);
+  bg_gtk_tree_widget_update(w);
   }
 
 static gboolean drag_drop_callback(GtkWidget *widget,
@@ -1836,6 +1967,8 @@
         case BG_ALBUM_TYPE_PLUGIN:
         case BG_ALBUM_TYPE_REMOVABLE:
         case BG_ALBUM_TYPE_TUNER:
+        case BG_ALBUM_TYPE_UPNP:
+        case BG_ALBUM_TYPE_UPNP_ROOT:
           break;
         }
       }
@@ -1847,7 +1980,7 @@
 static void tree_changed_callback(bg_media_tree_t * t, void * data)
   {
   bg_gtk_tree_widget_t * w = (bg_gtk_tree_widget_t *)data;
-  bg_gtk_tree_widget_update(w, 0);
+  bg_gtk_tree_widget_update(w);
 
   /* This is also called during loading of huge amounts of
      urls, so we update the GUI a bit */
@@ -1893,6 +2026,19 @@
   return TRUE;
   }
 
+static void check_open_album_window(bg_album_t * a, void * priv)
+  {
+  bg_gtk_tree_widget_t * w = priv;
+  if(bg_album_is_open(a))
+    bg_gtk_tree_widget_open_album_window(w, a);
+  }
+
+static void open_album_windows(bg_gtk_tree_widget_t * w)
+  {
+  bg_media_tree_foreach(w->tree, check_open_album_window, w);
+  }
+
+
 /* Constructor */
 
 bg_gtk_tree_widget_t *
@@ -1926,7 +2072,10 @@
                               G_TYPE_STRING,
                               GDK_TYPE_PIXBUF,
                               G_TYPE_INT,
-                              G_TYPE_STRING);
+                              G_TYPE_STRING,
+                              G_TYPE_INT,
+                              G_TYPE_INT
+                              );
   
   ret->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
 
@@ -2000,6 +2149,10 @@
                                      "weight", COLUMN_WEIGHT);
   gtk_tree_view_column_add_attribute(column,
                                      text_renderer,
+                                     "style", COLUMN_STYLE);
+  
+  gtk_tree_view_column_add_attribute(column,
+                                     text_renderer,
                                      "foreground", COLUMN_COLOR);
 
   gtk_tree_view_column_add_attribute(column,
@@ -2073,7 +2226,8 @@
 
   if(ret->toplevel_window)
     {
-    g_signal_connect(G_OBJECT(ret->notebook), "switch-page", G_CALLBACK(notebook_change_page), (gpointer*)ret);
+    g_signal_connect(G_OBJECT(ret->notebook), "switch-page",
+                     G_CALLBACK(notebook_change_page), (gpointer*)ret);
     }
 
   gtk_notebook_set_scrollable(GTK_NOTEBOOK(ret->notebook), TRUE);
@@ -2094,11 +2248,13 @@
   
   bg_cfg_section_apply(ret->cfg_section, parameters, set_parameter, ret);
   
-  bg_gtk_tree_widget_update(ret, 1);
+  bg_gtk_tree_widget_update(ret);
 
-#ifdef HAVE_INOTIFY
+  open_album_windows(ret);
+  
+  // #ifdef HAVE_INOTIFY
   ret->timeout_tag = g_timeout_add(500, timeout_func, (gpointer)ret);
-#endif
+  // #endif
   return ret;
   }
 
@@ -2112,9 +2268,14 @@
   
   while(w->album_windows)
     {
+    bg_album_t * a;
     win = (bg_gtk_album_window_t*)w->album_windows->data;
-    w->album_windows = g_list_remove(w->album_windows, (gpointer)win);
+
+    a = bg_gtk_album_window_get_album(win);
+    bg_album_set_destroy_callback(a, NULL, NULL);
     bg_gtk_album_window_destroy(win, 0);
+
+    w->album_windows = g_list_remove(w->album_windows, win);
     }
   if(w->timeout_tag > 0)
     g_source_remove(w->timeout_tag);

gmerlin-1.2.0.tar.gz/lib/gtk/treewindow.c -> gmerlin-4256.tar.gz/lib/gtk/treewindow.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/urllink.c -> gmerlin-4256.tar.gz/lib/gtk/urllink.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/urlselect.c -> gmerlin-4256.tar.gz/lib/gtk/urlselect.c Changed

gmerlin-1.2.0.tar.gz/lib/gtk/vumeter.c -> gmerlin-4256.tar.gz/lib/gtk/vumeter.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,6 +34,8 @@
 
 #include <gmerlin/utils.h>
 
+#include <gavl/peakdetector.h>
+
 /* Some constants */
 
 #define TIC_LENGTH    7
@@ -435,13 +437,12 @@
   uint8_t * on_ptr;
   uint8_t * off_ptr;
   
-  int on_stride, off_stride;
+  int on_stride;
 
   on_pixels = gdk_pixbuf_get_pixels(m->pixbuf_on);
   off_pixels = gdk_pixbuf_get_pixels(m->pixbuf_off);
 
   on_stride  = gdk_pixbuf_get_rowstride(m->pixbuf_on);
-  off_stride = gdk_pixbuf_get_rowstride(m->pixbuf_off);
   
   for(i = 0; i < m->meters[0].coords.width; i++)
     {
@@ -481,13 +482,12 @@
   uint8_t * on_ptr;
   uint8_t * off_ptr;
   
-  int on_stride, off_stride;
+  int on_stride;
 
   on_pixels = gdk_pixbuf_get_pixels(m->pixbuf_on);
   off_pixels = gdk_pixbuf_get_pixels(m->pixbuf_off);
 
   on_stride  = gdk_pixbuf_get_rowstride(m->pixbuf_on);
-  off_stride = gdk_pixbuf_get_rowstride(m->pixbuf_off);
   
   for(i = 0; i < m->meters[0].coords.height; i++)
     {
@@ -771,12 +771,12 @@
 
     if(v->pixbuf_on)
       {
-      gdk_pixbuf_unref(v->pixbuf_on);
+      g_object_unref(v->pixbuf_on);
       v->pixbuf_on = NULL;
       }
     if(v->pixbuf_off)
       {
-      gdk_pixbuf_unref(v->pixbuf_off);
+      g_object_unref(v->pixbuf_off);
       v->pixbuf_off = NULL;
       }

gmerlin-1.2.0.tar.gz/lib/hexdump.c -> gmerlin-4256.tar.gz/lib/hexdump.c Changed

gmerlin-4256.tar.gz/lib/http.c Added

@@ -0,0 +1,781 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <gmerlin/http.h>
+#include <gmerlin/bgsocket.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "http"
+
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+#include <errno.h>
+
+#define META_PROTOCOL   "$PROTOCOL"
+#define META_PATH       "$PATH"
+#define META_METHOD     "$METHOD"
+#define META_STATUS_INT "$STATUS_INT"
+#define META_STATUS_STR "$STATUS_STR"
+#define META_EMPTY      "$EMPTY"
+
+/* Prepare and write a http request (client) */
+
+static int parse_vars_line(gavl_metadata_t * m, char * line)
+  {
+  char * pos;
+
+  if(*line == '\0') // Final line
+    return 1;
+  
+  pos = strchr(line, ':');
+  if(!pos)
+    return 0;
+  *pos = '\0';
+  pos++;
+  while(isspace(*pos) && (*pos != '\0'))
+    pos++;
+  if(*pos == '\0')
+    gavl_metadata_set(m, line, META_EMPTY);
+  else
+    gavl_metadata_set(m, line, pos);
+  return 1;
+  }
+
+static int read_vars(int fd, char ** line, int * line_alloc,
+                     gavl_metadata_t * m, int timeout)
+  {
+  while(1)
+    {
+    if(!bg_socket_read_line(fd, line, line_alloc, timeout))
+      return 0;
+    
+    //    fprintf(stderr, "Got line: %s\n", *line);
+    
+    if(**line == '\0')
+      return 1;
+    
+    if(!parse_vars_line(m, *line))
+      return 0;
+    }
+  return 1;
+  }
+
+static void write_vars(char * str, const gavl_metadata_t * m)
+  {
+  int i;
+
+  for(i = 0; i < m->num_tags; i++)
+    {
+    if(!strcmp(m->tags[i].val, META_EMPTY))
+      {
+      strcat(str, m->tags[i].key);
+      strcat(str, ":\r\n");
+      }
+    else if(*(m->tags[i].key) != '$')
+      {
+      strcat(str, m->tags[i].key);
+      strcat(str, ": ");
+      strcat(str, m->tags[i].val);
+      strcat(str, "\r\n");
+      }
+    }
+  strcat(str, "\r\n");
+  }
+
+static int vars_len(const gavl_metadata_t * m)
+  {
+  int ret = 0;
+  int i;
+  for(i = 0; i < m->num_tags; i++)
+    {
+    if(!strcmp(m->tags[i].val, META_EMPTY))
+      ret += strlen(m->tags[i].key) + 3; // :\r\n
+    else if(*(m->tags[i].key) != '$')
+      ret += strlen(m->tags[i].key) + 2 + strlen(m->tags[i].val) + 2;
+    }
+  ret += 2;
+  return ret;
+  }
+
+static void log_header_fields(const gavl_metadata_t * req)
+  {
+  int i;
+  for(i = 0; i < req->num_tags; i++)
+    {
+    if(req->tags[i].key[0] != '$')
+      bg_log(BG_LOG_DEBUG, "http", "%s: %s",
+             req->tags[i].key, req->tags[i].val);
+    }
+  }
+
+static void log_request(const gavl_metadata_t * req)
+  {
+  bg_log(BG_LOG_INFO, "http", "%s %s %s",
+         gavl_metadata_get(req, META_METHOD),
+         gavl_metadata_get(req, META_PATH),
+         gavl_metadata_get(req, META_PROTOCOL));
+  log_header_fields(req);
+  }
+
+static void log_response(const gavl_metadata_t * res)
+  {
+  bg_log(BG_LOG_INFO, "http", "%s %s %s",
+         gavl_metadata_get(res, META_PROTOCOL),
+         gavl_metadata_get(res, META_STATUS_INT),
+         gavl_metadata_get(res, META_STATUS_STR));
+  log_header_fields(res);
+  }
+
+
+void bg_http_request_init(gavl_metadata_t * req,
+                          const char * method,
+                          const char * path,
+                          const char * protocol)
+ {
+  gavl_metadata_init(req);
+  gavl_metadata_set(req, META_METHOD, method);
+  gavl_metadata_set(req, META_PATH, path);
+  gavl_metadata_set(req, META_PROTOCOL, protocol);
+  }
+
+int bg_http_request_write(int fd, gavl_metadata_t * req)
+  {
+  int result, len = 0;
+  char * line;
+
+  line = bg_http_request_to_string(req, &len);
+
+  result = bg_socket_write_data(fd, (const uint8_t*)line, len);
+  free(line);
+  return result;
+  }
+
+
+char * bg_http_request_to_string(const gavl_metadata_t * req, int * lenp)
+  {
+  int len;
+  const char * method;
+  const char * path;
+  const char * protocol;
+  char * line;
+  
+  if(!(method = gavl_metadata_get(req, META_METHOD)) ||
+     !(path = gavl_metadata_get(req, META_PATH)) ||
+     !(protocol = gavl_metadata_get(req, META_PROTOCOL)))
+    return NULL;
+  
+  len = strlen(method) + 1 + strlen(path) + 1 + strlen(protocol) + 2 +
+    vars_len(req);
+  line = malloc(len + 1);
+  line[len] = '\0';
+  snprintf(line, len, "%s %s %s\r\n", method, path, protocol);
+  write_vars(line, req);
+  if(lenp)
+    *lenp = len;
+  return line;
+  }
+
+
+/* Read a http request (server) */
+
+static int parse_request_line(gavl_metadata_t * req, char * line)
+  {
+  char * pos1, *pos2;
+  pos1 = strchr(line, ' ');
+  pos2 = strrchr(line, ' ');
+
+  if(!pos1 || !pos2 || (pos1 == pos2))
+    return 0;
+  
+  gavl_metadata_set_nocpy(req, META_METHOD,
+                          gavl_strndup( line, pos1));
+  gavl_metadata_set_nocpy(req, META_PATH,
+                           gavl_strndup( pos1+1, pos2));
+  gavl_metadata_set_nocpy(req, META_PROTOCOL,
+                          gavl_strdup(pos2+1));
+  return 1;
+  }
+
+int bg_http_request_read(int fd, gavl_metadata_t * req, int timeout)
+  {
+  int result = 0;
+  char * line = NULL;
+  int line_alloc = 0;
+  
+  if(!bg_socket_read_line(fd, &line, &line_alloc, timeout))
+    goto fail;
+
+  //  fprintf(stderr, "Got line: %s\n", line);
+  //  gavl_hexdump((uint8_t*)line, strlen(line)+1, 16);
+  
+  if(!parse_request_line(req, line))
+    goto fail;
+  
+  result = read_vars(fd, &line, &line_alloc, req, timeout);
+  log_request(req);
+
+  fail:
+  
+  if(line)
+    free(line);
+
+  return result;
+  }
+
+int bg_http_request_from_string(gavl_metadata_t * req, const char * buf)
+  {
+  int i;
+  char * pos;
+  int result = 0;
+  char ** str = bg_strbreak(buf, '\n');
+
+  i = 0;
+  while(str[i])
+    {
+    if((pos = strchr(str[i], '\r')))
+      *pos = '\0';
+    i++;
+    }
+
+  if(!parse_request_line(req, str[0]))
+    goto fail;
+  
+  i = 1;
+  while(str[i])
+    {
+    if(!parse_vars_line(req, str[i]))
+      goto fail;
+    i++;
+    }
+  result = 1;
+  fail:
+  bg_strbreak_free(str);
+  return result;
+  }
+
+const char * bg_http_request_get_protocol(const gavl_metadata_t * req)
+  {
+  return gavl_metadata_get(req, META_PROTOCOL);
+  }
+
+const char * bg_http_request_get_method(const gavl_metadata_t * req)
+  {
+  return gavl_metadata_get(req, META_METHOD);
+  }
+
+const char * bg_http_request_get_path(const gavl_metadata_t * req)
+  {
+  return gavl_metadata_get(req, META_PATH);
+  }
+
+/* Prepare and write a response (server) */
+
+void bg_http_response_init(gavl_metadata_t * res,
+                           const char * protocol,
+                           int status_int, const char * status_str)
+  {
+  gavl_metadata_init(res);
+  gavl_metadata_set(res, META_PROTOCOL, protocol);
+  gavl_metadata_set_int(res, META_STATUS_INT, status_int);
+  gavl_metadata_set(res, META_STATUS_STR, status_str);
+  }
+
+void bg_http_response_set_protocol(gavl_metadata_t * res,
+                                   const char * protocol)
+  {
+  gavl_metadata_set(res, META_PROTOCOL, protocol);
+  }
+
+char * bg_http_response_to_string(const gavl_metadata_t * res, int * lenp)
+  {
+  int len;
+  char * line;
+  int status_int;
+  const char * status_str;
+  const char * protocol;
+  
+  if(!gavl_metadata_get_int(res, META_STATUS_INT, &status_int) ||
+     !(status_str = gavl_metadata_get(res, META_STATUS_STR)) ||
+     !(protocol = gavl_metadata_get(res, META_PROTOCOL)))
+    return 0;
+
+  // Maximum allowed code 999
+  len = strlen(protocol) + 1 + 3 + 1 + strlen(status_str) + 2; 
+  len += vars_len(res);
+
+  line = malloc(len + 1);
+  snprintf(line, len, "%s %d %s\r\n", protocol, status_int, status_str);
+  write_vars(line, res);
+  if(lenp)
+    *lenp = len;
+  return line;
+  }
+
+int bg_http_response_write(int fd, gavl_metadata_t * res)
+  {
+  int result, len = 0;
+  char * line;
+  log_response(res);
+  line = bg_http_response_to_string(res, &len);
+  result = bg_socket_write_data(fd, (const uint8_t*)line, len);
+  free(line);
+  return result;
+  }
+
+
+/* Read a response (client) */
+
+static int parse_response_line(gavl_metadata_t * res, char * line)
+  {
+  char * pos1;
+  char * pos2;
+
+  pos1 = strchr(line, ' ');
+  if(!pos1)
+    return 0;
+
+  pos2 = strchr(pos1+1, ' ');
+  
+  if(!pos2)
+    return 0;
+  
+  gavl_metadata_set_nocpy(res, META_PROTOCOL,
+                          gavl_strndup( line, pos1));
+  gavl_metadata_set_nocpy(res, META_STATUS_INT,
+                          gavl_strndup( pos1+1, pos2));
+
+  pos2++;
+  gavl_metadata_set(res, META_STATUS_STR, pos2);
+  return 1;
+  }
+
+int bg_http_response_read(int fd, gavl_metadata_t * res, int timeout)
+  {
+  int result = 0;
+  char * line = NULL;
+  int line_alloc = 0;
+  
+  if(!bg_socket_read_line(fd, &line, &line_alloc, timeout) ||
+     !parse_response_line(res, line) ||
+     !read_vars(fd, &line, &line_alloc, res, timeout))
+    goto fail;
+  
+  result = 1;
+  fail:
+  if(line)
+    free(line);
+  
+  return result;
+  }
+
+int bg_http_response_from_string(gavl_metadata_t * res, const char * buf)
+  {
+  int i;
+  char * pos;
+  int result = 0;
+  char ** str = bg_strbreak(buf, '\n');
+
+  i = 0;
+  while(str[i])
+    {
+    if((pos = strchr(str[i], '\r')))
+      *pos = '\0';
+    i++;
+    }
+
+  if(!parse_response_line(res, str[0]))
+    goto fail;
+  
+  i = 1;
+  while(str[i])
+    {
+    if(!parse_vars_line(res, str[i]))
+      goto fail;
+    i++;
+    }
+
+  result = 1;
+  fail:
+  bg_strbreak_free(str);
+  
+  return result;
+  }
+
+
+const char * bg_http_response_get_protocol(gavl_metadata_t * res)
+  {
+  return gavl_metadata_get(res, META_PROTOCOL);
+  }
+
+const int bg_http_response_get_status_int(gavl_metadata_t * res)
+  {
+  int ret = 0;
+  gavl_metadata_get_int(res, META_STATUS_INT, &ret);
+  return ret;
+  }
+
+const char * bg_http_response_get_status_str(gavl_metadata_t * res)
+  {
+  return gavl_metadata_get(res, META_STATUS_STR);
+  }
+
+void bg_http_header_set_empty_var(gavl_metadata_t * h, const char * name)
+  {
+  gavl_metadata_set(h, name, META_EMPTY);
+  }
+
+void bg_http_header_set_date(gavl_metadata_t * h, const char * name)
+  {
+  char date[30];
+  time_t curtime = time(NULL);
+  struct tm tm;
+  
+  strftime(date, 30,"%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&curtime, &tm));
+  gavl_metadata_set(h, name, date);
+  }
+
+uint8_t * bg_http_read_body(int fd, const gavl_metadata_t * res, int *len)
+  {
+  char * length_str = NULL;
+  int length_alloc = 0;
+  uint8_t * ret = NULL;
+  int success = 0;
+  const char * var;
+  int chunked = 0;
+  int result;
+  
+  *len = 0;
+
+  // gavl_metadata_dump(res, 0);
+
+  var = gavl_metadata_get_i(res, "Transfer-Encoding");
+  if(var && !strcasecmp(var, "chunked"))
+    chunked = 1;
+  else
+    {
+    if(!gavl_metadata_get_int_i(res, "Content-Length", len))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No length given in http response");
+      goto fail;
+      }
+    }
+  
+  if(chunked)
+    {
+    int chunk_len;
+    uint8_t crlf[2];
+    while(1)
+      {
+      /* Read length */
+      if(!bg_socket_read_line(fd, &length_str,
+                              &length_alloc, 5000) ||
+         (sscanf(length_str, "%x", &chunk_len) < 1))
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Reading chunk length failed");
+        goto fail;
+        }
+
+      if(chunk_len > 0)
+        {
+        if((*len) + chunk_len > 10 * 1024 * 1024) // Never download more then 10 MB
+          {
+          bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Length %d outside allowed range", (*len) + chunk_len);
+          goto fail;
+          }
+        
+        ret = realloc(ret, (*len) + chunk_len + 1);
+        result = bg_socket_read_data(fd, ret + (*len), chunk_len, 5000);
+
+        if(result < chunk_len)
+          {
+          bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Reading %d bytes failed (got %d): %s", chunk_len, result,
+                 strerror(errno));
+          goto fail;
+          }
+
+        (*len) += chunk_len;
+        }
+        
+      /* Read trailing \r\n */
+      if((bg_socket_read_data(fd, crlf, 2, 5000) < 2) ||
+         (crlf[0] != '\r') ||
+         (crlf[1] != '\n'))
+        goto fail;
+
+      if(chunk_len <= 0)
+        {
+        // fprintf(stderr, "Downloaded chunked http %d bytes\n", *len);
+        // gavl_hexdump(ret, *len, 16);
+        break;
+        }
+      }
+    }
+  else
+    {
+    if((*len <= 0) || (*len > 10 * 1024 * 1024)) // Never download more then 10 MB
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Length %d outside allowed range", *len);
+      goto fail;
+      }
+
+    ret = malloc((*len)+1);
+
+    result = bg_socket_read_data(fd, ret, *len, 5000);
+    
+    if(result < *len)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Reading %d bytes failed (got %d): %s", *len, result,
+             strerror(errno));
+      goto fail;
+      }
+    }
+    
+  ret[*len] = '\0'; // Become string friendly
+  // Success :)
+  success = 1;
+
+  fail:
+  
+  if(length_str)
+    free(length_str);
+
+  if(!success)
+    {
+    if(ret)
+      {
+      free(ret);
+      ret = NULL;
+      }
+    }
+  
+  return ret;
+  
+  }
+
+/* Simple function implementing GET for (small) files */ 
+static uint8_t * http_get(const char * url, int * len, char ** mimetype, char ** redirect)
+  {
+  gavl_metadata_t req;
+  gavl_metadata_t res;
+  uint8_t * ret = NULL;
+  char * host = NULL;
+  char * path = NULL;
+  char * protocol = NULL;
+  char * request_host = NULL;
+  int port = -1;
+  int fd = -1;
+  int status = -1;
+  
+  bg_socket_address_t * addr = NULL;
+
+  gavl_metadata_init(&req);
+  gavl_metadata_init(&res);
+
+  //  fprintf(stderr, "http_get: %s\n", url);
+  
+  if(!bg_url_split(url,
+                   &protocol,
+                   NULL,
+                   NULL,
+                   &host,
+                   &port,
+                   &path))
+    goto fail;
+
+  if(strcasecmp(protocol, "http"))
+    goto fail;
+
+  if(port == -1)
+    {
+    request_host = gavl_strdup(host);
+    port = 80;
+    }
+  else
+    request_host = bg_sprintf("%s:%d", host, port);
+
+  bg_http_request_init(&req, "GET", path, "HTTP/1.1");
+  gavl_metadata_set(&req, "Host", request_host);
+ 
+  addr = bg_socket_address_create();
+  
+  if(!bg_socket_address_set(addr, host, port, SOCK_STREAM))
+    goto fail;
+
+  if((fd = bg_socket_connect_inet(addr, 5000)) < 0)
+    goto fail;
+
+  //  fprintf(stderr, "Request:\n");
+  //  gavl_metadata_dump(&req, 2);
+  
+  if(!bg_http_request_write(fd, &req))
+    goto fail;
+
+  if(!bg_http_response_read(fd, &res, 5000))
+    goto fail;
+
+  //  fprintf(stderr, "Response:\n");
+  //  gavl_metadata_dump(&res, 2);
+  
+  status = bg_http_response_get_status_int(&res);
+
+  if(status == 200) // Success
+    {
+    *mimetype = gavl_strdup(gavl_metadata_get_i(&res, "Content-Type"));
+
+    if(!(*mimetype)) // No mimetype
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No mimetype given for %s", url);
+      goto fail;
+      }
+
+    ret = bg_http_read_body(fd, &res, len);
+    }
+  else if((status >= 300) && (status < 400)) // Redirection
+    {
+    *redirect = gavl_strdup(gavl_metadata_get_i(&res, "Location"));
+    if(!(*redirect))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No location for redirection for %s", url);
+      goto fail;
+      }
+    }
+  else // Failure
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Downloading %s failed: %d %s", url, 
+           bg_http_response_get_status_int(&res),
+           bg_http_response_get_status_str(&res));
+    }
+
+  fail:
+  if(host)
+    free(host);
+  if(request_host)
+    free(request_host);
+  if(path)
+    free(path);
+  if(protocol)
+    free(protocol);
+  
+  if(fd >= 0)
+    close(fd);
+  
+  gavl_metadata_free(&req);
+  gavl_metadata_free(&res);
+
+  if(!ret)
+    {
+    if(*mimetype)
+      {
+      free(*mimetype);
+      *mimetype = NULL;
+      }
+    }
+
+  if(addr)
+    bg_socket_address_destroy(addr);
+
+  return ret;
+  }
+
+uint8_t * bg_http_get(const char * url, int * len, char ** mimetype)
+  {
+  int i;
+  uint8_t * ret;
+  char * redirect = NULL;
+  char * real_url = gavl_strdup(url);
+
+  for(i = 0; i < 5; i++)
+    {
+    ret = http_get(real_url, len, mimetype, &redirect);
+    if(ret)
+      break;
+    else if(redirect)
+      {
+      free(real_url);
+      real_url = redirect;
+      redirect = NULL;
+      }
+    else
+      break; // Error
+    }
+  free(real_url);
+  return ret;
+  }
+
+int bg_http_write_data(int fd, const uint8_t * data, int len, int chunked)
+  {
+  if(chunked)
+    {
+    char buf[128];
+    int slen;
+    int result;
+
+    /* Length in hex + \r\n */
+    snprintf(buf, 128, "%x\r\n", len);
+    slen = strlen(buf);
+    if(bg_socket_write_data(fd, (uint8_t*)buf, slen) < slen)
+      return 0;
+    
+    /* Chunk */
+    if((result = bg_socket_write_data(fd, data, len) < len))
+      return 0;
+
+    /* Trailing \r\n */
+    strncpy(buf, "\r\n", 128);
+    if(bg_socket_write_data(fd, (uint8_t*)buf, 2) < 2)
+      return 0;
+    return result;
+    }
+  else
+    return bg_socket_write_data(fd, data, len);
+  }
+
+void bg_http_flush(int fd, int chunked)
+  {
+  if(chunked)
+    {
+    char buf[128];
+    strncpy(buf, "0\r\n\r\n", 128);
+    bg_socket_write_data(fd, (uint8_t*)buf, 5);
+    }
+  }
+
+int bg_http_check_keepalive(const gavl_metadata_t * req, gavl_metadata_t * res)
+  {
+  const char * var;
+
+  if((var = gavl_metadata_get(req, "Connection")) && !strcasecmp(var, "Keep-Alive"))
+    {
+    if(res)
+      gavl_metadata_set(res, "Connection", "keep-alive");
+    return 1;
+    }
+
+  if(res)
+    gavl_metadata_set(res, "Connection", "close");
+  return 0;
+  }
+

gmerlin-1.2.0.tar.gz/lib/language_table.c -> gmerlin-4256.tar.gz/lib/language_table.c Changed

gmerlin-1.2.0.tar.gz/lib/lcdproc.c -> gmerlin-4256.tar.gz/lib/lcdproc.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -207,11 +207,11 @@
   char ** answer_args;
   char * cmd = NULL;
   
-  bg_host_address_t * addr = bg_host_address_create();
+  bg_socket_address_t * addr = bg_socket_address_create();
 
-  if(!bg_host_address_set(addr, l->hostname_cfg, l->port_cfg, SOCK_STREAM))
+  if(!bg_socket_address_set(addr, l->hostname_cfg, l->port_cfg, SOCK_STREAM))
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not resolve adress for: %s",
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not resolve address for: %s",
            l->hostname_cfg);
     goto fail;
     }
@@ -280,7 +280,7 @@
   
   return 1;
   fail:
-  bg_host_address_destroy(addr);
+  bg_socket_address_destroy(addr);
 
   if(cmd) free(cmd);
   
@@ -298,7 +298,10 @@
 static int set_name(bg_lcdproc_t * l, const char * name)
   {
   char * command;
-
+  
+  if(!name)
+    return 1;
+  
   if(strlen(name) > l->width)
     command = bg_sprintf("widget_set %s %s 1 2 %d 3 m 1 {%s *** }",
                        name_time_name, name_name, l->width, name);
@@ -700,7 +703,6 @@
   int result = 1;
   
   int arg_i_1;
-  char * arg_str_1;
   
   int id;
   gavl_time_t time;
@@ -781,12 +783,14 @@
               break;
             }
           break;
-        case BG_PLAYER_MSG_TRACK_NAME:
+        case BG_PLAYER_MSG_METADATA:
           if(l->have_name_time)
             {
-            arg_str_1 = bg_msg_get_arg_string(msg, 0);
-            result = set_name(l, arg_str_1);
-            free(arg_str_1);
+            gavl_metadata_t m;
+            gavl_metadata_init(&m);
+            bg_msg_get_arg_metadata(msg, 0, &m);
+            result = set_name(l, gavl_metadata_get(&m, GAVL_META_LABEL));
+            gavl_metadata_free(&m);
             }
           break;
         case BG_PLAYER_MSG_AUDIO_STREAM_INFO:
@@ -812,14 +816,14 @@
         case BG_PLAYER_MSG_AUDIO_STREAM:
           if(l->have_formats)
             {
-            bg_msg_get_arg_audio_format(msg, 1, &audio_format, NULL);
+            bg_msg_get_arg_audio_format(msg, 1, &audio_format);
             result = set_audio_format(l, &audio_format);
             }
           break;
         case BG_PLAYER_MSG_VIDEO_STREAM:
           if(l->have_formats)
             {
-            bg_msg_get_arg_video_format(msg, 1, &video_format, NULL);
+            bg_msg_get_arg_video_format(msg, 1, &video_format);
             result = set_video_format(l, &video_format);
             }
           break;
@@ -979,7 +983,7 @@
     }
   else if(!strcmp(name, "hostname"))
     {
-    l->hostname_cfg = bg_strdup(l->hostname_cfg, val->val_str);
+    l->hostname_cfg = gavl_strrep(l->hostname_cfg, val->val_str);
     }
   else if(!strcmp(name, "port"))
     {

gmerlin-1.2.0.tar.gz/lib/log.c -> gmerlin-4256.tar.gz/lib/log.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -32,6 +32,10 @@
 #include <pthread.h>
 #include <syslog.h>
 
+#ifdef HAVE_ISATTY
+#include <unistd.h>
+#endif
+
 #include <gmerlin/log.h>
 #include <gmerlin/utils.h>
 
@@ -68,6 +72,83 @@
   return NULL;
   }
 
+/* Default log functions */
+
+static void log_default_nocolor(bg_log_level_t level,
+                                const char * domain, const char * msg)
+  {
+  fprintf(stderr, "[%s] %s: %s\n",
+          domain,
+          bg_log_level_to_string(level),
+          msg);
+  }
+
+#ifdef HAVE_ISATTY
+static int log_initialized = 0;
+static int use_color = 0;
+
+static char term_error[]  = "\33[31m";
+static char term_warn[]   = "\33[33m";
+static char term_debug[]  = "\33[32m";
+static char term_reset[]  = "\33[0m";
+
+static void log_default(bg_log_level_t level, const char * domain,
+                        const char * msg)
+  {
+  if(!log_initialized)
+    {
+    if(isatty(fileno(stderr)) && getenv("TERM"))
+      use_color = 1;
+    else
+      use_color = 0;
+    log_initialized = 1;
+    }
+
+  if(use_color)
+    {
+    switch(level)
+      {
+      case BG_LOG_INFO:
+        fprintf(stderr, "[%s] %s\n",
+                domain,
+                msg);
+        break;
+      case BG_LOG_WARNING:
+        fprintf(stderr, "%s[%s] %s%s\n",
+                term_warn,
+                domain,
+                msg,
+                term_reset);
+        break;
+      case BG_LOG_ERROR:
+        fprintf(stderr, "%s[%s] %s%s\n",
+                term_error,
+                domain,
+                msg,
+                term_reset);
+        break;
+      case BG_LOG_DEBUG:
+        fprintf(stderr, "%s[%s] %s%s\n",
+                term_debug,
+                domain,
+                msg,
+                term_reset);
+        break;
+      }
+    
+    }
+  else
+    {
+    log_default_nocolor(level, domain, msg);
+    }
+  }
+
+#else
+#define log_default log_default_nocolor
+#endif
+
+static void (*log_func)(bg_log_level_t level, const char * domain,
+                        const char * msg) = log_default;
 
 
 static bg_msg_queue_t * log_queue = NULL;
@@ -78,7 +159,6 @@
   bg_msg_t * msg;
   char ** lines;
   int i;
-  FILE * out = stderr;
 #ifndef DUMP_LOG
   if(!log_queue)
     {
@@ -89,14 +169,11 @@
       i = 0;
       while(lines[i])
         {
-        fprintf(out, "[%s] %s: %s\n",
-                domain,
-                bg_log_level_to_string(level),
-                lines[i]);
+        log_func(level, domain, lines[i]);
         if(level == BG_LOG_ERROR)
           {
           pthread_mutex_lock(&last_error_mutex);
-          last_error = bg_strdup(last_error, lines[i]);
+          last_error = gavl_strrep(last_error, lines[i]);
           pthread_mutex_unlock(&last_error_mutex);
           }
         i++;
@@ -176,19 +253,44 @@
   log_mask = mask;
   }
 
+void bg_log_set_verbose_level(int level)
+  {
+  int mask = 0;
+  if(level > 0)
+    mask |= BG_LOG_ERROR;
+  if(level > 1)
+    mask |= BG_LOG_WARNING;
+  if(level > 2)
+    mask |= BG_LOG_INFO;
+  if(level > 3)
+    mask |= BG_LOG_DEBUG; 
+  bg_log_set_verbose(mask);
+  }
+
+int bg_log_get_verbose_level()
+  {
+  if(log_mask & BG_LOG_DEBUG)
+    return 4;
+  if(log_mask & BG_LOG_INFO)
+    return 3;
+  if(log_mask & BG_LOG_WARNING)
+    return 2;
+  if(log_mask & BG_LOG_ERROR)
+    return 1;
+  return 0;
+  }
+
 char * bg_log_last_error()
   {
   char * ret;
   pthread_mutex_lock(&last_error_mutex);
-  ret = bg_strdup(NULL, last_error);
+  ret = gavl_strdup(last_error);
   pthread_mutex_unlock(&last_error_mutex);
   return ret;
   }
 
 /* Syslog stuff */
 
-static bg_msg_queue_t * syslog_queue = NULL;
-
 static struct
   {
   int gmerlin_level;
@@ -202,55 +304,40 @@
     { BG_LOG_DEBUG,   LOG_DEBUG },
   };
 
-void bg_log_syslog_init(const char * name)
+static void log_syslog(bg_log_level_t level, const char * domain,
+                       const char * msg)
   {
-  syslog_queue = bg_msg_queue_create();
-  bg_log_set_dest(syslog_queue);
-
-  /* Initialize Logging */
-  openlog(name, LOG_PID, LOG_USER);
-  }
-
-void bg_log_syslog_flush()
-  {
-  bg_msg_t * msg;
-  char * domain;
-  char * message;
   int i;
-  
-  int gmerlin_level;
   int syslog_level = LOG_INFO;
-  while((msg = bg_msg_queue_try_lock_read(syslog_queue)))
-    {
-    gmerlin_level = bg_msg_get_id(msg);
 
-    if(!(gmerlin_level & log_mask))
+  for(i = 0; i < sizeof(loglevels) / sizeof(loglevels[0]); i++)
+    {
+    if(loglevels[i].gmerlin_level == level)
       {
-      bg_msg_queue_unlock_read(syslog_queue);
-      continue;
+      syslog_level = loglevels[i].syslog_level;
+      break;
       }
-    
-    domain = bg_msg_get_arg_string(msg, 0);
-    message = bg_msg_get_arg_string(msg, 1);
+    }
+  syslog(syslog_level, "%s: %s", domain, msg);
+  }
 
+static char * syslog_name;
 
-    i = 0;
-    for(i = 0; i < sizeof(loglevels) / sizeof(loglevels[0]); i++)
-      {
-      if(loglevels[i].gmerlin_level == gmerlin_level)
-        {
-        loglevels[i].syslog_level = syslog_level;
-        break;
-        }
-      }
-    syslog(syslog_level, "%s: %s", domain, message);
-    free(domain);
-    free(message);
-    bg_msg_queue_unlock_read(syslog_queue);
-    }
-  
+void bg_log_syslog_init(const char * name)
+  {
+  //  syslog_queue = bg_msg_queue_create();
+  //  bg_log_set_dest(syslog_queue);
+
+  /* Initialize Logging */
+  syslog_name = gavl_strrep(syslog_name, name);
+  openlog(syslog_name, LOG_PID, LOG_USER);
+  log_func = log_syslog;
   }
 
+const char * bg_log_syslog_name()
+  {
+  return syslog_name;
+  }
 
 #if defined(__GNUC__)
 
@@ -260,8 +347,8 @@
   {
   if(last_error)
     free(last_error);
-  if(syslog_queue)
-    bg_msg_queue_destroy(syslog_queue);
+  if(syslog_name)
+    free(syslog_name);
   }
 
 #endif

gmerlin-4256.tar.gz/lib/mediaconnector.c Added

@@ -0,0 +1,646 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+
+#include <gmerlin/mediaconnector.h>
+
+#include <gmerlin/translation.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "mediaconnector"
+
+
+static bg_mediaconnector_stream_t *
+append_stream(bg_mediaconnector_t * conn,
+              const gavl_metadata_t * m, gavl_packet_source_t * psrc)
+  {
+  bg_mediaconnector_stream_t * ret;
+  conn->streams = realloc(conn->streams,
+                          (conn->num_streams+1) * sizeof(*conn->streams));
+  
+  ret = calloc(1, sizeof(*ret));
+
+  conn->streams[conn->num_streams] = ret;
+  conn->num_streams++;
+  
+  if(m)
+    gavl_metadata_copy(&ret->m, m);
+  ret->psrc = psrc;
+  ret->conn = conn;
+  ret->last_status = GAVL_SOURCE_OK; 
+  return ret;
+  }
+
+void
+bg_mediaconnector_init(bg_mediaconnector_t * conn)
+  {
+  memset(conn, 0, sizeof(*conn));
+  pthread_mutex_init(&conn->time_mutex, NULL);
+  pthread_mutex_init(&conn->running_threads_mutex, NULL);
+  }
+                       
+
+static void process_cb_audio(void * priv, gavl_audio_frame_t * frame)
+  {
+  bg_mediaconnector_stream_t * s = priv;
+  s->time = gavl_time_unscale(s->timescale,
+                              frame->timestamp + frame->valid_samples);
+  bg_mediaconnector_update_time(s->conn, s->time);
+  }
+
+static void process_cb_video(void * priv, gavl_video_frame_t * frame)
+  {
+  bg_mediaconnector_stream_t * s = priv;
+  s->time = gavl_time_unscale(s->timescale,
+                              frame->timestamp + frame->duration);
+  bg_mediaconnector_update_time(s->conn, s->time);
+  }
+
+static void process_cb_packet(void * priv, gavl_packet_t * p)
+  {
+  bg_mediaconnector_stream_t * s = priv;
+  s->time = gavl_time_unscale(s->timescale,
+                              p->pts + p->duration);
+  bg_mediaconnector_update_time(s->conn, s->time);
+  }
+
+static gavl_source_status_t read_video_discont(void * data,
+                                               gavl_video_frame_t ** f)
+  {
+  gavl_time_t frame_time, global_time;
+  gavl_source_status_t st;
+  bg_mediaconnector_stream_t * s = data;
+
+  if(!s->discont_vframe)
+    {
+    if((st = gavl_video_source_read_frame(s->vsrc, &s->discont_vframe)) != GAVL_SOURCE_OK)
+      return st;
+    }
+  
+  global_time = bg_mediaconnector_get_time(s->conn);
+  frame_time = gavl_time_unscale(s->timescale, s->discont_vframe->timestamp);
+
+  if(frame_time < global_time + GAVL_TIME_SCALE / 2)
+    {
+    *f = s->discont_vframe;
+    s->discont_vframe = NULL;
+    return GAVL_SOURCE_OK;
+    }
+  return GAVL_SOURCE_AGAIN;
+  }
+
+static gavl_source_status_t read_packet_discont(void * data,
+                                                gavl_packet_t ** p)
+  {
+  gavl_time_t frame_time, global_time;
+  gavl_source_status_t st;
+  bg_mediaconnector_stream_t * s = data;
+
+  if(!s->discont_packet)
+    {
+    if((st = gavl_packet_source_read_packet(s->psrc, &s->discont_packet)) != GAVL_SOURCE_OK)
+      return st;
+    }
+  
+  global_time = bg_mediaconnector_get_time(s->conn);
+  frame_time = gavl_time_unscale(s->timescale, s->discont_packet->pts);
+
+  //  fprintf(stderr, "read_packet_discont %ld %ld\n", global_time, frame_time);
+  
+  if((global_time != GAVL_TIME_UNDEFINED) &&
+     (frame_time < global_time + GAVL_TIME_SCALE / 2))
+    {
+    *p = s->discont_packet;
+    s->discont_packet = NULL;
+    return GAVL_SOURCE_OK;
+    }
+  return GAVL_SOURCE_AGAIN;
+  }
+
+
+static void create_connector(bg_mediaconnector_stream_t * ret)
+  {
+  if(ret->asrc)
+    {
+    ret->aconn = gavl_audio_connector_create(ret->asrc);
+    gavl_audio_connector_set_process_func(ret->aconn,
+                                          process_cb_audio,
+                                          ret);
+    }
+  else if(ret->vsrc)
+    {
+    if(ret->flags & BG_MEDIACONNECTOR_FLAG_DISCONT)
+      {
+      ret->discont_vsrc = gavl_video_source_create(read_video_discont, ret, GAVL_SOURCE_SRC_ALLOC,
+                                                   gavl_video_source_get_src_format(ret->vsrc));
+      ret->vconn = gavl_video_connector_create(ret->discont_vsrc);
+      }
+    else
+      ret->vconn = gavl_video_connector_create(ret->vsrc);
+    gavl_video_connector_set_process_func(ret->vconn,
+                                          process_cb_video,
+                                          ret);
+    }
+  else if(ret->psrc)
+    {
+    if(ret->flags & BG_MEDIACONNECTOR_FLAG_DISCONT)
+      {
+      ret->discont_psrc =
+        gavl_packet_source_create_source(read_packet_discont, ret, GAVL_SOURCE_SRC_ALLOC,
+                                         ret->psrc);
+      ret->pconn = gavl_packet_connector_create(ret->discont_psrc);
+      }
+    else
+      ret->pconn = gavl_packet_connector_create(ret->psrc);
+    gavl_packet_connector_set_process_func(ret->pconn,
+                                           process_cb_packet,
+                                           ret);
+    }
+  }
+
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_audio_stream(bg_mediaconnector_t * conn,
+                                   const gavl_metadata_t * m,
+                                   gavl_audio_source_t * asrc,
+                                   gavl_packet_source_t * psrc)
+  {
+  bg_mediaconnector_stream_t * ret = append_stream(conn, m, psrc);
+  ret->type = GAVF_STREAM_AUDIO;
+  ret->asrc = asrc;
+  return ret;
+  }
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_video_stream(bg_mediaconnector_t * conn,
+                                   const gavl_metadata_t * m,
+                                   gavl_video_source_t * vsrc,
+                                   gavl_packet_source_t * psrc)
+  {
+  const gavl_video_format_t * fmt;
+  bg_mediaconnector_stream_t * ret = append_stream(conn, m, psrc);
+  ret->type = GAVF_STREAM_VIDEO;
+  ret->vsrc = vsrc;
+
+  fmt = 
+    ret->vsrc ? gavl_video_source_get_src_format(ret->vsrc) :
+    gavl_packet_source_get_video_format(ret->psrc);
+  
+  if(fmt->framerate_mode == GAVL_FRAMERATE_STILL)
+    ret->flags |= BG_MEDIACONNECTOR_FLAG_DISCONT;
+  return ret;
+  }
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_overlay_stream(bg_mediaconnector_t * conn,
+                                     const gavl_metadata_t * m,
+                                     gavl_video_source_t * vsrc,
+                                     gavl_packet_source_t * psrc)
+  {
+  bg_mediaconnector_stream_t * ret = append_stream(conn, m, psrc);
+  ret->type = GAVF_STREAM_OVERLAY;
+  ret->vsrc = vsrc;
+  ret->flags |= BG_MEDIACONNECTOR_FLAG_DISCONT;
+  return ret;
+  }
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_add_text_stream(bg_mediaconnector_t * conn,
+                                  const gavl_metadata_t * m,
+                                  gavl_packet_source_t * psrc,
+                                  int timescale)
+  {
+  bg_mediaconnector_stream_t * ret = append_stream(conn, m, psrc);
+  ret->type = GAVF_STREAM_TEXT;
+  ret->flags |= BG_MEDIACONNECTOR_FLAG_DISCONT;
+  ret->timescale = timescale;
+  return ret;
+  }
+
+void
+bg_mediaconnector_create_conn(bg_mediaconnector_t * conn)
+  {
+  int i;
+  for(i = 0; i < conn->num_streams; i++)
+    create_connector(conn->streams[i]);
+  }
+
+void
+bg_mediaconnector_free(bg_mediaconnector_t * conn)
+  {
+  int i;
+  bg_mediaconnector_stream_t * s;
+  if(conn->streams)
+    {
+    for(i = 0; i < conn->num_streams; i++)
+      {
+      s = conn->streams[i];
+
+      if(s->free_priv)
+        s->free_priv(s);
+      
+      if(s->discont_psrc)
+        gavl_packet_source_destroy(s->discont_psrc);
+      if(s->aconn)
+        gavl_audio_connector_destroy(s->aconn);
+      if(s->vconn)
+        gavl_video_connector_destroy(s->vconn);
+      if(s->pconn)
+        gavl_packet_connector_destroy(s->pconn);
+      if(s->th)
+        bg_thread_destroy(s->th);
+      gavl_metadata_free(&s->m);
+      free(s);
+      }
+    free(conn->streams);
+    }
+  if(conn->tc)
+    bg_thread_common_destroy(conn->tc);
+  if(conn->th)
+    free(conn->th);
+
+  pthread_mutex_destroy(&conn->time_mutex);
+  pthread_mutex_destroy(&conn->running_threads_mutex);
+  }
+
+void
+bg_mediaconnector_start(bg_mediaconnector_t * conn)
+  {
+  int i;
+  bg_mediaconnector_stream_t * s;
+  
+  conn->time = GAVL_TIME_UNDEFINED;
+  
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+
+    s->time = GAVL_TIME_UNDEFINED;
+    
+    switch(s->type)
+      {
+      case GAVF_STREAM_AUDIO:
+        {
+        const gavl_audio_format_t * afmt;
+        if(s->aconn)
+          {
+          gavl_audio_connector_start(s->aconn);
+          afmt = gavl_audio_connector_get_process_format(s->aconn);
+          }
+        else
+          afmt = gavl_packet_source_get_audio_format(s->psrc);
+        s->timescale = afmt->samplerate;
+        }
+        break;
+      case GAVF_STREAM_VIDEO:
+        {
+        const gavl_video_format_t * vfmt;
+        if(s->vconn)
+          {
+          gavl_video_connector_start(s->vconn);
+          vfmt = gavl_video_connector_get_process_format(s->vconn);
+          }
+        else
+          vfmt = gavl_packet_source_get_video_format(s->psrc);
+
+        if(vfmt->framerate_mode == GAVL_FRAMERATE_STILL)
+          s->flags |= BG_MEDIACONNECTOR_FLAG_DISCONT;
+        
+        s->timescale = vfmt->timescale;
+        }
+        break;
+      case GAVF_STREAM_OVERLAY:
+        {
+        const gavl_video_format_t * vfmt;
+        if(s->vconn)
+          {
+          gavl_video_connector_start(s->vconn);
+          vfmt = gavl_video_connector_get_process_format(s->vconn);
+          }
+        else
+          vfmt = gavl_packet_source_get_video_format(s->psrc);
+
+        s->flags |= BG_MEDIACONNECTOR_FLAG_DISCONT;
+        s->timescale = vfmt->timescale;
+        }
+        break;
+      case GAVF_STREAM_TEXT:
+        {
+        s->flags |= BG_MEDIACONNECTOR_FLAG_DISCONT;
+        }
+        break;
+      }
+    }
+  }
+
+static int process_stream(bg_mediaconnector_stream_t * s)
+  {
+  int ret = 0;
+  if(s->aconn)
+    {
+    ret = gavl_audio_connector_process(s->aconn);
+    s->last_status = gavl_audio_connector_get_source_status(s->aconn);
+    }
+  else if(s->vconn)
+    {
+    ret = gavl_video_connector_process(s->vconn);
+    s->last_status = gavl_video_connector_get_source_status(s->vconn);
+    }
+  else if(s->pconn)
+    {
+    ret = gavl_packet_connector_process(s->pconn);
+    s->last_status = gavl_packet_connector_get_source_status(s->pconn);
+    }
+  if(!ret)
+    s->flags |= BG_MEDIACONNECTOR_FLAG_EOF;
+  else
+    s->counter++;
+  
+  return ret;
+  }
+
+gavl_time_t
+bg_mediaconnector_get_min_time(bg_mediaconnector_t * conn)
+  {
+  int i;
+  bg_mediaconnector_stream_t * s;
+  gavl_time_t min_time= GAVL_TIME_UNDEFINED;
+  
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+    if(s->flags & (BG_MEDIACONNECTOR_FLAG_EOF |
+                   BG_MEDIACONNECTOR_FLAG_DISCONT))
+      continue;
+    
+    if((min_time == GAVL_TIME_UNDEFINED) ||
+       (s->time < min_time))
+      {
+      min_time = s->time;
+      }
+    }
+  return min_time;
+  }
+
+int bg_mediaconnector_iteration(bg_mediaconnector_t * conn)
+  {
+  int i;
+  gavl_time_t min_time= GAVL_TIME_UNDEFINED;
+  int min_index = -1;
+  bg_mediaconnector_stream_t * s;
+  int ret = 0;
+  
+  /* Process discontinuous streams */
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+
+    if(s->flags & BG_MEDIACONNECTOR_FLAG_EOF)
+      continue;
+    
+    if(s->flags & BG_MEDIACONNECTOR_FLAG_DISCONT)
+      ret += process_stream(s);
+    }
+
+  /* Find stream with minimum timestamp */
+  
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+    
+    if(s->flags & (BG_MEDIACONNECTOR_FLAG_EOF |
+                   BG_MEDIACONNECTOR_FLAG_DISCONT))
+      continue;
+
+    /* If we didn't get any data the last time, avoid an infinite
+       loop and take another stream */
+    if(s->last_status == GAVL_SOURCE_AGAIN)
+      continue;
+
+    ret++;
+    
+    if(s->time == GAVL_TIME_UNDEFINED)
+      {
+      min_index = i;
+      break;
+      }
+
+    if((min_index == -1) ||
+       (s->time < min_time))
+      {
+      min_time = s->time;
+      min_index = i;
+      }
+    }
+  
+  /* Process this stream */
+  if(min_index < 0)
+    {
+    if(!ret)
+      bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "EOF (No stream left to process)");
+    return ret;
+    }
+  s = conn->streams[min_index];
+
+  if(!process_stream(s))
+    {
+    if(!s->counter)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Couldn't get first frame/packet");
+      return 0;
+      }
+    }
+  
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+    if(i == min_index)
+      continue;
+
+    if(s->flags & (BG_MEDIACONNECTOR_FLAG_EOF |
+                   BG_MEDIACONNECTOR_FLAG_DISCONT))
+      continue;
+
+    /* If we didn't get any data from this stream yet, it's worth to
+       tra again */
+    s->last_status = GAVL_SOURCE_OK;
+    }
+
+  ret++;
+  return ret;
+  }
+
+void
+bg_mediaconnector_update_time(bg_mediaconnector_t * conn,
+                              gavl_time_t time)
+  {
+  pthread_mutex_lock(&conn->time_mutex);
+  if((conn->time == GAVL_TIME_UNDEFINED) ||
+     (time > conn->time))
+    conn->time = time;
+  pthread_mutex_unlock(&conn->time_mutex);
+  }
+
+gavl_time_t
+bg_mediaconnector_get_time(bg_mediaconnector_t * conn)
+  {
+  gavl_time_t ret;
+  pthread_mutex_lock(&conn->time_mutex);
+  ret = conn->time;
+  pthread_mutex_unlock(&conn->time_mutex);
+  return ret;
+  }
+
+
+/* Thread stuff */
+
+void
+bg_mediaconnector_create_threads_common(bg_mediaconnector_t * conn)
+  {
+  conn->tc = bg_thread_common_create();
+  conn->th = calloc(conn->num_streams, sizeof(*conn->th));
+  }
+
+void
+bg_mediaconnector_create_thread(bg_mediaconnector_t * conn, int index, int all)
+  {
+  bg_mediaconnector_stream_t * s;
+  s = conn->streams[index];
+
+  if(!all &&
+     ((s->type == GAVF_STREAM_TEXT) ||
+      (s->type == GAVF_STREAM_OVERLAY)))
+    return;
+  
+  s->th = bg_thread_create(conn->tc);
+  conn->th[conn->num_threads] = s->th;
+  conn->num_threads++;
+  }
+
+void
+bg_mediaconnector_create_threads(bg_mediaconnector_t * conn, int all)
+  {
+  int i;
+  bg_mediaconnector_create_threads_common(conn);
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    bg_mediaconnector_create_thread(conn, i, all);
+    }
+  }
+
+static void * thread_func_separate(void * data)
+  {
+  bg_mediaconnector_stream_t * s = data;
+
+  if(!bg_thread_wait_for_start(s->th))
+    return NULL;
+  
+  while(1)
+    {
+    if(!bg_thread_check(s->th))
+      break;
+    if(!process_stream(s))
+      {
+      pthread_mutex_lock(&s->conn->running_threads_mutex);
+      s->conn->running_threads--;
+      pthread_mutex_unlock(&s->conn->running_threads_mutex);
+      bg_thread_exit(s->th);
+      break;
+      }
+    }
+  //  fprintf(stderr, "Thread done\n");
+  return NULL;
+  }
+
+void
+bg_mediaconnector_threads_init_separate(bg_mediaconnector_t * conn)
+  {
+  int i;
+  bg_mediaconnector_stream_t * s;
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    s = conn->streams[i];
+    if(s->th)
+      bg_thread_set_func(s->th,
+                         thread_func_separate, s);
+    }
+  conn->running_threads = conn->num_threads;
+  }
+
+void
+bg_mediaconnector_threads_start(bg_mediaconnector_t * conn)
+  {
+  bg_threads_init(conn->th, conn->num_threads);
+  bg_threads_start(conn->th, conn->num_threads);
+  }
+
+void
+bg_mediaconnector_threads_stop(bg_mediaconnector_t * conn)
+  {
+  bg_threads_join(conn->th, conn->num_threads);
+  }
+
+int bg_mediaconnector_done(bg_mediaconnector_t * conn)
+  {
+  int ret;
+  pthread_mutex_lock(&conn->running_threads_mutex);
+  if(conn->running_threads == 0)
+    ret = 1;
+  else
+    ret = 0;
+  pthread_mutex_unlock(&conn->running_threads_mutex);
+  return ret;
+  }
+
+int bg_mediaconnector_get_num_streams(bg_mediaconnector_t * conn,
+                                      gavf_stream_type_t type)
+  {
+  int ret = 0;
+  int i;
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    if(conn->streams[i]->type == type)
+      ret++;
+    }
+  return ret;
+  }
+
+bg_mediaconnector_stream_t *
+bg_mediaconnector_get_stream(bg_mediaconnector_t * conn,
+                             gavf_stream_type_t type, int idx)
+  {
+  int i;
+  int count = 0;
+  for(i = 0; i < conn->num_streams; i++)
+    {
+    if(conn->streams[i]->type == type)
+      {
+      if(count == idx)
+        return conn->streams[i];
+      count++;
+      }
+    }
+  return NULL;
+  }
+

gmerlin-1.2.0.tar.gz/lib/mediafiledevice.c -> gmerlin-4256.tar.gz/lib/mediafiledevice.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,10 +22,12 @@
 #include <config.h>
 #include <string.h>
 
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <gavl/metatags.h>
 
 #include <gmerlin/translation.h>
 #include <gmerlin/converters.h>
@@ -91,7 +93,6 @@
   *ret = st.st_mtime;
   return 1;
   }
-  
 
 static const bg_parameter_info_t parameters_audio[] =
   {
@@ -149,7 +150,7 @@
   else if(!strcmp(name, "samplerate"))
     m->out_format.samplerate = val->val_i;
   else if(!strcmp(name, "album"))
-    m->album_file = bg_strdup(m->album_file, val->val_str);
+    m->album_file = gavl_strrep(m->album_file, val->val_str);
   else if(!strcmp(name, "shuffle"))
     m->do_shuffle = val->val_i;
   
@@ -202,9 +203,9 @@
            sizeof(*m->files) * (m->files_alloc - m->num_files));
     }
   m->files[m->num_files].location =
-    bg_strdup(m->files[m->num_files].location, location);
+    gavl_strrep(m->files[m->num_files].location, location);
   m->files[m->num_files].plugin =
-    bg_strdup(m->files[m->num_files].plugin, plugin);
+    gavl_strrep(m->files[m->num_files].plugin, plugin);
   m->files[m->num_files].track = track;
   m->num_files++;
   }
@@ -338,16 +339,14 @@
 
   if(m->callbacks && m->callbacks->metadata_changed)
     {
-    if(ti->name)
-      m->callbacks->metadata_changed(m->callbacks->data, ti->name, &ti->metadata);
-    else
+    if(!gavl_metadata_get(&ti->metadata, GAVL_META_LABEL))
       {
-      char * tmp_string = bg_get_track_name_default(m->files[idx].location,
-                                                    m->files[idx].track,
-                                                    num_tracks);
-      m->callbacks->metadata_changed(m->callbacks->data, tmp_string, &ti->metadata);
-      free(tmp_string);
+      gavl_metadata_set_nocpy(&ti->metadata, GAVL_META_LABEL,
+                              bg_get_track_name_default(m->files[idx].location,
+                                                        m->files[idx].track,
+                                                        num_tracks));
       }
+    m->callbacks->metadata_changed(m->callbacks->data, &ti->metadata);
     }
   
   if(!m->plugin->start(m->h->priv))
@@ -377,7 +376,7 @@
 
 static int open_audio(void * p,
                       gavl_audio_format_t * format,
-                      gavl_video_format_t * video_format)
+                      gavl_video_format_t * video_format, gavl_metadata_t * metadata)
   {
   audiofile_t * m = p;
   /* Finalize audio format */
@@ -513,15 +512,15 @@
   
   ret = calloc(1, sizeof(*ret));
 
-  ret->gettext_domain      = bg_strdup(ret->gettext_domain, plugin->common.gettext_domain);
+  ret->gettext_domain      = gavl_strrep(ret->gettext_domain, plugin->common.gettext_domain);
   
-  ret->gettext_directory   = bg_strdup(ret->gettext_directory,
+  ret->gettext_directory   = gavl_strrep(ret->gettext_directory,
                                        plugin->common.gettext_directory);
   
   
-  ret->name      = bg_strdup(ret->name, plugin->common.name);
-  ret->long_name = bg_strdup(ret->long_name, plugin->common.long_name);
-  ret->description = bg_strdup(ret->description, plugin->common.description);
+  ret->name      = gavl_strrep(ret->name, plugin->common.name);
+  ret->long_name = gavl_strrep(ret->long_name, plugin->common.long_name);
+  ret->description = gavl_strrep(ret->description, plugin->common.description);
   
   ret->priority  =  plugin->common.priority;
   ret->type  =  plugin->common.type;

gmerlin-1.2.0.tar.gz/lib/metadata.c -> gmerlin-4256.tar.gz/lib/metadata.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <time.h>
 
 #include <config.h>
 #include <gmerlin/translation.h>
@@ -32,6 +33,14 @@
 
 #include <gavl/metatags.h>
 
+#define PARAM_LABEL \
+    { \
+      .name =      "label", \
+      .long_name = TRS("Label"), \
+      .type =      BG_PARAMETER_STRING, \
+      .help_string = TRS("Used for generation of output file names"),   \
+    }
+
 #define PARAM_ARTIST \
     { \
       .name =      "artist", \
@@ -104,6 +113,7 @@
 
 static const bg_parameter_info_t parameters[] =
   {
+    PARAM_LABEL,
     PARAM_ARTIST,
     PARAM_TITLE,
     PARAM_ALBUM,
@@ -133,7 +143,7 @@
 #define SP_STR(s, gavl_name)                \
   if(!strcmp(ret[i].name, s))               \
     ret[i].val_default.val_str =            \
-      bg_strdup(ret[i].val_default.val_str, \
+      gavl_strrep(ret[i].val_default.val_str, \
                 gavl_metadata_get(m, gavl_name))
 
 #define SP_INT(s, gavl_name)                        \
@@ -158,6 +168,7 @@
   i = 0;
   while(ret[i].name)
     {
+    SP_STR("label", GAVL_META_LABEL);
     SP_STR("artist", GAVL_META_ARTIST);
     SP_STR("albumartist", GAVL_META_ALBUMARTIST);
     SP_STR("title" , GAVL_META_TITLE);
@@ -206,7 +217,8 @@
 #define SP_INT(s, gavl_name) \
   if(!strcmp(name, s))       \
     { \
-    gavl_metadata_set_int(m, gavl_name, val->val_i); \
+    if(val->val_i) \
+      gavl_metadata_set_int(m, gavl_name, val->val_i);    \
     return; \
     }
 
@@ -324,7 +336,7 @@
     while((*end != '%') && (*end != '\0'))
       end++;
     if(end != f)
-      ret = bg_strncat(ret, f, end);
+      ret = gavl_strncat(ret, f, end);
 
     if(*end == '%')
       {
@@ -336,7 +348,7 @@
         end++;
         tag = gavl_metadata_get(metadata, GAVL_META_ARTIST);
         if(tag)
-          ret = bg_strcat(ret, tag);
+          ret = gavl_strcat(ret, tag);
         else
           goto fail;
         }
@@ -346,7 +358,7 @@
         end++;
         tag = gavl_metadata_get(metadata, GAVL_META_ALBUM);
         if(tag)
-          ret = bg_strcat(ret, tag);
+          ret = gavl_strcat(ret, tag);
         else
           goto fail;
         }
@@ -356,7 +368,7 @@
         end++;
         tag = gavl_metadata_get(metadata, GAVL_META_GENRE);
         if(tag)
-          ret = bg_strcat(ret, tag);
+          ret = gavl_strcat(ret, tag);
         else
           goto fail;
         }
@@ -366,7 +378,7 @@
         end++;
         tag = gavl_metadata_get(metadata, GAVL_META_TITLE);
         if(tag)
-          ret = bg_strcat(ret, tag);
+          ret = gavl_strcat(ret, tag);
         else
           goto fail;
         }
@@ -376,7 +388,7 @@
         end++;
         tag = gavl_metadata_get(metadata, GAVL_META_COMMENT);
         if(tag)
-          ret = bg_strcat(ret, tag);
+          ret = gavl_strcat(ret, tag);
         else
           goto fail;
         }
@@ -388,7 +400,7 @@
         if(tag_i > 0)
           {
           buf = bg_sprintf("%d", tag_i);
-          ret = bg_strcat(ret, buf);
+          ret = gavl_strcat(ret, buf);
           free(buf);
           }
         else
@@ -406,7 +418,7 @@
           track_format[4] = '\0';
           
           buf = bg_sprintf(track_format, tag_i);
-          ret = bg_strcat(ret, buf);
+          ret = gavl_strcat(ret, buf);
           free(buf);
           end+=2;
           }
@@ -415,7 +427,7 @@
         }
       else
         {
-        ret = bg_strcat(ret, "%");
+        ret = gavl_strcat(ret, "%");
         end++;
         }
       f = end;
@@ -428,7 +440,7 @@
   return NULL;
   }
 
-#define META_STRCAT() ret = bg_strcat(ret, tmp); free(tmp)
+#define META_STRCAT() ret = gavl_strcat(ret, tmp); free(tmp)
 
 char * bg_metadata_to_string(const gavl_metadata_t * m, int use_tabs)
   {
@@ -445,8 +457,7 @@
 
   for(i = 0; i < m->num_tags; i++)
     {
-    tmp = bg_sprintf(TR("%s%s%s\n"),
-                     m->tags[i].key, sep, m->tags[i].val);
+    tmp = bg_sprintf("%s%s%s\n", m->tags[i].key, sep, m->tags[i].val);
     META_STRCAT();
     }
   /* Remove trailing '\n' */
@@ -455,3 +466,19 @@
   return ret;
   }
 
+void bg_metadata_date_now(gavl_metadata_t * m, const char * key)
+  {
+  struct tm tm;
+  time_t t = time(NULL);
+  localtime_r(&t, &tm);
+  
+  tm.tm_mon++;
+  tm.tm_year+=1900;
+  gavl_metadata_set_date_time(m, key,
+                              tm.tm_year,
+                              tm.tm_mon,
+                              tm.tm_mday,
+                              tm.tm_hour,
+                              tm.tm_min,
+                              tm.tm_sec);
+  }

gmerlin-1.2.0.tar.gz/lib/metadata_xml.c -> gmerlin-4256.tar.gz/lib/metadata_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
@@ -31,32 +32,24 @@
 #include <gmerlin/utils.h>
 #include <gmerlin/xmlutils.h>
 
+#include <gmerlin/pluginregistry.h>
+#include <pluginreg_priv.h>
+
 #include <gavl/metatags.h>
 
-static const struct
-  {
-  const char * xml_name;
-  const char * gavl_name;
-  }
-tags[] =
-  {
-    { "track",     GAVL_META_TRACKNUMBER },
-    { "artist",    GAVL_META_ARTIST      },
-    { "title",     GAVL_META_TITLE       },
-    { "album",     GAVL_META_ALBUM       },
-    { "date",      GAVL_META_DATE        },
-    { "genre",     GAVL_META_GENRE       },
-    { "comment",   GAVL_META_COMMENT     },
-    { "author",    GAVL_META_AUTHOR      },
-    { "copyright", GAVL_META_COPYRIGHT   },
-    { /* End */ }
-  };
+/*
+ *  <metatag key="name" val="val" />
+ */
+
+static const char * metatag_key = "metatag";
+static const char * key_key     = "key";
+static const char * value_key   = "value";
 
 void bg_xml_2_metadata(xmlDocPtr xml_doc, xmlNodePtr xml_metadata,
                        gavl_metadata_t * ret)
   {
-  int i;
-  char * tmp_string;
+  char * val;
+  char * key;
   xmlNodePtr node;
   
   node = xml_metadata->children;
@@ -68,62 +61,346 @@
       node = node->next;
       continue;
       }
-    tmp_string = (char*)xmlNodeListGetString(xml_doc, node->children, 1);
-
-    i = 0;
-    while(tags[i].xml_name)
+    if(!BG_XML_STRCMP(node->name, metatag_key))
       {
-      if(!BG_XML_STRCMP(node->name, tags[i].xml_name))
-        {
-        gavl_metadata_set(ret, tags[i].gavl_name, tmp_string);
-        break;
-        }
-      i++;
+      key = BG_XML_GET_PROP(node, key_key);
+      val = BG_XML_GET_PROP(node, value_key);
+      if(key && val)
+        gavl_metadata_set(ret, key, val);
+      
+      if(key)
+        xmlFree(key);
+      if(val)
+        xmlFree(val);
       }
-    xmlFree(tmp_string);
     node = node->next;
     }
   }
 
-#define STRING_2_XML(key)                                             \
-  if(m->key)                                                          \
-    {                                                                 \
-    child = xmlNewTextChild(xml_metadata, NULL, (xmlChar*)#key, NULL); \
-    xmlAddChild(child, BG_XML_NEW_TEXT(m->key));                           \
-    xmlAddChild(xml_metadata, BG_XML_NEW_TEXT("\n"));                      \
-    }
-
-#define INT_2_XML(key)                         \
-  if(m->key)                                   \
-    { \
-    tmp_string = bg_sprintf("%d", m->key); \
-    child = xmlNewTextChild(xml_metadata, NULL, (xmlChar*)#key, NULL); \
-    xmlAddChild(child, BG_XML_NEW_TEXT(tmp_string));                       \
-    free(tmp_string);                                                 \
-    xmlAddChild(xml_metadata, BG_XML_NEW_TEXT("\n"));                      \
-    }
-
 void bg_metadata_2_xml(xmlNodePtr xml_metadata,
                        gavl_metadata_t * m)
   {
-  int i, j;
+  int i;
   xmlNodePtr child;
   for(i = 0; i < m->num_tags; i++)
     {
-    j = 0;
-    while(tags[j].gavl_name)
+    child = xmlNewTextChild(xml_metadata, NULL,
+                           (xmlChar*)metatag_key, NULL);
+    BG_XML_SET_PROP(child, key_key, m->tags[i].key);
+    BG_XML_SET_PROP(child, value_key, m->tags[i].val);
+    
+    xmlAddChild(xml_metadata, BG_XML_NEW_TEXT("\n"));
+    }
+  }
+
+/*
+  <metadata>
+    <track idx="0">
+      <global>
+        <metatag key="" value="" />
+        <metatag key="" value="" />
+      </global>
+      <audio_streams>
+        <stream idx="0">
+          <metatag key="" value="" />
+          <metatag key="" value="" />
+        </stream>
+        <stream idx="1">
+          <metatag key="" value="" />
+          <metatag key="" value="" />
+        </stream>
+      </audio_streams>
+      <video_streams>
+        <stream idx="0">
+          <metatag key="" value="" />
+          <metatag key="" value="" />
+        </stream>
+        <stream idx="1">
+          <metatag key="" value="" />
+          <metatag key="" value="" />
+        </stream>
+      </video_streams>
+    </track>
+  </metadata>
+
+*/
+
+static int get_index(xmlNodePtr node)
+  {
+  int ret = -1;
+  char * var;
+  
+  if(!(var = BG_XML_GET_PROP(node, "idx")))
+    return -1;
+  ret = atoi(var);
+
+  xmlFree(var);
+  return ret;
+  }
+
+static void set_index(xmlNodePtr node, int idx)
+  {
+  char var[16];
+  snprintf(var, 15, "%d", idx);
+  BG_XML_SET_PROP(node, "idx", var);
+  }
+
+void bg_plugin_load_metadata(bg_plugin_handle_t * h, const char * location)
+  {
+  bg_input_plugin_t * plugin;
+  bg_track_info_t * ti;
+  char * meta_file = NULL;
+  xmlDocPtr doc = NULL;
+  int track_index, stream_index;
+  int num_tracks;
+  
+  xmlNodePtr node;
+  xmlNodePtr track = NULL;
+  xmlNodePtr child;
+  xmlNodePtr stream;
+  
+  plugin = (bg_input_plugin_t*)h->plugin;
+
+  if(!plugin->get_track_info ||
+     !(ti = plugin->get_track_info(h->priv, 0)))
+    goto fail;
+
+  gavl_metadata_set(&ti->metadata, GAVL_META_LOCATION, location);
+
+  if(strstr(location, "://"))
+    goto fail;
+  
+  meta_file = bg_sprintf("%s.meta", location);
+
+  if(access(meta_file, R_OK))
+    goto fail;
+  
+  if(!(doc = bg_xml_parse_file(meta_file, 1)))
+    goto fail;
+  
+  if(!(node = doc->children) || BG_XML_STRCMP(node->name, "metadata"))
+    goto fail;
+
+  if(plugin->get_num_tracks)
+    num_tracks = plugin->get_num_tracks(h->priv);
+  else
+    num_tracks = 1;
+  
+  while((track = bg_xml_find_next_node_child_by_name(node, track, "track")))
+    {
+    track_index = get_index(track);
+    if((track_index < 0) || (track_index >= num_tracks))
+      continue;
+    
+    if(!(ti = plugin->get_track_info(h->priv, track_index)))
+      continue;
+
+    /* Global metadata */
+    child = bg_xml_find_node_child(track, "global");
+    if(child)
+      bg_xml_2_metadata(doc, child, &ti->metadata);
+    
+    /* Audio streams */
+    stream = NULL;
+    if((child = bg_xml_find_node_child(track, "audio_streams")))
+      {
+      while((stream = bg_xml_find_next_node_child_by_name(child, stream, "stream")))
+        {
+        stream_index = get_index(stream);
+        if((stream_index < 0) || (stream_index >= ti->num_audio_streams))
+          continue;
+        bg_xml_2_metadata(doc, stream, &ti->audio_streams[stream_index].m);
+        }
+      }
+
+    /* Video streams */
+    stream = NULL;
+
+    if((child = bg_xml_find_node_child(track, "video_streams")))
       {
-      if(!strcmp(m->tags[i].key, tags[j].gavl_name))
+      while((stream = bg_xml_find_next_node_child_by_name(child, stream, "stream")))
         {
-        child = xmlNewTextChild(xml_metadata, NULL,
-                                (xmlChar*)tags[j].xml_name, NULL);
-        xmlAddChild(child, BG_XML_NEW_TEXT(m->tags[i].val));
-        xmlAddChild(xml_metadata, BG_XML_NEW_TEXT("\n"));
-        break;
+        stream_index = get_index(stream);
+        if((stream_index < 0) || (stream_index >= ti->num_video_streams))
+          continue;
+        bg_xml_2_metadata(doc, stream, &ti->video_streams[stream_index].m);
         }
-      j++;
       }
+    
+    /* Text streams */
+    stream = NULL;
+
+    if((child = bg_xml_find_node_child(track, "text_streams")))
+      {
+      while((stream = bg_xml_find_next_node_child_by_name(child, stream, "stream")))
+        {
+        stream_index = get_index(stream);
+        if((stream_index < 0) || (stream_index >= ti->num_text_streams))
+          continue;
+        bg_xml_2_metadata(doc, stream, &ti->text_streams[stream_index].m);
+        }
+      }
+    
+    /* Overlay streams */
+    stream = NULL;
+
+    if((child = bg_xml_find_node_child(track, "overlay_streams")))
+      {
+      while((stream = bg_xml_find_next_node_child_by_name(child, stream, "stream")))
+        {
+        stream_index = get_index(stream);
+        if((stream_index < 0) || (stream_index >= ti->num_overlay_streams))
+          continue;
+        bg_xml_2_metadata(doc, stream, &ti->overlay_streams[stream_index].m);
+        }
+      }
+    
     }
   
+  fail:
+  
+  if(doc)
+    xmlFreeDoc(doc);
+  if(meta_file)
+    free(meta_file);
   }
 
+void bg_plugin_save_metadata(bg_plugin_handle_t * h)
+  {
+  const char * location;
+  bg_input_plugin_t * plugin;
+  bg_track_info_t * ti;
+  char * meta_file = NULL;
+  xmlDocPtr doc = NULL;
+  xmlNodePtr root;
+  xmlNodePtr track;
+  xmlNodePtr streams;
+  xmlNodePtr stream;
+  xmlNodePtr global;
+  int num_tracks;
+  int i, j;
+  
+  plugin = (bg_input_plugin_t*)h->plugin;
+  if(!plugin->get_track_info ||
+     !(ti = plugin->get_track_info(h->priv, 0)))
+    return;
+  
+  if(!(location = gavl_metadata_get(&ti->metadata, GAVL_META_LOCATION)))
+    goto fail;
+  meta_file = bg_sprintf("%s.meta", location);
+  
+  doc = xmlNewDoc((xmlChar*)"1.0");
+  root = xmlNewDocRawNode(doc, NULL, (xmlChar*)"metadata", NULL);
+  xmlDocSetRootElement(doc, root);
+
+  xmlAddChild(root, BG_XML_NEW_TEXT("\n"));
+
+  if(plugin->get_num_tracks)
+    num_tracks = plugin->get_num_tracks(h->priv);
+  else
+    num_tracks = 1;
+
+  for(i = 0; i < num_tracks; i++)
+    {
+    if(i)
+      ti = plugin->get_track_info(h->priv, i);
+
+    /* Select track and enable all streams */
+    if(plugin->set_track)
+      plugin->set_track(h->priv, i);
+
+    for(j = 0; j < ti->num_audio_streams; j++)
+      {
+      plugin->set_audio_stream(h->priv, j, BG_STREAM_ACTION_DECODE);
+      }
+    for(j = 0; j < ti->num_video_streams; j++)
+      {
+      plugin->set_video_stream(h->priv, j, BG_STREAM_ACTION_DECODE);
+      }
+    for(j = 0; j < ti->num_text_streams; j++)
+      {
+      plugin->set_text_stream(h->priv, j, BG_STREAM_ACTION_DECODE);
+      }
+    for(j = 0; j < ti->num_overlay_streams; j++)
+      {
+      plugin->set_overlay_stream(h->priv, j, BG_STREAM_ACTION_DECODE);
+      }
+
+    if(plugin->start)
+      plugin->start(h->priv);
+    
+    /* Save data */
+    track = xmlNewTextChild(root, NULL, (xmlChar*)"track", NULL);
+    xmlAddChild(track, BG_XML_NEW_TEXT("\n"));
+
+    set_index(track, i);
+    
+    global = xmlNewTextChild(track, NULL, (xmlChar*)"global", NULL);
+    xmlAddChild(global, BG_XML_NEW_TEXT("\n"));
+
+    bg_metadata_2_xml(global, &ti->metadata);
+
+    xmlAddChild(track, BG_XML_NEW_TEXT("\n"));
+    
+    streams = xmlNewTextChild(track, NULL, (xmlChar*)"audio_streams", NULL);
+    for(j = 0; j < ti->num_audio_streams; j++)
+      {
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      stream = xmlNewTextChild(streams, NULL, (xmlChar*)"stream", NULL);
+      set_index(stream, j);
+      xmlAddChild(stream, BG_XML_NEW_TEXT("\n"));
+      bg_metadata_2_xml(stream, &ti->audio_streams[j].m);
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      }
+    xmlAddChild(track, BG_XML_NEW_TEXT("\n"));
+    
+    streams = xmlNewTextChild(track, NULL, (xmlChar*)"video_streams", NULL);
+    for(j = 0; j < ti->num_video_streams; j++)
+      {
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      stream = xmlNewTextChild(streams, NULL, (xmlChar*)"stream", NULL);
+      set_index(stream, j);
+      xmlAddChild(stream, BG_XML_NEW_TEXT("\n"));
+      bg_metadata_2_xml(stream, &ti->video_streams[j].m);
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      }
+    xmlAddChild(track, BG_XML_NEW_TEXT("\n"));
+    
+    streams = xmlNewTextChild(track, NULL, (xmlChar*)"text_streams", NULL);
+    for(j = 0; j < ti->num_text_streams; j++)
+      {
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      stream = xmlNewTextChild(streams, NULL, (xmlChar*)"stream", NULL);
+      set_index(stream, j);
+      xmlAddChild(stream, BG_XML_NEW_TEXT("\n"));
+      bg_metadata_2_xml(stream, &ti->text_streams[j].m);
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      }
+    xmlAddChild(track, BG_XML_NEW_TEXT("\n"));
+    
+    streams = xmlNewTextChild(track, NULL, (xmlChar*)"overlay_streams", NULL);
+    for(j = 0; j < ti->num_overlay_streams; j++)
+      {
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      stream = xmlNewTextChild(streams, NULL, (xmlChar*)"stream", NULL);
+      set_index(stream, j);
+      xmlAddChild(stream, BG_XML_NEW_TEXT("\n"));
+      bg_metadata_2_xml(stream, &ti->overlay_streams[j].m);
+      xmlAddChild(streams, BG_XML_NEW_TEXT("\n"));
+      }
+    xmlAddChild(track, BG_XML_NEW_TEXT("\n"));
+    }
+
+  xmlAddChild(root, BG_XML_NEW_TEXT("\n"));
+  
+  bg_xml_save_file(doc, meta_file, 1);
+  
+  fail:
+  
+  if(meta_file)
+    free(meta_file);
+
+  if(doc)
+    xmlFreeDoc(doc);
+  
+  }

gmerlin-1.2.0.tar.gz/lib/msgqueue.c -> gmerlin-4256.tar.gz/lib/msgqueue.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -36,6 +36,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <pthread.h>
+
+#include <gavl/gavf.h>
+
+
 #include <gmerlin/bg_sem.h>
 
 #include <gmerlin/parameter.h>
@@ -382,79 +386,50 @@
   return data + len;
   }
 
-/*
-  int samples_per_frame; 
-  int samplerate;
-  int num_channels;
-  gavl_sample_format_t   sample_format;
-  gavl_interleave_mode_t interleave_mode;
-  gavl_channel_setup_t   channel_setup;
-  int lfe;
-*/
-
 void bg_msg_set_arg_audio_format(bg_msg_t * msg, int arg,
                                  const gavl_audio_format_t * format)
   {
-  uint8_t * ptr;
+  uint8_t * ptr1;
+  uint8_t * ptr2;
   int len;
-  len = bg_serialize_audio_format(format, NULL, 0);
-  ptr = bg_msg_set_arg_ptr(msg, arg, len);
-  bg_serialize_audio_format(format, ptr, len);
+  ptr1 = gavl_audio_format_to_buffer(&len, format);
+  ptr2 = bg_msg_set_arg_ptr(msg, arg, len);
+  memcpy(ptr2, ptr1, len);
+  free(ptr1);
   }
 
 void bg_msg_get_arg_audio_format(bg_msg_t * msg, int arg,
-                                 gavl_audio_format_t * format, int * big_endian)
+                                 gavl_audio_format_t * format)
   {
   uint8_t * ptr;
-  int len, be;
-  
+  int len;
   ptr = bg_msg_get_arg_ptr(msg, arg, &len);
-  bg_deserialize_audio_format(format, ptr, len, &be);
-
-  if(big_endian)
-    *big_endian = be;
-  
+  gavl_audio_format_from_buffer(ptr, len, format);
   free(ptr);
   }
 
 /* Video format */
 
-/*
-  int frame_width;
-  int frame_height;
-  int image_width;
-  int image_height;
-  int pixel_width;
-  int pixel_height;
-  gavl_pixelformat_t pixelformat;
-  int framerate_num;
-  int frame_duration;
-  
-  int free_framerate;
-*/
-
 void bg_msg_set_arg_video_format(bg_msg_t * msg, int arg,
                                  const gavl_video_format_t * format)
   {
-  uint8_t * ptr;
+  uint8_t * ptr1;
+  uint8_t * ptr2;
   int len;
-  len = bg_serialize_video_format(format, NULL, 0);
-  ptr = bg_msg_set_arg_ptr(msg, arg, len);
-  bg_serialize_video_format(format, ptr, len);
+  ptr1 = gavl_video_format_to_buffer(&len, format);
+  ptr2 = bg_msg_set_arg_ptr(msg, arg, len);
+  memcpy(ptr2, ptr1, len);
+  free(ptr1);
   }
 
 void bg_msg_get_arg_video_format(bg_msg_t * msg, int arg,
-                                 gavl_video_format_t * format, int * big_endian)
+                                 gavl_video_format_t * format)
   {
   uint8_t * ptr;
-  int len, be;
+  int len;
   
   ptr = bg_msg_get_arg_ptr(msg, arg, &len);
-  bg_deserialize_video_format(format, ptr, len, &be);
-  
-  if(big_endian)
-    *big_endian = be;
-  
+  gavl_video_format_from_buffer(ptr, len, format);
   free(ptr);
   }
 
@@ -507,8 +482,8 @@
   uint32_t num;
   uint8_t * ptr;
   uint8_t * pos;
-  char * key;
-  char * val;
+  char * key = NULL;
+  char * val = NULL;
   
   ptr = bg_msg_get_arg_ptr(msg, arg, NULL);
   
@@ -548,6 +523,7 @@
       m->args[i].value.val_ptr = NULL;
       }
     }
+  m->id = -1;
   }
 
 void bg_msg_destroy(bg_msg_t * m)
@@ -592,12 +568,13 @@
  *  a valid audio frame header
  */
 
-int bg_msg_read_audio_frame(gavl_dsp_context_t * ctx,
+int bg_msg_read_audio_frame(gavl_dsp_context_t ** ctx,
                             bg_msg_t * msg,
                             const gavl_audio_format_t * format,
+                            const gavl_metadata_t * m,
                             gavl_audio_frame_t * frame,
                             bg_msg_read_callback_t cb,
-                            void * cb_data, int big_endian)
+                            void * cb_data)
   {
   uint8_t * ptr;
   int len;
@@ -606,8 +583,8 @@
   bg_deserialize_audio_frame_header(format, frame, ptr, len);
   free(ptr);
   
-  return bg_deserialize_audio_frame(ctx, format, frame,
-                                    cb, cb_data, big_endian);
+  return bg_deserialize_audio_frame(ctx, format, m, frame,
+                                    cb, cb_data);
   }
 
 /* .parameters =
@@ -984,8 +961,9 @@
   
   //  bg_hexdump(buf, 4);
     
-  *ret = (buf[0]<<24) | (buf[1]<<16) |
-    (buf[2]<<8) | buf[3];
+  *ret =
+    (buf[0]<<24) | (buf[1]<<16) |
+    (buf[2]<< 8) | buf[3];
   return 1;
   }
 
@@ -1234,7 +1212,6 @@
 int bg_msg_read(bg_msg_t * ret, bg_msg_read_callback_t cb, void * cb_data)
   {
   int i;
-  void * ptr;
   
   int32_t val_i;
 
@@ -1250,6 +1227,8 @@
   
   ret->id = val_i;
 
+  //  fprintf(stderr, "Got ID: %d\n", ret->id);
+  
   /* Number of arguments */
 
   if(!cb(cb_data, &val_u8, 1))
@@ -1276,11 +1255,14 @@
           return 0;
         break;
       case TYPE_POINTER:
+        {
+        int result;
         if(!read_uint32((uint32_t*)(&val_i), cb, cb_data)) /* Length */
           return 0;
-        ptr = bg_msg_set_arg_ptr(ret, i, val_i);
-        if(cb(cb_data, ret->args[i].value.val_ptr, val_i) < val_i)
+        ret->args[i].value.val_ptr = malloc(val_i);
+        if((result = cb(cb_data, ret->args[i].value.val_ptr, val_i)) < val_i)
           return 0;
+        }
         break;
       case TYPE_TIME:
         if(!read_time(&val_time, cb, cb_data))
@@ -1288,6 +1270,7 @@
         ret->args[i].value.val_time = val_time;
         break;
       case TYPE_POINTER_NOCOPY:
+        ret->args[i].value.val_ptr = NULL;
         break;
       case TYPE_COLOR_RGB:
         if(!read_float(&ret->args[i].value.val_color[0], cb, cb_data) ||

gmerlin-1.2.0.tar.gz/lib/ocr.c -> gmerlin-4256.tar.gz/lib/ocr.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -84,7 +84,7 @@
 static int create_output_file(void * priv, const char * name)
   {
   bg_ocr_t * ocr = priv;
-  ocr->image_file = bg_strdup(ocr->image_file, name);
+  ocr->image_file = gavl_strrep(ocr->image_file, name);
   bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Writing image file %s", name);
   return 1;
   }
@@ -126,7 +126,7 @@
 
   if(!funcs)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No engine found");
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No OCR engine found");
     return NULL;
     }
   
@@ -184,7 +184,7 @@
     }
   else if(!strcmp(name, "tmpdir"))
     {
-    ocr->tmpdir = bg_strdup(ocr->tmpdir, val->val_str);
+    ocr->tmpdir = gavl_strrep(ocr->tmpdir, val->val_str);
     return 1;
     }
   
@@ -334,7 +334,7 @@
     return 0;
 
   
-  base = bg_strdup(NULL, tiff_file);
+  base = gavl_strdup(tiff_file);
   pos = strrchr(base, '.');
   if(!pos)
     return 0;
@@ -357,8 +357,8 @@
 
   if(ocr->lang[0] != '\0')
     {
-    commandline = bg_strcat(commandline, " -l ");
-    commandline = bg_strcat(commandline, bg_iso639_b_to_t(ocr->lang));
+    commandline = gavl_strcat(commandline, " -l ");
+    commandline = gavl_strcat(commandline, bg_iso639_b_to_t(ocr->lang));
     }
   
   if(bg_system(commandline))

gmerlin-1.2.0.tar.gz/lib/osd.c -> gmerlin-4256.tar.gz/lib/osd.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -38,6 +38,12 @@
   gavl_overlay_t * ovl;
   gavl_time_t duration;
   float font_size;
+  gavl_timer_t * timer;
+  int changed;
+  gavl_video_sink_t * sink;  
+
+  int active;
+  gavl_video_format_t fmt;
   };
 
 bg_osd_t * bg_osd_create()
@@ -58,14 +64,16 @@
 
   val.val_i = 20;
   bg_text_renderer_set_parameter(ret->renderer, "cache_size", &val);
-  
-  
+
+  ret->timer = gavl_timer_create();
+  gavl_timer_start(ret->timer);
   return ret;
   }
 
 void bg_osd_destroy(bg_osd_t * osd)
   {
   bg_text_renderer_destroy(osd->renderer);
+  gavl_timer_destroy(osd->timer);
   free(osd);
   }
 
@@ -196,41 +204,98 @@
     bg_text_renderer_set_parameter(osd->renderer, name, val);
   }
 
+/* Legacy */
+#if 0
 void bg_osd_set_overlay(bg_osd_t * osd, gavl_overlay_t * ovl)
   {
   osd->ovl = ovl;
-  ovl->frame->timestamp = -1;
+  ovl->timestamp = -1;
   }
 
+/* Legacy */
 void bg_osd_init(bg_osd_t * osd, const gavl_video_format_t * format,
                  gavl_video_format_t * overlay_format)
   {
   bg_text_renderer_init(osd->renderer, format, overlay_format);
+
+  }
+#endif
+
+void bg_osd_init(bg_osd_t * osd, gavl_video_sink_t * sink, 
+                 const gavl_video_format_t * frame_format)
+  {
+  osd->sink = sink;
+  gavl_video_format_copy(&osd->fmt, gavl_video_sink_get_format(osd->sink));
+  osd->fmt.timescale = GAVL_TIME_SCALE;
+  bg_text_renderer_init(osd->renderer, frame_format, &osd->fmt);
+  osd->ovl = gavl_video_frame_create(&osd->fmt);
+  gavl_timer_stop(osd->timer);
+  gavl_timer_start(osd->timer);
   }
 
-int bg_osd_overlay_valid(bg_osd_t * osd, gavl_time_t time)
+/* Call once before displaying a frame */
+void bg_osd_update(bg_osd_t * osd)
   {
-  if(!osd->enable || (osd->ovl->frame->timestamp < 0))
+  gavl_time_t current_time;
+
+  current_time = gavl_timer_get(osd->timer);
+  /* Check if OSD changed */
+
+  if(osd->changed)
+    {
+    osd->changed = 0;
+    osd->ovl->timestamp = current_time;
+//    fprintf(stderr, "OSD changed\n");
+//    gavl_video_frame_dump_metadata(&osd->fmt, osd->ovl);
+    gavl_video_sink_put_frame(osd->sink, osd->ovl);
+    osd->active = 1;
+    }
+  
+  /* Check if OSD became invalid */
+  if(osd->active)
+    {
+    if(current_time > osd->ovl->timestamp + osd->ovl->duration)
+      {
+//      fprintf(stderr, "OSD Invalid\n");
+      osd->ovl->src_rect.w = 0;
+      osd->ovl->src_rect.h = 0;
+      gavl_video_sink_put_frame(osd->sink, osd->ovl);
+      osd->active = 0;
+      }
+    }
+  }
+
+/* LEGACY */
+#if 0
+int bg_osd_overlay_valid(bg_osd_t * osd)
+  {
+  gavl_time_t t;
+  
+  if(!osd->enable || (osd->ovl->timestamp < 0))
     return 0;
 
-  if(time < osd->ovl->frame->timestamp)
+  t = gavl_timer_get(osd->timer);
+  
+  if(t < osd->ovl->timestamp)
     return 0;
   
-  else if(time > osd->ovl->frame->timestamp + osd->ovl->frame->duration)
+  else if(t > osd->ovl->timestamp + osd->ovl->duration)
     {
-    osd->ovl->frame->timestamp = -1;
+    osd->ovl->timestamp = -1;
     return 0;
     }
   return 1;
   }
+#endif
+
 
 #define FLOAT_BAR_SIZE       18
 #define FLOAT_BAR_SIZE_TOTAL 20
 
-static void print_float(bg_osd_t * osd, float val, char c, gavl_time_t time)
+static void print_float(bg_osd_t * osd, float val, char c)
   {
-  char _buf[FLOAT_BAR_SIZE_TOTAL+3];
-  char * buf = _buf;
+  char buf1[FLOAT_BAR_SIZE_TOTAL+3];
+  char * buf = buf1;
   int i, val_i;
 
   *buf = c; buf++;
@@ -254,43 +319,52 @@
   *buf = ']'; buf++;
   *buf = '\0';
   
-  bg_text_renderer_render(osd->renderer, _buf, osd->ovl);
+  bg_text_renderer_render(osd->renderer, buf1, osd->ovl);
 
-  osd->ovl->frame->timestamp = time;
-  osd->ovl->frame->duration = osd->duration;
-  
+  osd->ovl->duration = osd->duration;
+
+  osd->changed = 1;
   }
 
-void bg_osd_set_volume_changed(bg_osd_t * osd, float val,
-                               gavl_time_t time)
+/* LEGACY */
+#if 0
+int bg_osd_changed(bg_osd_t * osd)
+  {
+  if(osd->changed)
+    {
+    osd->changed = 0;
+    return 1;
+    }
+  return 0;
+  }
+#endif
+
+void bg_osd_set_volume_changed(bg_osd_t * osd, float val)
   {
   if(!osd->enable)
     return;
-  print_float(osd, val, 'V', time);
+  print_float(osd, val, 'V');
   }
 
-void bg_osd_set_brightness_changed(bg_osd_t * osd, float val,
-                                   gavl_time_t time)
+void bg_osd_set_brightness_changed(bg_osd_t * osd, float val)
   {
   if(!osd->enable)
     return;
-  print_float(osd, val, 'B', time);
+  print_float(osd, val, 'B');
 
   }
 
-void bg_osd_set_contrast_changed(bg_osd_t * osd, float val,
-                                 gavl_time_t time)
+void bg_osd_set_contrast_changed(bg_osd_t * osd, float val)
   {
   if(!osd->enable)
     return;
-  print_float(osd, val, 'C', time);
+  print_float(osd, val, 'C');
   }
 
-void bg_osd_set_saturation_changed(bg_osd_t * osd, float val,
-                                   gavl_time_t time)
+void bg_osd_set_saturation_changed(bg_osd_t * osd, float val)
   {
   if(!osd->enable)
     return;
-  print_float(osd, val, 'S', time);
+  print_float(osd, val, 'S');
   }

gmerlin-1.2.0.tar.gz/lib/ov.c -> gmerlin-4256.tar.gz/lib/ov.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,13 +29,24 @@
 
 #define LOG_DOMAIN "ov"
 
-#define LOCK(p) bg_plugin_lock(p->h)
+#define LOCK(p)   bg_plugin_lock(p->h)
 #define UNLOCK(p) bg_plugin_unlock(p->h)
 
-#define FLAG_EMULATE_OVL   (1<<0)
-#define FLAG_EMULATE_STILL (1<<1)
-#define FLAG_STILL_MODE    (1<<2)
-#define FLAG_OPEN          (1<<3)
+#define FLAG_EMULATE_OVL     (1<<0)
+#define FLAG_EMULATE_STILL   (1<<1)
+#define FLAG_STILL_MODE      (1<<2)
+#define FLAG_OPEN            (1<<3)
+#define FLAG_OVERLAY_CHANGED (1<<4)
+
+typedef struct
+  {
+  gavl_overlay_blend_context_t * ctx;
+  gavl_overlay_t * ovl;
+  gavl_video_format_t format;
+    
+  gavl_video_sink_t * sink_int;
+  gavl_video_sink_t * sink_ext;
+  } ovl_stream_t;
 
 struct bg_ov_s
   {
@@ -46,14 +57,12 @@
 
   int flags;
 
-  struct
-    {
-    gavl_overlay_blend_context_t * ctx;
-    gavl_overlay_t * ovl;
-    gavl_video_format_t format;
-    } * ovl_str;
+  ovl_stream_t ** ovl_str;
   int num_ovl_str;
   gavl_video_frame_t * still_frame;
+
+  gavl_video_sink_t * sink_ext;
+  gavl_video_sink_t * sink_int;
   };
 
 bg_ov_t * bg_ov_create(bg_plugin_handle_t * h)
@@ -83,6 +92,8 @@
     UNLOCK(ov);
     }
   bg_plugin_unref(ov->h);
+  if(ov->sink_ext)
+    gavl_video_sink_destroy(ov->sink_ext);
   free(ov);
   }
 
@@ -142,178 +153,215 @@
     }
   }
 
-int  bg_ov_open(bg_ov_t * ov, gavl_video_format_t * format, int keep_aspect)
+gavl_video_frame_t * bg_ov_get_frame(bg_ov_t * ov)
   {
-  int ret;
-
-  LOCK(ov);
-  ret = ov->plugin->open(ov->priv, format, keep_aspect);
-  UNLOCK(ov);
-  gavl_video_format_copy(&ov->format, format);
-  if(ret)
-    ov->flags = FLAG_OPEN;
-  return ret;
+  return gavl_video_sink_get_frame(ov->sink_ext);
   }
-  
-gavl_video_frame_t * bg_ov_get_frame(bg_ov_t * ov)
+
+static gavl_video_frame_t * get_frame_func(void * priv)
   {
   gavl_video_frame_t * ret;
+  bg_ov_t * ov = priv;
   LOCK(ov);
-  ret = ov->plugin->get_frame(ov->priv);
+  ret = gavl_video_sink_get_frame(ov->sink_int);
   UNLOCK(ov);
   return ret;
   }
 
-int bg_ov_add_overlay_stream(bg_ov_t * ov, gavl_video_format_t * format)
+
+void bg_ov_put_frame(bg_ov_t * ov, gavl_video_frame_t*frame)
   {
-  int ret;
-  
-  if(ov->plugin->add_overlay_stream)
+  gavl_video_sink_put_frame(ov->sink_ext, frame);
+  }
+
+static void blend_overlays(bg_ov_t * ov, gavl_video_frame_t * f)
+  {
+  int i;
+  for(i = 0; i < ov->num_ovl_str; i++)
     {
-    /* Try hardware overlay */
-    LOCK(ov);
-    ret = ov->plugin->add_overlay_stream(ov->priv, format);
-    UNLOCK(ov);
-    
-    if(ret >= 0)
+    if(ov->ovl_str[i]->ovl)
       {
-      bg_log(BG_LOG_INFO, LOG_DOMAIN,
-             "Using hardeware overlay for stream %d",
-             ret);
-      return ret;
+//      fprintf(stderr, "Blend overlay\n");
+      gavl_overlay_blend(ov->ovl_str[i]->ctx, f);
       }
     }
-  /* Software overlay */
-  ov->flags |= FLAG_EMULATE_OVL;
-  
-  bg_log(BG_LOG_INFO, LOG_DOMAIN,
-         "Using software overlay for stream %d",
-         ov->num_ovl_str);
-  
-  ov->ovl_str = realloc(ov->ovl_str,
-                        (ov->num_ovl_str+1)*
-                        sizeof(*ov->ovl_str));
-  memset(ov->ovl_str + ov->num_ovl_str, 0, sizeof(*ov->ovl_str));
-  
-  ov->ovl_str[ov->num_ovl_str].ctx =
-    gavl_overlay_blend_context_create();
-  gavl_overlay_blend_context_init(ov->ovl_str[ov->num_ovl_str].ctx,
-                                  &ov->format, format);
+  ov->flags &= ~FLAG_OVERLAY_CHANGED;
+  }
+
+static gavl_sink_status_t put_video(bg_ov_t * ov, gavl_video_frame_t*frame)
+  {
+  gavl_sink_status_t ret;
+
+  ov->flags &= ~FLAG_STILL_MODE;
   
-  gavl_video_format_copy(&ov->ovl_str[ov->num_ovl_str].format,
-                         format);
+  if(ov->flags & FLAG_EMULATE_OVL)
+    blend_overlays(ov, frame);
+  LOCK(ov);
+  ret = gavl_video_sink_put_frame(ov->sink_int, frame);
+  UNLOCK(ov);
+
+  bg_ov_handle_events(ov);
   
-  ov->num_ovl_str++;
-  return ov->num_ovl_str-1;
+  return ret;
   }
-  
-gavl_overlay_t * bg_ov_create_overlay(bg_ov_t * ov, int id)
+
+static gavl_sink_status_t put_still(bg_ov_t * ov, gavl_video_frame_t*frame)
   {
-  gavl_overlay_t * ret;
-  if(!(ov->flags & FLAG_EMULATE_OVL))
-    {
-    LOCK(ov);
-    ret = ov->plugin->create_overlay(ov->priv, id);
-    UNLOCK(ov);
-    return ret;
-    }
-  else
+  gavl_sink_status_t ret;
+
+  ov->flags |= FLAG_STILL_MODE;
+  if(!(ov->plugin->common.flags & BG_PLUGIN_OV_STILL))
+    ov->flags |= FLAG_EMULATE_STILL;
+
+  /* Save this frame */
+
+  if(ov->flags & (FLAG_EMULATE_STILL|FLAG_EMULATE_OVL))
     {
-    ret = calloc(1, sizeof(*ret));
-    ret->frame = gavl_video_frame_create(&ov->ovl_str[id].format);
-    gavl_video_frame_clear(ret->frame, &ov->ovl_str[id].format);
-    return ret;
+    if(!ov->still_frame)
+      ov->still_frame = gavl_video_frame_create(&ov->format);
+    gavl_video_frame_copy(&ov->format, ov->still_frame, frame);
+    ov->still_frame->duration = -1;
     }
+
+  if(ov->flags & FLAG_EMULATE_OVL)
+    blend_overlays(ov, frame);
+  
+  LOCK(ov);
+  ret = gavl_video_sink_put_frame(ov->sink_int, frame);
+  UNLOCK(ov);
+
+  bg_ov_handle_events(ov);
+  
+  return ret;
   }
 
-void bg_ov_set_overlay(bg_ov_t * ov, int stream, gavl_overlay_t * ovl)
+
+static gavl_sink_status_t put_frame_func(void * priv, gavl_video_frame_t*frame)
   {
-  if(ov->flags & FLAG_EMULATE_OVL)
-    {
-    gavl_overlay_blend_context_set_overlay(ov->ovl_str[stream].ctx, ovl);
-    ov->ovl_str[stream].ovl = ovl;
-    }
+  bg_ov_t * ov = priv;
+  if(frame->duration < 0)
+    return put_still(ov, frame);
   else
-    {
-    LOCK(ov);
-    ov->plugin->set_overlay(ov->priv, stream, ovl);
-    UNLOCK(ov);
-    }
+    return put_video(ov, frame);
   }
 
-void bg_ov_destroy_overlay(bg_ov_t * ov, int id, gavl_overlay_t * ovl)
+int bg_ov_open(bg_ov_t * ov, gavl_video_format_t * format, int keep_aspect)
   {
-  if(ov->flags & FLAG_EMULATE_OVL)
-    {
-    gavl_video_frame_destroy(ovl->frame);
-    free(ovl);
-    }
-  else
-    ov->plugin->destroy_overlay(ov->priv, id, ovl);
+  int ret;
+
+  LOCK(ov);
+  ret = ov->plugin->open(ov->priv, format, keep_aspect);
+  if(ret)
+    ov->sink_int = ov->plugin->get_sink(ov->priv);
+  UNLOCK(ov);
+
+  if(!ret)
+    return ret;
+  
+  gavl_video_format_copy(&ov->format, format);
+  ov->flags = FLAG_OPEN;
+  
+  ov->sink_ext = gavl_video_sink_create(get_frame_func,
+                                        put_frame_func, ov, format);
+  
+  return ret;
   }
 
-static void blend_overlays(bg_ov_t * ov, gavl_video_frame_t * f)
+gavl_video_sink_t * bg_ov_get_sink(bg_ov_t * ov)
   {
-  int i;
-  for(i = 0; i < ov->num_ovl_str; i++)
+  return ov->sink_ext;
+  }
+
+static gavl_sink_status_t
+put_overlay(void * priv, gavl_video_frame_t * frame)
+  {
+  ovl_stream_t * str = priv;
+
+  if(frame->src_rect.w && frame->src_rect.h)
     {
-    if(ov->ovl_str[i].ovl)
-      {
-      //      fprintf(stderr, "Blend overlay\n");
-      gavl_overlay_blend(ov->ovl_str[i].ctx, f);
-      }
+    str->ovl = frame;
+    gavl_overlay_blend_context_set_overlay(str->ctx,
+                                           str->ovl);
     }
+  else
+    str->ovl = NULL;
+  return GAVL_SINK_OK;
   }
 
-void bg_ov_put_video(bg_ov_t * ov, gavl_video_frame_t*frame)
+gavl_video_sink_t *
+bg_ov_add_overlay_stream(bg_ov_t * ov, gavl_video_format_t * format)
   {
-  ov->flags &= ~FLAG_STILL_MODE;
+  ovl_stream_t * str;
+
+  ov->ovl_str = realloc(ov->ovl_str,
+                        (ov->num_ovl_str+1)*
+                        sizeof(*ov->ovl_str));
+  str = calloc(1, sizeof(*str));
+  ov->ovl_str[ov->num_ovl_str] = str;
   
-  if(ov->flags & FLAG_EMULATE_OVL)
-    blend_overlays(ov, frame);
-  LOCK(ov);
-  ov->plugin->put_video(ov->priv, frame);
-  UNLOCK(ov);
-  }
+  ov->num_ovl_str++;
+ 
+  if(!format->image_width || !format->image_height)
+    {
+    format->image_width = ov->format.image_width;
+    format->image_height = ov->format.image_height;
+    format->pixel_width = ov->format.pixel_width;
+    format->pixel_height = ov->format.pixel_height;
+    gavl_video_format_set_frame_size(format, 0, 0);
 
-void bg_ov_put_still(bg_ov_t * ov, gavl_video_frame_t*frame)
-  {
-  ov->flags |= FLAG_STILL_MODE;
-  if(ov->plugin->put_still)
+    }
+ 
+  if(ov->plugin->add_overlay_stream)
     {
+    /* Try hardware overlay */
     LOCK(ov);
-    ov->plugin->put_still(ov->priv, frame);
+    str->sink_int = ov->plugin->add_overlay_stream(ov->priv, format);
     UNLOCK(ov);
-    return;
-    }
-  /* Still frames not supported */
-  else
-    {
-    if(!ov->still_frame)
-      ov->still_frame =
-        gavl_video_frame_create(&ov->format);
+    
+    if(str->sink_int)
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN,
+             "Using hardeware overlay for stream %d",
+             ov->num_ovl_str-1);
+      return str->sink_int;
+      }
     }
-  gavl_video_frame_copy(&ov->format,
-                        ov->still_frame,
-                        frame);
-  ov->flags |= FLAG_EMULATE_STILL;
-  LOCK(ov);
-  ov->plugin->put_video(ov->priv, frame);
-  UNLOCK(ov);
+  /* Software overlay */
+  ov->flags |= FLAG_EMULATE_OVL;
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN,
+         "Using software overlay for stream %d",
+         ov->num_ovl_str - 1);
+  
+  str->ctx = gavl_overlay_blend_context_create();
+  
+  gavl_overlay_blend_context_init(str->ctx,
+                                  &ov->format, format);
+  str->sink_ext = gavl_video_sink_create(NULL, put_overlay, str, format);
+  
+  gavl_video_format_copy(&str->format, format);
+  
+  return str->sink_ext;
   }
 
 void bg_ov_handle_events(bg_ov_t * ov)
   {
-  if((ov->flags & FLAG_STILL_MODE) &&
-     (ov->flags & FLAG_EMULATE_STILL))
+  if(ov->flags & FLAG_STILL_MODE)
     {
-    gavl_video_frame_t * f;
-    LOCK(ov);
-    f = ov->plugin->get_frame(ov->priv);
-    gavl_video_frame_copy(&ov->format,
-                          f, ov->still_frame);
-    ov->plugin->put_video(ov->priv, f);
-    UNLOCK(ov);
+    if(ov->flags & (FLAG_EMULATE_STILL|FLAG_OVERLAY_CHANGED))
+      {
+      gavl_video_frame_t * f;
+      LOCK(ov);
+      f = gavl_video_sink_get_frame(ov->sink_int);
+      gavl_video_frame_copy(&ov->format,
+                            f, ov->still_frame);
+      
+      if(ov->flags & FLAG_EMULATE_OVL)
+        blend_overlays(ov, f);
+
+      gavl_video_sink_put_frame(ov->sink_int, f);
+      UNLOCK(ov);
+      }
     }
   
   if(ov->plugin->handle_events)
@@ -352,11 +400,21 @@
     {
     int i;
     for(i = 0; i < ov->num_ovl_str; i++)
-      gavl_overlay_blend_context_destroy(ov->ovl_str[i].ctx);
+      {
+      if(ov->ovl_str[i]->ctx)
+        gavl_overlay_blend_context_destroy(ov->ovl_str[i]->ctx);
+      free(ov->ovl_str[i]);
+      }
     free(ov->ovl_str);
     ov->ovl_str = NULL;
     ov->num_ovl_str = 0;
     }
+
+  if(ov->sink_ext)
+    {
+    gavl_video_sink_destroy(ov->sink_ext);
+    ov->sink_ext = NULL;
+    }
   }
 
 void bg_ov_show_window(bg_ov_t * ov, int show)

gmerlin-1.2.0.tar.gz/lib/ovl2text.c -> gmerlin-4256.tar.gz/lib/ovl2text.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,7 +34,6 @@
 
 #include <gmerlin/ocr.h>
 
-
 typedef struct
   {
   bg_encoder_callbacks_t * cb;
@@ -47,6 +46,9 @@
   bg_plugin_handle_t * enc_handle;
   bg_encoder_plugin_t * enc_plugin;
 
+  gavl_packet_sink_t * sink_int;
+  gavl_video_sink_t * sink_ext;
+  
   } ovl2text_t;
 
 void * bg_ovl2text_create(bg_plugin_registry_t * plugin_reg)
@@ -66,9 +68,12 @@
 
 static int open_ovl2text(void * data, const char * filename,
                          const gavl_metadata_t * metadata,
-                         const bg_chapter_list_t * chapter_list)
+                         const gavl_chapter_list_t * chapter_list)
   {
   ovl2text_t * e = data;
+
+  if(!e->ocr) // No OCR engine found
+    return 0;
   
   /* Open text subtitle encoder */
   if(!e->enc_plugin || !e->enc_plugin->open(e->enc_handle->priv, filename,
@@ -93,54 +98,69 @@
   gavl_video_format_copy(&e->format, format);
   
   if(!e->enc_plugin ||
-     (e->enc_plugin->add_subtitle_text_stream(e->enc_handle->priv, m,
-                                              &e->format.timescale) < 0))
+     (e->enc_plugin->add_text_stream(e->enc_handle->priv, m,
+                                     &e->format.timescale) < 0))
     return -1;
   return 0;
   }
 
-static int start_ovl2text(void * priv)
+static gavl_sink_status_t
+write_ovl2text(void * priv, gavl_overlay_t * ovl)
   {
+  char * str = NULL;
   ovl2text_t * e = priv;
-  if(e->enc_plugin->start && !e->enc_plugin->start(e->enc_handle->priv))
-    return 0;
-  return 1;
+  
+  bg_ocr_run(e->ocr, &e->format, ovl, &str);
+  
+  if(str)
+    {
+    gavl_packet_t p;
+    gavl_packet_init(&p);
+    p.data_len = strlen(str);
+    p.data = (uint8_t *)str;
+    p.pts = ovl->timestamp;
+    p.duration = ovl->duration;
+    return gavl_packet_sink_put_packet(e->sink_int, &p);
+    }
+  return GAVL_SINK_ERROR;
   }
 
-static void get_subtitle_overlay_format_ovl2text(void * priv, int stream,
-                                               gavl_video_format_t*ret)
+static int start_ovl2text(void * priv)
   {
   ovl2text_t * e = priv;
-  gavl_video_format_copy(ret, &e->format);
+  if(e->enc_plugin->start && !e->enc_plugin->start(e->enc_handle->priv))
+    return 0;
+  e->sink_int = e->enc_plugin->get_text_sink(e->enc_handle->priv, 0);
+  e->sink_ext = gavl_video_sink_create(NULL, write_ovl2text, e, &e->format);
+  return 1;
   }
 
-static int write_subtitle_overlay_ovl2text(void * priv, gavl_overlay_t * ovl, int stream)
+static gavl_video_sink_t * get_sink_ovl2text(void * priv, int stream)
   {
-  int ret = 0;
-  char * str = NULL;
   ovl2text_t * e = priv;
-  
-  bg_ocr_run(e->ocr, &e->format, ovl->frame, &str);
-  
-  if(str)
-    ret = e->enc_plugin->write_subtitle_text(e->enc_handle->priv,
-                                             str, ovl->frame->timestamp,
-                                             ovl->frame->duration, stream);
-  return ret;
+  return e->sink_ext;
   }
 
 static int close_ovl2text(void * priv, int do_delete)
   {
   ovl2text_t * e = priv;
   e->enc_plugin->close(e->enc_handle->priv, do_delete);
+
+  if(e->sink_ext)
+    {
+    gavl_video_sink_destroy(e->sink_ext);
+    e->sink_ext = NULL;
+    }
   return 1;
   }
 
 static void destroy_ovl2text(void * priv)
   {
   ovl2text_t * e = priv;
-  bg_ocr_destroy(e->ocr);
 
+  if(e->ocr)
+    bg_ocr_destroy(e->ocr);
+  
   if(e->parameters)
     bg_parameter_info_destroy_array(e->parameters);
 
@@ -168,7 +188,7 @@
   bg_parameter_info_t * ret;
   enc = bg_parameter_info_copy_array(enc_section);
   bg_plugin_registry_set_parameter_info(plugin_reg,
-                                        BG_PLUGIN_ENCODER_SUBTITLE_TEXT,
+                                        BG_PLUGIN_ENCODER_TEXT,
                                         BG_PLUGIN_FILE, &enc[0]);
   info[0] = bg_ocr_get_parameters();
   info[1] = enc;
@@ -198,10 +218,11 @@
   ovl2text_t * e = priv;
   if(!name)
     {
-    bg_ocr_set_parameter(e->ocr, NULL, NULL);
+    if(e->ocr)
+      bg_ocr_set_parameter(e->ocr, NULL, NULL);
     return;
     }
-  else if(bg_ocr_set_parameter(e->ocr, name, val))
+  else if(e->ocr && bg_ocr_set_parameter(e->ocr, name, val))
     return;
   else if(!strcmp(name, "plugin"))
     {
@@ -220,7 +241,7 @@
     if(e->enc_plugin->set_callbacks && e->cb)
       e->enc_plugin->set_callbacks(e->enc_handle->priv, e->cb);
     }
-  else
+  else if(e->enc_plugin)
     e->enc_plugin->common.set_parameter(e->enc_handle->priv, name, val);
   }
 
@@ -232,7 +253,7 @@
       .name =           "e_ovl2text",       /* Unique short name */
       .long_name =      TRS("Overlay to text converter"),
       .description =    TRS("Exports overlay subtitles to a text format by performing an OCR."),
-      .type =           BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY,
+      .type =           BG_PLUGIN_ENCODER_OVERLAY,
       .flags =          BG_PLUGIN_FILE,
       .priority =       BG_PLUGIN_PRIORITY_MAX,
       .destroy =        destroy_ovl2text,
@@ -240,19 +261,18 @@
       .set_parameter =  set_parameter_ovl2text,
     },
 
-    .max_subtitle_overlay_streams = 1,
+    .max_overlay_streams = 1,
     
     .set_callbacks =        set_callbacks_ovl2text,
     
     .open =                 open_ovl2text,
 
-    .add_subtitle_overlay_stream =     add_subtitle_overlay_stream_ovl2text,
+    .add_overlay_stream =     add_subtitle_overlay_stream_ovl2text,
     
     .start =                start_ovl2text,
 
-    .get_subtitle_overlay_format = get_subtitle_overlay_format_ovl2text,
-    
-    .write_subtitle_overlay = write_subtitle_overlay_ovl2text,
+    .get_overlay_sink = get_sink_ovl2text,
+
     .close =             close_ovl2text,
   };

gmerlin-1.2.0.tar.gz/lib/parameter.c -> gmerlin-4256.tar.gz/lib/parameter.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -52,7 +52,7 @@
     case BG_PARAMETER_MULTI_MENU:
     case BG_PARAMETER_MULTI_LIST:
     case BG_PARAMETER_MULTI_CHAIN:
-      dst->val_str = bg_strdup(dst->val_str, src->val_str);
+      dst->val_str = gavl_strrep(dst->val_str, src->val_str);
       break;
     case BG_PARAMETER_COLOR_RGB:
       memcpy(dst->val_color,
@@ -127,7 +127,7 @@
   ret = calloc(num+1, sizeof(*ret));
 
   for(i = 0; i < num; i++)
-    ret[i] = bg_strdup(ret[i], arr[i]);
+    ret[i] = gavl_strrep(ret[i], arr[i]);
   return ret;
   }
 
@@ -150,17 +150,17 @@
   {
   int num_options, i;
 
-  dst->name = bg_strdup(dst->name, src->name);
+  dst->name = gavl_strrep(dst->name, src->name);
   
-  dst->long_name = bg_strdup(dst->long_name, src->long_name);
-  dst->opt = bg_strdup(dst->opt, src->opt);
-  dst->help_string = bg_strdup(dst->help_string, src->help_string);
+  dst->long_name = gavl_strrep(dst->long_name, src->long_name);
+  dst->opt = gavl_strrep(dst->opt, src->opt);
+  dst->help_string = gavl_strrep(dst->help_string, src->help_string);
   dst->type = src->type;
   dst->flags = src->flags;
 
-  dst->gettext_domain    = bg_strdup(dst->gettext_domain,    src->gettext_domain);
-  dst->gettext_directory = bg_strdup(dst->gettext_directory, src->gettext_directory);
-  dst->preset_path       = bg_strdup(dst->preset_path,       src->preset_path);
+  dst->gettext_domain    = gavl_strrep(dst->gettext_domain,    src->gettext_domain);
+  dst->gettext_directory = gavl_strrep(dst->gettext_directory, src->gettext_directory);
+  dst->preset_path       = gavl_strrep(dst->preset_path,       src->preset_path);
   
   switch(dst->type)
     {
@@ -186,13 +186,13 @@
     case BG_PARAMETER_DEVICE:
     case BG_PARAMETER_FILE:
     case BG_PARAMETER_DIRECTORY:
-      dst->val_default.val_str = bg_strdup(dst->val_default.val_str,
+      dst->val_default.val_str = gavl_strrep(dst->val_default.val_str,
                                            src->val_default.val_str);
       break;
     case BG_PARAMETER_MULTI_MENU:
     case BG_PARAMETER_MULTI_LIST:
     case BG_PARAMETER_MULTI_CHAIN:
-      dst->val_default.val_str = bg_strdup(dst->val_default.val_str,
+      dst->val_default.val_str = gavl_strrep(dst->val_default.val_str,
                                            src->val_default.val_str);
       
       dst->multi_names_nc        = copy_string_array(src->multi_names);
@@ -225,7 +225,7 @@
         }
       break;
     case BG_PARAMETER_STRINGLIST:
-      dst->val_default.val_str = bg_strdup(dst->val_default.val_str,
+      dst->val_default.val_str = gavl_strrep(dst->val_default.val_str,
                                            src->val_default.val_str);
 
       /* Copy stringlist options */

gmerlin-1.2.0.tar.gz/lib/parameter_xml.c -> gmerlin-4256.tar.gz/lib/parameter_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -136,8 +136,8 @@
     {
     if(flag_names[i].flag & flags)
       {
-      if(num) ret = bg_strcat(ret, "|");
-      ret = bg_strcat(ret, flag_names[i].name);
+      if(num) ret = gavl_strcat(ret, "|");
+      ret = gavl_strcat(ret, flag_names[i].name);
       num++;
       }
     }
@@ -205,7 +205,7 @@
       free(tmp_string);
 
       tmp_string = BG_XML_GET_PROP(cur, name_key);
-      ret[index].name = bg_strdup(ret[index].name, tmp_string);
+      ret[index].name = gavl_strrep(ret[index].name, tmp_string);
       free(tmp_string);
       
       child = cur->children;
@@ -221,7 +221,7 @@
         if(!BG_XML_STRCMP(child->name, long_name_key))
           {
           tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
-          ret[index].long_name = bg_strdup(ret[index].long_name, tmp_string);
+          ret[index].long_name = gavl_strrep(ret[index].long_name, tmp_string);
           free(tmp_string);
           }
         else if(!BG_XML_STRCMP(child->name, flags_key))
@@ -233,31 +233,31 @@
         else if(!BG_XML_STRCMP(child->name, opt_key))
           {
           tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
-          ret[index].opt = bg_strdup(ret[index].opt, tmp_string);
+          ret[index].opt = gavl_strrep(ret[index].opt, tmp_string);
           free(tmp_string);
           }
         else if(!BG_XML_STRCMP(child->name, help_string_key))
           {
           tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
-          ret[index].help_string = bg_strdup(ret[index].help_string, tmp_string);
+          ret[index].help_string = gavl_strrep(ret[index].help_string, tmp_string);
           free(tmp_string);
           }
         else if(!BG_XML_STRCMP(child->name, gettext_domain_key))
           {
           tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
-          ret[index].gettext_domain = bg_strdup(ret[index].gettext_domain, tmp_string);
+          ret[index].gettext_domain = gavl_strrep(ret[index].gettext_domain, tmp_string);
           free(tmp_string);
           }
         else if(!BG_XML_STRCMP(child->name, gettext_directory_key))
           {
           tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
-          ret[index].gettext_directory = bg_strdup(ret[index].gettext_directory, tmp_string);
+          ret[index].gettext_directory = gavl_strrep(ret[index].gettext_directory, tmp_string);
           free(tmp_string);
           }
         else if(!BG_XML_STRCMP(child->name, preset_path_key))
           {
           tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
-          ret[index].preset_path = bg_strdup(ret[index].preset_path, tmp_string);
+          ret[index].preset_path = gavl_strrep(ret[index].preset_path, tmp_string);
           free(tmp_string);
           }
         else if(!BG_XML_STRCMP(child->name, multi_names_key))
@@ -282,7 +282,7 @@
               {
               tmp_string = (char*)xmlNodeListGetString(xml_doc, grandchild->children, 1);
               ret[index].multi_names_nc[multi_index] =
-                bg_strdup(ret[index].multi_names_nc[multi_index], tmp_string);
+                gavl_strrep(ret[index].multi_names_nc[multi_index], tmp_string);
               free(tmp_string);
               multi_index++;
               }
@@ -311,7 +311,7 @@
               {
               tmp_string = (char*)xmlNodeListGetString(xml_doc, grandchild->children, 1);
               ret[index].multi_descriptions_nc[multi_index] =
-                bg_strdup(ret[index].multi_descriptions_nc[multi_index], tmp_string);
+                gavl_strrep(ret[index].multi_descriptions_nc[multi_index], tmp_string);
               free(tmp_string);
               multi_index++;
               }
@@ -341,7 +341,7 @@
               {
               tmp_string = (char*)xmlNodeListGetString(xml_doc, grandchild->children, 1);
               ret[index].multi_labels_nc[multi_index] =
-                bg_strdup(ret[index].multi_labels_nc[multi_index], tmp_string);
+                gavl_strrep(ret[index].multi_labels_nc[multi_index], tmp_string);
               free(tmp_string);
               multi_index++;
               }
@@ -403,7 +403,7 @@
             case BG_PARAMETER_MULTI_MENU:
             case BG_PARAMETER_MULTI_LIST:
             case BG_PARAMETER_MULTI_CHAIN:
-              ret[index].val_default.val_str = bg_strdup(ret[index].val_default.val_str,
+              ret[index].val_default.val_str = gavl_strrep(ret[index].val_default.val_str,
                                                          tmp_string);
               break;
             case BG_PARAMETER_COLOR_RGB:
@@ -840,6 +840,7 @@
   xml_params = xmlNewDocRawNode(xml_doc, NULL, (xmlChar*)"PARAMETERS", NULL);
   xmlDocSetRootElement(xml_doc, xml_params);
   bg_parameters_2_xml(info, xml_params);
-  xmlSaveFile(filename, xml_doc);
+
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   }

gmerlin-1.2.0.tar.gz/lib/player.c -> gmerlin-4256.tar.gz/lib/player.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * Gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -39,12 +39,6 @@
   bg_player_set_duration(p, duration, p->can_seek);
   }
 
-static void name_changed(void * data, const char * name)
-  {
-  bg_player_t * p = data;
-  bg_player_set_track_name(p, name);
-  }
-
 static void metadata_changed(void * data, const gavl_metadata_t * m)
   {
   bg_player_t * p = data;
@@ -77,7 +71,6 @@
 
   /* Callbacks */
   ret->input_callbacks.data = ret;
-  ret->input_callbacks.name_changed     = name_changed;
   ret->input_callbacks.duration_changed = duration_changed;
   ret->input_callbacks.metadata_changed = metadata_changed;
   ret->input_callbacks.buffer_notify    = buffer_notify;
@@ -91,7 +84,7 @@
   
   ret->visualizer = bg_visualizer_create(plugin_reg);
 
-  ret->thread_common = bg_player_thread_common_create();
+  ret->thread_common = bg_thread_common_create();
   
   /* Create contexts */
 
@@ -139,7 +132,7 @@
   pthread_mutex_destroy(&player->state_mutex);
   pthread_mutex_destroy(&player->config_mutex);
 
-  bg_player_thread_common_destroy(player->thread_common);
+  bg_thread_common_destroy(player->thread_common);
   
   free(player);
   }

gmerlin-1.2.0.tar.gz/lib/player_audio.c -> gmerlin-4256.tar.gz/lib/player_audio.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,23 +29,25 @@
 #include <gmerlin/player.h>
 #include <playerprivate.h>
 
-void bg_player_audio_create(bg_player_t * p, bg_plugin_registry_t * plugin_reg)
+void bg_player_audio_create(bg_player_t * p,
+                            bg_plugin_registry_t * plugin_reg)
   {
   bg_player_audio_stream_t * s = &p->audio_stream;
   
   bg_gavl_audio_options_init(&s->options);
 
-  s->th = bg_player_thread_create(p->thread_common);
+  s->th = bg_thread_create(p->thread_common);
   
   s->fc =
     bg_audio_filter_chain_create(&s->options,
                                  plugin_reg);
   
-  s->cnv_out = gavl_audio_converter_create();
-
+  
   s->volume = gavl_volume_control_create();
   s->peak_detector = gavl_peak_detector_create();
-  
+  gavl_peak_detector_set_callbacks(s->peak_detector, NULL,
+                                   bg_player_peak_callback, p);
+    
   pthread_mutex_init(&s->volume_mutex,NULL);
   pthread_mutex_init(&s->config_mutex,NULL);
   pthread_mutex_init(&s->time_mutex,NULL);
@@ -58,7 +60,6 @@
 void bg_player_audio_destroy(bg_player_t * p)
   {
   bg_player_audio_stream_t * s = &p->audio_stream;
-  gavl_audio_converter_destroy(s->cnv_out);
   bg_gavl_audio_options_free(&s->options);
   bg_audio_filter_chain_destroy(s->fc);
   
@@ -73,14 +74,12 @@
   if(s->plugin_handle)
     bg_plugin_unref(s->plugin_handle);
   
-  bg_player_thread_destroy(s->th); 
+  bg_thread_destroy(s->th); 
   
   }
 
 int bg_player_audio_init(bg_player_t * player, int audio_stream)
   {
-  gavl_sample_format_t force_format;
-  gavl_audio_options_t * opt;
   bg_player_audio_stream_t * s;
   //  int do_filter;
 
@@ -92,65 +91,27 @@
   
   s->options.options_changed = 0;
   
-  s->in_func   = bg_player_input_read_audio;
-  s->in_data   = player;
-  s->in_stream = player->current_audio_stream;
-  
   bg_player_input_get_audio_format(player);
 
-  bg_audio_filter_chain_connect_input(s->fc,
-                                      s->in_func,
-                                      s->in_data,
-                                      s->in_stream);
-  s->in_func = bg_audio_filter_chain_read;
-  s->in_data = s->fc;
-  s->in_stream = 0;
-  
   pthread_mutex_lock(&s->config_mutex);
-  force_format = s->options.force_format;
-  bg_audio_filter_chain_init(s->fc, &s->input_format, &s->fifo_format);
+  s->src = bg_audio_filter_chain_connect(s->fc,
+                                         s->in_src);
   pthread_mutex_unlock(&s->config_mutex);
   
-  
   gavl_audio_format_copy(&s->output_format,
-                         &s->fifo_format);
-
+                         gavl_audio_source_get_src_format(s->src));
+  
   if(!bg_player_oa_init(s))
     return 0;
 
-  gavl_audio_format_copy(&s->fifo_format,
-                         &s->output_format);
-  
-  if(force_format != GAVL_SAMPLE_NONE)
-    s->fifo_format.sample_format = force_format;
-
-  bg_audio_filter_chain_set_out_format(s->fc, &s->fifo_format);
-  
+  gavl_audio_source_set_dst(s->src, 0, &s->output_format);
+    
   /* Volume control */
   gavl_volume_control_set_format(s->volume,
-                                 &s->fifo_format);
+                                 &s->output_format);
   gavl_peak_detector_set_format(s->peak_detector,
-                                &s->fifo_format);
-
-  /* Output conversion */
-  opt = gavl_audio_converter_get_options(s->cnv_out);
-  gavl_audio_options_copy(opt, s->options.opt);
-
-  s->fifo_frame = gavl_audio_frame_create(&s->output_format);
+                                &s->output_format);
   
-  if(!gavl_audio_converter_init(s->cnv_out,
-                                &s->fifo_format,
-                                &s->output_format))
-    {
-    s->do_convert_out = 0;
-    s->output_frame = s->fifo_frame;
-    }
-  else
-    {
-    s->do_convert_out = 1;
-    s->output_frame =
-      gavl_audio_frame_create(&s->output_format);
-    }
   return 1;
   }
 
@@ -159,33 +120,24 @@
   bg_player_audio_stream_t * s;
   s = &player->audio_stream;
   
-  if(s->fifo_frame)
+  if(s->mute_frame)
     {
-    gavl_audio_frame_destroy(s->fifo_frame);
-    s->fifo_frame = NULL;
+    gavl_audio_frame_destroy(s->mute_frame);
+    s->mute_frame = NULL;
     }
-  if(s->output_frame && s->do_convert_out)
+  if(s->in_src)
     {
-    gavl_audio_frame_destroy(s->output_frame);
+    gavl_audio_source_destroy(s->in_src);
+    s->in_src = NULL;
     }
-  s->output_frame = NULL;
   }
 
 /* Configuration stuff */
 
 static const bg_parameter_info_t parameters[] =
   {
-#if 0
-    {
-      .name =      "audio",
-      .long_name = TRS("Audio"),
-      .type =      BG_PARAMETER_SECTION,
-    },
-#endif
-    BG_GAVL_PARAM_FORCE_SAMPLEFORMAT,
     BG_GAVL_PARAM_CONVERSION_QUALITY,
     BG_GAVL_PARAM_AUDIO_DITHER_MODE,
-    BG_GAVL_PARAM_SAMPLERATE,
     BG_GAVL_PARAM_RESAMPLE_MODE,
     BG_GAVL_PARAM_CHANNEL_SETUP,
     { /* End of parameters */ }
@@ -304,13 +256,15 @@
   
   }
 
-int
-bg_player_read_audio(bg_player_t * p, gavl_audio_frame_t * frame)
+#if 0
+gavl_source_status_t
+bg_player_read_audio(bg_player_t * p, gavl_audio_frame_t ** frame)
   {
   bg_player_audio_stream_t * s = &p->audio_stream;
   return s->in_func(s->in_data, frame, s->in_stream,
                     s->fifo_format.samples_per_frame);
   }
+#endif
 
 int bg_player_audio_set_eof(bg_player_t * p)
   {

gmerlin-1.2.0.tar.gz/lib/player_input.c -> gmerlin-4256.tar.gz/lib/player_input.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -83,13 +83,6 @@
   bg_player_video_stream_t * vs = &p->video_stream;
   bg_player_subtitle_stream_t * ss = &p->subtitle_stream;
   
-  vs->do_still = 0;
-  if(vs->still_frame_in)
-    {
-    gavl_video_frame_destroy(vs->still_frame_in);
-    vs->still_frame_in = NULL;
-    }
-  
   /* Adjust stream indices */
   if(p->current_audio_stream >= p->track_info->num_audio_streams)
     p->current_audio_stream = 0;
@@ -97,7 +90,8 @@
   if(p->current_video_stream >= p->track_info->num_video_streams)
     p->current_video_stream = 0;
 
-  if(p->current_subtitle_stream >= p->track_info->num_subtitle_streams)
+  if(p->current_subtitle_stream >=
+     p->track_info->num_text_streams + p->track_info->num_overlay_streams)
     p->current_subtitle_stream = 0;
 
   if(!p->audio_stream.plugin_handle)
@@ -130,7 +124,8 @@
     }
 
   if((p->current_subtitle_stream >= 0) &&
-     (p->current_subtitle_stream < p->track_info->num_subtitle_streams))
+     (p->current_subtitle_stream <
+      p->track_info->num_text_streams + p->track_info->num_overlay_streams))
     {
     p->flags |= PLAYER_DO_SUBTITLE;
     ss->eof = 0;
@@ -193,49 +188,56 @@
       }
     }
 
-  if(p->input_plugin->set_subtitle_stream)
+  if(p->input_plugin->set_text_stream)
     {
-    for(i = 0; i < p->track_info->num_subtitle_streams; i++)
+    for(i = 0; i < p->track_info->num_text_streams; i++)
       {
       if(i == p->current_subtitle_stream) 
-        p->input_plugin->set_subtitle_stream(p->input_priv, i,
-                                      BG_STREAM_ACTION_DECODE);
+        p->input_plugin->set_text_stream(p->input_priv, i,
+                                         BG_STREAM_ACTION_DECODE);
       else
-        p->input_plugin->set_subtitle_stream(p->input_priv, i,
+        p->input_plugin->set_text_stream(p->input_priv, i,
                                          BG_STREAM_ACTION_OFF);
       }
     }
-  }
 
-int bg_player_input_start(bg_player_t * p)
-  {
-  gavl_video_format_t * video_format;
-  
-  /* Start input plugin, so we get the formats */
-  if(p->input_plugin->start)
+  if(p->input_plugin->set_overlay_stream)
     {
-    if(!p->input_plugin->start(p->input_priv))
+    for(i = 0; i < p->track_info->num_overlay_streams; i++)
       {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Starting input plugin failed");
-
-      if(p->input_handle)
-        bg_plugin_unref(p->input_handle);
-      p->input_handle = NULL;
-      p->input_plugin = NULL;
-      return 0;
+      if(i + p->track_info->num_text_streams == p->current_subtitle_stream) 
+        p->input_plugin->set_overlay_stream(p->input_priv, i,
+                                            BG_STREAM_ACTION_DECODE);
+      else
+        p->input_plugin->set_overlay_stream(p->input_priv, i,
+                                            BG_STREAM_ACTION_OFF);
       }
     }
-  
-  /* Subtitle type must be set here, because it's unknown before the
-     start() call */
 
   if(DO_SUBTITLE(p->flags))
     {
-    if(p->track_info->subtitle_streams[p->current_subtitle_stream].is_text)
+    if(p->current_subtitle_stream < p->track_info->num_text_streams)
       p->flags |= PLAYER_DO_SUBTITLE_TEXT;
     else
       p->flags |= PLAYER_DO_SUBTITLE_OVERLAY;
     }
+  }
+
+int bg_player_input_start(bg_player_t * p)
+  {
+  gavl_video_format_t * video_format;
+  
+  /* Start input plugin, so we get the formats */
+  if(p->input_plugin->start && !p->input_plugin->start(p->input_priv))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Starting input plugin failed");
+    
+    if(p->input_handle)
+      bg_plugin_unref(p->input_handle);
+    p->input_handle = NULL;
+    p->input_plugin = NULL;
+    return 0;
+    }
   
   /* Check for still image mode */
   
@@ -245,7 +247,7 @@
       &p->track_info->video_streams[p->current_video_stream].format;
     
     if(video_format->framerate_mode == GAVL_FRAMERATE_STILL)
-      p->video_stream.do_still = 1;
+      p->flags |= PLAYER_DO_STILL;
     }
   p->audio_stream.has_first_timestamp_i = 0;
   return 1;
@@ -253,7 +255,7 @@
 
 void bg_player_input_stop(bg_player_t * p)
   {
-  if(p->input_plugin->stop)
+  if(p->input_plugin && p->input_plugin->stop)
     p->input_plugin->stop(p->input_priv);
   }
 
@@ -289,11 +291,14 @@
     }
   
   p->track_info = p->input_plugin->get_track_info(p->input_priv,
-                                            track_index);
+                                                  track_index);
+  
+
+  p->duration = bg_track_info_get_duration(p->track_info);
   
   if(p->input_plugin->seek &&
      (p->track_info->flags & BG_TRACK_SEEKABLE) &&
-     (p->track_info->duration > 0))
+     (p->duration != GAVL_TIME_UNDEFINED))
     p->can_seek = 1;
   else
     p->can_seek = 0;
@@ -340,11 +345,6 @@
   p->input_handle = NULL;
   p->input_plugin = NULL;
 
-  if(p->video_stream.still_frame_in)
-    {
-    gavl_video_frame_destroy(p->video_stream.still_frame_in);
-    p->video_stream.still_frame_in = NULL;
-    }
 #ifdef DEBUG_COUNTER
   sprintf(tmp_string, "%" PRId64, p->audio_stream.samples_read);
   
@@ -358,163 +358,193 @@
 #endif
   }
 
+static gavl_source_status_t
+read_audio(void * priv, gavl_audio_frame_t ** frame)
+  {
+  gavl_source_status_t st;
+  bg_player_t * p = priv;
+  gavl_audio_frame_t * f = NULL;
+  bg_player_audio_stream_t * as = &p->audio_stream;
+
+  
+  
+  if((st = gavl_audio_source_read_frame(p->audio_stream.in_src_int, &f)) != GAVL_SOURCE_OK)
+    {
+    //    fprintf(stderr, "Reading audio failed\n");
+    return st;
+    }
+  if(!as->has_first_timestamp_i)
+    {
+    as->samples_read = f->timestamp;
+    as->has_first_timestamp_i = 1;
+    }
+  as->samples_read += f->valid_samples;
+  *frame = f;
+  return GAVL_SOURCE_OK;
+  }
+
+
 int bg_player_input_get_audio_format(bg_player_t * p)
   {
+  p->audio_stream.in_src_int =
+    p->input_plugin->get_audio_source(p->input_priv, p->current_audio_stream);
+  gavl_audio_source_set_lock_funcs(p->audio_stream.in_src_int,
+                                   bg_plugin_lock, bg_plugin_unlock,
+                                   p->input_handle);
+  
   gavl_audio_format_copy(&p->audio_stream.input_format,
                          &p->track_info->audio_streams[p->current_audio_stream].format);
-  return 1;
-  }
 
-int bg_player_input_get_video_format(bg_player_t * p)
-  {
-  gavl_video_format_copy(&p->video_stream.input_format,
-                         &p->track_info->video_streams[p->current_video_stream].format);
+  gavl_audio_source_set_dst(p->audio_stream.in_src_int, 0, &p->audio_stream.input_format);
+  p->audio_stream.in_src = gavl_audio_source_create(read_audio, p, GAVL_SOURCE_SRC_ALLOC,
+                                                    &p->audio_stream.input_format);
+
 
-  if(p->video_stream.do_still)
-    {
-    p->video_stream.input_format.timescale = GAVL_TIME_SCALE;
-    pthread_mutex_lock(&p->config_mutex);
-    p->video_stream.input_format.frame_duration =
-      (int)((float)GAVL_TIME_SCALE / p->still_framerate);
-    pthread_mutex_unlock(&p->config_mutex);
-    }
   
   return 1;
   }
 
-int
-bg_player_input_get_subtitle_format(bg_player_t * p)
-  {
-  gavl_video_format_copy(&p->subtitle_stream.input_format,
-                         &p->track_info->subtitle_streams[p->current_subtitle_stream].format);
-  return 1;
-  }
+/* Video input */
 
-int
-bg_player_input_read_audio(void * priv, gavl_audio_frame_t * frame, int stream, int samples)
+static gavl_source_status_t
+read_video_still(void * priv, gavl_video_frame_t ** frame)
   {
-  int result;
+  gavl_source_status_t st;
+
   bg_player_t * p = priv;
-  bg_player_audio_stream_t * as = &p->audio_stream;
+  bg_player_video_stream_t * vs = &p->video_stream;
+  const gavl_video_format_t * format;
   
-  bg_plugin_lock(p->input_handle);
-  result = p->input_plugin->read_audio(p->input_priv, frame, stream, samples);
-  bg_plugin_unlock(p->input_handle);
+  format = gavl_video_source_get_dst_format(vs->in_src_int);
   
-  if(!as->has_first_timestamp_i)
-    {
-    as->samples_read = frame->timestamp;
-    as->has_first_timestamp_i = 1;
-    }
-  as->samples_read += frame->valid_samples;
-  return result;
+  if((st = gavl_video_source_read_frame(vs->in_src_int, frame)) != GAVL_SOURCE_OK)
+    return st;
+  
+  if(!DO_AUDIO(p->flags) &&
+     (p->duration != GAVL_TIME_UNDEFINED) &&
+     gavl_time_unscale(format->timescale,
+                       (*frame)->timestamp) > p->duration)
+    
+    return GAVL_SOURCE_EOF;
+  
+#ifdef DUMP_TIMESTAMPS
+  bg_debug("Input timestamp: %"PRId64" (timescale: %d)\n",
+           gavl_time_unscale(format->timescale,
+                             (*frame)->timestamp), format->timescale);
+#endif
+  return st;
   }
 
-int
-bg_player_input_read_video_still(void * priv,
-                                 gavl_video_frame_t * frame, int stream)
+static gavl_source_status_t
+read_video_subtitle_only(void * priv,
+                         gavl_video_frame_t ** frame)
   {
-  int result;
   bg_player_t * p = priv;
   bg_player_video_stream_t * vs = &p->video_stream;
-
-  gavl_video_format_t * format;
-  format = &vs->input_format;
-
-  if(!vs->still_frame_in)
-    {
-    vs->still_frame_in = gavl_video_frame_create(&vs->input_format);
-    vs->still_frame_in->timestamp = 0;
-    }
   
-  bg_plugin_lock(p->input_handle);
+  gavl_video_frame_fill(*frame, &vs->output_format, vs->bg_color);
 
-  if(p->input_plugin->has_still(p->input_priv, stream))
-    result = p->input_plugin->read_video(p->input_priv, frame,
-                                         stream);
-    
-  else
-    result = 0;
-    
-  bg_plugin_unlock(p->input_handle);
+  (*frame)->duration  = vs->output_format.frame_duration;
   
-  if(result)
-    gavl_video_frame_copy(&vs->input_format, vs->still_frame_in, frame);
-  else
-    {
-    if(!DO_AUDIO(p->flags) &&
-       (p->track_info->duration != GAVL_TIME_UNDEFINED) &&
-       gavl_time_unscale(vs->input_format.timescale,
-                         vs->still_frame_in->timestamp) > p->track_info->duration)
-      result = 0;
-    else
-      {
-      gavl_video_frame_copy(&vs->input_format, frame, vs->still_frame_in);
-      frame->timestamp = vs->still_frame_in->timestamp;
-      result = 1;
-      }
-    }
-  vs->still_frame_in->timestamp += vs->input_format.frame_duration;
-#ifdef DUMP_TIMESTAMPS
-  bg_debug("Input timestamp: %"PRId64" (timescale: %d)\n",
-           gavl_time_unscale(vs->input_format.timescale,
-                             frame->timestamp), vs->input_format.timescale);
-#endif
-  return result;
-    
+  (*frame)->timestamp = (int64_t)vs->frames_read * vs->output_format.frame_duration;
+  vs->frames_read++;
+  return GAVL_SOURCE_OK;
   }
 
-int
-bg_player_input_read_video(void * priv,
-                           gavl_video_frame_t * frame, int stream)
+static gavl_source_status_t
+read_video(void * priv, gavl_video_frame_t ** frame)
   {
-  int result;
+  gavl_source_status_t st;
   bg_player_t * p = priv;
   bg_player_video_stream_t * vs = &p->video_stream;
   
-  bg_plugin_lock(p->input_handle);
-
   /* Skip */
 
-  if(vs->skip && p->input_plugin->skip_video)
+  if((vs->skip > 1000000) && p->input_plugin->skip_video)
     {
     gavl_time_t skip_time = 
       vs->frame_time + vs->skip;
+
+    pthread_mutex_lock(&vs->config_mutex);
     
-    p->input_plugin->skip_video(p->input_priv, stream,
-                                &skip_time, GAVL_TIME_SCALE, 0);
+    if(vs->do_skip)
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Skipping frame, delta: %f",
+             gavl_time_to_seconds(vs->skip));
+
+      bg_plugin_lock(p->input_handle);
+      p->input_plugin->skip_video(p->input_priv, p->current_video_stream,
+                                  &skip_time, GAVL_TIME_SCALE, 0);
+      bg_plugin_unlock(p->input_handle);
+      }
+    pthread_mutex_unlock(&vs->config_mutex);
     }
-  
-  result = p->input_plugin->read_video(p->input_priv, frame, stream);
-  bg_plugin_unlock(p->input_handle);
+
+  if((st = gavl_video_source_read_frame(vs->in_src_int, frame)) != GAVL_SOURCE_OK)
+    return st;
 
 #ifdef DUMP_TIMESTAMPS
   bg_debug("Input timestamp: %"PRId64"\n",
            gavl_time_unscale(vs->input_format.timescale,
-                             frame->timestamp));
+                              (*frame)->timestamp));
 #endif
-  p->video_stream.frames_read++;
+  vs->frames_read++;
   
-  //  if(!result)
-  //    fprintf(stderr, "Read video failed\n");
-  return result;
+  return st;
   }
 
-int
-bg_player_input_read_video_subtitle_only(void * priv,
-                                         gavl_video_frame_t * frame,
-                                         int stream)
+int bg_player_input_get_video_format(bg_player_t * p)
   {
-  bg_player_t * p = priv;
-  bg_player_video_stream_t * vs = &p->video_stream;
+  p->video_stream.in_src_int =
+    p->input_plugin->get_video_source(p->input_priv, p->current_video_stream);
+
+  gavl_video_source_set_lock_funcs(p->video_stream.in_src_int,
+                                   bg_plugin_lock, bg_plugin_unlock,
+                                   p->input_handle);
+
+  
+  gavl_video_format_copy(&p->video_stream.input_format,
+                         gavl_video_source_get_src_format(p->video_stream.in_src_int));
+  
+  if(DO_STILL(p->flags))
+    {
+    gavl_video_format_t fmt;
+
+    gavl_video_format_copy(&fmt, &p->video_stream.input_format);
+    
+    fmt.timescale = GAVL_TIME_SCALE;
+    fmt.framerate_mode = GAVL_FRAMERATE_CONSTANT;
+    
+    pthread_mutex_lock(&p->config_mutex);
+    fmt.frame_duration =
+      (int)((float)GAVL_TIME_SCALE / p->still_framerate);
+    pthread_mutex_unlock(&p->config_mutex);
+
+    gavl_video_source_set_dst(p->video_stream.in_src_int, 0, &fmt);
+    
+    p->video_stream.in_src = gavl_video_source_create(read_video_still, p, GAVL_SOURCE_SRC_ALLOC, &fmt);
+    }
+  else if(DO_SUBTITLE_ONLY(p->flags))
+    {
+    gavl_video_source_set_dst(p->video_stream.in_src_int, 0, &p->video_stream.input_format);
+    p->video_stream.in_src = gavl_video_source_create(read_video_subtitle_only, p, 0,
+                                                      &p->video_stream.input_format);
+    }
+
   
-  gavl_video_frame_fill(frame, &vs->output_format, vs->bg_color);
+  else
+    {
+    gavl_video_source_set_dst(p->video_stream.in_src_int, 0, &p->video_stream.input_format);
+    p->video_stream.in_src = gavl_video_source_create(read_video, p, GAVL_SOURCE_SRC_ALLOC,
+                                                      &p->video_stream.input_format);
+    }
+
   
-  frame->timestamp = (int64_t)vs->frames_read * vs->output_format.frame_duration;
   return 1;
   }
 
 
+
 void bg_player_input_seek(bg_player_t * p,
                           gavl_time_t * time, int scale)
   {
@@ -527,10 +557,14 @@
   as = &p->audio_stream;
   vs = &p->video_stream;
   ss = &p->subtitle_stream;
+
+  //  fprintf(stderr, "Seek: %ld (%d)", *time, scale);
   
-  bg_plugin_lock(p->input_handle);
+  //  bg_plugin_lock(p->input_handle);
   p->input_plugin->seek(p->input_priv, time, scale);
-  bg_plugin_unlock(p->input_handle);
+  //  bg_plugin_unlock(p->input_handle);
+
+  //  fprintf(stderr, " %ld\n", *time);
   
   as->samples_read =
     gavl_time_to_samples(as->input_format.samplerate, *time);
@@ -547,10 +581,13 @@
     vs->frames_written =
       gavl_time_to_frames(vs->input_format.timescale, vs->input_format.frame_duration,
                           *time);
-    if(vs->still_frame_in)
-      vs->still_frame_in->timestamp =
-        gavl_time_scale(vs->input_format.timescale, *time);
     }
+
+  if(vs->in_src)
+    gavl_video_source_reset(vs->in_src);
+  if(as->in_src)
+    gavl_audio_source_reset(as->in_src);
+  
   // Clear EOF states
   do_audio = DO_AUDIO(p->flags);
   do_video = DO_VIDEO(p->flags);
@@ -629,11 +666,7 @@
   bg_msg_set_id(msg, BG_PLAYER_MSG_INPUT);
   
   if(d->handle)
-    {
     bg_msg_set_arg_string(msg, 0, d->handle->plugin->long_name);
-    bg_msg_set_arg_string(msg, 1, d->handle->location);
-    bg_msg_set_arg_int(msg, 2, d->track);
-    }
   }
 
 void bg_player_input_send_messages(bg_player_t * p)

gmerlin-1.2.0.tar.gz/lib/player_loop.c -> gmerlin-4256.tar.gz/lib/player_loop.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -30,14 +30,6 @@
 
 #define LOG_DOMAIN "player"
 
-/* Metadata */
-
-static void msg_metadata(bg_msg_t * msg, const void * data)
-  {
-  gavl_metadata_t * m = (gavl_metadata_t *)data;
-  bg_msg_set_id(msg, BG_PLAYER_MSG_METADATA);
-  bg_msg_set_arg_metadata(msg, 0, m);
-  }
 
 static void msg_time(bg_msg_t * msg,
                      const void * data)
@@ -127,7 +119,7 @@
 
   bg_msg_set_arg_int(msg, 0, info->num_audio_streams);
   bg_msg_set_arg_int(msg, 1, info->num_video_streams);
-  bg_msg_set_arg_int(msg, 2, info->num_subtitle_streams);
+  bg_msg_set_arg_int(msg, 2, info->num_text_streams + info->num_overlay_streams);
   }
 
 struct stream_info_s
@@ -158,12 +150,19 @@
 
 static void msg_subtitle_stream_info(bg_msg_t * msg, const void * data)
   {
+  int index, is_text;
   const struct stream_info_s * si;
   si = (const struct stream_info_s*)data;
   bg_msg_set_id(msg, BG_PLAYER_MSG_SUBTITLE_STREAM_INFO);
 
   bg_msg_set_arg_int(msg,    0, si->index);
-  bg_msg_set_arg_metadata(msg, 1, &si->track->subtitle_streams[si->index].m);
+
+  index = bg_player_get_subtitle_index(si->track, si->index, &is_text);
+
+  if(is_text)
+    bg_msg_set_arg_metadata(msg, 1, &si->track->text_streams[index].m);
+  else
+    bg_msg_set_arg_metadata(msg, 1, &si->track->overlay_streams[index].m);
   }
 
 static void msg_mute(bg_msg_t * msg, const void * data)
@@ -184,8 +183,7 @@
 
 static void msg_num_chapters(bg_msg_t * msg, const void * data)
   {
-  bg_chapter_list_t * l;
-  l = (bg_chapter_list_t *)data;
+  const gavl_chapter_list_t * l = data;
   bg_msg_set_id(msg, BG_PLAYER_MSG_NUM_CHAPTERS);
 
   if(l)
@@ -202,7 +200,7 @@
 
 struct chapter_info_s
   {
-  bg_chapter_list_t * l;
+  gavl_chapter_list_t * l;
   int index;
   };
 
@@ -242,7 +240,7 @@
   if(old_state == BG_PLAYER_STATE_PAUSED)
     return;
   
-  bg_player_threads_pause(p->threads, PLAYER_MAX_THREADS);
+  bg_threads_pause(p->threads, PLAYER_MAX_THREADS);
   
   bg_player_time_stop(p);
 
@@ -277,7 +275,7 @@
 
   p->flags &= ~(PLAYER_FREEZE_FRAME|PLAYER_FREEZE_VIS);
 
-  bg_player_threads_start(p->threads, PLAYER_MAX_THREADS);
+  bg_threads_start(p->threads, PLAYER_MAX_THREADS);
   }
 
 /* Pause command */
@@ -331,7 +329,7 @@
 
 static int init_subtitle_stream(bg_player_t * p)
   {
-  if(!bg_player_subtitle_init(p, p->current_subtitle_stream))
+  if(!bg_player_subtitle_init(p))
     {
     bg_player_set_state(p, BG_PLAYER_STATE_ERROR,
                         NULL, NULL);
@@ -407,6 +405,9 @@
 
   bg_player_set_state(p, BG_PLAYER_STATE_STARTING, NULL, NULL);
 
+  /* Do metadata callback as early as possible */
+  bg_player_set_metadata(p, &p->track_info->metadata);
+  
   /* Close previous visualization before we init the streams
      because it might close the ov_plugin as well */
   
@@ -428,27 +429,20 @@
       if(DO_VISUALIZE(p->old_flags))
         bg_visualizer_close(p->visualizer);
       /* Initialize visualizer */
-      bg_visualizer_open_plugin(p->visualizer, &p->audio_stream.fifo_format,
+      bg_visualizer_open_plugin(p->visualizer, &p->audio_stream.output_format,
                                 bg_ov_get_plugin(p->video_stream.ov));
       }
     else
       {
       /* Update audio format */
-      bg_visualizer_set_audio_format(p->visualizer, &p->audio_stream.fifo_format);
+      bg_visualizer_set_audio_format(p->visualizer, &p->audio_stream.output_format);
       }
     }
   
   /* Send input messages */
   bg_player_input_send_messages(p);
   
-  /* Send metadata */
-
-  bg_msg_queue_list_send(p->message_queues,
-                         msg_metadata,
-                         &p->track_info->metadata);
-
-
-  bg_player_set_duration(p, p->track_info->duration, p->can_seek);
+  bg_player_set_duration(p, p->duration, p->can_seek);
   
   bg_msg_queue_list_send(p->message_queues,
                          msg_num_streams,
@@ -493,13 +487,20 @@
                            msg_video_stream_info,
                            &si);
     }
-  for(i = 0; i < p->track_info->num_subtitle_streams; i++)
+  for(i = 0; i < p->track_info->num_overlay_streams; i++)
     {
     si.index = i;
     bg_msg_queue_list_send(p->message_queues,
                            msg_subtitle_stream_info,
                            &si);
     }
+  for(i = 0; i < p->track_info->num_text_streams; i++)
+    {
+    si.index = i + p->track_info->num_overlay_streams;
+    bg_msg_queue_list_send(p->message_queues,
+                           msg_subtitle_stream_info,
+                           &si);
+    }
   
   /* Send messages about formats */
   if(DO_AUDIO(p->flags))
@@ -526,23 +527,23 @@
 
   if(DO_AUDIO(p->flags))
     {
-    bg_player_thread_set_func(p->audio_stream.th,
+    bg_thread_set_func(p->audio_stream.th,
                               bg_player_oa_thread, p);
     }
   else
     {
-    bg_player_thread_set_func(p->audio_stream.th,
+    bg_thread_set_func(p->audio_stream.th,
                               NULL, NULL);
     }
   
   if(DO_VIDEO(p->flags))
     {
-    bg_player_thread_set_func(p->video_stream.th,
+    bg_thread_set_func(p->video_stream.th,
                               bg_player_ov_thread, p);
     }
   else
     {
-    bg_player_thread_set_func(p->video_stream.th,
+    bg_thread_set_func(p->video_stream.th,
                               NULL, NULL);
     }
   
@@ -557,11 +558,12 @@
     {
     if(DO_AUDIO(p->flags))
       bg_audio_filter_chain_reset(p->audio_stream.fc);
+    
     if(DO_VIDEO(p->flags))
       bg_video_filter_chain_reset(p->video_stream.fc);
     }
 
-  bg_player_threads_init(p->threads, PLAYER_MAX_THREADS);
+  bg_threads_init(p->threads, PLAYER_MAX_THREADS);
   preload(p);
   
   if(flags & BG_PLAY_FLAG_INIT_THEN_PAUSE)
@@ -591,14 +593,13 @@
 
 static void play_cmd(bg_player_t * p,
                      bg_plugin_handle_t * handle,
-                     int track_index, char * track_name, int flags)
+                     int track_index, int flags)
   {
   /* Shut down from last playback if necessary */
   
   if(p->input_handle)
     player_cleanup(p);
   
-  bg_player_set_track_name(p, track_name);
   
   p->input_handle = handle;
   
@@ -632,7 +633,7 @@
     case BG_PLAYER_STATE_SEEKING:
     case BG_PLAYER_STATE_BUFFERING:
     case BG_PLAYER_STATE_PLAYING:
-      bg_player_threads_join(player->threads, PLAYER_MAX_THREADS);
+      bg_threads_join(player->threads, PLAYER_MAX_THREADS);
       
       if(DO_AUDIO(player->flags))
         bg_player_oa_stop(&player->audio_stream);
@@ -791,7 +792,7 @@
   if(player->track_info->chapter_list)
     {
     new_chapter =
-      bg_chapter_list_get_current(player->track_info->chapter_list,
+      gavl_chapter_list_get_current(player->track_info->chapter_list,
                                   sync_time);
     if(new_chapter != player->current_chapter)
       {
@@ -880,7 +881,6 @@
   float arg_f1;
   int state;
   void * arg_ptr1;
-  char * arg_str1;
   gavl_time_t time;
   gavl_time_t current_time;
   bg_msg_t * command;
@@ -949,7 +949,6 @@
           }
         
         arg_i1   = bg_msg_get_arg_int(command, 1);
-        arg_str1 = bg_msg_get_arg_string(command, 3);
       
         if((state == BG_PLAYER_STATE_PLAYING) ||
            (state == BG_PLAYER_STATE_PAUSED))
@@ -962,12 +961,8 @@
                               "No Track selected", NULL);
           }
         else
-          play_cmd(player, arg_ptr1, arg_i1, arg_str1, play_flags);
+          play_cmd(player, arg_ptr1, arg_i1, play_flags);
         
-        if(arg_str1)
-          free(arg_str1);
-      
-                  
         break;
       case BG_PLAYER_CMD_STOP:
         state = bg_player_get_state(player);
@@ -1078,7 +1073,7 @@
         
         if(time < 0)
           time = 0;
-        else if(time > player->track_info->duration)
+        else if(time > player->duration)
           {
           /* Seeked beyond end -> finish track */
           stop_cmd(player, BG_PLAYER_STATE_CHANGING, 1);
@@ -1121,7 +1116,7 @@
             if(player->finish_mode == BG_PLAYER_FINISH_CHANGE)
               {
               bg_log(BG_LOG_INFO, LOG_DOMAIN, "Detected EOF");
-              bg_player_threads_join(player->threads, PLAYER_MAX_THREADS);
+              bg_threads_join(player->threads, PLAYER_MAX_THREADS);
               player_cleanup(player);
               bg_player_set_state(player, BG_PLAYER_STATE_EOF, NULL, NULL);
               }
@@ -1270,7 +1265,7 @@
             }
           }
         if(player->track_info->chapter_list &&
-           bg_chapter_list_changed(player->track_info->chapter_list,
+           gavl_chapter_list_changed(player->track_info->chapter_list,
                                    time, &player->current_chapter))
           {
           bg_msg_queue_list_send(player->message_queues,

gmerlin-1.2.0.tar.gz/lib/player_oa.c -> gmerlin-4256.tar.gz/lib/player_oa.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,7 +29,7 @@
 #define LOG_DOMAIN "player.audio_output"
 
 #define CHECK_PEAK(id, pos) \
-   index = gavl_channel_index(&s->fifo_format, id); \
+   index = gavl_channel_index(fmt, id); \
    if(index >= 0) \
      { \
      if(d.peak_out[pos] < peak[index]) \
@@ -37,7 +37,7 @@
      }
 
 #define CHECK_PEAK_2(id) \
-   index = gavl_channel_index(&s->fifo_format, id); \
+   index = gavl_channel_index(fmt, id); \
    if(index >= 0) \
      { \
      if(d.peak_out[0] < peak[index]) \
@@ -62,27 +62,23 @@
   bg_msg_set_arg_float(msg, 2, d->peak_out[1]);
   }
 
-static void do_peak(bg_player_t * p, gavl_audio_frame_t * frame)
+void bg_player_peak_callback(void * priv, int num_samples,
+                             const double * min,
+                             const double * max,
+                             const double * peak)
   {
   peak_data_t d;
-  int index;
+  bg_player_t * p = priv;
   bg_player_audio_stream_t * s;
-  double peak[GAVL_MAX_CHANNELS];
-
+  const gavl_audio_format_t * fmt;
+  int index;
   s = &p->audio_stream;
   
+  fmt = gavl_peak_detector_get_format(s->peak_detector);
+
   d.peak_out[0] = 0.0;
   d.peak_out[1] = 0.0;
-  d.num_samples = frame->valid_samples;
-  
-  gavl_peak_detector_reset(s->peak_detector);
-  gavl_peak_detector_update(s->peak_detector,
-                            frame);
-
-  gavl_peak_detector_get_peaks(s->peak_detector,
-                               NULL,
-                               NULL,
-                               peak);
+  d.num_samples = num_samples;
   
   /* Collect channels and merge into 2 */
   CHECK_PEAK(GAVL_CHID_FRONT_LEFT, 0);
@@ -102,6 +98,9 @@
 
   /* Broadcast */
   bg_msg_queue_list_send(p->message_queues, msg_peak, &d);
+
+  /* Reset */
+  gavl_peak_detector_reset(s->peak_detector);
   }
 
 /* Audio output thread */
@@ -139,12 +138,12 @@
       bg_visualizer_update(p->visualizer, frame);
     
     if(DO_PEAK(p->flags))
-      do_peak(p, frame);
+      gavl_peak_detector_update(s->peak_detector, frame);
     
     if(do_mute)
       {
       gavl_audio_frame_mute(frame,
-                            &s->fifo_format);
+                            &s->output_format);
       }
     else
       {
@@ -158,81 +157,67 @@
   
   }
 
-#if 0
-static void read_audio_callback(void * priv,
-                                gavl_audio_frame_t* frame,
-                                int stream,
-                                int num_samples)
-  {
-  
-  }
-#endif
-
 void * bg_player_oa_thread(void * data)
   {
   bg_player_audio_stream_t * s;
   gavl_time_t wait_time;
 
   bg_player_t * p = data;
+
+  gavl_audio_frame_t * f;
   
   s = &p->audio_stream;
   
   /* Wait for playback */
 
-  bg_player_thread_wait_for_start(s->th);
+  bg_thread_wait_for_start(s->th);
   
   while(1)
     {
-    if(!bg_player_thread_check(s->th))
+    if(!bg_thread_check(s->th))
       break;
 
+    f = gavl_audio_sink_get_frame(s->sink);
+        
     if(s->send_silence)
       {
-      gavl_audio_frame_mute(s->fifo_frame, &s->fifo_format);
+      if(!f)
+        {
+        if(!s->mute_frame)
+          s->mute_frame = gavl_audio_frame_create(&s->output_format);
+        f = s->mute_frame;
+        }
+      gavl_audio_frame_mute(f, &s->output_format);
       }
     else
       {
-      if(!bg_player_read_audio(p, s->fifo_frame))
+      if(gavl_audio_source_read_frame(s->src, &f) != GAVL_SOURCE_OK)
         {
         if(bg_player_audio_set_eof(p))
           {
-          if(!bg_player_thread_wait_for_start(s->th))
+          /* Stop here (don't send silence) */
+          if(!bg_thread_wait_for_start(s->th))
             break;
-          continue;
           }
+        continue;
         }
       }
     
-    process_frame(p, s->fifo_frame);
+    process_frame(p, f);
     
-    if(s->fifo_frame->valid_samples)
+    if(f->valid_samples)
       {
-      if(s->do_convert_out)
-        {
-        gavl_audio_convert(s->cnv_out, s->fifo_frame,
-                           s->output_frame);
-
-        bg_plugin_lock(s->plugin_handle);
-        s->plugin->write_audio(s->priv,
-                                 s->output_frame);
-        bg_plugin_unlock(s->plugin_handle);
-        }
-      else
-        {
-        bg_plugin_lock(s->plugin_handle);
-        s->plugin->write_audio(s->priv, s->fifo_frame);
-        bg_plugin_unlock(s->plugin_handle);
-        }
+      gavl_audio_sink_put_frame(s->sink, f);
       
       pthread_mutex_lock(&s->time_mutex);
-      s->samples_written += s->fifo_frame->valid_samples;
+      s->samples_written += f->valid_samples;
       pthread_mutex_unlock(&s->time_mutex);
       
       /* Now, wait a while to give other threads a chance to access the
          player time */
       wait_time =
         gavl_samples_to_time(s->output_format.samplerate,
-                             s->fifo_frame->valid_samples)/2;
+                             f->valid_samples)/2;
       }
     
     if(wait_time != GAVL_TIME_UNDEFINED)
@@ -254,8 +239,13 @@
   
   ctx->has_first_timestamp_o = 0;
 
-  bg_plugin_unlock(ctx->plugin_handle);
+  ctx->sink = ctx->plugin->get_sink(ctx->priv);
 
+  gavl_audio_sink_set_lock_funcs(ctx->sink,
+                                 bg_plugin_lock, bg_plugin_unlock,
+                                 ctx->plugin_handle);
+  
+  bg_plugin_unlock(ctx->plugin_handle);
   
   ctx->samples_written = 0;
   return result;

gmerlin-1.2.0.tar.gz/lib/player_ov.c -> gmerlin-4256.tar.gz/lib/player_ov.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -32,6 +32,7 @@
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "player.video_output"
 
+#define DUMP_SUBTITLE
 // #define DUMP_TIMESTAMPS
 
 static int accel_callback(void * data, int id)
@@ -61,29 +62,48 @@
 static void brightness_callback(void * data, float val)
   {
   bg_player_t * p = data;
-
-  bg_osd_set_brightness_changed(p->video_stream.osd, val,
-                                p->video_stream.frame_time);
+  bg_osd_set_brightness_changed(p->video_stream.osd, val);
   }
 
 static void saturation_callback(void * data, float val)
   {
   bg_player_t * p = data;
-
-  bg_osd_set_saturation_changed(p->video_stream.osd, val,
-                                p->video_stream.frame_time);
+  bg_osd_set_saturation_changed(p->video_stream.osd, val);
   }
 
 static void contrast_callback(void * data, float val)
   {
   bg_player_t * p = data;
+  bg_osd_set_contrast_changed(p->video_stream.osd, val);
+  }
+
+#if 0
+static void handle_osd(bg_player_video_stream_t * ctx)
+  {
+  /* Display OSD */
+  if(ctx->osd_id >= 0)
+    {
+    if(bg_osd_changed(ctx->osd))
+      {
+      bg_ov_set_overlay(ctx->ov, ctx->osd_id, ctx->osd_ovl);
+      ctx->osd_active = 1;
+      return;
+      }
 
-  bg_osd_set_contrast_changed(p->video_stream.osd, val,
-                              p->video_stream.frame_time);
+    if(ctx->osd_active)
+      {
+      if(!bg_osd_overlay_valid(ctx->osd))
+        {
+        bg_ov_set_overlay(ctx->ov, ctx->osd_id, NULL);
+        ctx->osd_active = 0;
+        }
+      }
+    }
   }
+#endif
 
 static void
-handle_messages(bg_player_video_stream_t * ctx, gavl_time_t time)
+handle_messages(bg_player_video_stream_t * ctx)
   {
   bg_msg_t * msg;
   int id;
@@ -96,11 +116,10 @@
       {
       case BG_PLAYER_MSG_VOLUME_CHANGED:
         arg_f = bg_msg_get_arg_float(msg, 0);
-        if(ctx->osd_ovl)
+        if(ctx->osd_sink)
           bg_osd_set_volume_changed(ctx->osd,
                                     (arg_f - BG_PLAYER_VOLUME_MIN)/
-                                    (-BG_PLAYER_VOLUME_MIN),
-                                    time);
+                                    (-BG_PLAYER_VOLUME_MIN));
         break;
       default:
         break;
@@ -174,7 +193,7 @@
 int bg_player_ov_init(bg_player_video_stream_t * vs)
   {
   int result;
-  
+  gavl_video_format_copy(&vs->output_format, gavl_video_source_get_src_format(vs->src));
   result = bg_ov_open(vs->ov, &vs->output_format, 1);
   
   bg_ov_set_window_title(vs->ov, "Video output");
@@ -186,32 +205,22 @@
     return result;
   
   memset(&vs->osd_format, 0, sizeof(vs->osd_format));
+
+  vs->osd_sink = bg_ov_add_overlay_stream(vs->ov, &vs->osd_format);
+  bg_osd_init(vs->osd, vs->osd_sink, &vs->output_format);
   
-  bg_osd_init(vs->osd, &vs->output_format,
-              &vs->osd_format);
   /* Fixme: Lets just hope, that the OSD format doesn't get changed
      by this call. Otherwise, we would need a gavl_video_converter */
-
-  vs->osd_id = bg_ov_add_overlay_stream(vs->ov,  &vs->osd_format);
-  
-  /* create_overlay needs the lock again */
-
-  /* Create frame */
   
-  if(vs->osd_id >= 0)
-    {
-    vs->osd_ovl = bg_ov_create_overlay(vs->ov, vs->osd_id);
-    bg_osd_set_overlay(vs->osd, vs->osd_ovl);
-    }
   vs->frames_written = 0;
   return result;
   }
-
+#if 0
 static int overlay_is_expired(gavl_overlay_t * ovl,
                               gavl_time_t frame_time)
   {
-  if((ovl->frame->duration > 0) &&
-     (ovl->frame->timestamp + ovl->frame->duration < frame_time))
+  if((ovl->duration > 0) &&
+     (ovl->timestamp + ovl->duration < frame_time))
     {
     return 1;
     }
@@ -221,16 +230,58 @@
 static int overlay_is_early(gavl_overlay_t * ovl,
                             gavl_time_t frame_time)
   {
-  if(ovl->frame->timestamp > frame_time)
+  if(ovl->timestamp > frame_time)
     return 1;
   return 0;
   }
 
+#ifdef DUMP_SUBTITLE
+static void dump_subtitle(gavl_overlay_t * ovl)
+  {
+  bg_dprintf("Got subtitle %f -> %f (%f) ",
+             gavl_time_to_seconds(ovl->timestamp),
+             gavl_time_to_seconds(ovl->timestamp +
+                                  ovl->duration),
+             gavl_time_to_seconds(ovl->duration));
+  
+  gavl_rectangle_i_dump(&ovl->src_rect);
+  bg_dprintf(" dst: %d %d\n", ovl->dst_x, ovl->dst_y);
+  }
+#endif
+
+static void read_subtitle(bg_player_subtitle_stream_t * ss,
+                          gavl_video_frame_t * frame)
+  {
+  gavl_source_status_t st;
+  if((frame->timestamp != GAVL_TIME_UNDEFINED) || ss->eof)
+    return;
+
+  st = gavl_video_source_read_frame(ss->vsrc, &frame);
+  if(st == GAVL_SOURCE_EOF)
+    {
+    ss->eof = 1;
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Subtitle stream finished");
+    }
+  if(st == GAVL_SOURCE_OK)
+    {
+    bg_player_subtitle_unscale_time(ss, frame);
+#ifdef DUMP_SUBTITLE
+    dump_subtitle(frame);
+#endif
+    }
+  }
+
+#endif
+
+#if 0
 static void handle_subtitle(bg_player_t * p)
   {
+  
+#if 0 // Old version
   bg_player_video_stream_t * s = &p->video_stream;
   gavl_overlay_t * swp;
-  
+
+  //fprintf(stderr, "handle_subtitle\n");
   /* Check if subtitle expired */
   if(s->subtitle_active &&
      overlay_is_expired(s->ss->current_subtitle, s->frame_time))
@@ -238,7 +289,7 @@
     bg_ov_set_overlay(s->ov, s->subtitle_id, NULL);
     
     /* Make invalid */
-    s->ss->current_subtitle->frame->timestamp = GAVL_TIME_UNDEFINED;
+    s->ss->current_subtitle->timestamp = GAVL_TIME_UNDEFINED;
     s->subtitle_active = 0;
     
     /* Swap */
@@ -249,34 +300,24 @@
   
   /* Try to read as many subtitles as possible */
   
-  if((s->ss->current_subtitle->frame->timestamp == GAVL_TIME_UNDEFINED) &&
-     bg_player_has_subtitle(p) && !s->ss->eof)
-    {
-    if(!bg_player_read_subtitle(p, s->ss->current_subtitle))
-      s->ss->eof = 1;
-    }
-  if((s->ss->next_subtitle->frame->timestamp == GAVL_TIME_UNDEFINED) &&
-     bg_player_has_subtitle(p) && !s->ss->eof)
-    {
-    if(!bg_player_read_subtitle(p, s->ss->next_subtitle))
-      s->ss->eof = 1;
-    }
+  read_subtitle(s->ss, s->ss->current_subtitle);
+  read_subtitle(s->ss, s->ss->next_subtitle);
   
   /* Check if the current subtitle became valid */
   if(!s->subtitle_active &&
-     (s->ss->current_subtitle->frame->timestamp != GAVL_TIME_UNDEFINED) &&
+     (s->ss->current_subtitle->timestamp != GAVL_TIME_UNDEFINED) &&
      !overlay_is_early(s->ss->current_subtitle, s->frame_time))
     {
     bg_ov_set_overlay(s->ov, s->subtitle_id, s->ss->current_subtitle);
     s->subtitle_active = 1;
     }
   /* Check if the next subtitle became valid */
-  else if((s->ss->next_subtitle->frame->timestamp != GAVL_TIME_UNDEFINED) &&
+  else if((s->ss->next_subtitle->timestamp != GAVL_TIME_UNDEFINED) &&
           !overlay_is_early(s->ss->next_subtitle, s->frame_time))
     {
     if(s->subtitle_active)
       {
-      s->ss->current_subtitle->frame->timestamp =
+      s->ss->current_subtitle->timestamp =
         GAVL_TIME_UNDEFINED;
       }
     
@@ -288,7 +329,9 @@
     bg_ov_set_overlay(s->ov, s->subtitle_id, s->ss->current_subtitle);
     s->subtitle_active = 1;
     }
+#endif
   }
+#endif
 
 
 void bg_player_ov_update_still(bg_player_t * p)
@@ -297,45 +340,29 @@
   bg_player_video_stream_t * s = &p->video_stream;
   
   frame = bg_ov_get_frame(s->ov);
-  if(!bg_player_read_video(p, frame))
+  if(!bg_player_read_video(p, &frame))
     return;
   s->frame_time =
     gavl_time_unscale(s->output_format.timescale,
                       frame->timestamp);
   
   if(DO_SUBTITLE(p->flags))
-    handle_subtitle(p);
-  
-  handle_messages(s, s->frame_time);
+    bg_subtitle_handler_update(s->sh, frame);
   
-  bg_ov_put_still(s->ov, frame);
-  bg_ov_handle_events(s->ov);
+  handle_messages(s);
+
+  bg_osd_update(s->osd);
+
+  frame->duration = -1;
+  bg_ov_put_frame(s->ov, frame);
   }
 
 void bg_player_ov_cleanup(bg_player_video_stream_t * s)
   {
-  if(s->osd_ovl)
-    {
-    bg_ov_destroy_overlay(s->ov, s->osd_id, s->osd_ovl);
-    s->osd_ovl = NULL;
-    }
-
+  
   //  destroy_frame(s, s->frame);
   //  s->frame = NULL;
-
-  if(s->ss->subtitles[0])
-    {
-    bg_ov_destroy_overlay(s->ov, s->subtitle_id, s->ss->subtitles[0]);
-    s->ss->subtitles[0] = NULL;
-    }
-  if(s->ss->subtitles[1])
-    {
-    bg_ov_destroy_overlay(s->ov, s->subtitle_id, s->ss->subtitles[1]);
-    s->ss->subtitles[1] = NULL;
-    }
-  
   bg_ov_close(s->ov);
-  
   }
 
 void bg_player_ov_reset(bg_player_t * p)
@@ -344,11 +371,7 @@
 
   if(DO_SUBTITLE(p->flags))
     {
-    if(s->subtitle_active)
-      bg_ov_set_overlay(s->ov, s->subtitle_id, NULL);
-    s->subtitle_active = 0;
-    s->ss->current_subtitle->frame->timestamp = GAVL_TIME_UNDEFINED;
-    s->ss->next_subtitle->frame->timestamp = GAVL_TIME_UNDEFINED;
+    bg_subtitle_handler_reset(s->sh);
     }
   }
 
@@ -366,26 +389,20 @@
   
   /* Add subtitle stream for plugin */
   
-  s->subtitle_id =
-    bg_ov_add_overlay_stream(s->ov,
-                                    &s->ss->output_format);
-  
-  /* Allocate overlay frames */
-  
-  s->ss->subtitles[0] = bg_ov_create_overlay(s->ov, s->subtitle_id);
-  s->ss->subtitles[1] = bg_ov_create_overlay(s->ov, s->subtitle_id);
+  s->subtitle_sink =
+    bg_ov_add_overlay_stream(s->ov, &s->ss->output_format);
 
-  s->ss->subtitles[0]->frame->timestamp = GAVL_TIME_UNDEFINED;  
-  s->ss->subtitles[1]->frame->timestamp = GAVL_TIME_UNDEFINED;  
-  
-  s->ss->current_subtitle = s->ss->subtitles[0];
-  s->ss->next_subtitle    = s->ss->subtitles[1];
+  bg_subtitle_handler_init(s->sh,
+                           &s->output_format,
+                           s->ss->vsrc,
+                           s->subtitle_sink);
   }
 
 void bg_player_ov_handle_events(bg_player_video_stream_t * s)
   {
+  bg_osd_update(s->osd);
   bg_ov_handle_events(s->ov);
-  handle_messages(s, s->frame_time);
+  handle_messages(s);
   }
 
 static void wait_or_skip(bg_player_t * p, gavl_time_t diff_time)
@@ -397,9 +414,8 @@
     {
     gavl_time_delay(&diff_time);
 
-    if(s->skip)
+    if(s->skip > 0)
       {
-      
       s->skip -= diff_time;
       if(s->skip < 0)
         s->skip = 0;
@@ -408,10 +424,9 @@
       }
     }
   /* TODO: Drop frames */
-  else if(diff_time < -100000) // 100 ms
+  else if(diff_time < -1000) // 1000 ms
     {
     s->skip -= diff_time;
-    // fprintf(stderr, "Diff time: %ld, skip: %ld\n", diff_time, s->skip);
     }
   }
 
@@ -428,28 +443,28 @@
 
   bg_player_add_message_queue(p, s->msg_queue);
 
-  bg_player_thread_wait_for_start(s->th);
+  bg_thread_wait_for_start(s->th);
 
   
   while(1)
     {
-    if(!bg_player_thread_check(s->th))
+    if(!bg_thread_check(s->th))
       {
       break;
       }
     
     frame = bg_ov_get_frame(s->ov);
     
-    if(!bg_player_read_video(p, frame))
+    if(!bg_player_read_video(p, &frame))
       {
       bg_player_video_set_eof(p);
-      if(!bg_player_thread_wait_for_start(s->th))
+      if(!bg_thread_wait_for_start(s->th))
         {
         break;
         }
       continue;
       }
-    
+
     /* Get frame time */
 
     s->frame_time =
@@ -462,29 +477,19 @@
     
     /* Subtitle handling */
     if(DO_SUBTITLE(p->flags))
-      {
-      handle_subtitle(p);
-      }
-    /* Handle message */
-    handle_messages(s, s->frame_time);
+      bg_subtitle_handler_update(s->sh, frame);
+//      handle_subtitle(p);
     
-    /* Display OSD */
-
-    if(s->osd_id >= 0)
-      {
-      if(bg_osd_overlay_valid(s->osd, s->frame_time))
-        bg_ov_set_overlay(s->ov, s->osd_id, s->osd_ovl);
-      else
-        bg_ov_set_overlay(s->ov, s->osd_id, NULL);
-      }
+    /* Handle stuff */
+    handle_messages(s);
+    bg_osd_update(s->osd);
     
     /* Check Timing */
     bg_player_time_get(p, 1, &current_time);
-
     diff_time =  s->frame_time - current_time;
     
 #ifdef DUMP_TIMESTAMPS
-    bg_debug("C: %"PRId64", F: %"PRId64", D: %"PRId64"\n",
+    bg_debug("C: %"PRId64", F: %"PRId64", Diff: %"PRId64"\n",
              current_time, s->frame_time, diff_time);
 #endif
     /* Wait until we can display the frame */
@@ -496,8 +501,7 @@
       bg_player_broadcast_time(p, s->frame_time);
       }
     
-    bg_ov_put_video(s->ov, frame);
-    bg_ov_handle_events(s->ov);
+    bg_ov_put_frame(s->ov, frame);
     s->frames_written++;
     }

gmerlin-1.2.0.tar.gz/lib/player_subtitle.c -> gmerlin-4256.tar.gz/lib/player_subtitle.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -26,43 +26,59 @@
 #include <gmerlin/player.h>
 #include <playerprivate.h>
 
-// #define DUMP_SUBTITLE
-
 void bg_player_subtitle_create(bg_player_t * p)
   {
-  p->subtitle_stream.cnv = gavl_video_converter_create();
   p->subtitle_stream.renderer = bg_text_renderer_create();
   pthread_mutex_init(&p->subtitle_stream.config_mutex, NULL);
-
   }
 
 void bg_player_subtitle_destroy(bg_player_t * p)
   {
-  gavl_video_converter_destroy(p->subtitle_stream.cnv);
   pthread_mutex_destroy(&p->subtitle_stream.config_mutex);
   bg_text_renderer_destroy(p->subtitle_stream.renderer);
   }
 
-int bg_player_subtitle_init(bg_player_t * player, int subtitle_stream)
+int bg_player_subtitle_init(bg_player_t * player)
   {
+  int index, is_text;
   bg_player_subtitle_stream_t * s;
 
   if(!DO_SUBTITLE(player->flags))
     return 1;
   
   s = &player->subtitle_stream;
-
-  bg_player_input_get_subtitle_format(player);
-
   
-  if(DO_SUBTITLE_TEXT(player->flags))
+  index = bg_player_get_subtitle_index(player->track_info,
+                                       player->current_subtitle_stream, &is_text);
+  
+  if(is_text)
     {
+    gavl_packet_source_t * psrc =
+      player->input_plugin->get_text_source(player->input_handle->priv, index);
+
+    if(!psrc)
+      {
+      return 0;
+      }
+    gavl_packet_source_set_lock_funcs(psrc, bg_plugin_lock, bg_plugin_unlock,
+                                      player->input_handle);
+
     pthread_mutex_lock(&s->config_mutex);
+
+    memset(&player->subtitle_stream.input_format, 0,
+           sizeof(player->subtitle_stream.input_format));
+
+    player->subtitle_stream.input_format.timescale =
+      player->track_info->text_streams[index].timescale;
+    player->subtitle_stream.input_format.frame_duration = 0;
+    player->subtitle_stream.input_format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+    
     if(DO_SUBTITLE_ONLY(player->flags))
       {
-      bg_text_renderer_init(s->renderer,
-                            NULL,
-                            &player->subtitle_stream.input_format);
+      s->vsrc = bg_text_renderer_connect(s->renderer,
+                                         psrc,
+                                         NULL,
+                                         &player->subtitle_stream.input_format);
       
       bg_text_renderer_get_frame_format(player->subtitle_stream.renderer,
                                         &player->video_stream.input_format);
@@ -71,14 +87,36 @@
       }
     else
       {
-      bg_text_renderer_init(player->subtitle_stream.renderer,
-                            &player->video_stream.output_format,
-                            &player->subtitle_stream.input_format);
+      s->vsrc = bg_text_renderer_connect(s->renderer,
+                                         psrc,
+                                         &player->video_stream.output_format,
+                                         &player->subtitle_stream.input_format);
       }
+    
     pthread_mutex_unlock(&player->subtitle_stream.config_mutex);
+
+    gavl_video_format_copy(&player->subtitle_stream.input_format,
+                           gavl_video_source_get_src_format(s->vsrc));
+    
+
+#if 0
+      fprintf(stderr, "text_renderer_connect\nVideo format:\n");
+      gavl_video_format_dump(&player->video_stream.output_format);
+      fprintf(stderr, "Subtitle format:\n");
+      gavl_video_format_dump(&player->subtitle_stream.input_format);
+#endif
+
     }
   else
     {
+    s->vsrc = 
+      player->input_plugin->get_overlay_source(player->input_handle->priv, index);
+    gavl_video_source_set_lock_funcs(s->vsrc, bg_plugin_lock, bg_plugin_unlock,
+                                     player->input_handle);
+    
+    gavl_video_format_copy(&player->subtitle_stream.input_format,
+                           &player->track_info->overlay_streams[index].format);
+    
     if(DO_SUBTITLE_ONLY(player->flags))
       {
       gavl_video_format_copy(&player->video_stream.input_format,
@@ -100,14 +138,11 @@
   return 1;
   }
 
-#define FREE_OVERLAY(ovl) if(ovl.frame) { gavl_video_frame_destroy(ovl.frame); ovl.frame = NULL; }
 
 void bg_player_subtitle_cleanup(bg_player_t * player)
   {
-  FREE_OVERLAY(player->subtitle_stream.input_subtitle);
   }
 
-#undef FREE_OVERLAY
 /* Configuration stuff */
 
 static bg_parameter_info_t general_parameters[] =
@@ -167,101 +202,31 @@
 void bg_player_subtitle_init_converter(bg_player_t * player)
   {
   bg_player_subtitle_stream_t * s;
-
   s = &player->subtitle_stream;
-  
-  s->do_convert =
-    gavl_video_converter_init(s->cnv,
-                              &s->input_format,
-                              &s->output_format);
-  if(s->do_convert)
-    s->input_subtitle.frame = gavl_video_frame_create(&s->input_format);
+  gavl_video_source_set_dst(s->vsrc, 0, &s->output_format);
   }
 
-int bg_player_has_subtitle(bg_player_t * p)
+void bg_player_subtitle_unscale_time(bg_player_subtitle_stream_t * s, gavl_overlay_t * ovl)
   {
-  int ret;
-  bg_plugin_lock(p->input_handle);
-  ret= p->input_plugin->has_subtitle(p->input_priv,
-                                     p->current_subtitle_stream);
-  bg_plugin_unlock(p->input_handle);
-  return ret;
+  ovl->timestamp =
+    gavl_time_unscale(s->input_format.timescale, ovl->timestamp) +
+    s->time_offset;
+  ovl->duration  =
+    gavl_time_unscale(s->input_format.timescale, ovl->duration);
   }
 
-int bg_player_read_subtitle(bg_player_t * p, gavl_overlay_t * ovl)
+int bg_player_get_subtitle_index(bg_track_info_t * info, int stream_index, int * is_text)
   {
-  gavl_time_t start, duration;
-  bg_player_subtitle_stream_t * s = &p->subtitle_stream;
-  
-  if(DO_SUBTITLE_TEXT(p->flags))
+  if(stream_index >= info->num_overlay_streams)
     {
-    bg_plugin_lock(p->input_handle);
-    if(!p->input_plugin->read_subtitle_text(p->input_priv,
-                                            &s->buffer,
-                                            &s->buffer_alloc,
-                                            &start, &duration,
-                                            p->current_subtitle_stream))
-      {
-      bg_plugin_unlock(p->input_handle);
-      return 0;
-      }
-    bg_plugin_unlock(p->input_handle);
-    if(s->do_convert)
-      {
-      bg_text_renderer_render(s->renderer, s->buffer, &s->input_subtitle);
-      gavl_video_convert(s->cnv, s->input_subtitle.frame, ovl->frame);
-      gavl_rectangle_i_copy(&ovl->ovl_rect, &s->input_subtitle.ovl_rect);
-      ovl->dst_x = s->input_subtitle.dst_x;
-      ovl->dst_y = s->input_subtitle.dst_y;
-      }
-    else
-      {
-      bg_text_renderer_render(s->renderer, s->buffer, ovl);
-      }
-    ovl->frame->timestamp = start;
-    ovl->frame->duration = duration;
+    if(is_text)
+      *is_text = 1;
+    return stream_index - info->num_overlay_streams;
     }
   else
     {
-    if(s->do_convert)
-      {
-      bg_plugin_lock(p->input_handle);
-      if(!p->input_plugin->read_subtitle_overlay(p->input_priv, &s->input_subtitle,
-                                                 p->current_subtitle_stream))
-        {
-        bg_plugin_unlock(p->input_handle);
-        return 0;
-        }
-      bg_plugin_unlock(p->input_handle);
-      gavl_video_convert(s->cnv, s->input_subtitle.frame, ovl->frame);
-      gavl_rectangle_i_copy(&ovl->ovl_rect, &s->input_subtitle.ovl_rect);
-      ovl->dst_x = s->input_subtitle.dst_x;
-      ovl->dst_y = s->input_subtitle.dst_y;
-      }
-    else
-      {
-      if(!p->input_plugin->read_subtitle_overlay(p->input_priv, ovl,
-                                                 p->current_subtitle_stream))
-        {
-        return 0;
-        }
-      }
+    if(is_text)
+      *is_text = 0;
+    return stream_index;
     }
-
-  /* Unscale the overlay times */
-  ovl->frame->timestamp =
-    gavl_time_unscale(s->input_format.timescale, ovl->frame->timestamp) +
-    s->time_offset;
-  ovl->frame->duration  =
-    gavl_time_unscale(s->input_format.timescale, ovl->frame->duration);
-#ifdef DUMP_SUBTITLE
-  bg_dprintf("Got subtitle %f -> %f (%f)\n",
-             gavl_time_to_seconds(ovl->frame->timestamp),
-             gavl_time_to_seconds(ovl->frame->timestamp +
-                                  ovl->frame->duration),
-             gavl_time_to_seconds(ovl->frame->duration));
-  
-#endif
-  
-  return 1;
   }

gmerlin-1.2.0.tar.gz/lib/player_thread.c -> gmerlin-4256.tar.gz/lib/player_thread.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * *****************************************************************/
 
-#include <player_thread.h>
+#include <gmerlin/bgthread.h>
 
 #include <pthread.h>
 #include <gmerlin/bg_sem.h>
@@ -83,15 +83,15 @@
   pthread_mutex_unlock(&s->lock);
   }
 
-struct bg_player_thread_common_s
+struct bg_thread_common_s
   {
   pthread_cond_t start_cond;
   pthread_mutex_t start_mutex;
   };
 
-struct bg_player_thread_s
+struct bg_thread_s
   {
-  bg_player_thread_common_t * com;
+  bg_thread_common_t * com;
   
   pthread_t thread;
   bin_sem_t sem;
@@ -106,40 +106,40 @@
   };
 
 
-bg_player_thread_common_t * bg_player_thread_common_create()
+bg_thread_common_t * bg_thread_common_create()
   {
-  bg_player_thread_common_t * com = calloc(1, sizeof(*com));
+  bg_thread_common_t * com = calloc(1, sizeof(*com));
   pthread_cond_init(&com->start_cond, NULL);
   pthread_mutex_init(&com->start_mutex, NULL);
   return com;
   }
 
-void bg_player_thread_common_destroy(bg_player_thread_common_t * com)
+void bg_thread_common_destroy(bg_thread_common_t * com)
   {
   pthread_cond_destroy(&com->start_cond);
   pthread_mutex_destroy(&com->start_mutex);
   free(com);
   }
 
-bg_player_thread_t *
-bg_player_thread_create(bg_player_thread_common_t * com)
+bg_thread_t *
+bg_thread_create(bg_thread_common_t * com)
   {
-  bg_player_thread_t * th = calloc(1, sizeof(*th));
+  bg_thread_t * th = calloc(1, sizeof(*th));
   th->com = com;
   bin_sem_init(&th->sem);
   pthread_mutex_init(&th->mutex, NULL);
   return th;
   }
 
-void bg_player_thread_destroy(bg_player_thread_t * th)
+void bg_thread_destroy(bg_thread_t * th)
   {
   bin_sem_destroy(&th->sem);
   pthread_mutex_destroy(&th->mutex);
   free(th);
   }
 
-void bg_player_thread_set_func(bg_player_thread_t * th,
-                               void * (*func)(void*), void * arg)
+void bg_thread_set_func(bg_thread_t * th,
+                        void * (*func)(void*), void * arg)
   {
   th->func = func;
   th->arg = arg;
@@ -147,7 +147,7 @@
   th->do_stop = 0;
   }
 
-void bg_player_threads_init(bg_player_thread_t ** th, int num)
+void bg_threads_init(bg_thread_t ** th, int num)
   {
   int i;
 
@@ -173,11 +173,14 @@
   
   }
 
-void bg_player_threads_start(bg_player_thread_t ** th, int num)
+void bg_threads_start(bg_thread_t ** th, int num)
   {
   int i;
   /* Lock the global mutex. This will succeed after all
      threads wait for the start condition */
+
+  if(!num)
+    return;
   
   pthread_mutex_lock(&th[0]->com->start_mutex);
   pthread_cond_broadcast(&th[0]->com->start_cond);
@@ -188,7 +191,6 @@
     {
     if(th[i]->func)
       {
-      // fprintf(stderr, "Sem wait...");
       bin_sem_wait(&th[i]->sem);
       // fprintf(stderr, "done ret: %d, val: %d\n", ret, val);
       }
@@ -196,7 +198,7 @@
 
   }
 
-void bg_player_threads_pause(bg_player_thread_t ** th, int num)
+void bg_threads_pause(bg_thread_t ** th, int num)
   {
   int i;
   /* Set pause flag */
@@ -218,7 +220,7 @@
     }
   }
 
-void bg_player_threads_join(bg_player_thread_t ** th, int num)
+void bg_threads_join(bg_thread_t ** th, int num)
   {
   int i;
   /* Set stop flag */
@@ -234,7 +236,9 @@
 
   /* Start the threads if they where paused.
      If not paused, this call does no harm */
-  bg_player_threads_start(th, num);
+  //  fprintf(stderr, "bg_threads_start %d\n", getpid());
+  bg_threads_start(th, num);
+  //  fprintf(stderr, "bg_threads_start done %d\n", getpid());
   
   for(i = 0; i < num; i++)
     {
@@ -252,7 +256,7 @@
   }
 /* called from within the thread */
 
-int bg_player_thread_wait_for_start(bg_player_thread_t * th)
+int bg_thread_wait_for_start(bg_thread_t * th)
   {
   int ret = 1;
   pthread_mutex_lock(&th->com->start_mutex);
@@ -273,7 +277,15 @@
   return ret;
   }
 
-int bg_player_thread_check(bg_player_thread_t * th)
+void bg_thread_exit(bg_thread_t * th)
+  {
+  /* bg_threads_start() (called by bg_threads_join())
+     needs this */
+  
+  bin_sem_post(&th->sem);
+  }
+
+int bg_thread_check(bg_thread_t * th)
   {
   int do_pause;
   
@@ -293,7 +305,7 @@
     th->do_pause = 0;
     pthread_mutex_unlock(&th->mutex);
     
-    return bg_player_thread_wait_for_start(th);
+    return bg_thread_wait_for_start(th);
     }
   return 1;
   }

gmerlin-1.2.0.tar.gz/lib/player_time.c -> gmerlin-4256.tar.gz/lib/player_time.c Changed

gmerlin-1.2.0.tar.gz/lib/player_video.c -> gmerlin-4256.tar.gz/lib/player_video.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,7 +34,7 @@
   {
   bg_player_video_stream_t * s = &p->video_stream;
   
-  s->th = bg_player_thread_create(p->thread_common);
+  s->th = bg_thread_create(p->thread_common);
   
   bg_gavl_video_options_init(&s->options);
 
@@ -48,6 +48,7 @@
   
   s->accel_map = bg_accelerator_map_create();
   s->osd = bg_osd_create();
+  s->sh = bg_subtitle_handler_create();
   
   }
 
@@ -58,13 +59,15 @@
   pthread_mutex_destroy(&s->eof_mutex);
   bg_gavl_video_options_free(&s->options);
   bg_video_filter_chain_destroy(s->fc);
-  bg_player_thread_destroy(s->th);
+  bg_thread_destroy(s->th);
   bg_msg_queue_destroy(s->msg_queue);
 
   bg_osd_destroy(s->osd);
   bg_accelerator_map_destroy(s->accel_map);
+  bg_subtitle_handler_destroy(s->sh);
   }
 
+
 int bg_player_video_init(bg_player_t * player, int video_stream)
   {
   bg_player_video_stream_t * s;
@@ -73,37 +76,22 @@
   s->skip = 0;
   s->frames_read = 0;
   
-  if(s->do_still)
-    s->in_func = bg_player_input_read_video_still;
-  else
-    s->in_func = bg_player_input_read_video;
-
-  s->in_data = player;
-  s->in_stream = player->current_video_stream;
-  
   if(!DO_VIDEO(player->flags))
     return 1;
   
+  bg_player_input_get_video_format(player);
+  s->src = s->in_src;
+  
   if(!DO_SUBTITLE_ONLY(player->flags))
-    {
-    bg_player_input_get_video_format(player);
-    
-    bg_video_filter_chain_connect_input(s->fc, s->in_func,
-                                        s->in_data, s->in_stream);
-    
-    bg_video_filter_chain_init(s->fc, &s->input_format, &s->output_format);
-    
-    s->in_func = bg_video_filter_chain_read;
-    s->in_data = s->fc;
-    s->in_stream = 0;
-    }
+    s->src = bg_video_filter_chain_connect(s->fc, s->src);
   
   if(!bg_player_ov_init(&player->video_stream))
     return 0;
-
-  if(!DO_SUBTITLE_ONLY(player->flags))
-    bg_video_filter_chain_set_out_format(s->fc, &s->output_format);
   
+  if(!DO_SUBTITLE_ONLY(player->flags))
+    gavl_video_source_set_dst(s->src, 0, &s->output_format);
+
+#if 0  
   if(DO_SUBTITLE_ONLY(player->flags))
     {
     /* Video output already initialized */
@@ -115,13 +103,20 @@
     s->in_data = player;
     s->in_stream = 0;
     }
-  
+#endif
   return 1;
   }
 
 void bg_player_video_cleanup(bg_player_t * player)
   {
+  bg_player_video_stream_t * s;
+  s = &player->video_stream;
   
+  if(s->in_src)
+    {
+    gavl_video_source_destroy(s->in_src);
+    s->in_src = NULL;
+    }
   }
 
 /* Configuration stuff */
@@ -148,6 +143,13 @@
       .num_digits =  2,
       .help_string = TRS("Set framerate with which still images will be redisplayed periodically"),
     },
+    {
+      .name = "skip",
+      .long_name = TRS("Skip frames"),
+      .type =      BG_PARAMETER_CHECKBUTTON,
+      .val_default = { .val_i =  1 },
+      .help_string = TRS("Skip frames to keep A/V sync"),
+    },
     BG_GAVL_PARAM_THREADS,
     { /* End of parameters */ }
   };
@@ -171,10 +173,14 @@
   pthread_mutex_lock(&p->video_stream.config_mutex);
 
   is_interrupted = p->video_stream.interrupted;
-  
-  bg_gavl_video_set_parameter(&p->video_stream.options,
-                              name, val);
 
+  if(!bg_gavl_video_set_parameter(&p->video_stream.options,
+                                  name, val))
+    {
+    if(!strcmp(name, "skip"))
+      p->video_stream.do_skip = val->val_i;
+    }
+  
   if(!do_init && !is_interrupted)
     check_restart = 1;
   else
@@ -265,10 +271,10 @@
   }
 
 int
-bg_player_read_video(bg_player_t * p, gavl_video_frame_t * frame)
+bg_player_read_video(bg_player_t * p, gavl_video_frame_t ** frame)
   {
   bg_player_video_stream_t * s = &p->video_stream;
-  return s->in_func(s->in_data, frame, s->in_stream);
+  return (gavl_video_source_read_frame(s->src, frame) == GAVL_SOURCE_OK);
   }
 
 void bg_player_video_set_eof(bg_player_t * p)

gmerlin-1.2.0.tar.gz/lib/playercmd.c -> gmerlin-4256.tar.gz/lib/playercmd.c Changed

gmerlin-1.2.0.tar.gz/lib/pluginfuncs.c -> gmerlin-4256.tar.gz/lib/pluginfuncs.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -121,3 +121,107 @@
   format->timescale      = rates_supported[min_index].timescale;
   format->frame_duration = rates_supported[min_index].frame_duration;
   }
+
+/* PTS cache for encoders, which reorder frames */
+
+/*
+ *  Original idea was to make it a fixed size until
+ *  we learned that x264 has insanely large encoding delays.
+ */
+
+struct bg_encoder_pts_cache_s
+  {
+  int64_t frame_counter;
+  int num_frames;
+  int frames_alloc;
+  
+  struct
+    {
+    int64_t pts;
+    int64_t duration;
+    gavl_interlace_mode_t il;
+    gavl_timecode_t tc;
+    int64_t frame_num;
+    } * entries;
+  
+  };
+
+bg_encoder_pts_cache_t * bg_encoder_pts_cache_create(void)
+  {
+  bg_encoder_pts_cache_t * ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+void bg_encoder_pts_cache_destroy(bg_encoder_pts_cache_t * c)
+  {
+  if(c->entries)
+    free(c->entries);
+  free(c);
+  }
+
+int
+bg_encoder_pts_cache_push_frame(bg_encoder_pts_cache_t * c,
+                                gavl_video_frame_t * f)
+  {
+  if(c->num_frames >= c->frames_alloc)
+    {
+    c->frames_alloc += 128;
+    c->entries = realloc(c->entries, c->frames_alloc * sizeof(*c->entries));
+    }
+  
+  c->entries[c->num_frames].pts       = f->timestamp;
+  c->entries[c->num_frames].duration  = f->duration;
+  c->entries[c->num_frames].il        = f->interlace_mode;
+  c->entries[c->num_frames].tc        = f->timecode;
+  c->entries[c->num_frames].frame_num = c->frame_counter++;
+  
+  c->num_frames++;
+  return 1;
+  }
+
+int
+bg_encoder_pts_cache_pop_packet(bg_encoder_pts_cache_t * c,
+                                gavl_packet_t * p,
+                                int64_t frame_num, int64_t pts)
+  {
+  int i, idx = -1;
+
+  if(pts != GAVL_TIME_UNDEFINED)
+    {
+    for(i = 0; i < c->num_frames; i++)
+      {
+      if(c->entries[i].pts == pts)
+        {
+        idx = i;
+        break;
+        }
+      }
+    }
+  else
+    {
+    for(i = 0; i < c->num_frames; i++)
+      {
+      if(c->entries[i].frame_num == frame_num)
+        {
+        idx = i;
+        break;
+        }
+      }
+    }
+
+  if(idx < 0)
+    return 0;
+
+  p->pts            = c->entries[idx].pts;
+  p->timecode       = c->entries[idx].tc;
+  p->duration       = c->entries[idx].duration;
+  p->interlace_mode = c->entries[idx].il;
+
+  if(idx < c->num_frames-1)
+    {
+    memmove(c->entries + idx, c->entries + (idx+1),
+            sizeof(*c->entries) * (c->num_frames-1-idx));
+    }
+  c->num_frames--;
+  return 1;
+  }

gmerlin-1.2.0.tar.gz/lib/pluginreg_xml.c -> gmerlin-4256.tar.gz/lib/pluginreg_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -42,16 +42,17 @@
     { "VideoRecorder",           BG_PLUGIN_RECORDER_VIDEO },
     { "EncoderAudio",            BG_PLUGIN_ENCODER_AUDIO },
     { "EncoderVideo",            BG_PLUGIN_ENCODER_VIDEO },
-    { "EncoderSubtitleText",     BG_PLUGIN_ENCODER_SUBTITLE_TEXT },
-    { "EncoderSubtitleOverlay",  BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY },
-    { "Encoder",                 BG_PLUGIN_ENCODER },
-    { "EncoderPP",               BG_PLUGIN_ENCODER_PP },
-    { "ImageReader",             BG_PLUGIN_IMAGE_READER },
-    { "ImageWriter",             BG_PLUGIN_IMAGE_WRITER },
-    { "AudioFilter",             BG_PLUGIN_FILTER_AUDIO },
-    { "VideoFilter",             BG_PLUGIN_FILTER_VIDEO },
+    { "EncoderSubtitleText",     BG_PLUGIN_ENCODER_TEXT },
+    { "EncoderSubtitleOverlay",  BG_PLUGIN_ENCODER_OVERLAY },
+    { "Encoder",                 BG_PLUGIN_ENCODER       },
+    { "EncoderPP",               BG_PLUGIN_ENCODER_PP    },
+    { "ImageReader",             BG_PLUGIN_IMAGE_READER  },
+    { "ImageWriter",             BG_PLUGIN_IMAGE_WRITER  },
+    { "AudioFilter",             BG_PLUGIN_FILTER_AUDIO  },
+    { "VideoFilter",             BG_PLUGIN_FILTER_VIDEO  },
     { "Visualization",           BG_PLUGIN_VISUALIZATION },
-    { NULL,                  BG_PLUGIN_NONE }
+    { "Codec",                   BG_PLUGIN_CODEC         },
+    { NULL,                      BG_PLUGIN_NONE }
   };
 
 static const struct
@@ -75,23 +76,31 @@
   }
 flag_names[] =
   {
-    { "Removable",    BG_PLUGIN_REMOVABLE      }, /* Removable media (CD, DVD etc.) */
-    { "Recorder",     BG_PLUGIN_RECORDER       }, /* Plugin can record              */
-    { "File",         BG_PLUGIN_FILE           }, /* Plugin reads/writes files      */
-    { "URL",          BG_PLUGIN_URL            }, /* Plugin reads URLs or streams   */
-    { "Playback",     BG_PLUGIN_PLAYBACK       }, /* Output plugins for playback    */
-    { "Stdin",          BG_PLUGIN_STDIN         }, /* Plugin reads from stdin */
-    { "Tuner",          BG_PLUGIN_TUNER         }, /* Plugin has tuner */
-    { "Filter1",        BG_PLUGIN_FILTER_1      }, /* Filter with one input port */
-    { "EmbedWindow",    BG_PLUGIN_EMBED_WINDOW },
+    { "Removable",      BG_PLUGIN_REMOVABLE       }, /* Removable media (CD, DVD etc.) */
+    { "Recorder",       BG_PLUGIN_RECORDER        }, /* Plugin can record              */
+    { "File",           BG_PLUGIN_FILE            }, /* Plugin reads/writes files      */
+    { "URL",            BG_PLUGIN_URL             }, /* Plugin reads URLs or streams   */
+    { "Playback",       BG_PLUGIN_PLAYBACK        }, /* Output plugins for playback    */
+    { "Pipe",           BG_PLUGIN_PIPE            }, /* Plugin reads from stdin */
+    { "Tuner",          BG_PLUGIN_TUNER           }, /* Plugin has tuner */
+    { "Filter1",        BG_PLUGIN_FILTER_1        }, /* Filter with one input port */
+    { "EmbedWindow",    BG_PLUGIN_EMBED_WINDOW    },
     { "VisualizeFrame", BG_PLUGIN_VISUALIZE_FRAME },
-    { "VisualizeGL",    BG_PLUGIN_VISUALIZE_GL },
-    { "PP",             BG_PLUGIN_PP },
-    { "Callbacks",      BG_PLUGIN_CALLBACKS },
-    { "Broadcast",      BG_PLUGIN_BROADCAST },
-    { "Devparam",       BG_PLUGIN_DEVPARAM },
-    { "Unsupported",    BG_PLUGIN_UNSUPPORTED   },
-    { NULL,    0                           },
+    { "VisualizeGL",    BG_PLUGIN_VISUALIZE_GL    },
+    { "PP",             BG_PLUGIN_PP              },
+    { "Callbacks",      BG_PLUGIN_CALLBACKS       },
+    { "Broadcast",      BG_PLUGIN_BROADCAST       },
+    { "Devparam",       BG_PLUGIN_DEVPARAM        },
+    { "OVStill",        BG_PLUGIN_OV_STILL        },
+    { "AudioCompressor",         BG_PLUGIN_AUDIO_COMPRESSOR },
+    { "VideoCompressor",         BG_PLUGIN_VIDEO_COMPRESSOR },
+    { "AudioDecompressor",       BG_PLUGIN_AUDIO_DECOMPRESSOR },
+    { "VideoDecompressor",       BG_PLUGIN_VIDEO_DECOMPRESSOR },
+    { "OverlayCompressor",       BG_PLUGIN_OVERLAY_COMPRESSOR },
+    { "OverlayDeCompressor",     BG_PLUGIN_OVERLAY_DECOMPRESSOR },
+    { "GAVFIO",                  BG_PLUGIN_GAVF_IO            },
+    { "Unsupported",    BG_PLUGIN_UNSUPPORTED     },
+    { NULL,    0                                  },
   };
 
 static const char * const plugin_key            = "PLUGIN";
@@ -102,6 +111,7 @@
 static const char * const description_key       = "DESCRIPTION";
 static const char * const mimetypes_key         = "MIMETYPES";
 static const char * const extensions_key        = "EXTENSIONS";
+static const char * const compressions_key      = "COMPRESSIONS";
 static const char * const protocols_key         = "PROTOCOLS";
 static const char * const module_filename_key   = "MODULE_FILENAME";
 static const char * const module_time_key       = "MODULE_TIME";
@@ -112,14 +122,14 @@
 static const char * const device_key            = "DEVICE";
 static const char * const max_audio_streams_key = "MAX_AUDIO_STREAMS";
 static const char * const max_video_streams_key = "MAX_VIDEO_STREAMS";
-static const char * const max_subtitle_text_streams_key = "MAX_SUBTITLE_TEXT_STREAMS";
-static const char * const max_subtitle_overlay_streams_key = "MAX_SUBTITLE_OVERLAY_STREAMS";
+static const char * const max_text_streams_key = "MAX_TEXT_STREAMS";
+static const char * const max_overlay_streams_key = "MAX_OVERLAY_STREAMS";
 
 static const char * const parameters_key       = "PARAMETERS";
 static const char * const audio_parameters_key = "AUDIO_PARAMETERS";
 static const char * const video_parameters_key = "VIDEO_PARAMETERS";
-static const char * const subtitle_text_parameters_key = "SUBTITLE_TEXT_PARAMETERS";
-static const char * const subtitle_overlay_parameters_key = "SUBTITLE_OVERLAY_PARAMETERS";
+static const char * const text_parameters_key = "TEXT_PARAMETERS";
+static const char * const overlay_parameters_key = "OVERLAY_PARAMETERS";
 
 static const char * const gettext_domain_key   = "GETTEXT_DOMAIN";
 static const char * const gettext_directory_key       = "GETTEXT_DIRECTORY";
@@ -215,15 +225,15 @@
       cur = cur->next;
       continue;
       }
-    else if(!BG_XML_STRCMP(cur->name, subtitle_text_parameters_key))
+    else if(!BG_XML_STRCMP(cur->name, text_parameters_key))
       {
-      ret->subtitle_text_parameters = bg_xml_2_parameters(doc, cur);
+      ret->text_parameters = bg_xml_2_parameters(doc, cur);
       cur = cur->next;
       continue;
       }
-    else if(!BG_XML_STRCMP(cur->name, subtitle_overlay_parameters_key))
+    else if(!BG_XML_STRCMP(cur->name, overlay_parameters_key))
       {
-      ret->subtitle_overlay_parameters = bg_xml_2_parameters(doc, cur);
+      ret->overlay_parameters = bg_xml_2_parameters(doc, cur);
       cur = cur->next;
       continue;
       }
@@ -232,39 +242,60 @@
 
     if(!BG_XML_STRCMP(cur->name, name_key))
       {
-      ret->name = bg_strdup(ret->name, tmp_string);
+      ret->name = gavl_strrep(ret->name, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, long_name_key))
       {
-      ret->long_name = bg_strdup(ret->long_name, tmp_string);
+      ret->long_name = gavl_strrep(ret->long_name, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, description_key))
       {
-      ret->description = bg_strdup(ret->description, tmp_string);
+      ret->description = gavl_strrep(ret->description, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, mimetypes_key))
       {
-      ret->mimetypes = bg_strdup(ret->mimetypes, tmp_string);
+      ret->mimetypes = gavl_strrep(ret->mimetypes, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, extensions_key))
       {
-      ret->extensions = bg_strdup(ret->extensions, tmp_string);
+      ret->extensions = gavl_strrep(ret->extensions, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, protocols_key))
       {
-      ret->protocols = bg_strdup(ret->protocols, tmp_string);
+      ret->protocols = gavl_strrep(ret->protocols, tmp_string);
+      }
+    else if(!BG_XML_STRCMP(cur->name, compressions_key))
+      {
+      int num;
+      char ** comp_list;
+
+      comp_list = bg_strbreak(tmp_string, ' ');
+
+      num = 0;
+      while(comp_list[num])
+        num++;
+      ret->compressions = calloc(num+1, sizeof(*ret->compressions));
+
+      num = 0;
+      
+      while(comp_list[num])
+        {
+        ret->compressions[num] = gavl_compression_from_short_name(comp_list[num]);
+        num++;
+        }
+      bg_strbreak_free(comp_list);
       }
     else if(!BG_XML_STRCMP(cur->name, module_filename_key))
       {
-      ret->module_filename = bg_strdup(ret->module_filename, tmp_string);
+      ret->module_filename = gavl_strrep(ret->module_filename, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, gettext_domain_key))
       {
-      ret->gettext_domain = bg_strdup(ret->gettext_domain, tmp_string);
+      ret->gettext_domain = gavl_strrep(ret->gettext_domain, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, gettext_directory_key))
       {
-      ret->gettext_directory = bg_strdup(ret->gettext_directory, tmp_string);
+      ret->gettext_directory = gavl_strrep(ret->gettext_directory, tmp_string);
       }
     else if(!BG_XML_STRCMP(cur->name, module_time_key))
       {
@@ -342,13 +373,13 @@
       {
       ret->max_video_streams = atoi(tmp_string);
       }
-    else if(!BG_XML_STRCMP(cur->name, max_subtitle_text_streams_key))
+    else if(!BG_XML_STRCMP(cur->name, max_text_streams_key))
       {
-      ret->max_subtitle_text_streams = atoi(tmp_string);
+      ret->max_text_streams = atoi(tmp_string);
       }
-    else if(!BG_XML_STRCMP(cur->name, max_subtitle_overlay_streams_key))
+    else if(!BG_XML_STRCMP(cur->name, max_overlay_streams_key))
       {
-      ret->max_subtitle_overlay_streams = atoi(tmp_string);
+      ret->max_overlay_streams = atoi(tmp_string);
       }
     xmlFree(tmp_string);
     cur = cur->next;
@@ -449,6 +480,24 @@
     xmlAddChild(xml_item, BG_XML_NEW_TEXT(info->protocols));
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
     }
+  if(info->compressions)
+    {
+    int index = 0;
+    char * tmp_string = NULL;
+
+    while(info->compressions[index] != GAVL_CODEC_ID_NONE)
+      {
+      if(index)
+        tmp_string = gavl_strcat(tmp_string, " ");
+      tmp_string = gavl_strcat(tmp_string, gavl_compression_get_short_name(info->compressions[index]));
+      index++;
+      }
+    
+    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)compressions_key, NULL);
+    xmlAddChild(xml_item, BG_XML_NEW_TEXT(tmp_string));
+    xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
+    free(tmp_string);
+    }
   if(info->mimetypes)
     {
     xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)mimetypes_key, NULL);
@@ -499,24 +548,24 @@
     bg_parameters_2_xml(info->video_parameters, xml_item);
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
     }
-  if(info->subtitle_text_parameters)
+  if(info->text_parameters)
     {
-    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)subtitle_text_parameters_key, NULL);
-    bg_parameters_2_xml(info->subtitle_text_parameters, xml_item);
+    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)text_parameters_key, NULL);
+    bg_parameters_2_xml(info->text_parameters, xml_item);
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
     }
-  if(info->subtitle_overlay_parameters)
+  if(info->overlay_parameters)
     {
-    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)subtitle_overlay_parameters_key, NULL);
-    bg_parameters_2_xml(info->subtitle_overlay_parameters, xml_item);
+    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)overlay_parameters_key, NULL);
+    bg_parameters_2_xml(info->overlay_parameters, xml_item);
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
     }
   
   if(info->type & (BG_PLUGIN_ENCODER_AUDIO|
                    BG_PLUGIN_ENCODER_VIDEO|
                    BG_PLUGIN_ENCODER |
-                   BG_PLUGIN_ENCODER_SUBTITLE_TEXT |
-                   BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY))
+                   BG_PLUGIN_ENCODER_TEXT |
+                   BG_PLUGIN_ENCODER_OVERLAY))
     {
     xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)max_audio_streams_key, NULL);
     sprintf(buffer, "%d", info->max_audio_streams);
@@ -528,13 +577,13 @@
     xmlAddChild(xml_item, BG_XML_NEW_TEXT(buffer));
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
 
-    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)max_subtitle_text_streams_key, NULL);
-    sprintf(buffer, "%d", info->max_subtitle_text_streams);
+    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)max_text_streams_key, NULL);
+    sprintf(buffer, "%d", info->max_text_streams);
     xmlAddChild(xml_item, BG_XML_NEW_TEXT(buffer));
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
 
-    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)max_subtitle_overlay_streams_key, NULL);
-    sprintf(buffer, "%d", info->max_subtitle_overlay_streams);
+    xml_item = xmlNewTextChild(xml_plugin, NULL, (xmlChar*)max_overlay_streams_key, NULL);
+    sprintf(buffer, "%d", info->max_overlay_streams);
     xmlAddChild(xml_item, BG_XML_NEW_TEXT(buffer));
     xmlAddChild(xml_plugin, BG_XML_NEW_TEXT("\n"));
     
@@ -620,10 +669,8 @@
   xmlNodePtr node;
   ret = NULL;
   end = NULL;
-
   
-  
-  xml_doc = bg_xml_parse_file(filename);
+  xml_doc = bg_xml_parse_file(filename, 1);
 
   if(!xml_doc)
     return NULL;
@@ -688,7 +735,8 @@
     }
   
   xmlAddChild(xml_registry, BG_XML_NEW_TEXT("\n"));
-  xmlSaveFile(filename, xml_doc);
+
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   free(filename);
   }

gmerlin-1.2.0.tar.gz/lib/pluginregistry.c -> gmerlin-4256.tar.gz/lib/pluginregistry.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,16 +29,21 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
+#include <errno.h>
 
 #include <config.h>
 
+#include <gavl/metatags.h>
+
+
 #include <gmerlin/cfg_registry.h>
 #include <gmerlin/pluginregistry.h>
 #include <pluginreg_priv.h>
 #include <config.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/singlepic.h>
-#include <gmerlin/mediafiledevice.h>
+
+#include <gavfenc.h>
 
 #include <gmerlin/translation.h>
 
@@ -49,6 +54,7 @@
 
 #include <ovl2text.h>
 
+#define KEEP_OPEN
 
 #ifdef HAVE_LV
 #include <bglv.h>
@@ -84,17 +90,17 @@
       bg_singlepic_encoder_create,
     },
     {
-      bg_audiofiledevice_name,
-      bg_audiofiledevice_info,
-      bg_audiofiledevice_get,
-      bg_audiofiledevice_create,
-    },
-    {
       bg_ovl2text_name,
       bg_ovl2text_info,
       bg_ovl2text_get,
       bg_ovl2text_create,
     },
+    {
+      bg_gavfenc_name,
+      bg_gavfenc_info,
+      bg_gavfenc_get,
+      bg_gavfenc_create,
+    },
     { /* End */ }
   };
 
@@ -104,17 +110,9 @@
   bg_plugin_info_t * entries;
   bg_cfg_section_t * config_section;
 
-#if 0  
-  /* Plugins generated by the core (from other plugins) */
-  bg_plugin_info_t * singlepic_input;
-  bg_plugin_info_t * singlepic_stills_input;
-  bg_plugin_info_t * singlepic_encoder;
-  bg_plugin_info_t * audiofile_recorder;
-#endif
+  int changed;
   };
 
-
-
 void bg_plugin_info_destroy(bg_plugin_info_t * info)
   {
   
@@ -141,6 +139,8 @@
     bg_device_info_destroy(info->devices);
   if(info->cmp_name)
     free(info->cmp_name);
+  if(info->compressions)
+    free(info->compressions);
   
   if(info->parameters)
     bg_parameter_info_destroy_array(info->parameters);
@@ -148,10 +148,10 @@
     bg_parameter_info_destroy_array(info->audio_parameters);
   if(info->video_parameters)
     bg_parameter_info_destroy_array(info->video_parameters);
-  if(info->subtitle_text_parameters)
-    bg_parameter_info_destroy_array(info->subtitle_text_parameters);
-  if(info->subtitle_overlay_parameters)
-    bg_parameter_info_destroy_array(info->subtitle_overlay_parameters);
+  if(info->text_parameters)
+    bg_parameter_info_destroy_array(info->text_parameters);
+  if(info->overlay_parameters)
+    bg_parameter_info_destroy_array(info->overlay_parameters);
   
   free(info);
   }
@@ -225,6 +225,9 @@
   bg_plugin_info_t ** arr;
   int num_plugins = 0;
   int keep_going;
+
+  if(NULL==list)
+    return NULL;
   
   /* Count plugins */
 
@@ -319,8 +322,6 @@
   return NULL;
   }
 
-
-
 const bg_plugin_info_t * bg_plugin_find_by_filename(bg_plugin_registry_t * reg,
                                                     const char * filename,
                                                     int typemask)
@@ -366,6 +367,82 @@
   return ret;
   }
 
+const bg_plugin_info_t * bg_plugin_find_by_mimetype(bg_plugin_registry_t * reg,
+                                                    const char * mimetype,
+                                                    int typemask)
+  {
+  bg_plugin_info_t * info, *ret = NULL;
+  int max_priority = BG_PLUGIN_PRIORITY_MIN - 1;
+
+  if(!mimetype)
+    return NULL;
+  
+  info = reg->entries;
+  
+  while(info)
+    {
+    if(!(info->type & typemask) ||
+       !info->mimetypes)
+      {
+      info = info->next;
+      continue;
+      }
+    if(bg_string_match(mimetype, info->mimetypes))
+      {
+      if(max_priority < info->priority)
+        {
+        max_priority = info->priority;
+        ret = info;
+        }
+      // return info;
+      }
+    info = info->next;
+    }
+  return ret;
+  }
+
+
+const bg_plugin_info_t *
+bg_plugin_find_by_compression(bg_plugin_registry_t * reg,
+                              gavl_codec_id_t id,
+                              int typemask, int flagmask)
+  {
+  int i;
+  bg_plugin_info_t * info, *ret = NULL;
+  int max_priority = BG_PLUGIN_PRIORITY_MIN - 1;
+
+  info = reg->entries;
+  
+  while(info)
+    {
+    if(!(info->type & typemask) ||
+       !(info->flags & flagmask) ||
+       !info->compressions)
+      {
+      info = info->next;
+      continue;
+      }
+
+    i = 0;
+    while(info->compressions[i] != GAVL_CODEC_ID_NONE)
+      {
+      if(info->compressions[i] == id)
+        {
+        if(max_priority < info->priority)
+          {
+          max_priority = info->priority;
+          ret = info;
+          }
+        }
+      i++;
+      }
+    
+    info = info->next;
+    }
+  return ret;
+  }
+
+
 static bg_plugin_info_t * remove_from_list(bg_plugin_info_t * list,
                                            bg_plugin_info_t * info)
   {
@@ -452,7 +529,7 @@
   
   if(info->type == BG_PARAMETER_SECTION)
     info->flags |= BG_PARAMETER_GLOBAL_PRESET;
-  info->preset_path = bg_strdup(info->preset_path, prefix);
+  info->preset_path = gavl_strrep(info->preset_path, prefix);
   }
 
 bg_plugin_info_t * bg_plugin_info_create(const bg_plugin_common_t * plugin)
@@ -460,17 +537,17 @@
   bg_plugin_info_t * new_info;
   new_info = calloc(1, sizeof(*new_info));
 
-  new_info->name = bg_strdup(new_info->name, plugin->name); 	 
+  new_info->name = gavl_strrep(new_info->name, plugin->name); 	 
 	  	 
-  new_info->long_name =  bg_strdup(new_info->long_name, 	 
+  new_info->long_name =  gavl_strrep(new_info->long_name, 	 
                                    plugin->long_name); 	 
 	  	 
-  new_info->description = bg_strdup(new_info->description, 	 
+  new_info->description = gavl_strrep(new_info->description, 	 
                                     plugin->description);
   
-  new_info->gettext_domain = bg_strdup(new_info->gettext_domain, 	 
+  new_info->gettext_domain = gavl_strrep(new_info->gettext_domain, 	 
                                        plugin->gettext_domain); 	 
-  new_info->gettext_directory = bg_strdup(new_info->gettext_directory, 	 
+  new_info->gettext_directory = gavl_strrep(new_info->gettext_directory, 	 
                                           plugin->gettext_directory); 	 
   new_info->type        = plugin->type; 	 
   new_info->flags       = plugin->flags; 	 
@@ -478,16 +555,16 @@
 
   if(plugin->type & (BG_PLUGIN_ENCODER_AUDIO|
                      BG_PLUGIN_ENCODER_VIDEO|
-                     BG_PLUGIN_ENCODER_SUBTITLE_TEXT |
-                     BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY |
+                     BG_PLUGIN_ENCODER_TEXT |
+                     BG_PLUGIN_ENCODER_OVERLAY |
                      BG_PLUGIN_ENCODER ))
     {
     bg_encoder_plugin_t * encoder;
     encoder = (bg_encoder_plugin_t*)plugin;
     new_info->max_audio_streams = encoder->max_audio_streams;
     new_info->max_video_streams = encoder->max_video_streams;
-    new_info->max_subtitle_text_streams = encoder->max_subtitle_text_streams;
-    new_info->max_subtitle_overlay_streams = encoder->max_subtitle_overlay_streams;
+    new_info->max_text_streams = encoder->max_text_streams;
+    new_info->max_overlay_streams = encoder->max_overlay_streams;
     }
   
   return new_info;
@@ -503,13 +580,14 @@
   
   new_info = bg_plugin_info_create(plugin);
 
-  new_info->module_filename = bg_strdup(new_info->module_filename, 	 
+  new_info->module_filename = gavl_strrep(new_info->module_filename, 	 
                                         module_filename);
   
   if(plugin->get_parameters)
     {
     parameter_info = plugin->get_parameters(plugin_priv);
-    new_info->parameters = bg_parameter_info_copy_array(parameter_info);
+    if(parameter_info)
+      new_info->parameters = bg_parameter_info_copy_array(parameter_info);
     if(new_info->parameters)
       {
       prefix = bg_sprintf("plugins/%s", new_info->name);
@@ -520,8 +598,8 @@
   
   if(plugin->type & (BG_PLUGIN_ENCODER_AUDIO|
                      BG_PLUGIN_ENCODER_VIDEO|
-                     BG_PLUGIN_ENCODER_SUBTITLE_TEXT |
-                     BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY |
+                     BG_PLUGIN_ENCODER_TEXT |
+                     BG_PLUGIN_ENCODER_OVERLAY |
                      BG_PLUGIN_ENCODER ))
     {
     bg_encoder_plugin_t * encoder;
@@ -550,26 +628,26 @@
         free(prefix);
         }
       }
-    if(encoder->get_subtitle_text_parameters)
+    if(encoder->get_text_parameters)
       {
-      parameter_info = encoder->get_subtitle_text_parameters(plugin_priv);
-      new_info->subtitle_text_parameters = bg_parameter_info_copy_array(parameter_info);
-      if(new_info->subtitle_text_parameters)
+      parameter_info = encoder->get_text_parameters(plugin_priv);
+      new_info->text_parameters = bg_parameter_info_copy_array(parameter_info);
+      if(new_info->text_parameters)
         {
-        prefix = bg_sprintf("plugins/%s/subtitle_text", new_info->name);
-        set_preset_path(new_info->subtitle_text_parameters, prefix);
+        prefix = bg_sprintf("plugins/%s/text", new_info->name);
+        set_preset_path(new_info->text_parameters, prefix);
         free(prefix);
         }
       }
-    if(encoder->get_subtitle_overlay_parameters)
+    if(encoder->get_overlay_parameters)
       {
-      parameter_info = encoder->get_subtitle_overlay_parameters(plugin_priv);
-      new_info->subtitle_overlay_parameters =
+      parameter_info = encoder->get_overlay_parameters(plugin_priv);
+      new_info->overlay_parameters =
         bg_parameter_info_copy_array(parameter_info);
-      if(new_info->subtitle_overlay_parameters)
+      if(new_info->overlay_parameters)
         {
-        prefix = bg_sprintf("plugins/%s/subtitle_overlay", new_info->name);
-        set_preset_path(new_info->subtitle_overlay_parameters, prefix);
+        prefix = bg_sprintf("plugins/%s/overlay", new_info->name);
+        set_preset_path(new_info->overlay_parameters, prefix);
         free(prefix);
         }
       }
@@ -580,31 +658,50 @@
     input = (bg_input_plugin_t*)plugin;
 
     if(input->get_mimetypes)
-      new_info->mimetypes =  bg_strdup(new_info->mimetypes,
-                                       input->get_mimetypes(plugin_priv));
+      new_info->mimetypes =  gavl_strrep(new_info->mimetypes,
+                                         input->get_mimetypes(plugin_priv));
 
     if(input->get_extensions)
-      new_info->extensions = bg_strdup(new_info->extensions,
+      new_info->extensions = gavl_strrep(new_info->extensions,
                                        input->get_extensions(plugin_priv));
     
 
     if(input->get_protocols)
-      new_info->protocols = bg_strdup(new_info->protocols,
+      new_info->protocols = gavl_strrep(new_info->protocols,
                                       input->get_protocols(plugin_priv));
     }
   if(plugin->type & BG_PLUGIN_IMAGE_READER)
     {
     bg_image_reader_plugin_t  * ir;
     ir = (bg_image_reader_plugin_t*)plugin;
-    new_info->extensions = bg_strdup(new_info->extensions,
-                                     ir->extensions);
+    new_info->extensions = gavl_strrep(new_info->extensions,
+                                       ir->extensions);
+    new_info->mimetypes = gavl_strrep(new_info->mimetypes,
+                                       ir->mimetypes);
     }
   if(plugin->type & BG_PLUGIN_IMAGE_WRITER)
     {
     bg_image_writer_plugin_t  * iw;
     iw = (bg_image_writer_plugin_t*)plugin;
-    new_info->extensions = bg_strdup(new_info->extensions,
+    new_info->extensions = gavl_strrep(new_info->extensions,
                                      iw->extensions);
+    new_info->mimetypes = gavl_strrep(new_info->mimetypes,
+                                      iw->mimetypes);
+    }
+  if(plugin->type & BG_PLUGIN_CODEC)
+    {
+    bg_codec_plugin_t  * p;
+    int num = 0;
+    const gavl_codec_id_t * compressions;
+    p = (bg_codec_plugin_t*)plugin;
+
+    compressions = p->get_compressions(plugin_priv);
+    
+    while(compressions[num])
+      num++;
+    new_info->compressions = calloc(num+1, sizeof(*new_info->compressions));
+    memcpy(new_info->compressions, compressions,
+           num * sizeof(*new_info->compressions));
     }
   
   if(plugin->find_devices)
@@ -623,7 +720,9 @@
   
   if(!check_plugin_version(test_module))
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Plugin %s has no or wrong version", filename);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Plugin %s has no or wrong version. Recompiling the plugin should fix this.",
+           filename);
     return NULL;
     }
   plugin = (bg_plugin_common_t*)(dlsym(test_module, "the_plugin"));
@@ -707,7 +806,7 @@
     sprintf(filename, "%s/%s", directory, entry->d_name);
     if(stat(filename, &st))
       continue;
-
+    
     /* Check if the plugin is already in the registry */
 
     new_info = find_by_dll(file_info, filename);
@@ -731,9 +830,10 @@
         continue;
         }
       }
-
+    
     if(!(*changed))
       {
+      // fprintf(stderr, "Registry changed %s\n", filename);
       *changed = 1;
       closedir(dir);
       if(_file_info)
@@ -799,19 +899,19 @@
         bg_cfg_section_create_items(stream_section,
                                     tmp_info->video_parameters);
         }
-      if(tmp_info->subtitle_text_parameters)
+      if(tmp_info->text_parameters)
         {
         stream_section = bg_cfg_section_find_subsection(plugin_section,
-                                                        "$subtitle_text");
+                                                        "$text");
         bg_cfg_section_create_items(stream_section,
-                                    tmp_info->subtitle_text_parameters);
+                                    tmp_info->text_parameters);
         }
-      if(tmp_info->subtitle_overlay_parameters)
+      if(tmp_info->overlay_parameters)
         {
         stream_section = bg_cfg_section_find_subsection(plugin_section,
-                                                        "$subtitle_overlay");
+                                                        "$overlay");
         bg_cfg_section_create_items(stream_section,
-                                    tmp_info->subtitle_overlay_parameters);
+                                    tmp_info->overlay_parameters);
         }
       tmp_info = tmp_info->next;
       }
@@ -830,7 +930,7 @@
 static bg_plugin_info_t *
 scan_directory(const char * directory, bg_plugin_info_t ** _file_info,
                bg_cfg_section_t * cfg_section, bg_plugin_api_t api,
-               const bg_plugin_registry_options_t * opt)
+               const bg_plugin_registry_options_t * opt, int * reg_changed)
   {
   int changed = 0;
   bg_plugin_info_t * file_info;
@@ -847,7 +947,7 @@
   
   while(file_info)
     {
-    tmp_string = bg_strdup(NULL, file_info->module_filename);
+    tmp_string = gavl_strdup(file_info->module_filename);
     pos = strrchr(tmp_string, '/');
     if(pos) *pos = '\0';
     
@@ -867,6 +967,8 @@
   if(!changed)
     return ret;
   
+  *reg_changed = 1;
+  
   free_info_list(ret);
   ret = scan_directory_internal(directory, _file_info,
                                 &changed, cfg_section, api, opt);
@@ -876,7 +978,8 @@
 static bg_plugin_info_t * scan_multi(const char * path,
                                      bg_plugin_info_t ** _file_info,
                                      bg_cfg_section_t * section,
-                                     bg_plugin_api_t api, const bg_plugin_registry_options_t * opt)
+                                     bg_plugin_api_t api, const bg_plugin_registry_options_t * opt,
+                                     int * reg_changed)
   {
   char ** paths;
   char ** real_paths;
@@ -920,7 +1023,7 @@
       {
       tmp_info = scan_directory(real_paths[i],
                                 _file_info, 
-                                section, api, opt);
+                                section, api, opt, reg_changed);
       if(tmp_info)
         ret = append_to_list(ret, tmp_info);
       }
@@ -972,7 +1075,9 @@
     file_info = bg_plugin_registry_load(filename);
     free(filename);
     }
-
+  else
+    ret->changed = 1;
+  
   /* Native plugins */
   env = getenv("GMERLIN_PLUGIN_PATH");
   if(env)
@@ -980,7 +1085,7 @@
   else
     path = bg_sprintf("%s", PLUGIN_DIR);
   
-  tmp_info = scan_multi(path, &file_info, section, BG_PLUGIN_API_GMERLIN, opt);
+  tmp_info = scan_multi(path, &file_info, section, BG_PLUGIN_API_GMERLIN, opt, &ret->changed);
   if(tmp_info)
     ret->entries = append_to_list(ret->entries, tmp_info);
   free(path);
@@ -992,7 +1097,7 @@
   else
     path = bg_sprintf("/usr/lib64/ladspa:/usr/local/lib64/ladspa:/usr/lib/ladspa:/usr/local/lib/ladspa");
 
-  tmp_info = scan_multi(path, &file_info, section, BG_PLUGIN_API_LADSPA, opt);
+  tmp_info = scan_multi(path, &file_info, section, BG_PLUGIN_API_LADSPA, opt, &ret->changed);
   if(tmp_info)
     ret->entries = append_to_list(ret->entries, tmp_info);
   
@@ -1000,14 +1105,14 @@
   
   /* Frei0r */
   tmp_info = scan_multi("/usr/lib64/frei0r-1:/usr/local/lib64/frei0r-1:/usr/lib/frei0r-1:/usr/local/lib/frei0r-1", &file_info, 
-                        section, BG_PLUGIN_API_FREI0R, opt);
+                        section, BG_PLUGIN_API_FREI0R, opt, &ret->changed);
   if(tmp_info)
     ret->entries = append_to_list(ret->entries, tmp_info);
     
 #ifdef HAVE_LV
   tmp_info = scan_directory(LV_PLUGIN_DIR,
                             &file_info, 
-                            section, BG_PLUGIN_API_LV, opt);
+                            section, BG_PLUGIN_API_LV, opt, &ret->changed);
   if(tmp_info)
     ret->entries = append_to_list(ret->entries, tmp_info);
 #endif
@@ -1028,16 +1133,18 @@
     ret->entries = append_to_list(ret->entries, tmp_info);
   
   
-  /* Sort */
-
-  ret->entries = sort_by_priority(ret->entries);
+  if(ret->entries)
+    {
+    /* Sort */
+    ret->entries = sort_by_priority(ret->entries);
 
-  if(!opt->dont_save)
-    bg_plugin_registry_save(ret->entries);
-  
-  /* Remove duplicate external plugins */
-  ret->entries = remove_duplicate(ret->entries);
+    if(ret->changed && !opt->dont_save)
+      bg_plugin_registry_save(ret->entries);
   
+    /* Remove duplicate external plugins */
+    ret->entries = remove_duplicate(ret->entries);
+    }
+
   /* Kick out unsupported plugins */
   tmp_info = ret->entries;
 
@@ -1066,6 +1173,11 @@
   return ret;
   }
 
+int bg_plugin_registry_changed(bg_plugin_registry_t * reg)
+  {
+  return reg->changed;
+  }
+
 void bg_plugin_registry_destroy(bg_plugin_registry_t * reg)
   {
   bg_plugin_info_t * info;
@@ -1207,7 +1319,7 @@
     return;
   if(!(info->flags & BG_PLUGIN_FILE))
     return;
-  info->extensions = bg_strdup(info->extensions, extensions);
+  info->extensions = gavl_strrep(info->extensions, extensions);
   
   bg_plugin_registry_save(reg->entries);
   
@@ -1223,7 +1335,7 @@
     return;
   if(!(info->flags & BG_PLUGIN_URL))
     return;
-  info->protocols = bg_strdup(info->protocols, protocols);
+  info->protocols = gavl_strrep(info->protocols, protocols);
   bg_plugin_registry_save(reg->entries);
 
   }
@@ -1261,8 +1373,8 @@
     { BG_PLUGIN_RECORDER_VIDEO,                  BG_PLUGIN_RECORDER, "video_recorder" },
     { BG_PLUGIN_ENCODER_AUDIO,                   BG_PLUGIN_FILE,     "audio_encoder"  },
     { BG_PLUGIN_ENCODER_VIDEO|BG_PLUGIN_ENCODER, BG_PLUGIN_FILE,     "video_encoder" },
-    { BG_PLUGIN_ENCODER_SUBTITLE_TEXT,           BG_PLUGIN_FILE,     "subtitle_text_encoder" },
-    { BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY,        BG_PLUGIN_FILE,     "subtitle_overlay_encoder" },
+    { BG_PLUGIN_ENCODER_TEXT,           BG_PLUGIN_FILE,     "text_encoder" },
+    { BG_PLUGIN_ENCODER_OVERLAY,        BG_PLUGIN_FILE,     "overlay_encoder" },
     { BG_PLUGIN_IMAGE_WRITER,                    BG_PLUGIN_FILE,     "image_writer"   },
     { BG_PLUGIN_ENCODER_PP,                      BG_PLUGIN_PP,       "encoder_pp"  },
     { BG_PLUGIN_VISUALIZATION,                   BG_PLUGIN_VISUALIZE_FRAME, "visualization_frame" },
@@ -1382,9 +1494,7 @@
   else if(h->priv && h->plugin->destroy)
     h->plugin->destroy(h->priv);
   
-  if(h->location) free(h->location);
-
-#if 1
+#ifndef KEEP_OPEN 
   // Some few libs (e.g. the OpenGL lib shipped with NVidia)
   // seem to install pthread cleanup handlers, which point to library
   // functions. dlclosing libraries causes programs to crash
@@ -1396,7 +1506,7 @@
     dlclose(h->dll_handle);
 #endif
   if(h->edl)
-    bg_edl_destroy(h->edl);
+    gavl_edl_destroy(h->edl);
   pthread_mutex_destroy(&h->mutex);
   free(h);
   }
@@ -1688,13 +1798,15 @@
   return ret;
   }
 
-void bg_plugin_lock(bg_plugin_handle_t * h)
+void bg_plugin_lock(void * p)
   {
+  bg_plugin_handle_t * h = p;
   pthread_mutex_lock(&h->mutex);
   }
 
-void bg_plugin_unlock(bg_plugin_handle_t * h)
+void bg_plugin_unlock(void * p)
   {
+  bg_plugin_handle_t * h = p;
   pthread_mutex_unlock(&h->mutex);
   }
 
@@ -1732,7 +1844,7 @@
     {
     if(!strcmp(info->devices[i].device, device))
       {
-      info->devices[i].name = bg_strdup(info->devices[i].name, name);
+      info->devices[i].name = gavl_strrep(info->devices[i].name, name);
       bg_plugin_registry_save(reg->entries);
       return;
       }
@@ -1818,7 +1930,7 @@
   for(i = 0; i < num_plugins; i++)
     {
     info = bg_plugin_find_by_index(reg, i, type_mask, flag_mask);
-    ret[i] = bg_strdup(NULL, info->name);
+    ret[i] = gavl_strdup(info->name);
     }
   return ret;
   
@@ -1853,6 +1965,13 @@
     }
   }
 
+static int input_plugin_finalize(bg_plugin_handle_t * h, const char * location)
+  {
+  /* Look for metadata */
+  bg_plugin_load_metadata(h, location); 
+  return 1;
+  }
+
 static int input_plugin_load(bg_plugin_registry_t * reg,
                              const char * location,
                              const bg_plugin_info_t * info,
@@ -1870,11 +1989,18 @@
   
   if(!location)
     return 0;
-
+  
   if(!strncmp(location, "file://", 7))
     location += 7;
   
   real_location = location;
+
+  if(!strstr(real_location, "://") && access(real_location, R_OK))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, TRS("Cannot access file \"%s\": %s"), real_location,
+                                         strerror(errno));
+    return 0;
+    }
   
   if(!info) /* No plugin given, seek one */
     {
@@ -1935,9 +2061,11 @@
       }
     else
       {
-      if(protocol) free(protocol);
-      if(path)     free(path);
-      (*ret)->location = bg_strdup((*ret)->location, real_location);
+      if(protocol)
+        free(protocol);
+      if(path)
+        free(path);
+      input_plugin_finalize(*ret, real_location);
       return 1;
       }
     }
@@ -1972,7 +2100,7 @@
       }
     else
       {
-      (*ret)->location = bg_strdup((*ret)->location, real_location);
+      input_plugin_finalize(*ret, real_location);
       return 1;
       }
     }
@@ -1986,8 +2114,8 @@
                          bg_input_callbacks_t * callbacks, int prefer_edl)
   {
   bg_input_plugin_t * plugin;
-  const bg_edl_t * edl_c;
-  bg_edl_t * edl;
+  const gavl_edl_t * edl_c;
+  gavl_edl_t * edl;
   int num_tracks = 1;
   if(!input_plugin_load(reg, location, info, ret, callbacks))
     return 0;
@@ -2009,20 +2137,82 @@
   //  bg_edl_save(edl_c, "test.edl");
     
   /* Load EDL instead */
-  edl = bg_edl_copy(edl_c);
+  edl = gavl_edl_copy(edl_c);
 
   info = bg_plugin_find_by_name(reg, "i_edldec");
   
   if(!bg_input_plugin_load_edl(reg, edl, info, ret,
                                callbacks))
     {
-    bg_edl_destroy(edl);
+    gavl_edl_destroy(edl);
     return 0;
     }
   (*ret)->edl = edl;
   return 1;
   }
 
+int bg_input_plugin_load_full(bg_plugin_registry_t * reg,
+                              const char * location,
+                              const bg_plugin_info_t * info,
+                              bg_plugin_handle_t ** ret,
+                              bg_input_callbacks_t * callbacks, int prefer_edl,
+                              int * track)
+  {
+  const char * url;
+  bg_input_plugin_t * input_plugin;
+  bg_track_info_t * track_info;
+  
+  if(!bg_input_plugin_load(reg,
+                           location,
+                           info,
+                           ret,
+                           callbacks, prefer_edl))
+    return 0;
+  
+  input_plugin = (bg_input_plugin_t*)((*ret)->plugin);
+
+  if(!(track_info = input_plugin->get_track_info((*ret)->priv, *track)))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No track %d in %s", *track + 1, location);
+    bg_plugin_unref(*ret);
+    return 0;
+    }
+
+  /* Do redirection */
+  if((url = gavl_metadata_get(&track_info->metadata, GAVL_META_REFURL)))
+    {
+    int result;
+    gavl_metadata_t m;
+    gavl_metadata_init(&m);
+    gavl_metadata_copy(&m, &track_info->metadata);
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Got redirected to %s", url);
+        
+    result = bg_input_plugin_load(reg, url,
+                                  info, ret, callbacks, prefer_edl);
+
+    if(result)
+      {
+      /* Merge metadata */
+
+      if(!(track_info = input_plugin->get_track_info((*ret)->priv, 0)))
+        result = 0;
+      else
+        {
+        gavl_metadata_set(&m, GAVL_META_REFURL, NULL);
+        gavl_metadata_merge2(&track_info->metadata, &m);
+        *track = 0;
+        }
+      }
+    
+    gavl_metadata_free(&m);
+    
+    return result;
+    }
+
+  return 1;
+  }
+  
 void
 bg_plugin_registry_set_encode_audio_to_video(bg_plugin_registry_t * reg,
                                                   int audio_to_video)
@@ -2059,35 +2249,35 @@
 
 
 void
-bg_plugin_registry_set_encode_subtitle_text_to_video(bg_plugin_registry_t * reg,
-                                                  int subtitle_text_to_video)
+bg_plugin_registry_set_encode_text_to_video(bg_plugin_registry_t * reg,
+                                                  int text_to_video)
   {
-  bg_cfg_section_set_parameter_int(reg->config_section, "encode_subtitle_text_to_video",
-                                   subtitle_text_to_video);
+  bg_cfg_section_set_parameter_int(reg->config_section, "encode_text_to_video",
+                                   text_to_video);
   }
 
 int
-bg_plugin_registry_get_encode_subtitle_text_to_video(bg_plugin_registry_t * reg)
+bg_plugin_registry_get_encode_text_to_video(bg_plugin_registry_t * reg)
   {
   int ret;
   bg_cfg_section_get_parameter_int(reg->config_section,
-                                   "encode_subtitle_text_to_video",
+                                   "encode_text_to_video",
                                    &ret);
   return ret;
   }
 
-void bg_plugin_registry_set_encode_subtitle_overlay_to_video(bg_plugin_registry_t * reg,
-                                                  int subtitle_overlay_to_video)
+void bg_plugin_registry_set_encode_overlay_to_video(bg_plugin_registry_t * reg,
+                                                  int overlay_to_video)
   {
-  bg_cfg_section_set_parameter_int(reg->config_section, "encode_subtitle_overlay_to_video",
-                                   subtitle_overlay_to_video);
+  bg_cfg_section_set_parameter_int(reg->config_section, "encode_overlay_to_video",
+                                   overlay_to_video);
   }
 
-int bg_plugin_registry_get_encode_subtitle_overlay_to_video(bg_plugin_registry_t * reg)
+int bg_plugin_registry_get_encode_overlay_to_video(bg_plugin_registry_t * reg)
   {
   int ret;
   bg_cfg_section_get_parameter_int(reg->config_section,
-                                   "encode_subtitle_overlay_to_video",
+                                   "encode_overlay_to_video",
                                    &ret);
   return ret;
   }
@@ -2140,10 +2330,10 @@
     { } // End
   };
 
-static const bg_parameter_info_t encoder_section_subtitle_overlay[] =
+static const bg_parameter_info_t encoder_section_overlay[] =
   {
     {
-      .name      = "$subtitle_overlay",
+      .name      = "$overlay",
       .long_name = TRS("Overlay subtitles"),
       .type      = BG_PARAMETER_SECTION,
       .flags     = BG_PARAMETER_OWN_SECTION,
@@ -2151,10 +2341,10 @@
     { } // End
   };
 
-static const bg_parameter_info_t encoder_section_subtitle_text[] =
+static const bg_parameter_info_t encoder_section_text[] =
   {
     {
-      .name      = "$subtitle_text",
+      .name      = "$text",
       .long_name = TRS("Text subtitles"),
       .type      = BG_PARAMETER_SECTION,
       .flags     = BG_PARAMETER_OWN_SECTION,
@@ -2163,22 +2353,21 @@
   };
 
 static bg_parameter_info_t *
-create_encoder_parameters(const bg_plugin_info_t * info)
+create_encoder_parameters(const bg_plugin_info_t * info, int stream_params)
   {
-  int i = 0;
-  bg_parameter_info_t * ret;
-  char * tmp_string;
+  bg_parameter_info_t * ret = NULL;
   
-  const bg_parameter_info_t * src[11];
-
   //  if(!strcmp(info->name, "e_mpeg"))
   //    fprintf(stderr, "e_mpeg\n");
   
-  if(info->audio_parameters ||
-     info->video_parameters ||
-     info->subtitle_text_parameters ||
-     info->subtitle_overlay_parameters)
+  if(stream_params &&
+     (info->audio_parameters ||
+      info->video_parameters ||
+      info->text_parameters ||
+      info->overlay_parameters))
     {
+    int i = 0;
+    const bg_parameter_info_t * src[11];
     if(info->parameters)
       {
       if(info->parameters[0].type != BG_PARAMETER_SECTION)
@@ -2189,50 +2378,54 @@
       src[i] = info->parameters;
       i++;
       }
-    
-    if(info->audio_parameters)
-      {
-      src[i] = encoder_section_audio;
-      i++;
-      src[i] = info->audio_parameters;
-      i++;
-      }
 
-    if(info->subtitle_text_parameters)
+    if(stream_params)
       {
-      src[i] = encoder_section_subtitle_text;
-      i++;
-      src[i] = info->subtitle_text_parameters;
-      i++;
-      }
+      if(info->audio_parameters)
+        {
+        src[i] = encoder_section_audio;
+        i++;
+        src[i] = info->audio_parameters;
+        i++;
+        }
 
-    if(info->subtitle_overlay_parameters)
-      {
-      src[i] = encoder_section_subtitle_overlay;
-      i++;
-      src[i] = info->subtitle_overlay_parameters;
-      i++;
-      }
+      if(info->text_parameters)
+        {
+        src[i] = encoder_section_text;
+        i++;
+        src[i] = info->text_parameters;
+        i++;
+        }
+
+      if(info->overlay_parameters)
+        {
+        src[i] = encoder_section_overlay;
+        i++;
+        src[i] = info->overlay_parameters;
+        i++;
+        }
+
+      if(info->video_parameters)
+        {
+        src[i] = encoder_section_video;
+        i++;
+        src[i] = info->video_parameters;
+        i++;
+        }
 
-    if(info->video_parameters)
-      {
-      src[i] = encoder_section_video;
-      i++;
-      src[i] = info->video_parameters;
-      i++;
       }
-    
     src[i] = NULL;
     ret = bg_parameter_info_concat_arrays(src);
     }
-  else
+  else if(info->parameters)
     ret = bg_parameter_info_copy_array(info->parameters);
 
   if(ret)
     {
+    char * tmp_string;
     ret->flags |= BG_PARAMETER_GLOBAL_PRESET;
     tmp_string = bg_sprintf("plugins/%s", info->name);
-    ret->preset_path = bg_strdup(ret->preset_path, tmp_string);
+    ret->preset_path = gavl_strrep(ret->preset_path, tmp_string);
     free(tmp_string);
     }
 
@@ -2242,59 +2435,78 @@
   return ret;
   }
 
-void bg_plugin_registry_set_parameter_info(bg_plugin_registry_t * reg,
-                                           uint32_t type_mask,
-                                           uint32_t flag_mask,
-                                           bg_parameter_info_t * ret)
+static void set_parameter_info(bg_plugin_registry_t * reg,
+                              uint32_t type_mask,
+                              uint32_t flag_mask,
+                              bg_parameter_info_t * ret, int stream_params)
   {
-  int num_plugins, i;
+  int num_plugins, start_entries, i;
   const bg_plugin_info_t * info;
   
   num_plugins =
     bg_plugin_registry_get_num_plugins(reg, type_mask, flag_mask);
 
-  ret->multi_names_nc      = calloc(num_plugins + 1, sizeof(*ret->multi_names));
-  ret->multi_labels_nc     = calloc(num_plugins + 1, sizeof(*ret->multi_labels));
-  ret->multi_parameters_nc = calloc(num_plugins + 1,
-                                 sizeof(*ret->multi_parameters));
+  start_entries = 0;
+  if(ret->multi_names_nc)
+    {
+    while(ret->multi_names_nc[start_entries])
+      start_entries++;
+    }
 
-  ret->multi_descriptions_nc = calloc(num_plugins + 1,
-                                   sizeof(*ret->multi_descriptions));
+#define REALLOC(arr) \
+  ret->arr = realloc(ret->arr, (start_entries + num_plugins + 1)*sizeof(*ret->arr)); \
+  memset(ret->arr + start_entries, 0, (num_plugins + 1)*sizeof(*ret->arr));
 
+  REALLOC(multi_names_nc);
+  REALLOC(multi_labels_nc);
+  REALLOC(multi_parameters_nc);
+  REALLOC(multi_descriptions_nc);
+#undef REALLOC
+    
   bg_parameter_info_set_const_ptrs(ret);
   
   for(i = 0; i < num_plugins; i++)
     {
     info = bg_plugin_find_by_index(reg, i,
                                    type_mask, flag_mask);
-    ret->multi_names_nc[i] = bg_strdup(NULL, info->name);
+    ret->multi_names_nc[start_entries+i] = gavl_strdup(info->name);
 
     /* First plugin is the default one */
-    if(!i && (ret->type != BG_PARAMETER_MULTI_CHAIN)) 
+    if((ret->type != BG_PARAMETER_MULTI_CHAIN) && !ret->val_default.val_str)
       {
-      ret->val_default.val_str = bg_strdup(NULL, info->name);
+      ret->val_default.val_str = gavl_strdup(info->name);
       }
     
     bg_bindtextdomain(info->gettext_domain, info->gettext_directory);
-    ret->multi_descriptions_nc[i] = bg_strdup(NULL, TRD(info->description,
+    ret->multi_descriptions_nc[start_entries+i] = gavl_strdup(TRD(info->description,
                                                      info->gettext_domain));
     
-    ret->multi_labels_nc[i] = bg_strdup(NULL, TRD(info->long_name,
-                                               info->gettext_domain));
+    ret->multi_labels_nc[start_entries+i] =
+      gavl_strdup(TRD(info->long_name,
+                          info->gettext_domain));
     
     if(info->type & (BG_PLUGIN_ENCODER_AUDIO |
                      BG_PLUGIN_ENCODER_VIDEO |
-                     BG_PLUGIN_ENCODER_SUBTITLE_TEXT |
-                     BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY |
+                     BG_PLUGIN_ENCODER_TEXT |
+                     BG_PLUGIN_ENCODER_OVERLAY |
                      BG_PLUGIN_ENCODER))
-      ret->multi_parameters_nc[i] = create_encoder_parameters(info);
+      ret->multi_parameters_nc[start_entries+i] =
+        create_encoder_parameters(info, stream_params);
     else if(info->parameters)
       {
-      ret->multi_parameters_nc[i] =
+      ret->multi_parameters_nc[start_entries+i] =
         bg_parameter_info_copy_array(info->parameters);
       }
     }
   }
+  
+void bg_plugin_registry_set_parameter_info(bg_plugin_registry_t * reg,
+                                           uint32_t type_mask,
+                                           uint32_t flag_mask,
+                                           bg_parameter_info_t * ret)
+  {
+  set_parameter_info(reg, type_mask, flag_mask, ret, 1);
+  }
 
 static const bg_parameter_info_t registry_settings_parameter =
   {
@@ -2341,7 +2553,6 @@
   int num_plugins, i;
   const bg_plugin_info_t * info;
   int index, index1, num_parameters;
-  char * prefix;
   
   num_plugins =
     bg_plugin_registry_get_num_plugins(reg, type_mask, flag_mask);
@@ -2363,19 +2574,19 @@
     {
     info = bg_plugin_find_by_index(reg, i,
                                    type_mask, flag_mask);
-    ret->multi_names_nc[i] = bg_strdup(NULL, info->name);
+    ret->multi_names_nc[i] = gavl_strdup(info->name);
 
     /* First plugin is the default one */
     if(!i && (ret->type != BG_PARAMETER_MULTI_CHAIN)) 
       {
-      ret->val_default.val_str = bg_strdup(NULL, info->name);
+      ret->val_default.val_str = gavl_strdup(info->name);
       }
     
     bg_bindtextdomain(info->gettext_domain, info->gettext_directory);
-    ret->multi_descriptions_nc[i] = bg_strdup(NULL, TRD(info->description,
+    ret->multi_descriptions_nc[i] = gavl_strdup(TRD(info->description,
                                                         info->gettext_domain));
     
-    ret->multi_labels_nc[i] = bg_strdup(NULL, TRD(info->long_name,
+    ret->multi_labels_nc[i] = gavl_strdup(TRD(info->long_name,
                                                info->gettext_domain));
 
     /* Create parameters: Extensions and protocols are added to the array
@@ -2395,7 +2606,6 @@
     
     //    prefix = bg_sprintf("%s.", info->name);
 
-    prefix = NULL;
     
     if(info->parameters)
       {
@@ -2446,7 +2656,7 @@
       bg_parameter_info_copy(&ret->multi_parameters_nc[i][index],
                              &extensions_parameter);
       ret->multi_parameters_nc[i][index].val_default.val_str =
-        bg_strdup(NULL, info->extensions);
+        gavl_strdup(info->extensions);
       index++;
       }
     if(info->flags & BG_PLUGIN_URL)
@@ -2454,7 +2664,7 @@
       bg_parameter_info_copy(&ret->multi_parameters_nc[i][index],
                              &protocols_parameter);
       ret->multi_parameters_nc[i][index].val_default.val_str =
-        bg_strdup(NULL, info->protocols);
+        gavl_strdup(info->protocols);
       index++;
       }
 
@@ -2488,7 +2698,7 @@
   if(!pos2)
     return 0;
 
-  plugin_name = bg_strndup(NULL, pos1, pos2);
+  plugin_name = gavl_strndup( pos1, pos2);
   pos2++;
 
   *parameter_name = pos2;
@@ -2506,6 +2716,14 @@
     if(!(*parameter_info))
       goto fail;
     }
+  else
+    {
+    *section = NULL;
+    *parameter_info = NULL;
+    }
+  
+  //  fprintf(stderr, "name: %s, plugin: %s, parameter: %s, section: %p, pi: %p\n",
+  //          name, plugin_name, *parameter_name, *section, *parameter_info);
   
   ret = 1;
   fail:
@@ -2525,19 +2743,15 @@
   if(!name)
     return;
 
+  //  fprintf(stderr,
+  //          "bg_plugin_registry_set_parameter_input\n");
+
   if(!find_parameter_input(plugin_reg, name, &parameter_info,
                            &plugin_info, &cfg_section, &parameter_name))
     return;
-
-  //  fprintf(stderr,
-  //          "bg_plugin_registry_set_parameter_input name: %s parameter_name: %s plugin_name: %s\n",
-  //          name, parameter_name, plugin_info->name);
-  
   
   if(!strcmp(parameter_name, "$priority"))
-    {
     bg_plugin_registry_set_priority(plugin_reg, plugin_info->name, val->val_i);
-    }
   else if(!strcmp(parameter_name, "$extensions"))
     bg_plugin_registry_set_extensions(plugin_reg, plugin_info->name, val->val_str);
   else if(!strcmp(parameter_name, "$protocols"))
@@ -2558,25 +2772,19 @@
   if(!name)
     return 0;
 
+  //  fprintf(stderr,
+  // "bg_plugin_registry_get_parameter_input\n");
+  
   if(!find_parameter_input(plugin_reg, name, &parameter_info,
                            &plugin_info, &cfg_section, &parameter_name))
     return 0;
-
-  //  fprintf(stderr,
-  //          "bg_plugin_registry_get_parameter_input name: %s parameter_name: %s plugin_name: %s\n",
-  //          name, parameter_name, plugin_info->name);
-  
-  //  fprintf(stderr, "plugin name: %s\n", plugin_info->name);
-  
+    
   if(!strcmp(parameter_name, "$priority"))
-    {
     val->val_i = plugin_info->priority;
-    //    fprintf(stderr, "get priority: %d\n", val->val_i);
-    }
   else if(!strcmp(parameter_name, "$extensions"))
-    val->val_str = bg_strdup(val->val_str, plugin_info->extensions);
+    val->val_str = gavl_strrep(val->val_str, plugin_info->extensions);
   else if(!strcmp(parameter_name, "$protocols"))
-    val->val_str = bg_strdup(val->val_str, plugin_info->protocols);
+    val->val_str = gavl_strrep(val->val_str, plugin_info->protocols);
   else
     bg_cfg_section_get_parameter(cfg_section, parameter_info, val);
   return 1;
@@ -2585,20 +2793,23 @@
 static const bg_parameter_info_t audio_to_video_param =
   {
     .name      = "encode_audio_to_video",
+    .opt       = "a2v",
     .long_name = TRS("Write audio stream to video file if possible"),
     .type      = BG_PARAMETER_CHECKBUTTON,
   };
 
-static const bg_parameter_info_t subtitle_text_to_video_param =
+static const bg_parameter_info_t text_to_video_param =
   {
-    .name      = "encode_subtitle_text_to_video",
+    .name      = "encode_text_to_video",
+    .opt       = "t2v",
     .long_name = TRS("Write text subtitles to video file if possible"),
     .type      = BG_PARAMETER_CHECKBUTTON,
   };
 
-static const bg_parameter_info_t subtitle_overlay_to_video_param =
+static const bg_parameter_info_t overlay_to_video_param =
   {
-    .name      = "encode_subtitle_overlay_to_video",
+    .name      = "encode_overlay_to_video",
+    .opt       = "o2v",
     .long_name = TRS("Write overlay subtitles to video file if possible"),
     .type      = BG_PARAMETER_CHECKBUTTON,
   };
@@ -2606,6 +2817,7 @@
 static const bg_parameter_info_t audio_encoder_param =
   {
     .name      = "audio_encoder",
+    .opt       = "ae",
     .long_name = TRS("Audio"),
     .type      = BG_PARAMETER_MULTI_MENU,
   };
@@ -2613,20 +2825,23 @@
 static const bg_parameter_info_t video_encoder_param =
   {
     .name      = "video_encoder",
+    .opt       = "ve",
     .long_name = TRS("Video"),
     .type      = BG_PARAMETER_MULTI_MENU,
   };
 
-static const bg_parameter_info_t subtitle_text_encoder_param =
+static const bg_parameter_info_t text_encoder_param =
   {
-    .name      = "subtitle_text_encoder",
+    .name      = "text_encoder",
+    .opt       = "te",
     .long_name = TRS("Text subtitles"),
     .type      = BG_PARAMETER_MULTI_MENU,
   };
 
-static const bg_parameter_info_t subtitle_overlay_encoder_param =
+static const bg_parameter_info_t overlay_encoder_param =
   {
-    .name      = "subtitle_overlay_encoder",
+    .name      = "overlay_encoder",
+    .opt       = "oe",
     .long_name = TRS("Overlay subtitles"),
     .type      = BG_PARAMETER_MULTI_MENU,
   };
@@ -2634,12 +2849,12 @@
 bg_parameter_info_t *
 bg_plugin_registry_create_encoder_parameters(bg_plugin_registry_t * reg,
                                              uint32_t type_mask,
-                                             uint32_t flag_mask)
+                                             uint32_t flag_mask, int stream_params)
   {
   int do_audio = 0;
   int do_video = 0;
-  int do_subtitle_text = 0;
-  int do_subtitle_overlay = 0;
+  int do_text = 0;
+  int do_overlay = 0;
   int i;
   
   bg_parameter_info_t * ret;
@@ -2650,18 +2865,18 @@
     do_audio = 1;
   if(type_mask & BG_STREAM_VIDEO)
     do_video = 1;
-  if(type_mask & BG_STREAM_SUBTITLE_TEXT)
-    do_subtitle_text = 1;
-  if(type_mask & BG_STREAM_SUBTITLE_OVERLAY)
-    do_subtitle_overlay = 1;
+  if(type_mask & BG_STREAM_TEXT)
+    do_text = 1;
+  if(type_mask & BG_STREAM_OVERLAY)
+    do_overlay = 1;
   
   /* Count parameters */
   i = 0;
   if(do_audio)
     i += 1 + do_video;
-  if(do_subtitle_text)
+  if(do_text)
     i += 1 + do_video;
-  if(do_subtitle_overlay)
+  if(do_overlay)
     i += 1 + do_video;
   if(do_video)
     i++;
@@ -2679,54 +2894,53 @@
       }
     bg_parameter_info_copy(&ret[i], &audio_encoder_param);
 
-    bg_plugin_registry_set_parameter_info(reg,
-                                          BG_PLUGIN_ENCODER_AUDIO,
-                                          flag_mask, &ret[i]);
+    set_parameter_info(reg,
+                       BG_PLUGIN_ENCODER_AUDIO,
+                       flag_mask, &ret[i], stream_params);
 
     i++;
     }
-  if(do_subtitle_text)
+  if(do_text)
     {
     if(do_video)
       {
-      bg_parameter_info_copy(&ret[i], &subtitle_text_to_video_param);
+      bg_parameter_info_copy(&ret[i], &text_to_video_param);
       i++;
       }
-    bg_parameter_info_copy(&ret[i], &subtitle_text_encoder_param);
-
-    bg_plugin_registry_set_parameter_info(reg,
-                                          BG_PLUGIN_ENCODER_SUBTITLE_TEXT,
-                                          flag_mask, &ret[i]);
+    bg_parameter_info_copy(&ret[i], &text_encoder_param);
 
+    set_parameter_info(reg,
+                       BG_PLUGIN_ENCODER_TEXT,
+                       flag_mask, &ret[i], stream_params);
+    
     i++;
     }
-  if(do_subtitle_overlay)
+  if(do_overlay)
     {
     if(do_video)
       {
-      bg_parameter_info_copy(&ret[i], &subtitle_overlay_to_video_param);
+      bg_parameter_info_copy(&ret[i], &overlay_to_video_param);
       i++;
       }
-    bg_parameter_info_copy(&ret[i], &subtitle_overlay_encoder_param);
-    bg_plugin_registry_set_parameter_info(reg,
-                                          BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY,
-                                          flag_mask, &ret[i]);
+    bg_parameter_info_copy(&ret[i], &overlay_encoder_param);
+    set_parameter_info(reg,
+                       BG_PLUGIN_ENCODER_OVERLAY,
+                       flag_mask, &ret[i], stream_params);
     i++;
     }
   if(do_video)
     {
     bg_parameter_info_copy(&ret[i], &video_encoder_param);
 
-    bg_plugin_registry_set_parameter_info(reg,
-                                          BG_PLUGIN_ENCODER_VIDEO | BG_PLUGIN_ENCODER,
-                                          flag_mask, &ret[i]);
-
+    set_parameter_info(reg,
+                       BG_PLUGIN_ENCODER_VIDEO | BG_PLUGIN_ENCODER,
+                       flag_mask, &ret[i], stream_params);
     i++;
     }
 
   /* Set preset path */
   
-  ret[0].preset_path = bg_strdup(NULL, "encoders");
+  ret[0].preset_path = gavl_strdup("encoders");
   
   return ret;
   }
@@ -2759,16 +2973,16 @@
       if(preference && info->max_audio_streams)
         return 1;
       break;
-    case BG_STREAM_SUBTITLE_TEXT:
-      bg_cfg_section_get_parameter_int(s, "encode_subtitle_text_to_video",
+    case BG_STREAM_TEXT:
+      bg_cfg_section_get_parameter_int(s, "encode_text_to_video",
                                        &preference);
-      if(preference && info->max_subtitle_text_streams)
+      if(preference && info->max_text_streams)
         return 1;
       break;
-    case BG_STREAM_SUBTITLE_OVERLAY:
-      bg_cfg_section_get_parameter_int(s, "encode_subtitle_overlay_to_video",
+    case BG_STREAM_OVERLAY:
+      bg_cfg_section_get_parameter_int(s, "encode_overlay_to_video",
                                        &preference);
-      if(preference && info->max_subtitle_overlay_streams)
+      if(preference && info->max_overlay_streams)
         return 1;
       break;
     default:
@@ -2793,15 +3007,15 @@
         bg_cfg_section_get_parameter_string(s, "audio_encoder",
                                             &ret);
       break;
-    case BG_STREAM_SUBTITLE_TEXT:
-      if(!encode_to_video(plugin_reg, s, BG_STREAM_SUBTITLE_TEXT, stream_mask))
-        bg_cfg_section_get_parameter_string(s, "subtitle_text_encoder",
+    case BG_STREAM_TEXT:
+      if(!encode_to_video(plugin_reg, s, BG_STREAM_TEXT, stream_mask))
+        bg_cfg_section_get_parameter_string(s, "text_encoder",
                                             &ret);
       break;
-    case BG_STREAM_SUBTITLE_OVERLAY:
-      if(!encode_to_video(plugin_reg, s, BG_STREAM_SUBTITLE_OVERLAY,
+    case BG_STREAM_OVERLAY:
+      if(!encode_to_video(plugin_reg, s, BG_STREAM_OVERLAY,
                           stream_mask))
-        bg_cfg_section_get_parameter_string(s, "subtitle_overlay_encoder",
+        bg_cfg_section_get_parameter_string(s, "overlay_encoder",
                                             &ret);
       break;
     case BG_STREAM_VIDEO:
@@ -2854,17 +3068,17 @@
         *section_ret = bg_cfg_section_find_subsection(*section_ret, plugin_name);
         }
       break;
-    case BG_STREAM_SUBTITLE_TEXT:
+    case BG_STREAM_TEXT:
       if(section_ret)
         {
-        *section_ret = bg_cfg_section_find_subsection(s, "subtitle_text_encoder");
+        *section_ret = bg_cfg_section_find_subsection(s, "text_encoder");
         *section_ret = bg_cfg_section_find_subsection(*section_ret, plugin_name);
         }
       break;
-    case BG_STREAM_SUBTITLE_OVERLAY:
+    case BG_STREAM_OVERLAY:
       if(section_ret)
         {
-        *section_ret = bg_cfg_section_find_subsection(s, "subtitle_overlay_encoder");
+        *section_ret = bg_cfg_section_find_subsection(s, "overlay_encoder");
         *section_ret = bg_cfg_section_find_subsection(*section_ret, plugin_name);
         }
       break;
@@ -2891,8 +3105,6 @@
   const bg_plugin_info_t * info;
   bg_cfg_section_t * subsection = NULL;
   
-  int to_video = 0;
-  
   plugin_name =
     bg_encoder_section_get_plugin(plugin_reg,
                                   s, stream_type,
@@ -2907,7 +3119,6 @@
     
     subsection = bg_cfg_section_find_subsection(s, "video_encoder");
     
-    to_video = 1;
     }
 
   info = bg_plugin_find_by_name(plugin_reg, plugin_name);
@@ -2932,30 +3143,30 @@
         }
 
       break;
-    case BG_STREAM_SUBTITLE_TEXT:
+    case BG_STREAM_TEXT:
       if(params_ret)
-        *params_ret = info->subtitle_text_parameters;
+        *params_ret = info->text_parameters;
 
-      if(section_ret && info->subtitle_text_parameters)
+      if(section_ret && info->text_parameters)
         {
         if(!subsection)
-          subsection = bg_cfg_section_find_subsection(s, "subtitle_text_encoder");
+          subsection = bg_cfg_section_find_subsection(s, "text_encoder");
         subsection = bg_cfg_section_find_subsection(subsection, plugin_name);
-        *section_ret = bg_cfg_section_find_subsection(subsection, "$subtitle_text");
+        *section_ret = bg_cfg_section_find_subsection(subsection, "$text");
         
         }
       
       break;
-    case BG_STREAM_SUBTITLE_OVERLAY:
+    case BG_STREAM_OVERLAY:
       if(params_ret)
-        *params_ret = info->subtitle_overlay_parameters;
+        *params_ret = info->overlay_parameters;
 
-      if(section_ret && info->subtitle_overlay_parameters)
+      if(section_ret && info->overlay_parameters)
         {
         if(!subsection)
-          subsection = bg_cfg_section_find_subsection(s, "subtitle_overlay_encoder");
+          subsection = bg_cfg_section_find_subsection(s, "overlay_encoder");
         subsection = bg_cfg_section_find_subsection(subsection, plugin_name);
-        *section_ret = bg_cfg_section_find_subsection(subsection, "$subtitle_overlay");
+        *section_ret = bg_cfg_section_find_subsection(subsection, "$overlay");
         
         }
       
@@ -2992,7 +3203,7 @@
   if(!parameters)
     {
     parameters_priv =
-      bg_plugin_registry_create_encoder_parameters(plugin_reg, type_mask, flag_mask);
+      bg_plugin_registry_create_encoder_parameters(plugin_reg, type_mask, flag_mask, 1);
     parameters = parameters_priv;
     }
 
@@ -3027,18 +3238,18 @@
       j++;
       }
     }
-  if(type_mask & BG_STREAM_SUBTITLE_TEXT)
+  if(type_mask & BG_STREAM_TEXT)
     {
     info = bg_plugin_registry_get_default(plugin_reg,
-                                          BG_PLUGIN_ENCODER_SUBTITLE_TEXT, flag_mask);
-    bg_cfg_section_set_parameter_string(ret, "subtitle_text_encoder", info->name);
+                                          BG_PLUGIN_ENCODER_TEXT, flag_mask);
+    bg_cfg_section_set_parameter_string(ret, "text_encoder", info->name);
 
     bg_cfg_section_get_parameter_int(plugin_reg->config_section,
-                                     "encode_subtitle_text_to_video", &i);
-    bg_cfg_section_set_parameter_int(ret, "encode_subtitle_text_to_video", i);
+                                     "encode_text_to_video", &i);
+    bg_cfg_section_set_parameter_int(ret, "encode_text_to_video", i);
 
     i = 0;
-    while(strcmp(parameters[i].name, "subtitle_text_encoder"))
+    while(strcmp(parameters[i].name, "text_encoder"))
       i++;
     j = 0;
     while(parameters[i].multi_names[j])
@@ -3046,25 +3257,25 @@
       s_src = bg_cfg_section_find_subsection(plugin_reg->config_section,
                                              parameters[i].multi_names[j]);
 
-      s_dst = bg_cfg_section_find_subsection(ret, "subtitle_text_encoder");
+      s_dst = bg_cfg_section_find_subsection(ret, "text_encoder");
       s_dst = bg_cfg_section_find_subsection(s_dst, parameters[i].multi_names[j]);
       bg_cfg_section_transfer(s_src, s_dst);
       j++;
       }
     
     }
-  if(type_mask & BG_STREAM_SUBTITLE_OVERLAY)
+  if(type_mask & BG_STREAM_OVERLAY)
     {
     info = bg_plugin_registry_get_default(plugin_reg,
-                                          BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY, flag_mask);
-    bg_cfg_section_set_parameter_string(ret, "subtitle_overlay_encoder", info->name);
+                                          BG_PLUGIN_ENCODER_OVERLAY, flag_mask);
+    bg_cfg_section_set_parameter_string(ret, "overlay_encoder", info->name);
 
     bg_cfg_section_get_parameter_int(plugin_reg->config_section,
-                                     "encode_subtitle_overlay_to_video", &i);
-    bg_cfg_section_set_parameter_int(ret, "encode_subtitle_overlay_to_video", i);
+                                     "encode_overlay_to_video", &i);
+    bg_cfg_section_set_parameter_int(ret, "encode_overlay_to_video", i);
 
     i = 0;
-    while(strcmp(parameters[i].name, "subtitle_overlay_encoder"))
+    while(strcmp(parameters[i].name, "overlay_encoder"))
       i++;
     j = 0;
     while(parameters[i].multi_names[j])
@@ -3072,7 +3283,7 @@
       s_src = bg_cfg_section_find_subsection(plugin_reg->config_section,
                                              parameters[i].multi_names[j]);
 
-      s_dst = bg_cfg_section_find_subsection(ret, "subtitle_overlay_encoder");
+      s_dst = bg_cfg_section_find_subsection(ret, "overlay_encoder");
       s_dst = bg_cfg_section_find_subsection(s_dst, parameters[i].multi_names[j]);
       bg_cfg_section_transfer(s_src, s_dst);
       j++;
@@ -3125,7 +3336,7 @@
     {
     parameters_priv =
       bg_plugin_registry_create_encoder_parameters(plugin_reg,
-                                                   type_mask, flag_mask);
+                                                   type_mask, flag_mask, 1);
     parameters = parameters_priv;
     }
   
@@ -3157,20 +3368,20 @@
       j++;
       }
     }
-  if(type_mask & BG_STREAM_SUBTITLE_TEXT)
+  if(type_mask & BG_STREAM_TEXT)
     {
-    bg_cfg_section_get_parameter_string(s, "subtitle_text_encoder",
+    bg_cfg_section_get_parameter_string(s, "text_encoder",
                                         &name);
     bg_plugin_registry_set_default(plugin_reg,
-                                   BG_PLUGIN_ENCODER_SUBTITLE_TEXT,
+                                   BG_PLUGIN_ENCODER_TEXT,
                                    flag_mask, name);
     
-    bg_cfg_section_get_parameter_int(s, "encode_subtitle_text_to_video", &i);
+    bg_cfg_section_get_parameter_int(s, "encode_text_to_video", &i);
     bg_cfg_section_set_parameter_int(plugin_reg->config_section,
-                                     "encode_subtitle_text_to_video", i);
+                                     "encode_text_to_video", i);
     
     i = 0;
-    while(strcmp(parameters[i].name, "subtitle_text_encoder"))
+    while(strcmp(parameters[i].name, "text_encoder"))
       i++;
     j = 0;
     while(parameters[i].multi_names[j])
@@ -3178,7 +3389,7 @@
       s_dst = bg_cfg_section_find_subsection(plugin_reg->config_section,
                                              parameters[i].multi_names[j]);
 
-      s_src = bg_cfg_section_find_subsection(s, "subtitle_text_encoder");
+      s_src = bg_cfg_section_find_subsection(s, "text_encoder");
       s_src = bg_cfg_section_find_subsection(s_src,
                                              parameters[i].multi_names[j]);
       bg_cfg_section_transfer(s_src, s_dst);
@@ -3186,19 +3397,19 @@
       }
     
     }
-  if(type_mask & BG_STREAM_SUBTITLE_OVERLAY)
+  if(type_mask & BG_STREAM_OVERLAY)
     {
-    bg_cfg_section_get_parameter_string(s, "subtitle_overlay_encoder", &name);
+    bg_cfg_section_get_parameter_string(s, "overlay_encoder", &name);
     bg_plugin_registry_set_default(plugin_reg,
-                                   BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY,
+                                   BG_PLUGIN_ENCODER_OVERLAY,
                                    flag_mask, name);
     
-    bg_cfg_section_get_parameter_int(s, "encode_subtitle_overlay_to_video", &i);
+    bg_cfg_section_get_parameter_int(s, "encode_overlay_to_video", &i);
     bg_cfg_section_set_parameter_int(plugin_reg->config_section,
-                                     "encode_subtitle_overlay_to_video", i);
+                                     "encode_overlay_to_video", i);
     
     i = 0;
-    while(strcmp(parameters[i].name, "subtitle_overlay_encoder"))
+    while(strcmp(parameters[i].name, "overlay_encoder"))
       i++;
     j = 0;
     while(parameters[i].multi_names[j])
@@ -3206,7 +3417,7 @@
       s_dst = bg_cfg_section_find_subsection(plugin_reg->config_section,
                                              parameters[i].multi_names[j]);
 
-      s_src = bg_cfg_section_find_subsection(s, "subtitle_overlay_encoder");
+      s_src = bg_cfg_section_find_subsection(s, "overlay_encoder");
       s_src = bg_cfg_section_find_subsection(s_src,
                                              parameters[i].multi_names[j]);
       bg_cfg_section_transfer(s_src, s_dst);
@@ -3240,3 +3451,93 @@
     bg_parameter_info_destroy_array(parameters_priv);
   
   }
+
+static const bg_parameter_info_t compressor_parameters[] =
+  {
+    {
+      .name = "codec",
+      .long_name = TRS("Codec"),
+      .type = BG_PARAMETER_MULTI_MENU,
+      .flags = BG_PARAMETER_PLUGIN,
+      .val_default = { .val_str = "none" },
+      .multi_names = (const char *[]){ "none", NULL },
+      .multi_labels = (const char *[]){ TRS("None"), NULL },
+      .multi_descriptions = (const char *[]){ TRS("Write stream as uncompressed if possible"), NULL },
+      .multi_parameters = (const bg_parameter_info_t*[]) { NULL, NULL },
+    },
+    { /* End */ },
+  };
+
+
+bg_parameter_info_t *
+bg_plugin_registry_create_compressor_parameters(bg_plugin_registry_t * plugin_reg,
+                                                uint32_t flag_mask)
+  {
+  bg_parameter_info_t * ret =
+    bg_parameter_info_copy_array(compressor_parameters);
+  bg_plugin_registry_set_parameter_info(plugin_reg, BG_PLUGIN_CODEC,
+                                        flag_mask, ret);
+  return ret;
+  }
+
+void
+bg_plugin_registry_set_compressor_parameter(bg_plugin_registry_t * plugin_reg,
+                                            bg_plugin_handle_t ** plugin,
+                                            const char * name,
+                                            const bg_parameter_value_t * val)
+  {
+  if(!name)
+    {
+    if(*plugin && (*plugin)->plugin->set_parameter)
+      (*plugin)->plugin->set_parameter((*plugin)->priv, NULL, NULL);
+    return;
+    }
+
+  if(!strcmp(name, "codec"))
+    {
+    if(*plugin && (!val->val_str || strcmp((*plugin)->info->name, val->val_str)))
+      {
+      bg_plugin_unref(*plugin);
+      *plugin = NULL;
+      }
+
+    if(val->val_str && !strcmp(val->val_str, "none"))
+      return;
+    
+    if(val->val_str && !(*plugin))
+      {
+      const bg_plugin_info_t * info;
+      info = bg_plugin_find_by_name(plugin_reg, val->val_str);
+      if(!info)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find plugin %s",
+               val->val_str);
+        return;
+        }
+      *plugin = bg_plugin_load(plugin_reg, info);
+      }
+    
+    }
+  else
+    {
+    if(*plugin)
+      (*plugin)->plugin->set_parameter((*plugin)->priv, name, val);
+    }
+  
+  }
+
+gavl_codec_id_t
+bg_plugin_registry_get_compressor_id(bg_plugin_registry_t * plugin_reg,
+                                     bg_cfg_section_t * section)
+  {
+  const bg_plugin_info_t * info;
+  const char * codec = NULL;
+  if(!bg_cfg_section_get_parameter_string(section, "codec", &codec))
+    return GAVL_CODEC_ID_NONE;
+
+  info = bg_plugin_find_by_name(plugin_reg, codec);
+  if(!info)
+    return GAVL_CODEC_ID_NONE;
+  return info->compressions[0];
+  
+  }

gmerlin-1.2.0.tar.gz/lib/preset.c -> gmerlin-4256.tar.gz/lib/preset.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -99,10 +99,10 @@
     if(pos)
       {
       pos++;
-      name = bg_strdup(NULL, pos);
+      name = gavl_strdup(pos);
       }
     else
-      name = bg_strdup(NULL, filename);
+      name = gavl_strdup(filename);
 
     /* Check, if a preset with that name aready exists */
     
@@ -301,7 +301,7 @@
     dir = bg_sprintf("%s/.gmerlin/presets/%s", home_dir,
                      preset_path);
 
-    if(!bg_ensure_directory(dir))
+    if(!bg_ensure_directory(dir, 1))
       {
       bg_log(BG_LOG_ERROR, LOG_DOMAIN,
              "Could not create directory: %s", dir);
@@ -309,7 +309,7 @@
       return presets;
       }
     p = calloc(1, sizeof(*p));
-    p->name = bg_strdup(p->name, name);
+    p->name = gavl_strrep(p->name, name);
     p->file = bg_sprintf("%s/%s", dir, name);
     p->next = presets;
     presets = p;

gmerlin-1.2.0.tar.gz/lib/preset_xml.c -> gmerlin-4256.tar.gz/lib/preset_xml.c Changed

gmerlin-1.2.0.tar.gz/lib/recorder.c -> gmerlin-4256.tar.gz/lib/recorder.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -42,23 +42,26 @@
 const uint32_t bg_recorder_plugin_mask = BG_PLUGIN_FILE | BG_PLUGIN_BROADCAST;
 
 static void
-metadata_changed_callback(void * priv, const char * name,
-                          const gavl_metadata_t * m)
+metadata_changed_callback(void * priv, const gavl_metadata_t * m)
   {
+  int i;
+  
   bg_recorder_t * rec = priv;
   if(rec->metadata_mode != BG_RECORDER_METADATA_INPUT)
     return;
 
-  bg_log(BG_LOG_INFO, LOG_DOMAIN, "New track: %s", name);
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "New track");
+
+  for(i = 0; i < m->num_tags; i++)
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "  %s: %s", m->tags[i].key, m->tags[i].val);
   
   if(rec->enc && rec->encoding_finalized)
     {
-    bg_encoder_update_metadata(rec->enc, name, m);
+    bg_encoder_update_metadata(rec->enc, m);
     }
   else
     {
     gavl_metadata_copy(&rec->updated_metadata, m);
-    rec->updated_name = bg_strdup(rec->updated_name, name);
     }
   }
 
@@ -75,7 +78,7 @@
                                   BG_PLUGIN_RECORDER);
   
   ret->plugin_reg = plugin_reg;
-  ret->tc = bg_player_thread_common_create();
+  ret->tc = bg_thread_common_create();
   
   bg_recorder_create_audio(ret);
   bg_recorder_create_video(ret);
@@ -101,7 +104,7 @@
   bg_recorder_destroy_audio(rec);
   bg_recorder_destroy_video(rec);
 
-  bg_player_thread_common_destroy(rec->tc);
+  bg_thread_common_destroy(rec->tc);
 
   free(rec->display_string);
   
@@ -117,8 +120,6 @@
 
   gavl_metadata_free(&rec->m);
   gavl_metadata_free(&rec->updated_metadata);
-  if(rec->updated_name)
-    free(rec->updated_name);
   
   pthread_mutex_destroy(&rec->time_mutex);
   pthread_mutex_destroy(&rec->snapshot_mutex);
@@ -159,7 +160,8 @@
   rec->enc = bg_encoder_create(rec->plugin_reg,
                                rec->encoder_section,
                                NULL,
-                               bg_recorder_stream_mask, bg_recorder_plugin_mask);
+                               bg_recorder_stream_mask,
+                               bg_recorder_plugin_mask);
 
   if(rec->metadata_mode != BG_RECORDER_METADATA_STATIC)
     m = &rec->updated_metadata;
@@ -180,7 +182,7 @@
   if(rec->vs.flags & STREAM_ACTIVE)
     bg_recorder_video_finalize_encode(rec);
   
-  bg_encoder_update_metadata(rec->enc, rec->updated_name, &rec->updated_metadata);
+  bg_encoder_update_metadata(rec->enc, &rec->updated_metadata);
   rec->encoding_finalized = 1;
   return 1;
   }
@@ -239,21 +241,21 @@
     }
   
   if(rec->as.flags & STREAM_ACTIVE)
-    bg_player_thread_set_func(rec->as.th, bg_recorder_audio_thread, rec);
+    bg_thread_set_func(rec->as.th, bg_recorder_audio_thread, rec);
   else
-    bg_player_thread_set_func(rec->as.th, NULL, NULL);
+    bg_thread_set_func(rec->as.th, NULL, NULL);
 
   if(rec->vs.flags & STREAM_ACTIVE)
-    bg_player_thread_set_func(rec->vs.th, bg_recorder_video_thread, rec);
+    bg_thread_set_func(rec->vs.th, bg_recorder_video_thread, rec);
   else
-    bg_player_thread_set_func(rec->vs.th, NULL, NULL);
+    bg_thread_set_func(rec->vs.th, NULL, NULL);
   
   if(rec->flags & FLAG_DO_RECORD)
     rec->flags &= FLAG_RECORDING;
     
   
-  bg_player_threads_init(rec->th, NUM_THREADS);
-  bg_player_threads_start(rec->th, NUM_THREADS);
+  bg_threads_init(rec->th, NUM_THREADS);
+  bg_threads_start(rec->th, NUM_THREADS);
   
   rec->flags |= FLAG_RUNNING;
 
@@ -272,7 +274,7 @@
     rec->encoder_parameters =
       bg_plugin_registry_create_encoder_parameters(rec->plugin_reg,
                                                    bg_recorder_stream_mask,
-                                                   bg_recorder_plugin_mask);
+                                                   bg_recorder_plugin_mask, 1);
   return rec->encoder_parameters;
   }
 
@@ -286,7 +288,7 @@
   {
   if(!(rec->flags & FLAG_RUNNING))
     return;
-  bg_player_threads_join(rec->th, NUM_THREADS);
+  bg_threads_join(rec->th, NUM_THREADS);
   bg_recorder_audio_cleanup(rec);
   bg_recorder_video_cleanup(rec);
 
@@ -318,7 +320,7 @@
 
 void bg_recorder_set_display_string(bg_recorder_t * rec, const char * str)
   {
-  rec->display_string = bg_strdup(rec->display_string, str);
+  rec->display_string = gavl_strrep(rec->display_string, str);
   }
 
 /* Message stuff */
@@ -543,16 +545,16 @@
   rec = data;
   
   if(!strcmp(name, "output_directory"))
-    rec->output_directory = bg_strdup(rec->output_directory, val->val_str);
+    rec->output_directory = gavl_strrep(rec->output_directory, val->val_str);
   else if(!strcmp(name, "output_filename_mask"))
     rec->output_filename_mask =
-      bg_strdup(rec->output_filename_mask, val->val_str);
+      gavl_strrep(rec->output_filename_mask, val->val_str);
   else if(!strcmp(name, "snapshot_directory"))
     rec->snapshot_directory =
-      bg_strdup(rec->snapshot_directory, val->val_str);
+      gavl_strrep(rec->snapshot_directory, val->val_str);
   else if(!strcmp(name, "snapshot_filename_mask"))
     rec->snapshot_filename_mask =
-      bg_strdup(rec->snapshot_filename_mask, val->val_str);
+      gavl_strrep(rec->snapshot_filename_mask, val->val_str);
   }
 
 static const bg_parameter_info_t common_metadata_parameters[] =
@@ -667,7 +669,7 @@
 #define CHECK_STRING(key, val) \
   len = strlen(key); \
   if(!strncmp(key, line, len)) \
-    val = bg_strdup(val, line + len)
+    val = gavl_strrep(val, line + len)
 
 
 static void update_metadata(bg_recorder_t * rec)
@@ -700,7 +702,7 @@
     if(!pos)
       continue;
 
-    key = bg_strndup(NULL, line, pos);
+    key = gavl_strndup( line, pos);
     pos++;
     while(isspace(*pos))
       pos++;
@@ -711,24 +713,17 @@
     }
   bg_subprocess_close(sp);
 
-  if(!gavl_metadata_equal(&m, &rec->updated_metadata) ||
-     (!rec->updated_name && name) ||
-     (name && rec->updated_name && strcmp(name, rec->updated_name)))
+  if(!gavl_metadata_equal(&m, &rec->updated_metadata))
     {
     /* Metadata changed */
 
     if(rec->enc)
-      bg_encoder_update_metadata(rec->enc, name, &m);
-    
-    if(rec->updated_name)
-      free(rec->updated_name);
-    rec->updated_name = name;
+      bg_encoder_update_metadata(rec->enc, &m);
     
     gavl_metadata_free(&rec->updated_metadata);
     memcpy(&rec->updated_metadata, &m, sizeof(m));
-
-    if(name)
-      bg_log(BG_LOG_INFO, LOG_DOMAIN, "New track %s", name);
+    
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "New track");
     }
   else
     {

gmerlin-1.2.0.tar.gz/lib/recorder_audio.c -> gmerlin-4256.tar.gz/lib/recorder_audio.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -27,6 +27,7 @@
 #include <gmerlin/recorder.h>
 #include <recorder_private.h>
 #include <language_table.h>
+#include <gmerlin/utils.h>
 
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "recorder.audio"
@@ -43,7 +44,7 @@
   bg_gavl_audio_options_init(&as->opt);
   
   as->fc = bg_audio_filter_chain_create(&as->opt, rec->plugin_reg);
-  as->th = bg_player_thread_create(rec->tc);
+  as->th = bg_thread_create(rec->tc);
 
   as->pd = gavl_peak_detector_create();
 
@@ -73,7 +74,7 @@
   gavl_audio_converter_destroy(as->output_cnv);
   gavl_audio_converter_destroy(as->enc_cnv);
   bg_audio_filter_chain_destroy(as->fc);
-  bg_player_thread_destroy(as->th);
+  bg_thread_destroy(as->th);
 
   gavl_peak_detector_destroy(as->pd);
   pthread_mutex_destroy(&as->eof_mutex);
@@ -187,7 +188,6 @@
                                        const char * name,
                                        const bg_parameter_value_t * val)
   {
-  int need_restart;
   
   bg_recorder_t * rec = data;
   bg_recorder_audio_stream_t * as = &rec->as;
@@ -202,26 +202,21 @@
   bg_audio_filter_chain_lock(as->fc);
   bg_audio_filter_chain_set_parameter(as->fc, name, val);
   
-  if(bg_audio_filter_chain_need_restart(as->fc))
-    need_restart = 1;
-  else
-    need_restart = 0;
-
   bg_audio_filter_chain_unlock(as->fc);
   }
 
+
 void * bg_recorder_audio_thread(void * data)
   {
-  double peaks[2]; /* Doesn't work for > 2 channels!! */
   gavl_time_t idle_time = GAVL_TIME_SCALE / 100; // 10 ms
   bg_recorder_t * rec = data;
   bg_recorder_audio_stream_t * as = &rec->as;
 
-  bg_player_thread_wait_for_start(as->th);
+  bg_thread_wait_for_start(as->th);
   
   while(1)
     {
-    if(!bg_player_thread_check(as->th))
+    if(!bg_thread_check(as->th))
       break;
 
     if(bg_recorder_audio_get_eof(as))
@@ -235,16 +230,18 @@
       {
       bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Read failed (device unplugged?)");
       bg_recorder_audio_set_eof(as, 1);
-      continue; // Need to go to bg_player_thread_check to stop the thread cleanly
+      // Need to go to bg_thread_check to stop the thread cleanly
+      continue; 
       }
     /* Peak detection */    
     gavl_peak_detector_update(as->pd, as->pipe_frame);
+#if 0
     gavl_peak_detector_get_peaks(as->pd, NULL, NULL, peaks);
     if(as->pipe_format.num_channels == 1)
       peaks[1] = peaks[0];
     bg_recorder_msg_audiolevel(rec, peaks, as->pipe_frame->valid_samples);
     gavl_peak_detector_reset(as->pd);   	
-
+#endif
     /* Encoding */
     if(as->flags & STREAM_ENCODE_OPEN)
       {
@@ -267,16 +264,41 @@
 
   }
 
+static void peaks_callback(void * priv,
+                           int samples,
+                           const double * min,
+                           const double * max,
+                           const double * abs)
+  {
+  const gavl_audio_format_t * fmt;
+  double peaks[2]; /* Doesn't work for > 2 channels!! */
+  bg_recorder_t * rec = priv;
+  bg_recorder_audio_stream_t * as = &rec->as;
+
+  fmt = gavl_peak_detector_get_format(as->pd);
+  
+  peaks[0] = abs[0];
+  
+  if(fmt->num_channels == 1)
+    peaks[1] = abs[0];
+  else
+    peaks[1] = abs[1];
+
+  bg_recorder_msg_audiolevel(rec, peaks, samples);
+  gavl_peak_detector_reset(as->pd);
+  }
+
 int bg_recorder_audio_init(bg_recorder_t * rec)
   {
   bg_recorder_audio_stream_t * as = &rec->as;
 
   /* Open input */
-  if(!as->input_plugin->open(as->input_handle->priv, &as->input_format, NULL))
+  if(!as->input_plugin->open(as->input_handle->priv, &as->input_format, NULL, &as->m))
     {
     return 0;
     }
 
+  bg_metadata_date_now(&as->m, GAVL_META_DATE_CREATE);
   as->flags |= STREAM_INPUT_OPEN;
   
   as->in_func   = as->input_plugin->read_audio;
@@ -299,7 +321,8 @@
   /* Set up peak detection */
 
   gavl_peak_detector_set_format(as->pd, &as->pipe_format);
-
+  gavl_peak_detector_set_callbacks(as->pd, NULL, peaks_callback, rec);
+  
   /* Create frame(s) */
   
   as->pipe_frame = gavl_audio_frame_create(&as->pipe_format);
@@ -309,7 +332,7 @@
   if(as->flags & STREAM_ENCODE)
     {
     as->enc_index = bg_encoder_add_audio_stream(rec->enc, &as->m,
-                                                &as->pipe_format, 0);
+                                                &as->pipe_format, 0, NULL);
     }
   
   return 1;
@@ -347,6 +370,9 @@
   as->do_convert_enc = gavl_audio_converter_init(as->enc_cnv, &as->pipe_format,
                                                  &as->enc_format);
 
+  as->enc_format.samples_per_frame =
+    (as->pipe_format.samples_per_frame * as->enc_format.samplerate) / as->pipe_format.samplerate + 10;
+  
   if(as->do_convert_enc)
     as->enc_frame = gavl_audio_frame_create(&as->enc_format);

gmerlin-1.2.0.tar.gz/lib/recorder_video.c -> gmerlin-4256.tar.gz/lib/recorder_video.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,6 +35,8 @@
 
 #define FRAMERATE_INTERVAL 10
 
+#include <gavl/metatags.h>
+
 static int create_snapshot_cb(void * data, const char * filename)
   {
   bg_recorder_t * rec = data;
@@ -91,7 +93,7 @@
   
   vs->fc = bg_video_filter_chain_create(&vs->opt, rec->plugin_reg);
 
-  vs->th = bg_player_thread_create(rec->tc);
+  vs->th = bg_thread_create(rec->tc);
   vs->timer = gavl_timer_create();
   pthread_mutex_init(&vs->config_mutex, NULL);
 
@@ -132,7 +134,7 @@
   gavl_video_converter_destroy(vs->snapshot_cnv);
   
   bg_video_filter_chain_destroy(vs->fc);
-  bg_player_thread_destroy(vs->th);
+  bg_thread_destroy(vs->th);
   gavl_timer_destroy(vs->timer);
   pthread_mutex_destroy(&vs->config_mutex);
 
@@ -161,26 +163,6 @@
       .type      = BG_PARAMETER_MULTI_MENU,
       .flags     = BG_PARAMETER_PLUGIN,
     },
-    {
-      .name        = "do_limit_fps",
-      .long_name   = TRS("Limit fps"),
-      .type        = BG_PARAMETER_CHECKBUTTON,
-      .val_default = { .val_i = 1 },
-      .num_digits  = 2,
-      .help_string = TRS("Limit frames per second. "
-                         "By default, the maximum possible framerate will be used."),
-    },
-    {
-      .name        = "limit_fps",
-      .long_name   = TRS("fps limit"),
-      .type        = BG_PARAMETER_FLOAT,
-      .val_min     = { .val_f = 1.0 },
-      .val_max     = { .val_f = 100.0 },
-      .val_default = { .val_f = 25.0 },
-      .num_digits  = 2,
-      .help_string = TRS("Specify the maximum framerate for input plugins, which can \
-capture images really fast"),
-    },
     { },
   };
 
@@ -248,19 +230,6 @@
     if(vs->input_plugin->set_callbacks)
       vs->input_plugin->set_callbacks(vs->input_handle->priv, &rec->recorder_cb);
     }
-  else if(!strcmp(name, "limit_fps"))
-    {
-    pthread_mutex_lock(&vs->config_mutex);
-    vs->limit_timescale      = (int)(val->val_f * 100.0);
-    vs->limit_duration = 100;
-    pthread_mutex_unlock(&vs->config_mutex);
-    }
-  else if(!strcmp(name, "do_limit_fps"))
-    {
-    pthread_mutex_lock(&vs->config_mutex);
-    vs->do_limit_fps = val->val_i;
-    pthread_mutex_unlock(&vs->config_mutex);
-    }
   else if(vs->input_handle && vs->input_plugin->common.set_parameter)
     {
     vs->input_plugin->common.set_parameter(vs->input_handle->priv, name, val);
@@ -537,7 +506,7 @@
       }
     
     if(end - pos)
-      filename = bg_strncat(filename, pos, end);
+      filename = gavl_strncat(filename, pos, end);
     
     if(*end == '\0')
       break;
@@ -553,7 +522,7 @@
       mask[3] = 'd';
       mask[4] = '\0';
       sprintf(buf, mask, rec->vs.snapshot_counter);
-      filename = bg_strcat(filename, buf);
+      filename = gavl_strcat(filename, buf);
       pos += 3;
 
       if(have_count)
@@ -569,7 +538,7 @@
         have_time = 1;
         }
       strftime(buf, BUFFER_SIZE, "%Y-%m-%d", &time_date);
-      filename = bg_strcat(filename, buf);
+      filename = gavl_strcat(filename, buf);
       pos += 2;
       }
     /* Insert date */
@@ -582,12 +551,12 @@
         have_time = 1;
         }
       strftime(buf, BUFFER_SIZE, "%H-%M-%S", &time_date);
-      filename = bg_strcat(filename, buf);
+      filename = gavl_strcat(filename, buf);
       pos += 2;
       }
     else
       {
-      filename = bg_strcat(filename, "%");
+      filename = gavl_strcat(filename, "%");
       pos++;
       }
     }
@@ -667,8 +636,6 @@
   vs->snapshot_counter++;
   vs->last_snapshot_time = frame_time;
   }
-                      
-
 
 void * bg_recorder_video_thread(void * data)
   {
@@ -676,14 +643,14 @@
   bg_recorder_video_stream_t * vs = &rec->vs;
   gavl_video_frame_t * monitor_frame = NULL;
   gavl_time_t idle_time = GAVL_TIME_SCALE / 100; // 10 ms
-  bg_player_thread_wait_for_start(vs->th);
+  bg_thread_wait_for_start(vs->th);
 
   gavl_timer_set(vs->timer, 0);
   gavl_timer_start(vs->timer);
   
   while(1)
     {
-    if(!bg_player_thread_check(vs->th))
+    if(!bg_thread_check(vs->th))
       break;
 
     if(bg_recorder_video_get_eof(vs))
@@ -696,20 +663,22 @@
     
     if(vs->flags & STREAM_MONITOR)
       {
-      monitor_frame =
-        vs->monitor_plugin->get_frame(vs->monitor_handle->priv);
+      monitor_frame = gavl_video_sink_get_frame(vs->monitor_sink);
       if(!vs->do_convert_monitor)
         vs->pipe_frame = monitor_frame;
       }
 
     if(!vs->pipe_frame)
+      {
+      if(!vs->pipe_frame_priv)
+        vs->pipe_frame_priv = gavl_video_frame_create(&vs->pipe_format);
       vs->pipe_frame = vs->pipe_frame_priv;
-    
+      }
     if(!vs->in_func(vs->in_data, vs->pipe_frame, vs->in_stream))
       {
       bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Read failed (device unplugged?)");
       bg_recorder_video_set_eof(vs, 1);
-      continue; // Need to go to bg_player_thread_check to stop the thread cleanly
+      continue; // Need to go to bg_thread_check to stop the thread cleanly
       }
     /* Check whether to make a snapshot */
     check_snapshot(rec);
@@ -718,9 +687,21 @@
     if(vs->flags & STREAM_MONITOR)
       {
       if(vs->do_convert_monitor)
+        {
+        if(!monitor_frame)
+          {
+          if(!vs->monitor_frame_priv)
+            vs->monitor_frame_priv =
+              gavl_video_frame_create(&vs->monitor_format);
+          monitor_frame = vs->monitor_frame_priv;
+          }
         gavl_video_convert(vs->monitor_cnv, vs->pipe_frame, monitor_frame);
+          
+        }
+      else if(!monitor_frame)
+        monitor_frame = vs->pipe_frame;
       
-      vs->monitor_plugin->put_video(vs->monitor_handle->priv, monitor_frame);
+      gavl_video_sink_put_frame(vs->monitor_sink, monitor_frame);
       }
     if(vs->monitor_plugin && vs->monitor_plugin->handle_events)
       vs->monitor_plugin->handle_events(vs->monitor_handle->priv);
@@ -750,34 +731,13 @@
 
 static int read_video_internal(void * data, gavl_video_frame_t * frame, int stream)
   {
-  gavl_time_t diff_time, time_after, cur_time, next_frame_time;
+  gavl_time_t time_after, cur_time;
   
   int ret;
 
   bg_recorder_t * rec = data;
   bg_recorder_video_stream_t * vs = &rec->vs;
   
-  /* Limit the captured framerate */
-  if(vs->frame_counter)
-    {
-    pthread_mutex_lock(&vs->config_mutex);
-
-    if(vs->do_limit_fps)
-      {
-      next_frame_time = vs->last_frame_time +
-        gavl_frames_to_time(vs->limit_timescale, vs->limit_duration, 1);
-      pthread_mutex_unlock(&vs->config_mutex);
-    
-      cur_time = gavl_timer_get(vs->timer);
-      diff_time = next_frame_time - cur_time - vs->last_capture_duration;
-    
-      if(diff_time > 0)
-        gavl_time_delay(&diff_time);
-      }
-    else
-      pthread_mutex_unlock(&vs->config_mutex);
-    }
-  
   cur_time = gavl_timer_get(vs->timer);
   ret = vs->input_plugin->read_video(vs->input_handle->priv, frame, 0);
   time_after = gavl_timer_get(vs->timer);
@@ -812,9 +772,11 @@
   vs->fps_frame_counter = 0;
 
   /* Open input */
-  if(!vs->input_plugin->open(vs->input_handle->priv, NULL, &vs->input_format))
+  if(!vs->input_plugin->open(vs->input_handle->priv, NULL,
+                             &vs->input_format, &vs->m))
     return 0;
-
+  bg_metadata_date_now(&vs->m, GAVL_META_DATE_CREATE);
+  
   vs->flags |= STREAM_INPUT_OPEN;
   
 
@@ -840,10 +802,20 @@
   if(vs->flags & STREAM_MONITOR)
     {
     gavl_video_format_copy(&vs->monitor_format, &vs->pipe_format);
-    vs->monitor_plugin->open(vs->monitor_handle->priv, &vs->monitor_format, 1);
-
-    vs->do_convert_monitor = gavl_video_converter_init(vs->monitor_cnv, &vs->pipe_format,
-                                                       &vs->monitor_format);
+    if(!vs->monitor_plugin->open(vs->monitor_handle->priv,
+                                 &vs->monitor_format, 1))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "Opening monitor plugin failed");
+      return 0;
+      }
+    vs->monitor_sink =
+      vs->monitor_plugin->get_sink(vs->monitor_handle->priv);
+    
+    vs->do_convert_monitor =
+      gavl_video_converter_init(vs->monitor_cnv,
+                                &vs->pipe_format,
+                                &vs->monitor_format);
     vs->flags |= STREAM_MONITOR_OPEN;
 
     if(vs->monitor_plugin->show_window && !rec->display_string)
@@ -861,7 +833,7 @@
   if(vs->flags & STREAM_ENCODE)
     {
     vs->enc_index =
-      bg_encoder_add_video_stream(rec->enc, NULL, &vs->pipe_format, 0);
+      bg_encoder_add_video_stream(rec->enc, &vs->m, &vs->pipe_format, 0, NULL);
     }
   
   /* Create frames */
@@ -875,8 +847,6 @@
       vs->monitor_frame = gavl_video_frame_create(&vs->monitor_format);
     }
 #endif
-  if(vs->do_convert_monitor || !(vs->flags & STREAM_MONITOR))
-    vs->pipe_frame_priv = gavl_video_frame_create(&vs->pipe_format);
   
   /* Initialize snapshot counter */
   
@@ -924,7 +894,11 @@
   if(vs->pipe_frame_priv)
     gavl_video_frame_destroy(vs->pipe_frame_priv);
   
+  if(vs->monitor_frame_priv)
+    gavl_video_frame_destroy(vs->monitor_frame_priv);
+
   vs->pipe_frame_priv = NULL;
+  vs->monitor_frame_priv = NULL;
   
   if(vs->flags & STREAM_MONITOR_OPEN)
     vs->monitor_plugin->close(vs->monitor_handle->priv);

gmerlin-1.2.0.tar.gz/lib/remote.c -> gmerlin-4256.tar.gz/lib/remote.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -52,7 +52,7 @@
 typedef struct server_connection_s 
   {
   int fd;
-  int do_put_msg;
+  int put_msg;
   struct server_connection_s * next;
   } server_connection_t;
 
@@ -69,10 +69,10 @@
   int max_connections;
 
   server_connection_t * connections;
-
+  server_connection_t * current_connection;
+  
   int do_reopen;
   bg_msg_t * msg;
-  int last_read_fd;
   };
 
 bg_remote_server_t * bg_remote_server_create(int listen_port,
@@ -81,7 +81,7 @@
   bg_remote_server_t * ret;
   ret = calloc(1, sizeof(*ret));
   ret->listen_port = listen_port;
-  ret->protocol_id = bg_strdup(ret->protocol_id, protocol_id);
+  ret->protocol_id = gavl_strrep(ret->protocol_id, protocol_id);
   ret->fd = -1;
   ret->msg = bg_msg_create();
   return ret;
@@ -93,7 +93,8 @@
   if(!s->allow_remote)
     flags |= BG_SOCKET_LOOPBACK;
   
-  s->fd = bg_listen_socket_create_inet(s->listen_port,
+  s->fd = bg_listen_socket_create_inet(NULL,
+                                       s->listen_port,
                                        s->max_connections,
                                        flags);
   if(s->fd < 0)
@@ -130,8 +131,7 @@
 
   strings = bg_strbreak(buffer, ' ');
   if(!strings[0] || strcmp(strings[0], s->protocol_id) ||
-     !strings[1] || strcmp(strings[1], VERSION) ||
-     !strings[2])
+     !strings[1] || strcmp(strings[1], VERSION))
     {
     bg_log(BG_LOG_INFO, LOG_DOMAIN_SERVER, "Protocol mismatch");
     goto fail;
@@ -142,15 +142,12 @@
   welcome_msg = bg_sprintf("%s %s\r\n", s->protocol_id, VERSION);
 
   len = strlen(welcome_msg);
-
-    
+  
   if(bg_socket_write_data(fd, (uint8_t*)welcome_msg, len) < len)
     goto fail;
   
-
   ret = calloc(1, sizeof(*ret));
   ret->fd = fd;
-  ret->do_put_msg = atoi(strings[2]);
   fail:
   if(buffer)
     free(buffer);
@@ -204,7 +201,7 @@
   
   /* Check for new connections */
 
-  new_fd = bg_listen_socket_accept(s->fd);
+  new_fd = bg_listen_socket_accept(s->fd, 0, NULL);
 
   if(new_fd >= 0)
     {
@@ -219,45 +216,49 @@
     }
   }
 
-static int select_socket(int fd, int milliseconds)
+void bg_remote_server_request_msg(bg_remote_server_t * s)
   {
-  fd_set rset;
-  struct timeval timeout;
-
-  FD_ZERO (&rset);
-  FD_SET  (fd, &rset);
-
-  timeout.tv_sec  = milliseconds / 1000;
-  timeout.tv_usec = (milliseconds % 1000) * 1000;
-  
-  if(select (fd+1, &rset, NULL, NULL, &timeout) > 0)
-    return 1;
-  return 0;
+  if(s->current_connection)
+    s->current_connection->put_msg = 1;
   }
 
 bg_msg_t * bg_remote_server_get_msg(bg_remote_server_t * s)
   {
-  server_connection_t * conn, * tmp_conn;
-  check_connections(s);
+  server_connection_t * conn;
+  
+  /* Open incoming connections */
 
+  check_connections(s);
   if(!s->connections)
     return NULL;
-
-  conn = s->connections;
-    
+  
+  if(s->current_connection)
+    conn = s->current_connection->next;
+  else
+    conn = s->connections;
+  
+  s->current_connection = NULL;
+  
   while(conn)
     {
-    if(select_socket(conn->fd, 0))
+    if(conn->put_msg)
+      {
+      if(!(conn = conn->next))
+        break;
+      }
+    
+    if(bg_socket_can_read(conn->fd, 0))
       {
       bg_msg_free(s->msg);
       if(bg_msg_read_socket(s->msg, conn->fd, -1))
         {
-        s->last_read_fd = conn->fd;
+        s->current_connection = conn; 
         return s->msg;
         }
       else /* Select said reading won't block but reading failed
               -> Client probably disconnected */
         {
+        server_connection_t * tmp_conn;
         tmp_conn = conn->next;
         s->connections = remove_connection(s->connections, conn);
         conn = tmp_conn;
@@ -279,7 +280,10 @@
 int bg_remote_server_done_msg_write(bg_remote_server_t * s)
   {
   /* Write message */
-  return bg_msg_write_socket(s->msg, s->last_read_fd);
+  if(s->current_connection)
+    return bg_msg_write_socket(s->msg, s->current_connection->fd);
+  else
+    return 0;
   }
 
 void bg_remote_server_wait_close(bg_remote_server_t * s)
@@ -296,7 +300,25 @@
 
 void bg_remote_server_put_msg(bg_remote_server_t * s, bg_msg_t * m)
   {
+  server_connection_t * conn = s->connections;
   
+  while(conn)
+    {
+    if(conn->put_msg)
+      {
+      if(!bg_msg_write_socket(m, conn->fd))
+        {
+        server_connection_t * tmp_conn;
+        tmp_conn = conn->next;
+        s->connections = remove_connection(s->connections, conn);
+        conn = tmp_conn;
+        }
+      else
+        conn = conn->next;
+      }
+    else
+      conn = conn->next;
+    }
   }
 
 void bg_remote_server_destroy(bg_remote_server_t * s)
@@ -382,19 +404,16 @@
   {
   int fd;
   char * protocol_id;
-  int read_messages;
 
   bg_msg_t * msg;
   int milliseconds; /* Read and connect timeout */
   };
 
-bg_remote_client_t * bg_remote_client_create(const char * protocol_id,
-                                             int read_messages)
+bg_remote_client_t * bg_remote_client_create(const char * protocol_id)
   {
   bg_remote_client_t * ret;
   ret = calloc(1, sizeof(*ret));
-  ret->protocol_id = bg_strdup(ret->protocol_id, protocol_id);
-  ret->read_messages = read_messages;
+  ret->protocol_id = gavl_strrep(ret->protocol_id, protocol_id);
   ret->msg = bg_msg_create();
   return ret;
   }
@@ -417,9 +436,9 @@
   
   char * answer_message;
     
-  bg_host_address_t * addr = bg_host_address_create();
+  bg_socket_address_t * addr = bg_socket_address_create();
   c->milliseconds = milliseconds;
-  if(!bg_host_address_set(addr, host, port, SOCK_STREAM))
+  if(!bg_socket_address_set(addr, host, port, SOCK_STREAM))
     goto fail;
   c->fd = bg_socket_connect_inet(addr, c->milliseconds);
   if(c->fd < 0)
@@ -429,8 +448,8 @@
     }
 
   /* Send hello line */
-  answer_message = bg_sprintf("%s %s %s\r\n", c->protocol_id,
-                              VERSION, (c->read_messages ? "1" : "0"));
+  answer_message = bg_sprintf("%s %s\r\n", c->protocol_id,
+                              VERSION);
   len = strlen(answer_message);
 
   if(bg_socket_write_data(c->fd, (uint8_t*)answer_message, len) < len)
@@ -462,7 +481,7 @@
   fail:
   if(strings)
     bg_strbreak_free(strings);
-  bg_host_address_destroy(addr);
+  bg_socket_address_destroy(addr);
   return ret;
   }
 
@@ -489,14 +508,15 @@
   return bg_msg_write_socket(c->msg, c->fd);
   }
 
-bg_msg_t * bg_remote_client_get_msg_read(bg_remote_client_t * c)
+bg_msg_t * bg_remote_client_get_msg_read(bg_remote_client_t * c,
+                                         int timeout)
   {
-  if(select_socket(c->fd, 1000))
-    {
-    bg_msg_free(c->msg);
-    if(bg_msg_read_socket(c->msg, c->fd, -1))
-      return c->msg;
-    }
+  if((timeout >= 0) && !bg_socket_can_read(c->fd, timeout))
+    return NULL;
+
+  bg_msg_free(c->msg);
+  if(bg_msg_read_socket(c->msg, c->fd, -1))
+    return c->msg;
   return NULL;
   }

gmerlin-1.2.0.tar.gz/lib/searchpath.c -> gmerlin-4256.tar.gz/lib/searchpath.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -92,7 +92,7 @@
 
   testdir  = bg_sprintf("%s/.%s/%s", home_dir, PACKAGE, directory);
 
-  if(!bg_ensure_directory(testdir))
+  if(!bg_ensure_directory(testdir, 1))
     {
     free(testdir);
     return NULL;
@@ -115,7 +115,10 @@
     }
   }
 
-int bg_ensure_directory(const char * dir)
+// S_IRUSR|S_IWUSR|S_IXUSR
+// S_IRUSR|S_IWUSR|S_IXUSR|
+
+int bg_ensure_directory(const char * dir, int priv)
   {
   char ** directories;
   char * subpath = NULL;
@@ -143,13 +146,17 @@
   while(directories[i])
     {
     if(i || absolute)
-      subpath = bg_strcat(subpath, "/");
+      subpath = gavl_strcat(subpath, "/");
 
-    subpath = bg_strcat(subpath, directories[i]);
+    subpath = gavl_strcat(subpath, directories[i]);
 
     if(access(subpath, R_OK) && (errno == ENOENT))
       {
-      if(mkdir(subpath, S_IRUSR|S_IWUSR|S_IXUSR) == -1)
+      mode_t mode = S_IRUSR|S_IWUSR|S_IXUSR;
+      if(!priv)
+        mode |= S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH;
+      
+      if(mkdir(subpath, mode) == -1)
         {
         bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Creating directory %s failed: %s",
                subpath, strerror(errno));
@@ -251,7 +258,7 @@
     {
     if(bg_search_file_exec(webbrowsers[i].command, NULL))
       {
-      return bg_strdup(NULL, webbrowsers[i].template);
+      return gavl_strdup(webbrowsers[i].template);
       }
     }
   return NULL;
@@ -268,7 +275,7 @@
   
   complete_path = bg_sprintf("file://%s/%s", DOC_DIR, path);
   command = bg_sprintf(url_launcher, complete_path);
-  command = bg_strcat(command, " &");
+  command = gavl_strcat(command, " &");
   bg_system(command);
   free(command);
   free(url_launcher);

gmerlin-1.2.0.tar.gz/lib/serialize.c -> gmerlin-4256.tar.gz/lib/serialize.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -413,11 +413,11 @@
   }
 
 int
-bg_deserialize_audio_frame(gavl_dsp_context_t * ctx,
+bg_deserialize_audio_frame(gavl_dsp_context_t ** ctx,
                            const gavl_audio_format_t * format,
+                           const gavl_metadata_t * m,
                            gavl_audio_frame_t * frame,
-                           bg_serialize_read_callback_t cb, void * cb_data,
-                           int big_endian)
+                           bg_serialize_read_callback_t cb, void * cb_data)
   {
   int len, bytes_per_sample, i;
   
@@ -455,19 +455,19 @@
         return 0;
       break;
     }
-  
-#ifndef WORDS_BIGENDIAN
-  if(big_endian)
-    gavl_dsp_audio_frame_swap_endian(ctx, frame, format);
-#else
-  if(!big_endian)
-    gavl_dsp_audio_frame_swap_endian(ctx, frame, format);
-#endif
+
+  if(gavl_metadata_do_swap_endian(m))
+    {
+    if(!(*ctx))
+      *ctx = gavl_dsp_context_create();
+    gavl_dsp_audio_frame_swap_endian(*ctx, frame, format);
+    }
   
   return 1;
   }
 
-static int write_plane(const uint8_t * plane, int stride, int bytes_per_line, int height,
+static int write_plane(const uint8_t * plane, int stride,
+                       int bytes_per_line, int height,
                        bg_serialize_write_callback_t cb, void * cb_data)
   {
   int i;
@@ -494,14 +494,17 @@
 
   if(num_planes == 1)
     {
-    bytes_per_line = gavl_pixelformat_bytes_per_pixel(format->pixelformat) * format->image_width;
+    bytes_per_line =
+      gavl_pixelformat_bytes_per_pixel(format->pixelformat) *
+      format->image_width;
     return write_plane(frame->planes[0], frame->strides[0], bytes_per_line,
                        format->image_height, cb, cb_data);
     }
   else
     {
     int h = format->image_height;
-    bytes_per_line = format->image_width * gavl_pixelformat_bytes_per_component(format->pixelformat);
+    bytes_per_line = format->image_width *
+      gavl_pixelformat_bytes_per_component(format->pixelformat);
     gavl_pixelformat_chroma_sub(format->pixelformat, &sub_h, &sub_v);
 
     for(i = 0; i < num_planes; i++)
@@ -522,7 +525,8 @@
 
 /* */
 
-static int read_plane(uint8_t * plane, int stride, int bytes_per_line, int height,
+static int read_plane(uint8_t * plane, int stride, int bytes_per_line,
+                      int height,
                       bg_serialize_read_callback_t cb, void * cb_data)
   {
   int i;
@@ -552,14 +556,17 @@
 
   if(num_planes == 1)
     {
-    bytes_per_line = gavl_pixelformat_bytes_per_pixel(format->pixelformat) * format->image_width;
+    bytes_per_line =
+      gavl_pixelformat_bytes_per_pixel(format->pixelformat) *
+      format->image_width;
     return read_plane(frame->planes[0], frame->strides[0], bytes_per_line,
                        format->image_height, cb, cb_data);
     }
   else
     {
     int h = format->image_height;
-    bytes_per_line = format->image_width * gavl_pixelformat_bytes_per_component(format->pixelformat);
+    bytes_per_line = format->image_width *
+      gavl_pixelformat_bytes_per_component(format->pixelformat);
     gavl_pixelformat_chroma_sub(format->pixelformat, &sub_h, &sub_v);
 
     for(i = 0; i < num_planes; i++)

gmerlin-1.2.0.tar.gz/lib/singlepic.c -> gmerlin-4256.tar.gz/lib/singlepic.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -60,9 +60,9 @@
     {
     info = bg_plugin_find_by_index(reg, i,
                                    type_mask, flag_mask);
-    ret = bg_strcat(ret, info->extensions);
+    ret = gavl_strcat(ret, info->extensions);
     if(i < num-1)
-      ret = bg_strcat(ret, " ");
+      ret = gavl_strcat(ret, " ");
     }
   return ret;
   }
@@ -130,6 +130,11 @@
   bg_stream_action_t action;
 
   int do_still;
+
+  gavl_video_source_t * src;
+  gavl_packet_source_t * psrc;
+
+  gavl_compression_info_t ci;
   } input_t;
 
 static const bg_parameter_info_t * get_parameters_input(void * priv)
@@ -166,7 +171,6 @@
     }
   }
 
-
 static int open_input(void * priv, const char * filename)
   {
   const bg_plugin_info_t * info;
@@ -177,7 +181,6 @@
   const gavl_metadata_t * m;
   
   input_t * inp = priv;
-
   
   /* Check if the first file exists */
   
@@ -227,13 +230,13 @@
   /* Now, cut the pieces together */
 
   if(pos_start != filename)
-    inp->template = bg_strncat(inp->template, filename, pos_start);
+    inp->template = gavl_strncat(inp->template, filename, pos_start);
 
   tmp_string = bg_sprintf("%%0%dd", (int)(pos_end - pos_start));
-  inp->template = bg_strcat(inp->template, tmp_string);
+  inp->template = gavl_strcat(inp->template, tmp_string);
   free(tmp_string);
 
-  inp->template = bg_strcat(inp->template, pos_end);
+  inp->template = gavl_strcat(inp->template, pos_end);
 
   inp->frame_start = strtoll(pos_start, NULL, 10);
   inp->frame_end = inp->frame_start+1;
@@ -253,12 +256,13 @@
   inp->track_info.num_video_streams = 1;
   inp->track_info.video_streams =
     calloc(1, sizeof(*inp->track_info.video_streams));
-  
-  inp->track_info.duration = gavl_frames_to_time(inp->timescale,
-                                                 inp->frame_duration,
-                                                 inp->frame_end -
-                                                 inp->frame_start);
-  
+
+  gavl_metadata_set_long(&inp->track_info.metadata, GAVL_META_APPROX_DURATION,
+                    gavl_frames_to_time(inp->timescale,
+                                        inp->frame_duration,
+                                        inp->frame_end -
+                                        inp->frame_start));
+    
   /* Get track name */
 
   bg_set_track_name_default(&inp->track_info, filename);
@@ -341,13 +345,13 @@
   inp->track_info.video_streams[0].format.framerate_mode =
     GAVL_FRAMERATE_STILL;
   
-  inp->track_info.duration = inp->display_time;
+  gavl_metadata_set_long(&inp->track_info.metadata, GAVL_META_APPROX_DURATION, inp->display_time);
   
   /* Get track name */
 
   bg_set_track_name_default(&inp->track_info, filename);
 
-  inp->filename_buffer = bg_strdup(inp->filename_buffer, filename);
+  inp->filename_buffer = gavl_strrep(inp->filename_buffer, filename);
 
   if(!inp->image_reader->read_header(inp->handle->priv,
                                      inp->filename_buffer,
@@ -412,44 +416,39 @@
 static int get_compression_info_input(void * priv, int stream,
                                       gavl_compression_info_t * ci)
   {
-  int ret;
   input_t * inp = priv;
-  if(!inp->image_reader || !inp->image_reader->get_compression_info)
-    return 0;
-  ret = inp->image_reader->get_compression_info(inp->handle->priv, ci);
 
-  if(ret)
+  if(inp->ci.id == GAVL_CODEC_ID_NONE)
     {
-    if(gavl_compression_need_pixelformat(ci->id) &&
-       (inp->track_info.video_streams[0].format.pixelformat == GAVL_PIXELFORMAT_NONE))
+    if(!inp->image_reader || !inp->image_reader->get_compression_info)
+      return 0;
+    
+    if(!inp->image_reader->get_compression_info(inp->handle->priv, &inp->ci))
       return 0;
     }
-  return ret;
-  }
-
-static int start_input(void * priv)
-  {
+  
+  if(gavl_compression_need_pixelformat(inp->ci.id) &&
+     (inp->track_info.video_streams[0].format.pixelformat == GAVL_PIXELFORMAT_NONE))
+    return 0;
+  
+  gavl_compression_info_copy(ci, &inp->ci);
   return 1;
   }
 
-static int has_frame_input(void * priv, int stream)
-  {
-  return 1;
-  }
-                           
-static int read_video_frame_input(void * priv, gavl_video_frame_t* f,
-                                  int stream)
+static gavl_source_status_t
+read_video_func_input(void * priv, gavl_video_frame_t ** fp)
   {
   gavl_video_format_t format;
   input_t * inp = priv;
+  gavl_video_frame_t * f = *fp;
   
   if(inp->do_still)
     {
     if(inp->current_frame)
-      return 0;
+      return GAVL_SOURCE_EOF;
     }
   else if(inp->current_frame == inp->frame_end)
-    return 0;
+    return GAVL_SOURCE_EOF;
   
   if(!inp->header_read)
     {
@@ -459,26 +458,27 @@
     if(!inp->image_reader->read_header(inp->handle->priv,
                                        inp->filename_buffer,
                                        &format))
-      return 0;
+      return GAVL_SOURCE_EOF;
     }
   if(!inp->image_reader->read_image(inp->handle->priv, f))
     {
-    return 0;
+    return GAVL_SOURCE_EOF;
     }
   if(f)
     {
     f->timestamp = (inp->current_frame - inp->frame_start) * inp->frame_duration;
 
-    if(!inp->do_still)
+    if(inp->do_still)
+      f->duration = -1;
+    else
       f->duration = inp->frame_duration;
     }
   inp->header_read = 0;
   inp->current_frame++;
-  
-  return 1;
+  return GAVL_SOURCE_OK;
   }
 
-static int read_video_packet_input(void * priv, int stream, gavl_packet_t* p)
+static gavl_source_status_t read_video_packet_input(void * priv, gavl_packet_t ** p)
   {
   FILE * in;
   int64_t size;
@@ -489,10 +489,10 @@
   if(inp->do_still)
     {
     if(inp->current_frame)
-      return 0;
+      return GAVL_SOURCE_EOF;
     }
   else if(inp->current_frame == inp->frame_end)
-    return 0;
+    return GAVL_SOURCE_EOF;
   
   in = fopen(inp->filename_buffer, "rb");
   if(!in)
@@ -502,27 +502,71 @@
   size = ftell(in);
   fseek(in, 0, SEEK_SET);
 
-  gavl_packet_alloc(p, size);
+  gavl_packet_alloc(*p, size);
 
-  p->data_len = fread(p->data, 1, size, in);
+  (*p)->data_len = fread((*p)->data, 1, size, in);
   
   fclose(in);
   
-  if(p->data_len < size)
+  if((*p)->data_len < size)
     return 0;
 
-  p->pts = (inp->current_frame - inp->frame_start) * inp->frame_duration;
+  (*p)->pts = (inp->current_frame - inp->frame_start) * inp->frame_duration;
   
-  p->flags = GAVL_PACKET_KEYFRAME;
+  (*p)->flags = GAVL_PACKET_KEYFRAME;
   
   if(!inp->do_still)
-    p->duration = inp->frame_duration;
-
+    (*p)->duration = inp->frame_duration;
+  
   inp->current_frame++;
   
   return 1;
   }
 
+
+static int start_input(void * priv)
+  {
+  input_t * inp = priv;
+  if(inp->action == BG_STREAM_ACTION_DECODE)
+    inp->src = gavl_video_source_create(read_video_func_input, inp,
+                                        0, &inp->track_info.video_streams[0].format);
+  else if(inp->action == BG_STREAM_ACTION_READRAW)
+    inp->psrc =
+      gavl_packet_source_create_video(read_video_packet_input,
+                                      inp, 0,
+                                      &inp->ci,
+                                      &inp->track_info.video_streams[0].format);
+  
+  return 1;
+  }
+
+static gavl_video_source_t * get_video_source_input(void * priv, int stream)
+  {
+  input_t * inp = priv;
+  return inp->src;
+  }
+
+#if 0
+static int has_frame_input(void * priv, int stream)
+  {
+  return 1;
+  }
+                           
+static int read_video_frame_input(void * priv, gavl_video_frame_t* f,
+                                  int stream)
+  {
+  input_t * inp = priv;
+  return gavl_video_source_read_frame(inp->src, &f) == GAVL_SOURCE_OK;
+  }
+#endif
+
+
+static gavl_packet_source_t * get_video_packet_source_input(void * priv, int track)
+  {
+  input_t * inp = priv;
+  return inp->psrc;
+  }
+
 static int set_track_input_stills(void * priv, int track)
   {
   input_t * inp = priv;
@@ -577,6 +621,18 @@
     bg_plugin_unref(inp->handle);
   inp->handle = NULL;
   inp->image_reader = NULL;
+
+  if(inp->src)
+    {
+    gavl_video_source_destroy(inp->src);
+    inp->src = NULL;
+    }
+  if(inp->psrc)
+    {
+    gavl_packet_source_destroy(inp->psrc);
+    inp->psrc = NULL;
+    }
+  gavl_compression_info_free(&inp->ci);
   }
 
 static void destroy_input(void* priv)
@@ -616,9 +672,10 @@
      *  in the stream infos to check out, which streams are to be decoded
      */
     .start =                 start_input,
-    /* Read one video frame (returns FALSE on EOF) */
-    .read_video =      read_video_frame_input,
-    .read_video_packet = read_video_packet_input,
+
+    .get_video_source = get_video_source_input,
+    .get_video_packet_source = get_video_packet_source_input,
+
     /*
      *  Do percentage seeking (can be NULL)
      *  Media streams are supposed to be seekable, if this
@@ -664,10 +721,9 @@
      */
     .start =                 start_input,
 
-    .has_still =             has_frame_input,
+    .get_video_source = get_video_source_input,
     
     /* Read one video frame (returns FALSE on EOF) */
-    .read_video =      read_video_frame_input,
     /*
      *  Do percentage seeking (can be NULL)
      *  Media streams are supposed to be seekable, if this
@@ -801,6 +857,9 @@
   bg_iw_callbacks_t iw_callbacks;
   
   const gavl_compression_info_t * ci;
+
+  gavl_video_sink_t * sink;
+  gavl_packet_sink_t * psink;
   
   } encoder_t;
 
@@ -822,7 +881,7 @@
 
 static const bg_parameter_info_t * get_parameters_encoder(void * priv)
   {
-  encoder_t * enc = (encoder_t *)priv;
+  encoder_t * enc = priv;
   
   if(!enc->parameters)
     enc->parameters = create_encoder_parameters(enc->plugin_reg);
@@ -834,8 +893,7 @@
   {
   const bg_plugin_info_t * info;
   
-  encoder_t * e;
-  e = (encoder_t *)priv;
+  encoder_t * e = priv;
   
   if(!name)
     {
@@ -887,10 +945,10 @@
   {
   char * tmp_string;
   int filename_len;
-  e->mask = bg_strdup(e->mask, e->filename_base);
+  e->mask = gavl_strrep(e->mask, e->filename_base);
   
   tmp_string = bg_sprintf("-%%0%d"PRId64".%s", e->frame_digits, ext);
-  e->mask = bg_strcat(e->mask, tmp_string);
+  e->mask = gavl_strcat(e->mask, tmp_string);
   free(tmp_string);
   
   filename_len = strlen(e->filename_base) + e->frame_digits + strlen(ext) + 16;
@@ -899,14 +957,12 @@
 
 static int open_encoder(void * data, const char * filename,
                         const gavl_metadata_t * metadata,
-                        const bg_chapter_list_t * chapter_list)
+                        const gavl_chapter_list_t * chapter_list)
   {
-  encoder_t * e;
-  
-  e = (encoder_t *)data;
+  encoder_t * e = data;
   
   e->frame_counter = e->frame_offset;
-  e->filename_base = bg_strdup(e->filename_base, filename);
+  e->filename_base = gavl_strrep(e->filename_base, filename);
   
   if(metadata)
     gavl_metadata_copy(&e->metadata, metadata);
@@ -935,13 +991,75 @@
   return ret;
   }
 
+static gavl_sink_status_t
+write_video_func_encoder(void * data, gavl_video_frame_t * frame)
+  {
+  int ret = 1;
+  encoder_t * e = data;
+
+  if(!e->have_header)
+    ret = write_frame_header(e);
+  if(ret)
+    ret = e->image_writer->write_image(e->plugin_handle->priv, frame);
+  
+  e->have_header = 0;
+  
+  return ret ? GAVL_SINK_OK : GAVL_SINK_ERROR;
+  }
+
+static gavl_sink_status_t write_packet_encoder(void * data, gavl_packet_t * packet)
+  {
+  FILE * out;
+  encoder_t * e = data;
+  sprintf(e->filename_buffer, e->mask, e->frame_counter);
+
+  if(!bg_encoder_cb_create_output_file(e->cb, e->filename_buffer))
+    return GAVL_SINK_ERROR;
+  out = fopen(e->filename_buffer, "wb");
+  if(!out)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN_ENC, "Cannot open file %s: %s",
+           e->filename_buffer, strerror(errno));
+    return GAVL_SINK_ERROR;
+    }
+  
+  if(fwrite(packet->data, 1, packet->data_len, out) < packet->data_len)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN_ENC, "Couldn't write data to %s: %s",
+           e->filename_buffer, strerror(errno));
+    return GAVL_SINK_ERROR;
+    }
+  fclose(out);
+  e->frame_counter++;
+  return GAVL_SINK_OK;
+  }
+
 static int start_encoder(void * data)
   {
-  encoder_t * e;
-  e = (encoder_t *)data;
+  encoder_t * e = data;
+
+  if(e->have_header)
+    e->sink = gavl_video_sink_create(NULL, write_video_func_encoder,
+                                     e, &e->format);
+  else if(e->ci)
+    e->psink = gavl_packet_sink_create(NULL, write_packet_encoder,
+                                       e);
+  
   return (e->have_header || e->ci) ? 1 : 0;
   }
 
+static gavl_video_sink_t * get_video_sink_encoder(void * priv, int stream)
+  {
+  encoder_t * e = priv;
+  return e->sink;
+  }
+
+static gavl_packet_sink_t * get_packet_sink_encoder(void * priv, int stream)
+  {
+  encoder_t * e = priv;
+  return e->psink;
+  }
+
 static int writes_compressed_video(void * priv,
                                    const gavl_video_format_t * format,
                                    const gavl_compression_info_t * info)
@@ -981,67 +1099,12 @@
                                     const gavl_video_format_t * format,
                                     const gavl_compression_info_t * info)
   {
-  encoder_t * e;
-  e = (encoder_t *)data;
+  encoder_t * e = data;
   e->ci = info;
   create_mask(e, gavl_compression_get_extension(e->ci->id, NULL));
   return 0;
   }
 
-static void get_video_format_encoder(void * data, int stream,
-                                     gavl_video_format_t * format)
-  {
-  encoder_t * e;
-
-  e = (encoder_t *)data;
-  gavl_video_format_copy(format, &e->format);
-  }
-
-static int
-write_video_frame_encoder(void * data, gavl_video_frame_t * frame,
-                          int stream)
-  {
-  int ret = 1;
-  encoder_t * e;
-
-  e = (encoder_t *)data;
-
-  if(!e->have_header)
-    ret = write_frame_header(e);
-  if(ret)
-    ret = e->image_writer->write_image(e->plugin_handle->priv, frame);
-  
-  e->have_header = 0;
-  return ret;
-  }
-
-static int write_video_packet_encoder(void * data, gavl_packet_t * packet,
-                                      int stream)
-  {
-  FILE * out;
-  encoder_t * e = data;
-  sprintf(e->filename_buffer, e->mask, e->frame_counter);
-
-  if(!bg_encoder_cb_create_output_file(e->cb, e->filename_buffer))
-    return 0;
-  out = fopen(e->filename_buffer, "wb");
-  if(!out)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN_ENC, "Cannot open file %s: %s",
-           e->filename_buffer, strerror(errno));
-    return 0;
-    }
-  
-  if(fwrite(packet->data, 1, packet->data_len, out) < packet->data_len)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN_ENC, "Couldn't write data to %s: %s",
-           e->filename_buffer, strerror(errno));
-    return 0;
-    }
-  fclose(out);
-  e->frame_counter++;
-  return 1;
-  }
 
 #define STR_FREE(s) if(s){free(s);s=NULL;}
 
@@ -1071,13 +1134,19 @@
     bg_plugin_unref(e->plugin_handle);
     e->plugin_handle = NULL;
     }
+
+  if(e->sink)
+    {
+    gavl_video_sink_destroy(e->sink);
+    e->sink = NULL;
+    }
+  
   return 1;
   }
 
 static void destroy_encoder(void * data)
   {
-  encoder_t * e;
-  e = (encoder_t *)data;
+  encoder_t * e = data;
   close_encoder(data, 0);
 
   if(e->parameters)
@@ -1123,12 +1192,13 @@
     .add_video_stream =  add_video_stream_encoder,
     .add_video_stream_compressed =  add_video_stream_compressed_encoder,
     
-    .get_video_format =  get_video_format_encoder,
-
     .start =             start_encoder,
+
+    .get_video_sink =    get_video_sink_encoder,
+    .get_video_packet_sink =    get_packet_sink_encoder,
     
-    .write_video_frame = write_video_frame_encoder,
-    .write_video_packet = write_video_packet_encoder,
+    //    .write_video_frame = write_video_frame_encoder,
+    //    .write_video_packet = write_video_packet_encoder,
     
     
     /* Close it */

gmerlin-1.2.0.tar.gz/lib/socket.c -> gmerlin-4256.tar.gz/lib/socket.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -34,6 +35,17 @@
 #include <sys/types.h>
 #endif
 
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_SYS_SENDFILE_H
+#include <sys/sendfile.h>
+#endif
+
+#include <netinet/tcp.h> // IPPROTO_TCP, TCP_MAXSEG
+
 #include <unistd.h>
 
 #include <netdb.h> /* gethostbyname */
@@ -51,29 +63,36 @@
 #include <gmerlin/bgsocket.h>
 
 #include <gmerlin/log.h>
-#define LOG_DOMAIN "tcpsocket"
+#define LOG_DOMAIN "socket"
 
 #if !HAVE_DECL_MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif
 
-/* Opaque address structure so we can support IPv6 in the future */
+/* Opaque address structure so we can support IPv6 */
 
-struct bg_host_address_s 
+struct bg_socket_address_s 
   {
-  struct addrinfo * addr;
+  struct sockaddr_storage addr;
+  size_t len;
+  //  struct addrinfo * addr;
   };
 
-bg_host_address_t * bg_host_address_create()
+bg_socket_address_t * bg_socket_address_create()
   {
-  bg_host_address_t * ret;
+  bg_socket_address_t * ret;
   ret = calloc(1, sizeof(*ret));
   return ret;
   }
 
-void bg_host_address_destroy(bg_host_address_t * a)
+void bg_socket_address_copy(bg_socket_address_t * dst,
+                            const bg_socket_address_t * src)
+  {
+  memcpy(dst, src, sizeof(*dst));
+  }
+
+void bg_socket_address_destroy(bg_socket_address_t * a)
   {
-  freeaddrinfo(a->addr);
   free(a);
   }
 
@@ -98,37 +117,93 @@
 
 /* */
 
-static void address_set_port(struct addrinfo * info, int port)
+void bg_socket_address_set_port(bg_socket_address_t * addr, int port)
   {
-  while(info)
+  switch(addr->addr.ss_family)
     {
-    switch(info->ai_family)
+    case AF_INET:
       {
-      case AF_INET:
-        {
-        struct sockaddr_in * addr;
-        addr = (struct sockaddr_in*)info->ai_addr;
-        addr->sin_port = htons(port);
-        }
-        break;
-      case AF_INET6:
-        {
-        struct sockaddr_in6 * addr;
-        addr = (struct sockaddr_in6*)info->ai_addr;
-        addr->sin6_port = htons(port);
-        }
-        break;
-      default:
-        break;
+      struct sockaddr_in * a;
+      a = (struct sockaddr_in*)&addr->addr;
+      a->sin_port = htons(port);
       }
-    info = info->ai_next;
+      break;
+    case AF_INET6:
+      {
+      struct sockaddr_in6 * a;
+      a = (struct sockaddr_in6*)&addr->addr;
+      a->sin6_port = htons(port);
+      }
+      break;
+    default:
+      break;
     }
   }
 
-static struct addrinfo * hostbyname(const char * hostname, int port, int socktype)
+int bg_socket_address_get_port(bg_socket_address_t * addr)
+  {
+  switch(addr->addr.ss_family)
+    {
+    case AF_INET:
+      {
+      struct sockaddr_in * a;
+      a = (struct sockaddr_in*)&addr->addr;
+      return ntohs(a->sin_port);
+      }
+      break;
+    case AF_INET6:
+      {
+      struct sockaddr_in6 * a;
+      a = (struct sockaddr_in6*)&addr->addr;
+      return ntohs(a->sin6_port);
+      }
+      break;
+    default:
+      break;
+    }
+  return 0;
+  }
+
+char * bg_socket_address_to_string(bg_socket_address_t * addr, char * str)
+  {
+  switch(addr->addr.ss_family)
+    {
+    case AF_INET:
+      {
+      char buf[INET_ADDRSTRLEN];
+
+      struct sockaddr_in * a;
+      a = (struct sockaddr_in*)&addr->addr;
+
+      inet_ntop(AF_INET, &a->sin_addr, buf, INET_ADDRSTRLEN);
+      snprintf(str, BG_SOCKET_ADDR_STR_LEN, "%s:%d", buf, ntohs(a->sin_port));
+      return str;
+      }
+      break;
+    case AF_INET6:
+      {
+      char buf[INET6_ADDRSTRLEN];
+      struct sockaddr_in6 * a;
+      
+      a = (struct sockaddr_in6*)&addr->addr;
+
+      inet_ntop(AF_INET6, &a->sin6_addr, buf, INET6_ADDRSTRLEN);
+      snprintf(str, BG_SOCKET_ADDR_STR_LEN, "[%s]:%d", buf, ntohs(a->sin6_port));
+      return str;
+      }
+      break;
+    default:
+      break;
+    }
+  return NULL;
+  }
+
+static struct addrinfo *
+hostbyname(const char * hostname, int socktype)
   {
   int err;
   struct in_addr ipv4_addr;
+  struct in6_addr ipv6_addr;
   
   struct addrinfo hints;
   struct addrinfo * ret;
@@ -141,8 +216,17 @@
 
   /* prevent DNS lookup for numeric IP addresses */
 
-  if(inet_aton(hostname, &ipv4_addr))
+  if(inet_pton(AF_INET, hostname, &ipv4_addr))
+    {
+    hints.ai_flags |= AI_NUMERICHOST;
+    hints.ai_family   = PF_INET;
+    }
+  else if(inet_pton(AF_INET6, hostname, &ipv6_addr))
+    {
     hints.ai_flags |= AI_NUMERICHOST;
+    hints.ai_family   = PF_INET6;
+    }
+  
   if((err = getaddrinfo(hostname, NULL /* service */,
                         &hints, &ret)))
     {
@@ -156,39 +240,104 @@
   else if(ret[0].ai_addr->sa_family == AF_INET6)
     fprintf(stderr, "Got IPV6 address\n");
 #endif  
-  address_set_port(ret, port);
   
   return ret;
   }
 
-int bg_host_address_set(bg_host_address_t * a, const char * hostname,
+int bg_socket_address_set(bg_socket_address_t * a, const char * hostname,
                         int port, int socktype)
   {
-  a->addr = hostbyname(hostname, port, socktype);
+  struct addrinfo * addr;
+  
+  addr = hostbyname(hostname, socktype);
+  if(!addr)
+    return 0;
+  
+  memcpy(&a->addr, addr->ai_addr, addr->ai_addrlen);
+  a->len = addr->ai_addrlen;
   //  if(!hostbyname(a, hostname))
   //    return 0;
   //  a->port = port;
+
+  freeaddrinfo(addr);
+
+  bg_socket_address_set_port(a, port);
   
-  if(!a->addr)
+  return 1;
+  }
+
+int bg_socket_address_set_local(bg_socket_address_t * a, int port)
+  {
+#ifdef HAVE_IFADDRS_H  
+  int ret = 0;
+  struct ifaddrs * ifap = NULL;
+  struct ifaddrs * addr;
+  if(getifaddrs(&ifap))
     return 0;
+
+  addr = ifap;
+  while(addr)
+    {
+    if(!(addr->ifa_flags & IFF_LOOPBACK))
+      {
+      if(addr->ifa_addr->sa_family == AF_INET)
+        a->len = sizeof(struct sockaddr_in);
+      else if(addr->ifa_addr->sa_family == AF_INET6)
+        a->len = sizeof(struct sockaddr_in6);
+      else
+        {
+        addr = addr->ifa_next;
+        continue;
+        }
+      memcpy(&a->addr, addr->ifa_addr, a->len);
+      bg_socket_address_set_port(a, port);
+      ret = 1;
+      break;
+      }
+    addr = addr->ifa_next;
+    }
+  
+  freeifaddrs(ifap);
+  return ret;
+#else
+  return 0;
+#endif
+  //  return bg_socket_address_set(a, hostname, port, socktype);
+  }
+
+int bg_socket_get_address(int sock, bg_socket_address_t * local, bg_socket_address_t * remote)
+  {
+  socklen_t len;
+  if(local)
+    {
+    len = sizeof(local->addr); 
+    if(getsockname(sock, (struct sockaddr *)&local->addr, &len))
+      return 0;
+    local->len = len;
+    }
+  if(remote) 
+    { 
+    len = sizeof(remote->addr);
+    if(getpeername(sock, (struct sockaddr *)&remote->addr, &len))
+      return 0;
+    remote->len = len;
+    }
   return 1;
   }
 
 /* Client connection (stream oriented) */
 
-int bg_socket_connect_inet(bg_host_address_t * a, int milliseconds)
+int bg_socket_connect_inet(bg_socket_address_t * a, int milliseconds)
   {
   int ret = -1;
   int err;
   socklen_t err_len;
 
-  struct timeval timeout;
-  fd_set write_fds;
                                                                                
   /* Create the socket */
-  if((ret = create_socket(a->addr->ai_family, SOCK_STREAM, 0)) < 0)
+  if((ret = create_socket(a->addr.ss_family, SOCK_STREAM, 0)) < 0)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create socket");
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create TCP socket");
     return -1;
     }
   
@@ -200,31 +349,20 @@
     }
   
   /* Connect the thing */
-  if(connect(ret, a->addr->ai_addr, a->addr->ai_addrlen)<0)
+  if(connect(ret, (struct sockaddr*)&a->addr, a->len) < 0)
     {
     if(errno == EINPROGRESS)
       {
-      timeout.tv_sec = milliseconds / 1000;
-      timeout.tv_usec = 1000 * (milliseconds % 1000);
-      FD_ZERO (&write_fds);
-      FD_SET (ret, &write_fds);
-
-      err = select(ret+1, NULL, &write_fds, NULL,&timeout);
-      
-      if(!err)
+      if(!bg_socket_can_write(ret, milliseconds))
         {
         bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Connection timed out");
         return -1;
         }
-      else if(err < 0)
-        {
-        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "select() failed on connect");
-        return -1;
-        }
       }
     else
       {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Connecting failed: %s", strerror(errno));
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Connecting failed: %s",
+             strerror(errno));
       return -1;
       }
     }
@@ -270,7 +408,8 @@
   
   if(connect(ret,(struct sockaddr*)(&addr),addr_len)<0)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Connecting unix socket failed");
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Connecting unix socket failed: %s",
+           strerror(errno));
     return -1;
     }
   return ret;
@@ -318,37 +457,53 @@
 
 /* Server socket (stream oriented) */
 
-int bg_listen_socket_create_inet(int port,
+int bg_listen_socket_create_inet(bg_socket_address_t * addr,
+                                 int port,
                                  int queue_size,
                                  int flags)
   {
-  int ret, err, use_ipv6;
+  int ret, err, use_ipv6 = 0;
   struct sockaddr_in  name_ipv4;
   struct sockaddr_in6 name_ipv6;
 
-  if(flags & BG_SOCKET_LOOPBACK)
+  if(addr)
+    {
+    if(addr->addr.ss_family == AF_INET6)
+      use_ipv6 = 1;
+    }
+  else if(flags & BG_SOCKET_LOOPBACK)
     use_ipv6 = have_ipv6();
-  else
-    use_ipv6 = 0;
   
   memset(&name_ipv4, 0, sizeof(name_ipv4));
   memset(&name_ipv6, 0, sizeof(name_ipv6));
+
+  /* Create the socket. */
   
   if(use_ipv6)
     ret = create_socket(PF_INET6, SOCK_STREAM, 0);
   else
     ret = create_socket(PF_INET, SOCK_STREAM, 0);
   
-  /* Create the socket. */
-  if (ret < 0)
+  if(ret < 0)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create inet server socket");
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create TCP server socket");
     return -1;
     }
   
+  if(flags & BG_SOCKET_REUSEADDR)
+    {
+    int optval = 1;
+    setsockopt(ret, SOL_SOCKET, SO_REUSEADDR,
+               &optval, sizeof(optval));
+    }
+  
   /* Give the socket a name. */
 
-  if(use_ipv6)
+  if(addr)
+    {
+    err = bind(ret, (struct sockaddr*)&addr->addr, addr->len);
+    }
+  else if(use_ipv6)
     {
     name_ipv6.sin6_family = AF_INET6;
     name_ipv6.sin6_port   = htons(port);
@@ -375,11 +530,6 @@
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot bind inet socket: %s", strerror(errno));
     return -1;
     }
-  if(fcntl(ret, F_SETFL, O_NONBLOCK) < 0)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot set nonblocking mode");
-    return -1;
-    }
   if(listen(ret, queue_size))
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot put socket into listening mode");
@@ -408,12 +558,8 @@
   addr_len = SUN_LEN(&addr);
   if(bind(ret,(struct sockaddr*)(&addr),addr_len)<0)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not bind socket");
-    return -1;
-    }
-  if(fcntl(ret, F_SETFL, O_NONBLOCK) < 0)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot set nonblocking mode");
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot bind UNIX domain socket: %s",
+           strerror(errno));
     return -1;
     }
   if(listen(ret, queue_size))
@@ -426,10 +572,26 @@
 
 /* Accept a new client connection, return -1 if there is none */
 
-int bg_listen_socket_accept(int sock)
+int bg_listen_socket_accept(int sock, int milliseconds,
+                            bg_socket_address_t * from)
   {
   int ret;
-  ret = accept(sock, NULL, NULL);
+  
+  if((milliseconds >= 0) && !bg_socket_can_read(sock, milliseconds))
+    return -1;
+
+  if(from)
+    {
+    struct sockaddr * a;
+    socklen_t len;
+    a = (struct sockaddr *)&from->addr;
+    len = sizeof(from->addr);
+    ret = accept(sock, a, &len);
+    from->len = len; 
+    }
+  else
+    ret = accept(sock, NULL, NULL);
+  
   if(ret < 0)
     return -1;
   return ret;
@@ -440,27 +602,53 @@
   close(sock);
   }
 
-int bg_socket_read_data(int fd, uint8_t * data, int len, int milliseconds)
+int bg_socket_can_read(int fd, int milliseconds)
   {
-  int result;
-  fd_set rset;
+  fd_set set;
   struct timeval timeout;
+  FD_ZERO (&set);
+  FD_SET  (fd, &set);
 
-  if(milliseconds >= 0)
-    {
-    FD_ZERO (&rset);
-    FD_SET  (fd, &rset);
+  timeout.tv_sec  = milliseconds / 1000;
+  timeout.tv_usec = (milliseconds % 1000) * 1000;
     
-    timeout.tv_sec  = milliseconds / 1000;
-    timeout.tv_usec = (milliseconds % 1000) * 1000;
+  if(select(fd+1, &set, NULL, NULL, &timeout) <= 0)
+    {
+    //    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got read timeout");
+    return 0;
+    }
+  return 1;
+  }
+
+
+int bg_socket_can_write(int fd, int milliseconds)
+  {
+  fd_set set;
+  struct timeval timeout;
+  FD_ZERO (&set);
+  FD_SET  (fd, &set);
+
+  timeout.tv_sec  = milliseconds / 1000;
+  timeout.tv_usec = (milliseconds % 1000) * 1000;
     
-    if(select (fd+1, &rset, NULL, NULL, &timeout) <= 0)
-      {
-      // bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got read timeout");
-      return 0;
-      }
+  if(select(fd+1, NULL, &set, NULL, &timeout) <= 0)
+    {
+    // bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got read timeout");
+    return 0;
     }
+  return 1;
+  }
+
 
+int bg_socket_read_data(int fd, uint8_t * data, int len, int milliseconds)
+  {
+  int result;
+  
+  if((milliseconds >= 0) && !bg_socket_can_read(fd, milliseconds))
+    {
+    bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Got read timeout");
+    return 0;
+    }
   result = recv(fd, data, len, MSG_WAITALL);
   if(result <= 0)
     {
@@ -510,12 +698,22 @@
   pos = *ret;
   while(1)
     {
+    c = 0;
     if(!bg_socket_read_data(fd, (uint8_t*)(&c), 1, milliseconds))
       {
       if(!bytes_read)
         return 0;
       break;
       }
+
+    // fprintf(stderr, "%c", c);
+    
+    if((c > 0x00) && (c < 0x20) && (c != '\r') && (c != '\n'))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got non ASCII character (%d) while reading line", c);
+      return 0;
+      }
+    
     /*
      *  Line break sequence
      *  is starting, remove the rest from the stream
@@ -525,7 +723,7 @@
       break;
       }
     /* Reallocate buffer */
-    else if(c != '\r')
+    else if((c != '\r') && (c != '\0'))
       {
       if(bytes_read+2 >= *ret_alloc)
         {
@@ -543,3 +741,259 @@
   return 1;
   }
 
+int bg_socket_is_local(int fd)
+  {
+  struct sockaddr_storage us;
+  struct sockaddr_storage them;
+  socklen_t slen;
+  slen = sizeof(us);
+  
+  if(getsockname(fd, (struct sockaddr*)&us, &slen) == -1)
+    return 1;
+
+  if(slen == 0 || us.ss_family == AF_LOCAL)
+    return 1;
+
+  if(us.ss_family == AF_INET)
+    {
+    struct sockaddr_in * a1, *a2;
+    a1 = (struct sockaddr_in *)&us;
+    if(a1->sin_addr.s_addr == INADDR_LOOPBACK)
+      return 1;
+
+    slen = sizeof(them);
+    
+    if(getpeername(fd, (struct sockaddr*)&them, &slen) == -1)
+      return 0;
+
+    a2 = (struct sockaddr_in *)&them;
+
+    if(!memcmp(&a1->sin_addr.s_addr, &a2->sin_addr.s_addr,
+               sizeof(a2->sin_addr.s_addr)))
+      return 1;
+    }
+  else if(us.ss_family == AF_INET6)
+    {
+    struct sockaddr_in6 * a1, *a2;
+    a1 = (struct sockaddr_in6 *)&us;
+
+    /* Detect loopback */
+    if(!memcmp(&a1->sin6_addr.s6_addr, &in6addr_loopback,
+               sizeof(in6addr_loopback)))
+      return 1;
+
+    if(getpeername(fd, (struct sockaddr*)&them, &slen) == -1)
+      return 0;
+
+    a2 = (struct sockaddr_in6 *)&them;
+
+    if(!memcmp(&a1->sin6_addr.s6_addr, &a2->sin6_addr.s6_addr,
+               sizeof(a2->sin6_addr.s6_addr)))
+      return 1;
+
+    }
+  return 0;
+  }
+
+/* Send an entire file */
+int bg_socket_send_file(int fd, const char * filename,
+                        int64_t offset, int64_t len)
+  {
+  int ret = 0;
+  int buf_size;
+  uint8_t * buf = NULL;
+  int file_fd;
+  socklen_t size_len;
+  int64_t result;
+  int64_t bytes_written;
+  int bytes;
+  
+  file_fd = open(filename, O_RDONLY);
+  if(file_fd < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open local file: %s", strerror(errno));
+    return 0;
+    }
+  
+  if(len <= 0)
+    len = lseek(file_fd, 0, SEEK_END);
+  lseek(file_fd, offset, SEEK_SET);
+  
+  /* Try sendfile */
+#ifdef HAVE_SYS_SENDFILE_H
+  result = sendfile(fd, file_fd, &offset, len);
+  if(result < 0)
+    {
+    if((errno != EINVAL) && (errno != ENOSYS))
+      goto end;
+    }
+  else
+    {
+    ret = 1;
+    goto end;
+    }
+#endif
+  
+  if(getsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, &buf_size, &size_len))
+    buf_size = 576 - 40;
+
+  bytes_written = 0;
+  
+  buf = malloc(buf_size);
+
+  while(bytes_written < len)
+    {
+    bytes = len - bytes_written;
+    
+    if(bytes > buf_size)
+      bytes = buf_size;
+    
+    bytes = read(file_fd, buf, bytes);
+    if(bytes < 0)
+      goto end;
+    
+    if(bg_socket_write_data(fd, buf, bytes) < bytes)
+      goto end;
+    bytes_written += bytes;
+    }
+
+  ret = 1;
+  end:
+
+  close(file_fd);
+  
+  if(buf)
+    free(buf);
+  return ret;
+  }
+
+int bg_udp_socket_create(bg_socket_address_t * addr)
+  {
+  int ret;
+  int err;
+  int get_port = (bg_socket_address_get_port(addr) == 0) ? 1 : 0;
+ 
+  if((ret = create_socket(addr->addr.ss_family, SOCK_DGRAM, 0)) < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create UDP socket: %s", strerror(errno));
+    return -1;
+    }
+  err = bind(ret, (struct sockaddr*)&addr->addr, addr->len);
+
+  if(err)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot bind UDP socket: %s", strerror(errno));
+    return -1;
+    }
+
+  if(get_port)
+    bg_socket_get_address(ret, addr, NULL);
+
+  return ret;
+  }
+
+int bg_udp_socket_connect(int fd, bg_socket_address_t * dst)
+  {
+  if(connect(fd, (struct sockaddr*)&dst->addr, dst->len) < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "connect() failed for UDP socket: %s",
+           strerror(errno));
+    return 0;
+    }
+  return 1;
+  }
+
+
+int bg_udp_socket_create_multicast(bg_socket_address_t * addr)
+  {
+  int reuse = 1;
+  int ret;
+  int err;
+  uint8_t loop = 1;
+
+  bg_socket_address_t bind_addr;
+  
+  if((ret = create_socket(addr->addr.ss_family, SOCK_DGRAM, 0)) < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create UDP multicast socket: %s", strerror(errno));
+    return -1;
+    }
+  
+  if(setsockopt(ret, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) < 0)
+
+    {
+    close(ret);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot set SO_REUSEADDR: %s", strerror(errno));
+    return -1;
+    }
+
+  /* Bind to proper port */
+  
+  memset(&bind_addr, 0, sizeof(bind_addr));
+  
+  bg_socket_address_set(&bind_addr, "0.0.0.0",
+                      bg_socket_address_get_port(addr), SOCK_DGRAM);
+
+  err = bind(ret, (struct sockaddr*)&addr->addr, addr->len);
+
+  if(err)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot bind UDP socket: %s", strerror(errno));
+    close(ret);
+    return -1;
+    }
+  
+  if(addr->addr.ss_family == AF_INET)
+    {
+    struct ip_mreq req;
+    struct sockaddr_in * a = (struct sockaddr_in *)(&addr->addr);
+    memcpy(&req.imr_multiaddr, &a->sin_addr, sizeof(req.imr_multiaddr));
+    req.imr_interface.s_addr = INADDR_ANY;
+
+    if(setsockopt(ret, IPPROTO_IP, IP_ADD_MEMBERSHIP, &req, sizeof(req)))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot join multicast group: %s",
+             strerror(errno));
+      close(ret);
+      return -1;
+      }
+    }
+  else
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "IPV6 multicast not supported yet");
+    close(ret);
+    return -1;
+    }
+  
+  setsockopt(ret, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop));
+  return ret;
+  }
+
+int bg_udp_socket_receive(int fd, uint8_t * data, int data_size,
+                          bg_socket_address_t * addr)
+  {
+  socklen_t len = sizeof(addr->addr);
+  ssize_t result;
+
+  if(addr)  
+    result = recvfrom(fd, data, data_size, 0 /* int flags */,
+                      (struct sockaddr *)&addr->addr, &len);
+  else
+    result = recv(fd, data, data_size, 0);
+
+  if(result < 0)
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "UDP Receive failed");
+  
+  addr->len = len;
+  return result;
+  }
+
+int bg_udp_socket_send(int fd, const uint8_t * data, int data_size,
+                       bg_socket_address_t * addr)
+  {
+  if(addr)
+    return (sendto(fd, data, data_size, 0 /* int flags */,
+                   (struct sockaddr *)&addr->addr, addr->len) == data_size);
+  else
+    return (send(fd, data, data_size, 0) == data_size);
+  }

gmerlin-4256.tar.gz/lib/sqlite.c Added

@@ -0,0 +1,250 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <bgsqlite.h>
+
+#include <string.h>
+
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "sqlite"
+
+int
+bg_sqlite_exec(sqlite3 * db,                              /* An open database */
+               const char *sql,                           /* SQL to be evaluated */
+               int (*callback)(void*,int,char**,char**),  /* Callback function */
+               void * data)                               /* 1st argument to callback */
+  {
+  char * err_msg;
+  int err;
+
+  err = sqlite3_exec(db, sql, callback, data, &err_msg);
+
+  //  fprintf(stderr, "SQL: %s\n", sql);
+
+  if(err)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "SQL query: \"%s\" failed: %s",
+           sql, err_msg);
+    sqlite3_free(err_msg);
+    return 0;
+    }
+  return 1;
+  }
+
+int bg_sqlite_int_callback(void * data, int argc, char **argv, char **azColName)
+  {
+  int64_t * ret = data;
+  if(argv[0])
+    *ret = strtoll(argv[0], NULL, 10);
+  return 0;
+  }
+
+int bg_sqlite_string_callback(void * data, int argc,
+                              char **argv, char **azColName)
+  {
+  char ** ret = data;
+  if((argv[0]) && (*(argv[0]) != '\0'))
+    *ret = gavl_strdup(argv[0]);
+  return 0;
+  }
+
+static int64_t get_max_int(sqlite3 * db, const char * table,
+                           const char * row)
+  {
+  int result;
+  char * sql;
+  int64_t ret = 0;
+
+  sql = sqlite3_mprintf("select max(%s) from %s;", row, table);
+  result = bg_sqlite_exec(db, sql, bg_sqlite_int_callback, &ret);
+  sqlite3_free(sql);
+  if(!result)
+    return -1;
+
+  if(ret < 0)
+    return -1;
+  return ret;
+  }
+
+int64_t bg_sqlite_string_to_id(sqlite3 * db,
+                               const char * table,
+                               const char * id_row,
+                               const char * string_row,
+                               const char * str)
+  {
+  char * buf;
+  int64_t ret = -1;
+  int result;
+  buf = sqlite3_mprintf("select %s from %s where %s = %Q;",
+                        id_row, table, string_row, str);
+  result = bg_sqlite_exec(db, buf, bg_sqlite_int_callback, &ret);
+  sqlite3_free(buf);
+  return result ? ret : -1 ;
+  }
+
+int64_t bg_sqlite_string_to_id_add(sqlite3 * db,
+                                   const char * table,
+                                   const char * id_row,
+                                   const char * string_row,
+                                   const char * str)
+  {
+  char * sql;
+  int result;
+
+  int64_t ret;
+  ret = bg_sqlite_string_to_id(db, table, id_row, string_row, str);
+  if(ret >= 0)
+    return ret;
+  ret = get_max_int(db, table, id_row);
+  if(ret < 0)
+    return ret;
+
+  ret++;
+  
+  /* Insert into table */
+  sql = sqlite3_mprintf("INSERT INTO %s "
+                          "( %s, %s ) VALUES "
+                          "( %"PRId64", %Q );",
+                          table, id_row, string_row, ret, str);
+
+  result = bg_sqlite_exec(db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  if(!result)
+    return -1;
+  return ret;
+  }
+        
+
+char * bg_sqlite_id_to_string(sqlite3 * db,
+                           const char * table,
+                           const char * string_row,
+                           const char * id_row,
+                           int64_t id)
+  {
+  char * buf;
+  char * ret = NULL;
+  int result;
+  buf = sqlite3_mprintf("select %s from %s where %s = %"PRId64";",
+                        string_row, table, id_row, id);
+  result = bg_sqlite_exec(db, buf, bg_sqlite_string_callback, &ret);
+  sqlite3_free(buf);
+  return result ? ret : NULL;
+  }
+
+int64_t bg_sqlite_id_to_id(sqlite3 * db,
+                           const char * table,
+                           const char * dst_row,
+                           const char * src_row,
+                           int64_t id)
+  {
+  char * buf;
+  int64_t ret = -1;
+  int result;
+  buf = sqlite3_mprintf("select %s from %s where %s = %"PRId64";",
+                        dst_row, table, src_row, id);
+  result = bg_sqlite_exec(db, buf, bg_sqlite_int_callback, &ret);
+  return result ? ret : -1;
+  }
+
+int64_t bg_sqlite_get_next_id(sqlite3 * db, const char * table)
+  {
+  int64_t ret = get_max_int(db, table, "ID");
+  if(ret < 0)
+    return -1;
+  return ret + 1;
+  }
+
+#if 0
+typedef struct
+  {
+  int64_t * val;
+  int val_alloc;
+  int num_val;
+  } bg_sqlite_id_tab_t;
+#endif
+
+void bg_sqlite_id_tab_init(bg_sqlite_id_tab_t * tab)
+  {
+  memset(tab, 0, sizeof(*tab));
+  }
+
+void bg_sqlite_id_tab_free(bg_sqlite_id_tab_t * tab)
+  {
+  if(tab->val)
+    free(tab->val);
+  }
+
+void bg_sqlite_id_tab_reset(bg_sqlite_id_tab_t * tab)
+  {
+  tab->num_val = 0;
+  }
+
+int bg_sqlite_append_id_callback(void * data, int argc, char **argv, char **azColName)
+  {
+  int64_t ret;
+  bg_sqlite_id_tab_t * val = data;
+  if(argv[0])
+    {
+    ret = strtoll(argv[0], NULL, 10);
+    if(val->num_val + 1 > val->val_alloc)
+      {
+      val->val_alloc = val->num_val + 1024;
+      val->val = realloc(val->val, val->val_alloc * sizeof(*val->val));
+      }
+    val->val[val->num_val] = ret;
+    val->num_val++;
+    }
+  return 0;
+  }
+
+void bg_sqlite_delete_by_id(sqlite3 * db,
+                            const char * table,
+                            int64_t id)
+  {
+  char * sql;
+  sql = sqlite3_mprintf("DELETE FROM %s WHERE ID = %"PRId64";", table, id);
+  bg_sqlite_exec(db, sql, NULL, NULL);
+  sqlite3_free(sql);
+  }
+
+int bg_sqlite_select_join(sqlite3 * db, bg_sqlite_id_tab_t * tab,
+                          const char * table_1,
+                          const char * col_1,
+                          int64_t val_1,
+                          const char * table_2,
+                          const char * col_2,
+                          int64_t val_2)
+  {
+  char * sql;
+  int result;
+  sql = sqlite3_mprintf("SELECT a.ID from %s a INNER JOIN %s b on (a.ID = b.ID) & (a.%s = %"PRId64") & (b.%s = %"PRId64");", table_1, table_2, col_1, val_1, col_2, val_2);
+
+  result = bg_sqlite_exec(db, sql, bg_sqlite_append_id_callback, tab);
+  sqlite3_free(sql);
+  return result;
+  }
+
+char * bg_sqlite_get_col_str(sqlite3_stmt * st, int col)
+  {
+  return gavl_strdup((const char*)sqlite3_column_text(st, col));
+  }

gmerlin-1.2.0.tar.gz/lib/streaminfo.c -> gmerlin-4256.tar.gz/lib/streaminfo.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -25,6 +25,7 @@
 #include <ctype.h>
 
 #include <gavl/gavl.h>
+#include <gavl/metatags.h>
 #include <gmerlin/parameter.h>
 #include <gmerlin/streaminfo.h>
 #include <gmerlin/utils.h>
@@ -46,7 +47,12 @@
   gavl_metadata_free(&info->m);
   }
 
-static void bg_subtitle_info_free(bg_subtitle_info_t * info)
+static void bg_text_info_free(bg_text_info_t * info)
+  {
+  gavl_metadata_free(&info->m);
+  }
+
+static void bg_overlay_info_free(bg_overlay_info_t * info)
   {
   gavl_metadata_free(&info->m);
   }
@@ -68,45 +74,52 @@
       bg_video_info_free(&info->video_streams[i]);
     MY_FREE(info->video_streams);
     }
-  if(info->subtitle_streams)
+  if(info->text_streams)
     {
-    for(i = 0; i < info->num_subtitle_streams; i++)
-      bg_subtitle_info_free(&info->subtitle_streams[i]);
-    MY_FREE(info->subtitle_streams);
+    for(i = 0; i < info->num_text_streams; i++)
+      bg_text_info_free(&info->text_streams[i]);
+    MY_FREE(info->text_streams);
     }
-
+  if(info->overlay_streams)
+    {
+    for(i = 0; i < info->num_overlay_streams; i++)
+      bg_overlay_info_free(&info->overlay_streams[i]);
+    MY_FREE(info->overlay_streams);
+    }
+  
   gavl_metadata_free(&info->metadata);
 
   if(info->chapter_list)
-    bg_chapter_list_destroy(info->chapter_list);
+    gavl_chapter_list_destroy(info->chapter_list);
   
-  MY_FREE(info->name);
-  MY_FREE(info->url);
   memset(info, 0, sizeof(*info));
   }
 
 void bg_set_track_name_default(bg_track_info_t * info,
                                const char * location)
   {
+  char * name;
   const char * start_pos;
   const char * end_pos;
+
+  if(gavl_metadata_get(&info->metadata, GAVL_META_LABEL))
+    return;
   
   if(bg_string_is_url(location))
+    name = gavl_strdup(location);
+  else
     {
-    info->name = bg_strdup(info->name, location);
-    return;
+    start_pos = strrchr(location, '/');
+    if(start_pos)
+      start_pos++;
+    else
+      start_pos = location;
+    end_pos = strrchr(start_pos, '.');
+    if(!end_pos)
+      end_pos = &start_pos[strlen(start_pos)];
+    name = gavl_strndup( start_pos, end_pos);
     }
-  
-  start_pos = strrchr(location, '/');
-  if(start_pos)
-    start_pos++;
-  else
-    start_pos = location;
-  end_pos = strrchr(start_pos, '.');
-  if(!end_pos)
-    end_pos = &start_pos[strlen(start_pos)];
-  info->name = bg_strndup(info->name, start_pos, end_pos);
-  
+  gavl_metadata_set_nocpy(&info->metadata, GAVL_META_LABEL, name);
   }
 
 char * bg_get_track_name_default(const char * location, int track, int num_tracks)
@@ -117,7 +130,7 @@
   
   if(bg_string_is_url(location))
     {
-    tmp_string = bg_strdup(NULL, location);
+    tmp_string = gavl_strdup(location);
     }
   else
     {
@@ -141,3 +154,11 @@
     }
   }
 
+gavl_time_t bg_track_info_get_duration(const bg_track_info_t * info)
+  {
+  gavl_time_t ret;
+  if(gavl_metadata_get_long(&info->metadata, GAVL_META_APPROX_DURATION, &ret))
+    return ret;
+  else
+    return GAVL_TIME_UNDEFINED;
+  }

gmerlin-1.2.0.tar.gz/lib/stringutils.c -> gmerlin-4256.tar.gz/lib/stringutils.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -82,57 +82,6 @@
     return path;
   }
 
-char * bg_strdup(char * old_string, const char * new_string)
-  {
-  char * ret;
-  int len;
-  if(!new_string || (*new_string == '\0'))
-    {
-    if(old_string)
-      free(old_string);
-    return NULL;
-    }
-
-  if(old_string)
-    {
-    if(!strcmp(old_string, new_string))
-      return old_string;
-    else
-      free(old_string);
-    }
-  len = ((strlen(new_string)+1 + 3) / 4) * 4 ;
-  
-  ret = malloc(len);
-  strcpy(ret, new_string);
-  return ret;
-  }
-
-char * bg_strndup(char * old_string,
-                  const char * new_string_start,
-                  const char * new_string_end)
-  {
-  char * ret;
-  if(!new_string_start || (*new_string_start == '\0'))
-    {
-    if(old_string)
-      free(old_string);
-    return NULL;
-    }
-
-  if(old_string)
-    {
-    if(!strncmp(old_string, new_string_start,
-                new_string_end - new_string_start))
-      return old_string;
-    else
-      free(old_string);
-    }
-  ret = malloc(new_string_end - new_string_start + 1);
-  strncpy(ret, new_string_start, new_string_end - new_string_start);
-  ret[new_string_end - new_string_start] = '\0';
-  return ret;
-  }
-
 char * bg_sprintf(const char * format,...)
   {
   va_list argp; /* arg ptr */
@@ -195,31 +144,6 @@
     }
   }
 
-char * bg_strcat(char * old_string, const char * tail)
-  {
-  if(!old_string)
-    return bg_strdup(NULL, tail);
-
-  old_string = realloc(old_string, strlen(old_string) + strlen(tail) + 1);
-  strcat(old_string, tail);
-  return old_string;
-  }
-
-char * bg_strncat(char * old_string, const char * start, const char * end)
-  {
-  int old_len;
-  
-  if(!old_string)
-    return bg_strndup(NULL, start, end);
-
-  old_len = strlen(old_string);
-  
-  old_string = realloc(old_string, old_len + end - start + 1);
-  strncpy(&old_string[old_len], start, end - start);
-  old_string[old_len + end - start] = '\0';
-  return old_string;
-  }
-
 char ** bg_strbreak(const char * str, char delim)
   {
   int num_entries;
@@ -240,7 +164,7 @@
     }
   ret = calloc(num_entries+1, sizeof(char*));
 
-  ret[0] = bg_strdup(NULL, str);
+  ret[0] = gavl_strdup(str);
   pos = ret[0];
   for(i = 0; i < num_entries; i++)
     {
@@ -281,6 +205,24 @@
   return 1;
   }
 
+char * bg_path_to_label(const char * path)
+  {
+  const char * start;
+  const char * end;
+  start = strrchr(path, '/');
+  if(!start)
+    start = path;
+  else
+    start++;
+
+  end = strrchr(start, '.');
+  if(!end)
+    end = start + strlen(start);
+
+  return gavl_strndup(start, end);
+  }
+
+
 int bg_url_split(const char * url,
                  char ** protocol,
                  char ** user,
@@ -309,7 +251,7 @@
   /* Protocol */
     
   if(protocol)
-    *protocol = bg_strndup(NULL, pos1, pos2);
+    *protocol = gavl_strndup( pos1, pos2);
 
   pos2 += 3;
   pos1 = pos2;
@@ -325,22 +267,35 @@
      (at_pos < slash_pos))
     {
     if(user)
-      *user = bg_strndup(NULL, pos1, colon_pos);
+      *user = gavl_strndup( pos1, colon_pos);
     pos1 = colon_pos + 1;
     if(password)
-      *password = bg_strndup(NULL, pos1, at_pos);
+      *password = gavl_strndup( pos1, at_pos);
     pos1 = at_pos + 1;
     pos2 = pos1;
     }
   
   /* Hostname */
 
-  while((*pos2 != '\0') && (*pos2 != ':') && (*pos2 != '/'))
-    pos2++;
-
-  if(hostname)
-    *hostname = bg_strndup(NULL, pos1, pos2);
+  if(*pos1 == '[') // IPV6
+    {
+    pos1++;
+    pos2 = strchr(pos1, ']');
+    if(!pos2)
+      return 0;
 
+    if(hostname)
+      *hostname = gavl_strndup( pos1, pos2);
+    pos2++;
+    }
+  else
+    {
+    while((*pos2 != '\0') && (*pos2 != ':') && (*pos2 != '/'))
+      pos2++;
+    if(hostname)
+      *hostname = gavl_strndup( pos1, pos2);
+    }
+  
   switch(*pos2)
     {
     case '\0':
@@ -367,14 +322,65 @@
     pos1 = pos2;
     pos2 = pos1 + strlen(pos1);
     if(pos1 != pos2)
-      *path = bg_strndup(NULL, pos1, pos2);
+      *path = gavl_strndup( pos1, pos2);
     else
       *path = NULL;
     }
   return 1;
   }
 
+/*
+ *  Split off vars like path?var1=val1&var2=val2#fragment
+ */
+ 
+void bg_url_get_vars(char * path,
+                     gavl_metadata_t * vars)
+  {
+  int i;
+  char ** str;
+  
+  char * pos;
+
+  /* Hack */
+  pos = strchr(path, '#');
+  if(pos)
+    *pos = '\0';
+  /* End Hack */
+
+  pos = strrchr(path, '?');
+  if(!pos)
+    return;
+
+  *pos = '\0';
+
+  if(!vars)
+    return;
+  
+  pos++;
 
+  str = bg_strbreak(pos, '&');
+
+  i = 0;
+
+  while(str[i])
+    {
+    char * key;
+
+    pos = strchr(str[i], '=');
+    if(!pos)
+      gavl_metadata_set_int(vars, str[i], 1);
+    else
+      {
+      key = gavl_strndup( str[i], pos);
+      pos++;
+
+      gavl_metadata_set(vars, key, pos);
+      free(key);
+      }
+    i++;
+    }
+  bg_strbreak_free(str);
+  }
 
 /* Scramble and descramble password (taken from gftp) */
 
@@ -405,7 +411,7 @@
   int error;
   
   if (*str != '$')
-    return (bg_strdup (NULL, str));
+    return (gavl_strdup(str));
   
   strpos = str + 1;
   newstr = malloc (strlen (strpos) / 2 + 1);
@@ -430,7 +436,7 @@
   if(error)
     {
     free (newstr);
-    return (bg_strdup(NULL, str));
+    return (gavl_strdup(str));
     }
   
   *newpos = '\0';
@@ -448,7 +454,7 @@
       return bg_language_labels[i];
     i++;
     }
-  return NULL;
+  return iso;
   }
 
 int bg_string_match(const char * key,
@@ -493,24 +499,17 @@
 
 char * bg_toupper(const char * str)
   {
-  char * tmp_string_1;
-  char * tmp_string_2;
+  wchar_t * tmp_string_1;
+  wchar_t * tmp_string_2;
+  wchar_t * pos_1;
+  wchar_t * pos_2;
   char * ret;
-  int len;
-  wchar_t * pos_1, * pos_2;
-  
-  bg_charset_converter_t * cnv1;
-  bg_charset_converter_t * cnv2;
   
-  cnv1 = bg_charset_converter_create("UTF-8", "WCHAR_T");
-  cnv2 = bg_charset_converter_create("WCHAR_T", "UTF-8");
+  tmp_string_1 = bg_str_to_wchar(str);
+  tmp_string_2 = malloc((wcslen(tmp_string_1) + 1) * sizeof(*tmp_string_2));
   
-  tmp_string_1 = bg_convert_string(cnv1, str, -1, &len);
-
-  tmp_string_2 = malloc(len + 4);
-
-  pos_1 = (wchar_t*)tmp_string_1;
-  pos_2 = (wchar_t*)tmp_string_2;
+  pos_1 = tmp_string_1;
+  pos_2 = tmp_string_2;
 
   while(*pos_1)
     {
@@ -520,12 +519,58 @@
     }
   *pos_2 = 0;
 
-  ret = bg_convert_string(cnv2, tmp_string_2, len, NULL);
+  ret = bg_wchar_to_str(tmp_string_2);
+  free(tmp_string_1);
+  free(tmp_string_2);
+  return ret;
+  }
+
+char * bg_capitalize(const char * str)
+  {
+  wchar_t * tmp_string_1;
+  wchar_t * tmp_string_2;
+  wchar_t * pos_1;
+  wchar_t * pos_2;
+  char * ret;
+  int capitalize = 1;
+  
+  tmp_string_1 = bg_str_to_wchar(str);
+  tmp_string_2 = malloc((wcslen(tmp_string_1) + 1) * sizeof(*tmp_string_2));
+  
+  pos_1 = tmp_string_1;
+  pos_2 = tmp_string_2;
 
+  while(*pos_1)
+    {
+    if(capitalize)
+      {
+      if(!iswspace(*pos_1)) // a -> A
+        {
+        *pos_2 = towupper(*pos_1);
+        capitalize = 0;
+        }
+      else
+        *pos_2 = *pos_1;
+      }
+    else if(iswspace(*pos_1))
+      {
+      *pos_2 = *pos_1;
+      capitalize = 1;
+      }
+    else
+      {
+       // A -> a
+      *pos_2 = towlower(*pos_1);
+      }
+    
+    pos_1++;
+    pos_2++;
+    }
+  *pos_2 = 0;
+  
+  ret = bg_wchar_to_str(tmp_string_2);
   free(tmp_string_1);
   free(tmp_string_2);
-  bg_charset_converter_destroy(cnv1);
-  bg_charset_converter_destroy(cnv2);
   return ret;
   }
 
@@ -573,7 +618,7 @@
 
   if((pos = strrchr(filename, '.')) &&
      (!strcasecmp(pos+1, ext)))
-    return bg_strdup(NULL, filename);
+    return gavl_strdup(filename);
   else
     return bg_sprintf("%s.%s", filename, ext);
   }
@@ -600,64 +645,9 @@
 
 char * bg_canonical_filename(const char * name)
   {
-#ifdef HAVE_CANONICALIZE_FILE_NAME
-  return canonicalize_file_name(name);
-#else
-  char * ret = malloc(PATH_MAX);
-  realpath(name, ret);
-  return ret;
-#endif
-  }
-
-void * bg_read_file(const char * filename, int * len_ret)
-  {
-  uint8_t * ret;
-  FILE * file;
-  size_t len;
-  
-  file = fopen(filename, "r");
-  if(!file)
-    return NULL;
-
-  fseek(file, 0, SEEK_END);
-  len = ftell(file);
-  fseek(file, 0, SEEK_SET);
-
-  ret = malloc(len + 1);
-
-  if(fread(ret, 1, len, file) < len)
-    {
-    fclose(file);
-    free(ret);
-    return NULL;
-    }
-  ret[len] = '\0';
-  fclose(file);
-
-  if(len_ret)
-    *len_ret = len;
-  
-  return ret;
-  }
-
-int bg_write_file(const char * filename, void * data, int len)
-  {
-  FILE * file;
-  
-  file = fopen(filename, "w");
-  if(!file)
-    return 0;
-  
-  if(fwrite(data, 1, len, file) < len)
-    {
-    fclose(file);
-    return 0;
-    }
-  fclose(file);
-  return 1;
+  return realpath(name, NULL);
   }
 
-
 static const struct
   {
   const char * bcode;
@@ -699,3 +689,73 @@
     }
   return code;
   }
+
+const char * bg_iso639_t_to_b(const char * code)
+  {
+  int i = 0;
+  while(iso639tab[i].bcode)
+    {
+    if(!strcmp(code, iso639tab[i].tcode))
+      return iso639tab[i].bcode;
+    i++;
+    }
+  return code;
+  }
+
+wchar_t * bg_str_to_wchar(const char * str)
+  {
+  size_t len;
+  wchar_t * ret;
+
+  len = mbstowcs(NULL,str,0)+1;
+  ret = calloc(len, sizeof(*ret));
+
+  if(mbstowcs(ret,str,len) == (size_t)-1)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid multibyte sequence in mbstowcs");
+    free(ret);
+    return NULL;
+    }
+  return ret;
+  }
+
+char * bg_wchar_to_str(const wchar_t * wstr)
+  {
+  size_t len;
+  char * ret;
+
+  len = wcstombs(NULL,wstr,0)+1;
+  ret = calloc(len, sizeof(*ret));
+  if(wcstombs(ret,wstr,len) == (size_t)-1)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Invalid multibyte sequence in wcstombs");
+    free(ret);
+    return NULL;
+    }
+  return ret;
+  }
+
+char * bg_strip_space(char * str)
+  {
+  char * pos = str;
+
+  while(isspace(*pos) && *pos != '\0')
+    pos++;
+
+  if(*pos == '\0')
+    {
+    free(str);
+    return NULL;
+    }
+  
+  if(pos > str)
+    memmove(str, pos, strlen(pos)+1);
+
+  pos = str + (strlen(pos)-1);
+  while(isspace(*pos))
+    pos--;
+
+  pos++;
+  *pos = '\0';
+  return str;
+  }

gmerlin-1.2.0.tar.gz/lib/subprocess.c -> gmerlin-4256.tar.gz/lib/subprocess.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <inttypes.h>
@@ -36,7 +37,7 @@
 
 #include <gmerlin/subprocess.h>
 #include <gmerlin/log.h>
-
+#include <gmerlin/utils.h>
 #define READ  0
 #define WRITE 1
 
@@ -137,6 +138,7 @@
   pid = fork();
   if(pid == (pid_t) 0)
     {
+    setsid();
     /*  Child */
     connect_pipe_child(&ret_priv->stdin_fd, STDIN_FILENO);
     connect_pipe_child(&ret_priv->stdout_fd, STDOUT_FILENO);
@@ -182,7 +184,7 @@
 void bg_subprocess_kill(bg_subprocess_t * p, int sig)
   {
   subprocess_priv_t * priv = (subprocess_priv_t*)(p->priv);
-  kill(priv->pid, sig);
+  kill(-priv->pid, sig);
   
   }
 
@@ -284,3 +286,44 @@
   return bytes_read;
   }
 
+void bg_daemonize()
+  {
+  pid_t pid, sid;
+  /* Fork off the parent process */
+  pid = fork();
+  if(pid < 0)
+    {
+    exit(EXIT_FAILURE);
+    }
+  /* If we got a good PID, then
+     we can exit the parent process. */
+  if(pid > 0)
+    {
+    exit(EXIT_SUCCESS);
+    }
+  
+  /* Change the file mode mask */
+  umask(0);
+                
+  /* Open any logs here */        
+                
+  /* Create a new SID for the child process */
+  sid = setsid();
+  if (sid < 0)
+    {
+    /* Log the failure */
+    exit(EXIT_FAILURE);
+    }
+  
+  /* Change the current working directory */
+  if ((chdir("/")) < 0)
+    {
+    /* Log the failure */
+    exit(EXIT_FAILURE);
+    }
+  
+  /* Close out the standard file descriptors */
+  close(STDIN_FILENO);
+  close(STDOUT_FILENO);
+  close(STDERR_FILENO);
+  }

gmerlin-4256.tar.gz/lib/subtitle.c Added

@@ -0,0 +1,217 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gavl/gavl.h>
+#include <gavl/connectors.h>
+
+#include <gmerlin/subtitle.h>
+#include <gmerlin/log.h>
+#include <gmerlin/utils.h>
+
+#define LOG_DOMAIN "subtitle"
+
+// #define DUMP_SUBTITLE
+
+struct bg_subtitle_handler_s
+  {
+  gavl_video_format_t video_format;
+  gavl_video_format_t ovl_format;
+  
+  gavl_video_source_t * src;
+  gavl_video_sink_t   * sink;
+
+  gavl_video_frame_t * cur;
+  gavl_video_frame_t * next;
+
+  gavl_video_frame_t * ovl[2];
+
+//  gavl_video_frame_t * out_ovl;
+  
+  int eof;
+  int active; // Current subtitle is active
+  };
+
+bg_subtitle_handler_t * bg_subtitle_handler_create()
+  {
+  bg_subtitle_handler_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+void bg_subtitle_handler_destroy(bg_subtitle_handler_t * h)
+  {
+  free(h);
+  }
+
+void bg_subtitle_handler_init(bg_subtitle_handler_t * h,
+                              gavl_video_format_t * video_format,
+                              gavl_video_source_t * src,
+                              gavl_video_sink_t * sink)
+  {
+  if(h->ovl[0])
+    gavl_video_frame_destroy(h->ovl[0]);
+  if(h->ovl[1])
+    gavl_video_frame_destroy(h->ovl[1]);
+ 
+  h->src = src;
+  h->sink = sink;
+
+  if(!h->src || !h->sink)
+    return;
+
+  gavl_video_format_copy(&h->ovl_format,
+                         gavl_video_sink_get_format(h->sink));
+  
+  gavl_video_source_set_dst(h->src, 0, &h->ovl_format);
+  
+  gavl_video_format_copy(&h->video_format, video_format);
+
+  h->ovl[0] = gavl_video_frame_create(&h->ovl_format);
+  h->ovl[1] = gavl_video_frame_create(&h->ovl_format);
+  h->cur = h->ovl[0];
+  h->next = h->ovl[1];
+
+  bg_subtitle_handler_reset(h);
+  }
+
+static void read_subtitle(bg_subtitle_handler_t * h,
+                          gavl_video_frame_t * frame)
+  {
+  gavl_source_status_t st;
+  if((frame->src_rect.w > 0) || h->eof)
+    return;
+  
+  st = gavl_video_source_read_frame(h->src, &frame);
+  if(st == GAVL_SOURCE_EOF)
+    {
+    h->eof = 1;
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Subtitle stream finished");
+    }
+  if(st == GAVL_SOURCE_OK)
+    {
+#ifdef DUMP_SUBTITLE
+    bg_dprintf("Got subtitle\n");
+    gavl_video_frame_dump_metadata(gavl_video_source_get_dst_format(h->src),
+                                   frame);
+#endif
+    }
+  }
+
+static void put_overlay(bg_subtitle_handler_t * h)
+  {
+  h->active = 1;
+  gavl_video_sink_put_frame(h->sink, h->cur);
+#ifdef DUMP_SUBTITLE
+  bg_dprintf("Put subtitle\n");
+  gavl_video_frame_dump_metadata(gavl_video_source_get_dst_format(h->src),
+                                 h->cur);
+#endif
+  }
+
+static void clear_overlay(bg_subtitle_handler_t * h)
+  {
+  h->active = 0;
+  h->cur->src_rect.w = 0;
+  gavl_video_sink_put_frame(h->sink, h->cur);
+#ifdef DUMP_SUBTITLE
+  bg_dprintf("Clear subtitle\n");
+#endif
+  }
+
+void bg_subtitle_handler_update(bg_subtitle_handler_t * h,
+                                const gavl_video_frame_t * frame)
+  {
+  gavl_video_frame_t * swp;
+  gavl_time_t frame_start;
+  gavl_time_t frame_end;
+  gavl_time_t overlay_start;
+  gavl_time_t overlay_end;
+  
+  frame_start = gavl_time_unscale(h->video_format.timescale, frame->timestamp);
+  frame_end = gavl_time_unscale(h->video_format.timescale, frame->timestamp + frame->duration);
+  
+  /* Check if the subtitle is expired */
+  if(h->active && (h->cur->duration > 0))
+    {
+    overlay_end = gavl_time_unscale(h->ovl_format.timescale,
+                                    h->cur->timestamp + h->cur->duration);
+    if(frame_start > overlay_end)
+      {
+      clear_overlay(h);
+      
+      /* Swap */
+      swp = h->cur;
+      h->cur = h->next;
+      h->next = swp;
+      }
+    }
+
+  /* Read as many subtitles as possible */
+  read_subtitle(h, h->cur);
+  read_subtitle(h, h->next);
+
+  /* Check if the current subtitle became valid */
+  if(!h->active && h->cur->src_rect.w)
+    {
+    overlay_start = gavl_time_unscale(h->ovl_format.timescale,
+                                      h->cur->timestamp);
+
+    
+    if(overlay_start < frame_end)
+      put_overlay(h);
+    }
+  /* Check if the next subtitle became valid */
+  else if(h->next->src_rect.w)
+    {
+    overlay_start = gavl_time_unscale(h->ovl_format.timescale,
+                                      h->next->timestamp);
+    if(overlay_start < frame_end)
+      {
+      h->cur->src_rect.w = 0;
+      
+      /* Swap */
+      swp = h->cur;
+      h->cur = h->next;
+      h->next = swp;
+      
+      put_overlay(h);
+      }
+    }
+  }
+
+void bg_subtitle_handler_reset(bg_subtitle_handler_t * h)
+  {
+  if(h->active)
+    clear_overlay(h);
+  
+  h->cur->src_rect.w = 0;
+  h->cur->src_rect.h = 0;
+
+  h->next->src_rect.w = 0;
+  h->next->src_rect.h = 0;
+  h->active = 0;
+  h->eof = 0;
+  }

gmerlin-1.2.0.tar.gz/lib/textrenderer.c -> gmerlin-4256.tar.gz/lib/textrenderer.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -33,7 +33,8 @@
 
 #include <config.h>
 #include <gmerlin/translation.h>
-
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "textrenderer"
 
 #include <bgfreetype.h>
 
@@ -42,6 +43,7 @@
 #include <gmerlin/utils.h>
 #include <gmerlin/charset.h>
 
+
 // #undef FT_STROKER_H
 
 /* Text alignment */
@@ -185,7 +187,7 @@
       .type =       BG_PARAMETER_STRINGLIST,
       .val_default =  { .val_str = "yuv" },
       .multi_names =  (char const *[]){ "yuv", "rgb", NULL },
-      .multi_labels = (char const *[]){ TRS("YCrCb"), TRS("RGB"), NULL },
+      .multi_labels = (char const *[]){ TRS("YCbCr"), TRS("RGB"), NULL },
     },
     {
       .name =       "default_framerate",
@@ -277,6 +279,9 @@
   int default_width, default_height;
   gavl_pixelformat_t default_csp;
   float default_framerate;
+
+  gavl_packet_source_t * psrc;
+  gavl_video_source_t * vsrc;
   };
 
 static void adjust_bbox(cache_entry_t * glyph, int dst_x, int dst_y, bbox_t * ret)
@@ -296,17 +301,107 @@
 
 #define MY_MIN(x, y) (x < y ? x : y)
 
+static int get_rectangles(FT_BitmapGlyph g,
+                          int dst_x, int dst_y,
+                          gavl_rectangle_i_t * frame_rect,
+                          gavl_rectangle_i_t * glyph_rect,
+                          const gavl_video_format_t * ovl_format)
+  {
+  int delta;
+  frame_rect->x = dst_x + g->left;
+  frame_rect->y = dst_y - g->top;
+  
+  frame_rect->w = MY_MIN(g->bitmap.width, g->bitmap.pitch);
+  frame_rect->h = g->bitmap.rows;
+
+  glyph_rect->x = 0;
+  glyph_rect->y = 0;
+
+  glyph_rect->w = frame_rect->w;
+  glyph_rect->h = frame_rect->h;
+
+  if(frame_rect->x < 0)
+    {
+    delta = -frame_rect->x;
+    gavl_rectangle_i_crop_left(frame_rect, delta);
+    gavl_rectangle_i_crop_left(glyph_rect, delta);
+
+    if(frame_rect->w <= 0)
+      return 0;
+    }
+  if(frame_rect->y < 0)
+    {
+    delta = -frame_rect->y;
+    gavl_rectangle_i_crop_top(frame_rect, delta);
+    gavl_rectangle_i_crop_top(glyph_rect, delta);
+
+    if(frame_rect->h <= 0)
+      return 0;
+
+    //    fprintf(stderr, "Crop top %d\n", delta);
+    }
+
+  if(frame_rect->x + frame_rect->w > ovl_format->image_width)
+    {
+    delta = frame_rect->x + frame_rect->w - ovl_format->image_width;
+    gavl_rectangle_i_crop_right(frame_rect, delta);
+    gavl_rectangle_i_crop_right(glyph_rect, delta);
+    //    fprintf(stderr, "Crop right %d\n", delta);
+
+    if(frame_rect->w <= 0)
+      return 0;
+
+    }
+
+  if(frame_rect->y + frame_rect->h > ovl_format->image_height)
+    {
+    delta = frame_rect->y + frame_rect->h - ovl_format->image_height;
+    gavl_rectangle_i_crop_bottom(frame_rect, delta);
+    gavl_rectangle_i_crop_bottom(glyph_rect, delta);
+    //    fprintf(stderr, "Crop bottom %d\n", delta);
+    
+    if(frame_rect->h <= 0)
+      return 0;
+
+    }
+  
+  return 1;
+  }
+
+static void get_start_ptrs(FT_BitmapGlyph g,
+                           gavl_video_frame_t * f,
+                           gavl_rectangle_i_t * frame_rect,
+                           gavl_rectangle_i_t * glyph_rect,
+                           uint8_t ** src_ptr_start,
+                           uint8_t ** dst_ptr_start,
+                           int byptes_per_pixel)
+  {
+  *src_ptr_start =
+    g->bitmap.buffer +
+    glyph_rect->y * g->bitmap.pitch +
+    glyph_rect->x;
+
+  *dst_ptr_start = f->planes[0] +
+    frame_rect->y * f->strides[0] +
+    frame_rect->x * byptes_per_pixel;
+  }
+                          
+
 static void render_rgba_32(bg_text_renderer_t * r, cache_entry_t * glyph,
                            gavl_video_frame_t * frame,
                            int * dst_x, int * dst_y)
   {
   FT_BitmapGlyph bitmap_glyph;
   uint8_t * src_ptr, * dst_ptr, * src_ptr_start, * dst_ptr_start;
-  int i, j, i_tmp, jmax;
+  int i, j, i_tmp;
 #ifdef FT_STROKER_H
   int alpha_i;
 #endif
- 
+
+  gavl_rectangle_i_t frame_rect;
+  gavl_rectangle_i_t glyph_rect;
+
+  //  fprintf(stderr, "Render RGBA 32\n");
 
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph_stroke);
@@ -321,19 +416,44 @@
     return;
     }
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 4;
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
 
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-    
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 4);
+#if 0  
+  if((*dst_x < 0) || (*dst_y < 0))
+    fprintf(stderr, "Buuug: %d %d\n", *dst_x, *dst_y);
+
+  if(((*dst_x + jmax) >= r->frame_format.image_width) ||
+     ((*dst_y + bitmap_glyph->bitmap.rows) >= r->frame_format.image_height))
+    fprintf(stderr, "Buuug: %d %d\n", *dst_x + jmax,
+            *dst_y + bitmap_glyph->bitmap.rows);
+#endif
+
+  //  fprintf(stderr, "Glyph_rect: ");
+  //  gavl_rectangle_i_dump(&glyph_rect);
+  //  fprintf(stderr, "\n");
+
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       i_tmp = ((int)*src_ptr * (int)r->alpha_i) >> 8;
       if(i_tmp > dst_ptr[3])
@@ -348,20 +468,35 @@
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph);
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 4;
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
 
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-  
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 4);
+
+  //  fprintf(stderr, "Glyph_rect: ");
+  //  gavl_rectangle_i_dump(&glyph_rect);
+  //  fprintf(stderr, "\n");
   
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       if(*src_ptr)
         {
@@ -397,11 +532,13 @@
   {
   FT_BitmapGlyph bitmap_glyph;
   uint8_t * src_ptr, * dst_ptr, * src_ptr_start, * dst_ptr_start;
-  int i, j, i_tmp, jmax;
+  int i, j, i_tmp;
 #ifdef FT_STROKER_H
   int alpha_i;
 #endif
  
+  gavl_rectangle_i_t frame_rect;
+  gavl_rectangle_i_t glyph_rect;
 
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph_stroke);
@@ -415,20 +552,32 @@
     *dst_y += glyph->advance_y;
     return;
     }
-
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 2;
   
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-    
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
+  
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 2);
+  
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       i_tmp = ((int)*src_ptr * (int)r->alpha_i) >> 8;
       if(i_tmp > dst_ptr[1])
@@ -443,20 +592,31 @@
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph);
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 2;
-
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-  
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
   
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 2);
+   
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       if(*src_ptr)
         {
@@ -486,10 +646,12 @@
   FT_BitmapGlyph bitmap_glyph;
   uint8_t * src_ptr, * src_ptr_start, * dst_ptr_start;
   uint16_t * dst_ptr;
-  int i, j, i_tmp, jmax;
+  int i, j, i_tmp;
 #ifdef FT_STROKER_H
   int alpha_i;
 #endif
+  gavl_rectangle_i_t frame_rect;
+  gavl_rectangle_i_t glyph_rect;
 
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph_stroke);
@@ -503,20 +665,32 @@
     *dst_y += glyph->advance_y;
     return;
     }
-
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 8;
-
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-    
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
+  
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 8);
+       
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (uint16_t*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       i_tmp = ((int)*src_ptr * (int)r->alpha_i) >> 8;
       if(i_tmp > dst_ptr[3])
@@ -533,19 +707,31 @@
   /* Render border */
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph);
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 8;
-
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
   
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 8);
+
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (uint16_t*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       if(*src_ptr)
         {
@@ -583,10 +769,12 @@
   FT_BitmapGlyph bitmap_glyph;
   uint8_t * src_ptr, * src_ptr_start, * dst_ptr_start;
   uint16_t * dst_ptr;
-  int i, j, i_tmp, jmax;
+  int i, j, i_tmp;
 #ifdef FT_STROKER_H
   int alpha_i;
 #endif
+  gavl_rectangle_i_t frame_rect;
+  gavl_rectangle_i_t glyph_rect;
 
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph_stroke);
@@ -601,19 +789,31 @@
     return;
     }
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 4;
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
+  
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 4);
 
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-    
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (uint16_t*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       i_tmp = ((int)*src_ptr * (int)r->alpha_i) >> 8;
       if(i_tmp > dst_ptr[1])
@@ -630,19 +830,31 @@
   /* Render border */
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph);
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 4;
-
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
   
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 4);
+      
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (uint16_t*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       if(*src_ptr)
         {
@@ -673,11 +885,13 @@
   FT_BitmapGlyph bitmap_glyph;
   uint8_t * src_ptr, * src_ptr_start, * dst_ptr_start;
   float * dst_ptr;
-  int i, j, jmax;
+  int i, j;
   float f_tmp;
 #ifdef FT_STROKER_H
   float alpha_f;
 #endif
+  gavl_rectangle_i_t frame_rect;
+  gavl_rectangle_i_t glyph_rect;
 
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph_stroke);
@@ -692,20 +906,31 @@
     return;
     }
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 4 * sizeof(float);
-
-
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
+  
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 4 * sizeof(float));
 
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (float*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       f_tmp = ((float)*src_ptr * r->alpha_f) / 255.0;
       if(f_tmp > dst_ptr[3])
@@ -721,20 +946,32 @@
 #ifdef FT_STROKER_H
   /* Render border */
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph);
-  
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 4 * sizeof(float);
 
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
   
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 4 * sizeof(float));
+   
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (float*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       if(*src_ptr)
         {
@@ -765,11 +1002,13 @@
   FT_BitmapGlyph bitmap_glyph;
   uint8_t * src_ptr, * src_ptr_start, * dst_ptr_start;
   float * dst_ptr;
-  int i, j, jmax;
+  int i, j;
   float f_tmp;
 #ifdef FT_STROKER_H
   float alpha_f;
 #endif
+  gavl_rectangle_i_t frame_rect;
+  gavl_rectangle_i_t glyph_rect;
 
 #ifdef FT_STROKER_H
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph_stroke);
@@ -783,21 +1022,31 @@
     *dst_y += glyph->advance_y;
     return;
     }
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
 
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 2 * sizeof(float);
-
-
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
-
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 2 * sizeof(float));
+  
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (float*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       f_tmp = ((float)*src_ptr * r->alpha_f) / 255.0;
       if(f_tmp > dst_ptr[1])
@@ -813,20 +1062,32 @@
 #ifdef FT_STROKER_H
   /* Render border */
   bitmap_glyph = (FT_BitmapGlyph)(glyph->glyph);
-  
-  src_ptr_start = bitmap_glyph->bitmap.buffer;
-  dst_ptr_start = frame->planes[0] + (*dst_y - bitmap_glyph->top) *
-    frame->strides[0] + (*dst_x + bitmap_glyph->left) * 2 * sizeof(float);
 
-  jmax = MY_MIN(bitmap_glyph->bitmap.width, 
-                bitmap_glyph->bitmap.pitch);
+  if(!get_rectangles(bitmap_glyph,
+                     *dst_x, *dst_y,
+                     &frame_rect,
+                     &glyph_rect,
+                     &r->overlay_format))
+    {
+    *dst_x += glyph->advance_x;
+    *dst_y += glyph->advance_y;
+    return;
+    }
+
+  get_start_ptrs(bitmap_glyph,
+                 frame,
+                 &frame_rect,
+                 &glyph_rect,
+                 &src_ptr_start,
+                 &dst_ptr_start,
+                 2 * sizeof(float));
   
-  for(i = 0; i < bitmap_glyph->bitmap.rows; i++)
+  for(i = 0; i < glyph_rect.h; i++)
     {
     src_ptr = src_ptr_start;
     dst_ptr = (float*)dst_ptr_start;
     
-    for(j = 0; j < jmax; j++)
+    for(j = 0; j < glyph_rect.w; j++)
       {
       if(*src_ptr)
         {
@@ -848,7 +1109,6 @@
 
   }
 
-
 static void alloc_glyph_cache(bg_text_renderer_t * r, int size)
   {
   int i;
@@ -1010,6 +1270,7 @@
   FcPattern *fc_pattern_1 = NULL;
   FcChar8 *filename;
   FcBool scalable;
+  FcResult result;
   float sar, font_size_scaled;
   
   unload_font(r);
@@ -1020,19 +1281,35 @@
     FcInit();
     fc_pattern = FcNameParse((const FcChar8*)r->font);
     
-    //  FcPatternPrint(fc_pattern);
+//    FcPatternPrint(fc_pattern);
     
     FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
     
-    //  FcPatternPrint(fc_pattern);
+//    FcPatternPrint(fc_pattern);
     
     FcDefaultSubstitute(fc_pattern);
     
-    //  FcPatternPrint(fc_pattern);
+//    FcPatternPrint(fc_pattern);
     
-    fc_pattern_1 = FcFontMatch(NULL, fc_pattern, 0);
-    
-    //  FcPatternPrint(fc_pattern);
+    fc_pattern_1 = FcFontMatch(NULL, fc_pattern, &result);
+
+#if 0
+    if(result != FcResultMatch)
+      {
+      FcPatternDestroy(fc_pattern);
+      if(fc_pattern_1)
+        FcPatternDestroy(fc_pattern_1);
+      return 0;
+      }
+#else
+    if(!fc_pattern_1)
+      {
+      FcPatternDestroy(fc_pattern);
+      return 0;
+      }
+#endif    
+
+    //    FcPatternPrint(fc_pattern);
     
     FcPatternGetBool(fc_pattern_1, FC_SCALABLE, 0, &scalable);
     if(scalable != FcTrue)
@@ -1154,6 +1431,10 @@
   
   FT_Done_FreeType(r->library);
   pthread_mutex_destroy(&r->config_mutex);
+
+  if(r->vsrc)
+    gavl_video_source_destroy(r->vsrc);
+
   free(r);
   }
 
@@ -1178,7 +1459,7 @@
     {
     if(!r->font || strcmp(val->val_str, r->font))
       {
-      r->font = bg_strdup(r->font, val->val_str);
+      r->font = gavl_strrep(r->font, val->val_str);
       r->font_changed = 1;
       }
     }
@@ -1187,7 +1468,7 @@
     {
     if(!r->font_file || strcmp(val->val_str, r->font_file))
       {
-      r->font_file = bg_strdup(r->font_file, val->val_str);
+      r->font_file = gavl_strrep(r->font_file, val->val_str);
       r->font_changed = 1;
       }
     }
@@ -1354,7 +1635,7 @@
 static
 void init_nolock(bg_text_renderer_t * r)
   {
-  int bits;
+  //  int bits;
 #ifdef FT_STROKER_H 
   float y_tmp, u_tmp, v_tmp;
 #endif  
@@ -1368,26 +1649,58 @@
 
   gavl_video_format_copy(&r->last_frame_format, &r->frame_format);
   
-  
   /* Load font if necessary */
   if(r->font_changed || !r->face)
     load_font(r);
   
   /* Copy formats */
 
-  gavl_video_format_copy(&r->overlay_format, &r->frame_format);
+  // gavl_video_format_copy(&r->overlay_format, &r->frame_format);
+  
+  if(!r->overlay_format.image_width || !r->overlay_format.image_height)
+    {
+    r->overlay_format.image_width = r->frame_format.image_width;
+    r->overlay_format.image_height = r->frame_format.image_height;
+    r->overlay_format.frame_width = r->frame_format.frame_width;
+    r->overlay_format.frame_height = r->frame_format.frame_height;
+    r->overlay_format.pixel_width = r->frame_format.pixel_width;
+    r->overlay_format.pixel_height = r->frame_format.pixel_height;
+    }
+  if(!gavl_pixelformat_has_alpha(r->overlay_format.pixelformat))
+    {
+    /* Guess overlay format from the frame format */
+    gavl_video_format_t fmt;
+    gavl_overlay_blend_context_t * ctx;
+
+    ctx = gavl_overlay_blend_context_create();
+    gavl_video_format_copy(&fmt,
+                           &r->frame_format);
+
+    gavl_overlay_blend_context_init(ctx,
+                                    &r->frame_format, &fmt);
+    r->overlay_format.pixelformat = fmt.pixelformat;
+    gavl_overlay_blend_context_destroy(ctx);
+    }
+  if(!r->overlay_format.timescale)
+    {
+    r->overlay_format.timescale      = r->frame_format.timescale;
+    r->overlay_format.frame_duration = r->frame_format.frame_duration;
+    r->overlay_format.framerate_mode = r->frame_format.framerate_mode;
+    }
   
   /* Decide about overlay format */
 
   gavl_pixelformat_chroma_sub(r->frame_format.pixelformat,
                               &r->sub_h, &r->sub_v);
+
+  if(!r->sub_h)
+    r->sub_h = 1;
+  if(!r->sub_v)
+    r->sub_v = 1;
   
-  if(gavl_pixelformat_is_rgb(r->frame_format.pixelformat))
+  switch(r->overlay_format.pixelformat)
     {
-    bits = 8*gavl_pixelformat_bytes_per_pixel(r->frame_format.pixelformat);
-    if(bits <= 32)
-      {
-      r->overlay_format.pixelformat = GAVL_RGBA_32;
+    case GAVL_RGBA_32:
       r->alpha_i = (int)(r->alpha_f*255.0+0.5);
 #ifdef FT_STROKER_H 
       r->color_i[0] = (int)(r->color_config[0]*255.0+0.5);
@@ -1396,10 +1709,8 @@
       r->color_i[3] = (int)(r->color_config[3]*255.0+0.5);
 #endif
       r->render_func = render_rgba_32;
-      }
-    else if(bits <= 64)
-      {
-      r->overlay_format.pixelformat = GAVL_RGBA_64;
+      break;
+    case GAVL_RGBA_64:
       r->alpha_i = (int)(r->alpha_f*65535.0+0.5);
 #ifdef FT_STROKER_H 
       r->color_i[0] = (int)(r->color_config[0]*65535.0+0.5);
@@ -1408,143 +1719,82 @@
       r->color_i[3] = (int)(r->color_config[3]*65535.0+0.5);
 #endif
       r->render_func = render_rgba_64;
-      }
-    else
-      {
-      r->overlay_format.pixelformat = GAVL_RGBA_FLOAT;
+      break;
+    case GAVL_RGBA_FLOAT:
       r->render_func = render_rgba_float;
       r->color[0] = r->color_config[0];
       r->color[1] = r->color_config[1];
       r->color[2] = r->color_config[2];
-      }
-    }
-  else if(gavl_pixelformat_is_yuv(r->frame_format.pixelformat))
-    {
-    if(gavl_pixelformat_is_planar(r->frame_format.pixelformat))
-      {
-      switch(gavl_pixelformat_bytes_per_component(r->frame_format.pixelformat))
-        {
-        case 1:
-          r->overlay_format.pixelformat = GAVL_YUVA_32;
-          r->alpha_i = (int)(r->alpha_f*255.0+0.5);
+      break;
+    case GAVL_YUVA_32:
+      r->alpha_i = (int)(r->alpha_f*255.0+0.5);
 #ifdef FT_STROKER_H 
-          RGB_FLOAT_TO_YUV_8(r->color_config[0],
-                             r->color_config[1],
-                             r->color_config[2],
-                             r->color_i[0],
-                             r->color_i[1],
-                             r->color_i[2]);
-          r->color_i[3] = (int)(r->color[3]*255.0+0.5);
+      RGB_FLOAT_TO_YUV_8(r->color_config[0],
+                         r->color_config[1],
+                         r->color_config[2],
+                         r->color_i[0],
+                         r->color_i[1],
+                         r->color_i[2]);
+      r->color_i[3] = (int)(r->color[3]*255.0+0.5);
 #endif
-          r->render_func = render_rgba_32;
-          break; 
-        case 2:
-          r->overlay_format.pixelformat = GAVL_YUVA_64;
-          r->alpha_i = (int)(r->alpha_f*65535.0+0.5);
+      r->render_func = render_rgba_32;
+      break;
+    case GAVL_YUVA_64:
+      r->alpha_i = (int)(r->alpha_f*65535.0+0.5);
 #ifdef FT_STROKER_H 
-          RGB_FLOAT_TO_YUV_16(r->color_config[0],
-                              r->color_config[1],
-                              r->color_config[2],
-                              r->color_i[0],
-                              r->color_i[1],
-                              r->color_i[2]);
-          r->color_i[3] = (int)(r->color[3]*65535.0+0.5);
+      RGB_FLOAT_TO_YUV_16(r->color_config[0],
+                          r->color_config[1],
+                          r->color_config[2],
+                          r->color_i[0],
+                          r->color_i[1],
+                          r->color_i[2]);
+      r->color_i[3] = (int)(r->color[3]*65535.0+0.5);
 #endif
-          r->render_func = render_rgba_64;
-          break; 
-        }
-      }
-    else /* Packed */
-      {
-      switch(gavl_pixelformat_bytes_per_pixel(r->frame_format.pixelformat))
-        {
-        case 2: /* YUY2, UYVY */
-        case 4: /* YUVA32 */
-          r->overlay_format.pixelformat = GAVL_YUVA_32;
-          r->alpha_i = (int)(r->alpha_f*255.0+0.5);
+      r->render_func = render_rgba_64;
+      break;
+    case GAVL_YUVA_FLOAT:
 #ifdef FT_STROKER_H 
-          RGB_FLOAT_TO_YUV_8(r->color_config[0],
+      RGB_FLOAT_TO_YUV_FLOAT(r->color_config[0],
                              r->color_config[1],
                              r->color_config[2],
-                             r->color_i[0],
-                             r->color_i[1],
-                             r->color_i[2]);
-          r->color_i[3] = (int)(r->color[3]*255.0+0.5);
-#endif
-          r->render_func = render_rgba_32;
-          break; 
-        case 8: /* YUVA 64 */
-          r->overlay_format.pixelformat = GAVL_YUVA_64;
-          r->alpha_i = (int)(r->alpha_f*65535.0+0.5);
-#ifdef FT_STROKER_H 
-          RGB_FLOAT_TO_YUV_16(r->color_config[0],
-                              r->color_config[1],
-                              r->color_config[2],
-                              r->color_i[0],
-                              r->color_i[1],
-                              r->color_i[2]);
-          r->color_i[3] = (int)(r->color[3]*65535.0+0.5);
-#endif
-          r->render_func = render_rgba_64;
-          break; 
-        case 3*sizeof(float): /* YUV float */
-        case 4*sizeof(float): /* YUVA float */
-          r->overlay_format.pixelformat = GAVL_YUVA_FLOAT;
-#ifdef FT_STROKER_H 
-          RGB_FLOAT_TO_YUV_FLOAT(r->color_config[0],
-                                 r->color_config[1],
-                                 r->color_config[2],
-                                 r->color[0],
-                                 r->color[1],
-                                 r->color[2]);
+                             r->color[0],
+                             r->color[1],
+                             r->color[2]);
 #endif
-          r->render_func = render_rgba_float;
-          break; 
-        }
-      }
-    }
-  else // Gray
-    {
-    switch(r->frame_format.pixelformat)
-      {
-      case GAVL_GRAY_8:
-      case GAVL_GRAYA_16:
-        r->overlay_format.pixelformat = GAVL_GRAYA_16;
-        r->alpha_i = (int)(r->alpha_f*255.0+0.5);
+      r->render_func = render_rgba_float;
+      break;
+    case GAVL_GRAYA_16:
+      r->alpha_i = (int)(r->alpha_f*255.0+0.5);
 #ifdef FT_STROKER_H 
-        RGB_FLOAT_TO_GRAY_8(r->color_config[0],
-                            r->color_config[1],
-                            r->color_config[2],
-                            r->color_i[0]);
+      RGB_FLOAT_TO_GRAY_8(r->color_config[0],
+                          r->color_config[1],
+                          r->color_config[2],
+                          r->color_i[0]);
 #endif
-        r->render_func = render_graya_16;
-        break;
-      case GAVL_GRAY_16:
-      case GAVL_GRAYA_32:
-        r->overlay_format.pixelformat = GAVL_GRAYA_32;
-        r->alpha_i = (int)(r->alpha_f*65535.0+0.5);
+      r->render_func = render_graya_16;
+      break;      
+    case GAVL_GRAYA_32:
+      r->alpha_i = (int)(r->alpha_f*65535.0+0.5);
 #ifdef FT_STROKER_H 
-        RGB_FLOAT_TO_GRAY_16(r->color_config[0],
-                             r->color_config[1],
-                             r->color_config[2],
-                             r->color_i[0]);
+      RGB_FLOAT_TO_GRAY_16(r->color_config[0],
+                           r->color_config[1],
+                           r->color_config[2],
+                           r->color_i[0]);
 #endif
-        r->render_func = render_graya_32;
-        break;
-      case GAVL_GRAY_FLOAT:
-      case GAVL_GRAYA_FLOAT:
-        r->overlay_format.pixelformat = GAVL_GRAYA_FLOAT;
-        r->render_func = render_graya_float;
-        RGB_FLOAT_TO_GRAY_FLOAT(r->color_config[0],
-                                r->color_config[1],
-                                r->color_config[2],
-                                r->color[0]);
-        break;
-      default:
-        break;
-      }
+      r->render_func = render_graya_32;
+      break;
+    case GAVL_GRAYA_FLOAT:
+      r->render_func = render_graya_float;
+      RGB_FLOAT_TO_GRAY_FLOAT(r->color_config[0],
+                              r->color_config[1],
+                              r->color_config[2],
+                              r->color[0]);
+      break;      
+    default:
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unknown pixelformat %s",
+             gavl_pixelformat_to_string(r->overlay_format.pixelformat));
     }
-  
+ 
   /* */
   
   gavl_rectangle_i_set_all(&r->max_bbox, &r->overlay_format);
@@ -1556,50 +1806,6 @@
   
   }
 
-void bg_text_renderer_init(bg_text_renderer_t * r,
-                           const gavl_video_format_t * frame_format,
-                           gavl_video_format_t * overlay_format)
-  {
-  int timescale, frame_duration;
-  
-  pthread_mutex_lock(&r->config_mutex);
-
-  timescale      = overlay_format->timescale;
-  frame_duration = overlay_format->frame_duration;
-    
-  if(frame_format)
-    {
-    gavl_video_format_copy(&r->frame_format, frame_format);
-    }
-  else
-    {
-    memset(&r->frame_format, 0, sizeof(r->frame_format));
-    r->frame_format.image_width  = r->default_width;
-    r->frame_format.image_height = r->default_height;
-
-    r->frame_format.frame_width  = r->default_width;
-    r->frame_format.frame_height = r->default_height;
-
-    r->frame_format.pixel_width = 1;
-    r->frame_format.pixel_height = 1;
-    r->frame_format.pixelformat = r->default_csp;
-    r->frame_format.timescale = (int)(r->default_framerate * 1000 + 0.5);
-    r->frame_format.frame_duration = 1000;
-    
-    }
-  
-  init_nolock(r);
-
-  r->overlay_format.timescale      = timescale;
-  r->overlay_format.frame_duration = frame_duration;
-
-  gavl_video_format_copy(overlay_format, &r->overlay_format);
-
-  r->config_changed = 0;
-
-  
-  pthread_mutex_unlock(&r->config_mutex);
-  }
 
 void bg_text_renderer_get_frame_format(bg_text_renderer_t * r,
                                        gavl_video_format_t * frame_format)
@@ -1666,7 +1872,7 @@
   int len, i;
   int pos_x, pos_y;
   int line_start, line_end;
-  int line_width, line_end_y;
+  int line_width;
   int line_offset;
   int break_word; /* Linebreak within a (long) word */
   pthread_mutex_lock(&r->config_mutex);
@@ -1682,9 +1888,9 @@
   r->bbox.ymax = 0;
 
 #ifdef FT_STROKER_H
-  gavl_video_frame_fill(ovl->frame, &r->overlay_format, r->color_stroke);
+  gavl_video_frame_fill(ovl, &r->overlay_format, r->color_stroke);
 #else
-  gavl_video_frame_fill(ovl->frame, &r->overlay_format, r->color);
+  gavl_video_frame_fill(ovl, &r->overlay_format, r->color);
 #endif
   
   /* Convert string */
@@ -1726,7 +1932,6 @@
       {
       line_end = i;
       line_width = pos_x;
-      line_end_y = pos_y;
       break_word = 0;
       }
     
@@ -1739,13 +1944,12 @@
       if(line_end < 0)
         {
         line_width = pos_x;
-        line_end_y = pos_y;
         line_end = i;
         break_word = 1;
         }
       /* Render the line */
       
-      flush_line(r, ovl->frame,
+      flush_line(r, ovl,
                  &glyphs[line_start], line_end - line_start,
                  &pos_y);
       
@@ -1766,33 +1970,33 @@
     }
   if(len - line_start)
     {
-    flush_line(r, ovl->frame,
+    flush_line(r, ovl,
                &glyphs[line_start], len - line_start,
                &pos_y);
     }
   
-  ovl->ovl_rect.x = r->bbox.xmin;
-  ovl->ovl_rect.y = r->bbox.ymin;
+  ovl->src_rect.x = r->bbox.xmin;
+  ovl->src_rect.y = r->bbox.ymin;
 
-  ovl->ovl_rect.w = r->bbox.xmax - r->bbox.xmin;
-  ovl->ovl_rect.h = r->bbox.ymax - r->bbox.ymin;
+  ovl->src_rect.w = r->bbox.xmax - r->bbox.xmin;
+  ovl->src_rect.h = r->bbox.ymax - r->bbox.ymin;
 
   /* Align to subsampling */
-  ovl->ovl_rect.w += r->sub_h - (ovl->ovl_rect.w % r->sub_h);
-  ovl->ovl_rect.h += r->sub_v - (ovl->ovl_rect.h % r->sub_v);
+  ovl->src_rect.w += r->sub_h - (ovl->src_rect.w % r->sub_h);
+  ovl->src_rect.h += r->sub_v - (ovl->src_rect.h % r->sub_v);
   
   switch(r->justify_h)
     {
     case JUSTIFY_LEFT:
     case JUSTIFY_CENTER:
-      ovl->dst_x = ovl->ovl_rect.x + r->border_left;
+      ovl->dst_x = ovl->src_rect.x + r->border_left;
       
       if(ovl->dst_x % r->sub_h)
         ovl->dst_x += r->sub_h - (ovl->dst_x % r->sub_h);
       
       break;
     case JUSTIFY_RIGHT:
-      ovl->dst_x = r->overlay_format.image_width - r->border_right - ovl->ovl_rect.w;
+      ovl->dst_x = r->overlay_format.image_width - r->border_right - ovl->src_rect.w;
       ovl->dst_x -= (ovl->dst_x % r->sub_h);
       break;
     }
@@ -1806,14 +2010,14 @@
       break;
     case JUSTIFY_CENTER:
       ovl->dst_y = r->border_top +
-        ((r->overlay_format.image_height - ovl->ovl_rect.h)>>1);
+        ((r->overlay_format.image_height - ovl->src_rect.h)>>1);
 
       if(ovl->dst_y % r->sub_v)
         ovl->dst_y += r->sub_v - (ovl->dst_y % r->sub_v);
 
       break;
     case JUSTIFY_BOTTOM:
-      ovl->dst_y = r->overlay_format.image_height - r->border_bottom - ovl->ovl_rect.h;
+      ovl->dst_y = r->overlay_format.image_height - r->border_bottom - ovl->src_rect.h;
       ovl->dst_y -= (ovl->dst_y % r->sub_v);
       break;
     }
@@ -1825,3 +2029,85 @@
   pthread_mutex_unlock(&r->config_mutex);
   }
 
+static gavl_source_status_t read_video(void * priv, gavl_video_frame_t ** frame)
+  {
+  gavl_packet_t * p = NULL;
+  gavl_source_status_t st;
+  bg_text_renderer_t * r = priv;
+  
+  if((st = gavl_packet_source_read_packet(r->psrc, &p)) != GAVL_SOURCE_OK)
+    return st;
+
+  bg_text_renderer_render(r, (char*)p->data, // Assume the text is properly zero padded
+                          *frame);
+  (*frame)->timestamp = p->pts;
+  (*frame)->duration = p->duration;
+  return GAVL_SOURCE_OK;
+  }
+
+static void init_common(bg_text_renderer_t * r,
+                        const gavl_video_format_t * frame_format,
+                        gavl_video_format_t * overlay_format)
+  {
+  if(overlay_format)
+    gavl_video_format_copy(&r->overlay_format, overlay_format);
+  else
+    memset(&r->overlay_format, 0, sizeof(r->overlay_format));
+  
+  if(frame_format)
+    {
+    gavl_video_format_copy(&r->frame_format, frame_format);
+    }
+  else
+    {
+    memset(&r->frame_format, 0, sizeof(r->frame_format));
+    r->frame_format.image_width  = r->default_width;
+    r->frame_format.image_height = r->default_height;
+
+    r->frame_format.frame_width  = r->default_width;
+    r->frame_format.frame_height = r->default_height;
+
+    r->frame_format.pixel_width = 1;
+    r->frame_format.pixel_height = 1;
+    r->frame_format.pixelformat = r->default_csp;
+    r->frame_format.timescale = (int)(r->default_framerate * 1000 + 0.5);
+    r->frame_format.frame_duration = 1000;
+    
+    }
+  
+  init_nolock(r);
+  
+  gavl_video_format_copy(overlay_format, &r->overlay_format);
+
+  r->config_changed = 0;
+  }
+
+gavl_video_source_t * bg_text_renderer_connect(bg_text_renderer_t * r,
+                                               gavl_packet_source_t * src,
+                                               const gavl_video_format_t * frame_format,
+                                               gavl_video_format_t * overlay_format)
+  {
+  pthread_mutex_lock(&r->config_mutex);
+  
+  r->psrc = src;
+
+  init_common(r, frame_format, overlay_format);
+  pthread_mutex_unlock(&r->config_mutex);
+  
+  if(r->vsrc)
+    gavl_video_source_destroy(r->vsrc);
+  
+  r->vsrc = gavl_video_source_create(read_video, r, 
+                                     GAVL_SOURCE_SRC_DISCONTINUOUS, 
+                                     overlay_format);
+  return r->vsrc;
+  }
+
+void bg_text_renderer_init(bg_text_renderer_t * r,
+                           const gavl_video_format_t * frame_format,
+                           gavl_video_format_t * overlay_format)
+  {
+  pthread_mutex_lock(&r->config_mutex);
+  init_common(r, frame_format, overlay_format);
+  pthread_mutex_unlock(&r->config_mutex);
+  }

gmerlin-1.2.0.tar.gz/lib/threadpool.c -> gmerlin-4256.tar.gz/lib/threadpool.c Changed

gmerlin-1.2.0.tar.gz/lib/thumbnail.c -> gmerlin-4256.tar.gz/lib/thumbnail.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -42,7 +42,6 @@
                                 gavl_video_format_t * format,
                                 int64_t mtime)
   {
-  int i;
   gavl_metadata_t metadata;
   int64_t test_mtime;
   int ret = 0;
@@ -55,8 +54,6 @@
                                          format,
                                          &metadata);
   
-  i = 0;
-
   val = gavl_metadata_get(&metadata, "Thumb::MTime");
   if(val)
     {
@@ -147,8 +144,8 @@
   thumbs_dir_normal = bg_sprintf("%s/.thumbnails/normal",       home_dir);
   thumbs_dir_fail   = bg_sprintf("%s/.thumbnails/fail/gmerlin", home_dir);
   
-  if(!bg_ensure_directory(thumbs_dir_normal) ||
-     !bg_ensure_directory(thumbs_dir_fail))
+  if(!bg_ensure_directory(thumbs_dir_normal, 1) ||
+     !bg_ensure_directory(thumbs_dir_fail, 1))
     goto done;
   
   bg_get_filename_hash(gml, hash);
@@ -252,3 +249,152 @@
   
   return ret;
   }
+
+
+typedef struct
+  {
+  char * filename;
+  } iw_t;
+
+static int create_file(void * data, const char * filename)
+  {
+  iw_t * iw = data;
+  iw->filename = gavl_strdup(filename);
+  return 1;
+  }
+                        
+
+
+char * bg_make_thumbnail(bg_plugin_registry_t * plugin_reg,
+                         gavl_video_frame_t * in_frame,
+                         gavl_video_format_t * input_format,
+                         int max_width, int max_height,
+                         const char * out_file_base,
+                         const char * mimetype)
+  {
+  int result = 0;
+  int do_convert;
+  gavl_video_frame_t * output_frame = NULL;
+  bg_image_writer_plugin_t * output_plugin;
+  bg_plugin_handle_t * output_handle = NULL;
+  const bg_plugin_info_t * plugin_info;
+  iw_t iw;
+  bg_iw_callbacks_t cb;
+  gavl_video_format_t out_format;
+  gavl_video_converter_t * cnv;
+  double ext_x, ext_y;
+  double ar;
+  gavl_video_options_t * opt;
+    
+  cnv = gavl_video_converter_create();
+
+  opt = gavl_video_converter_get_options(cnv);
+  gavl_video_options_set_quality(opt, 3);
+  
+  memset(&iw, 0, sizeof(iw));
+  memset(&cb, 0, sizeof(cb));
+  
+  cb.create_output_file = create_file;
+  cb.data = &iw;
+
+  /* Set output format */
+  ar = (double)input_format->image_width / (double)input_format->image_height;
+  
+  gavl_video_format_copy(&out_format, input_format);
+    
+  ext_x = (double)input_format->image_width / (double)max_width;
+  ext_y = (double)input_format->image_height / (double)max_height;
+  
+  if((ext_x > 1.0) || (ext_y > 1.0))
+    {
+    if(ext_x > ext_y) // Fit to max_width
+      {
+      out_format.image_width  = max_width;
+      out_format.image_height = (int)((double)max_width / ar + 0.5);
+      }
+    else // Fit to max_height
+      {
+      out_format.image_height  = max_height;
+      out_format.image_width = (int)((double)max_height * ar + 0.5);
+      }
+    }
+  
+  
+  out_format.pixel_width = 1;
+  out_format.pixel_height = 1;
+  out_format.interlace_mode = GAVL_INTERLACE_NONE;
+
+  out_format.frame_width = out_format.image_width;
+  out_format.frame_height = out_format.image_height;
+
+  plugin_info =
+    bg_plugin_find_by_mimetype(plugin_reg, mimetype, BG_PLUGIN_IMAGE_WRITER);
+  
+  if(!plugin_info)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No plugin for %s", mimetype);
+    goto end;
+    }
+
+  output_handle = bg_plugin_load(plugin_reg, plugin_info);
+
+  if(!output_handle)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Loading %s failed", plugin_info->long_name);
+    goto end;
+    }
+  
+  output_plugin = (bg_image_writer_plugin_t*)output_handle->plugin;
+
+  output_plugin->set_callbacks(output_handle->priv, &cb);
+  
+  if(!output_plugin->write_header(output_handle->priv,
+                                  out_file_base, &out_format, NULL))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing image header failed");
+    goto end;
+    }
+
+  /* Initialize video converter */
+  do_convert = gavl_video_converter_init(cnv, input_format, &out_format);
+
+  if(do_convert)
+    {
+    output_frame = gavl_video_frame_create(&out_format);
+    gavl_video_frame_clear(output_frame, &out_format);
+    gavl_video_convert(cnv, in_frame, output_frame);
+    if(!output_plugin->write_image(output_handle->priv,
+                                   output_frame))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing image failed");
+      goto end;
+      }
+    }
+  else
+    {
+    if(!output_plugin->write_image(output_handle->priv,
+                                   in_frame))
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing image failed");
+      goto end;
+      }
+    }
+  result = 1;
+  
+  end:
+
+  if(cnv)
+    gavl_video_converter_destroy(cnv);
+  if(output_frame)
+    gavl_video_frame_destroy(output_frame);
+  if(output_handle)
+    bg_plugin_unref(output_handle);
+  
+  if(result)
+    return iw.filename;
+  
+  if(iw.filename)
+    free(iw.filename);
+  return NULL;
+  
+  }

gmerlin-1.2.0.tar.gz/lib/transcoder.c -> gmerlin-4256.tar.gz/lib/transcoder.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * *****************************************************************/
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -39,6 +38,7 @@
 #include <gmerlin/transcodermsg.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/bggavl.h>
+#include <gmerlin/subtitle.h>
 
 #include <gmerlin/textrenderer.h>
 #include <gmerlin/converters.h>
@@ -48,7 +48,7 @@
 #include <gmerlin/subprocess.h>
 
 #include <gavl/metatags.h>
-
+#include <gavl/peakdetector.h>
 
 // #define DUMP_VIDEO_TIMESTAMPS
 // #define DUMP_AUDIO_TIMESTAMPS
@@ -59,10 +59,10 @@
 #define STREAM_STATE_ON       1
 #define STREAM_STATE_FINISHED 2
 
-#define STREAM_TYPE_AUDIO            0
-#define STREAM_TYPE_VIDEO            1
-#define STREAM_TYPE_SUBTITLE_TEXT    2
-#define STREAM_TYPE_SUBTITLE_OVERLAY 3
+#define STREAM_TYPE_AUDIO   0
+#define STREAM_TYPE_VIDEO   1
+#define STREAM_TYPE_TEXT    2
+#define STREAM_TYPE_OVERLAY 3
 
 #define STREAM_ACTION_FORGET    0
 #define STREAM_ACTION_TRANSCODE 1
@@ -126,9 +126,14 @@
   
   gavl_compression_info_t ci;
   gavl_packet_t packet;
-
   gavl_metadata_t m;
-  
+  gavl_packet_source_t * psrc;  
+  gavl_packet_sink_t * psink;
+
+  bg_transcoder_t * t;
+
+  int64_t pts_offset;
+  int64_t pts_end;    // When we don't decode to the very end
   } stream_t;
 
 static int set_stream_parameters_general(stream_t * s,
@@ -156,31 +161,18 @@
   {
   stream_t com;
 
-  // int do_convert_in;
-  int do_convert_out;
-  
-  gavl_audio_converter_t * cnv_out;
-
   bg_audio_filter_chain_t * fc;
-  
-  gavl_audio_frame_t * out_frame;
-  gavl_audio_frame_t * pipe_frame;
-  
+
+  /* TODO: These can probably be kicked out as well */  
   gavl_audio_format_t in_format;
-  gavl_audio_format_t pipe_format;
   gavl_audio_format_t out_format;
   
-  bg_read_audio_func_t in_func;
-  void * in_data;
-  int in_stream;
-  
   /* Set by set_parameter */
   bg_gavl_audio_options_t options;
 
   /* Do normalization */
   int normalize;
   
-  int64_t samples_to_read; /* Samples to read     (in OUTPUT samplerate) */
   int64_t samples_read;    /* Samples read so far (in OUTPUT samplerate) */
   
   int initialized;
@@ -191,6 +183,8 @@
   char in_language[4];
   char out_language[4];
   int force_language;
+  gavl_audio_source_t * asrc;        // Output of the filter chain
+  gavl_audio_sink_t * asink;
   } audio_stream_t;
 
 static void set_audio_parameter_general(void * data, const char * name,
@@ -248,14 +242,14 @@
   bg_gavl_video_options_t options;
   
   /* Data source */
-  bg_read_video_func_t in_func;
-  void * in_data;
-  int in_stream;
+//  bg_read_video_func_t in_func;
+//  void * in_data;
+//  int in_stream;
   
   /* Other stuff */
 
   int initialized;
-  int64_t start_time_scaled;
+//  int64_t start_time_scaled;
 
   /* Whether 2-pass transcoding is requested */
   int twopass;
@@ -267,7 +261,9 @@
   
   int b_frames_seen;
   int flush_b_frames;
-  
+
+  gavl_video_source_t * vsrc;
+  gavl_video_sink_t   * vsink;
   } video_stream_t;
 
 static void set_video_parameter_general(void * data,
@@ -295,24 +291,28 @@
 struct subtitle_stream_s
   {
   stream_t com;
-  gavl_video_converter_t * cnv;
-  int do_convert;
+  //  gavl_video_converter_t * cnv;
+  //  int do_convert;
 
-  gavl_overlay_t ovl1, ovl2;
+  //  gavl_overlay_t * ovl1;
+  //  gavl_overlay_t * ovl2;
 
-  gavl_overlay_t * current_ovl;
-  gavl_overlay_t * next_ovl;
+  //  gavl_overlay_t * current_ovl;
+  //  gavl_overlay_t * next_ovl;
 
-  int has_current;
-  int has_next;
+  gavl_video_frame_t * ovl;
   
+  int has_current;
+  // int has_next;
+
+  bg_subtitle_handler_t * sh;
   gavl_overlay_blend_context_t * blend_context;
   int video_stream;
 
   gavl_video_format_t in_format;
   gavl_video_format_t out_format;
   
-  int do_blend; /* Set by check_video_blend() */
+  //  int do_blend; /* Set by check_video_blend() */
   
   int eof; /* Set STREAM finished not before the last subtitle expired */
 
@@ -322,20 +322,19 @@
 
   int64_t time_offset;
   int64_t time_offset_scaled;
+
+  int64_t subtitle_start_unscaled;
+
+  gavl_video_source_t * vsrc;
+  gavl_video_sink_t * vsink;
   };
 
 typedef struct
   {
   subtitle_stream_t com;
   bg_text_renderer_t * textrenderer;
-
-  char * text;
-  int text_alloc;
-
-  gavl_time_t subtitle_start;
-  gavl_time_t subtitle_duration;
-
-  } subtitle_text_stream_t;
+  int timescale;
+  } text_stream_t;
 
 static void set_subtitle_parameter_general(void * data,
                                            const char * name,
@@ -379,20 +378,20 @@
   int num_audio_streams;
   int num_video_streams;
 
-  int num_subtitle_text_streams;
-  int num_subtitle_overlay_streams;
+  int num_text_streams;
+  int num_overlay_streams;
 
   int num_audio_streams_real;
   int num_video_streams_real;
 
-  int num_subtitle_text_streams_real;
-  int num_subtitle_overlay_streams_real;
+  int num_text_streams_real;
+  int num_overlay_streams_real;
       
   audio_stream_t * audio_streams;
   video_stream_t * video_streams;
 
-  subtitle_text_stream_t * subtitle_text_streams;
-  subtitle_stream_t      * subtitle_overlay_streams;
+  text_stream_t * text_streams;
+  subtitle_stream_t      * overlay_streams;
   
   float percentage_done;
   gavl_time_t remaining_time; /* Remaining time (Transcoding time, NOT track time!!!) */
@@ -482,7 +481,7 @@
 
   memset(t->output_files + t->num_output_files, 0, 2 * sizeof(*t->output_files));
 
-  t->output_files[t->num_output_files] = bg_strdup(NULL, filename);
+  t->output_files[t->num_output_files] = gavl_strdup(filename);
   t->num_output_files++;
   }
 
@@ -550,7 +549,7 @@
 
   if(!strcmp(name, "output_path"))
     {
-    w->output_path = bg_strdup(w->output_path, val->val_str);
+    w->output_path = gavl_strrep(w->output_path, val->val_str);
     }
   else if(!strcmp(name, "delete_incomplete"))
     {
@@ -766,51 +765,12 @@
                          set_message_metadata, m);
   }
 
-
-/* */
-
-static int decode_video_frame(void * priv, gavl_video_frame_t * f, int stream)
-  {
-  video_stream_t * s;
-  bg_transcoder_t * t;
-  int result;
-
-  t = (bg_transcoder_t *)priv;
-  s = &t->video_streams[stream];
-  
-  result = s->com.in_plugin->read_video(s->com.in_handle->priv,
-                                        f, s->com.in_index);
-
-  if(!result)
-    return 0;
-
-#ifdef DUMP_VIDEO_TIMESTAMPS
-  bg_debug("Input timestamp (video): %"PRId64" Offset: %"PRId64"\n",
-           f->timestamp, s->start_time_scaled);
-#endif
-  
-  /* Check for end of stream */
-  
-  if((t->end_time != GAVL_TIME_UNDEFINED) &&
-     (gavl_time_unscale(s->in_format.timescale, f->timestamp) >= t->end_time))
-    return 0;
-  
-  /* Correct timestamps */
-  
-  if(s->start_time_scaled)
-    {
-    f->timestamp -= s->start_time_scaled;
-    if(f->timestamp < 0)
-      f->timestamp = 0;
-    }
-  return 1;
-  }
-
 static void init_audio_stream(audio_stream_t * ret,
                               bg_transcoder_track_audio_t * s,
                               int in_index, bg_plugin_registry_t * plugin_reg)
   {
   ret->com.type = STREAM_TYPE_AUDIO;
+  gavl_metadata_copy(&ret->com.m, &s->m);
   /* Default options */
 
   ret->volume_control = gavl_volume_control_create();
@@ -819,7 +779,6 @@
   /* Create converter */
   
   bg_gavl_audio_options_init(&ret->options);
-  ret->cnv_out = gavl_audio_converter_create();
   ret->fc = bg_audio_filter_chain_create(&ret->options, plugin_reg);
   
   /* Apply parameters */
@@ -866,7 +825,7 @@
                               int in_index, bg_plugin_registry_t * plugin_reg)
   {
   ret->com.type = STREAM_TYPE_VIDEO;
-
+  gavl_metadata_copy(&ret->com.m, &s->m);
   /* Default options */
   bg_gavl_video_options_init(&ret->options);
   
@@ -888,7 +847,8 @@
   ret->com.in_index = in_index;
   }
 
-static void start_video_stream_i(video_stream_t * ret, bg_plugin_handle_t * in_handle)
+static void start_video_stream_i(video_stream_t * ret,
+                                 bg_plugin_handle_t * in_handle)
   {
   ret->com.in_handle = in_handle;
   ret->com.in_plugin = (bg_input_plugin_t*)(in_handle->plugin);
@@ -912,11 +872,11 @@
   }
 
 
-static void init_subtitle_overlay_stream(subtitle_stream_t * ret,
-                                         bg_transcoder_track_subtitle_overlay_t * s)
+static void init_overlay_stream(subtitle_stream_t * ret,
+                                bg_transcoder_track_overlay_t * s)
   {
-  ret->com.type = STREAM_TYPE_SUBTITLE_OVERLAY;
-  
+  ret->com.type = STREAM_TYPE_OVERLAY;
+  gavl_metadata_copy(&ret->com.m, &s->m);  
   /* Apply parameters */
   
   bg_cfg_section_apply(s->general_section,
@@ -927,16 +887,16 @@
   if(ret->com.action == STREAM_ACTION_BLEND)
     {
     ret->blend_context = gavl_overlay_blend_context_create();
+    ret->sh = bg_subtitle_handler_create();
     }
 
-  ret->cnv = gavl_video_converter_create();
   }
 
-static void init_subtitle_text_stream(subtitle_text_stream_t * ret,
-                                      bg_transcoder_track_subtitle_text_t * s)
+static void init_text_stream(text_stream_t * ret,
+                             bg_transcoder_track_text_t * s)
   {
-  ret->com.com.type = STREAM_TYPE_SUBTITLE_TEXT;
-  
+  ret->com.com.type = STREAM_TYPE_TEXT;
+  gavl_metadata_copy(&ret->com.com.m, &s->m);
   /* Apply parameters */
   
   bg_cfg_section_apply(s->general_section,
@@ -953,6 +913,7 @@
                          bg_text_renderer_get_parameters(),
                          bg_text_renderer_set_parameter,
                          ret->textrenderer);
+    ret->com.sh = bg_subtitle_handler_create();
     }
   else if(ret->com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
     {
@@ -961,56 +922,126 @@
                          bg_text_renderer_get_parameters(),
                          bg_text_renderer_set_parameter,
                          ret->textrenderer);
-    ret->com.cnv = gavl_video_converter_create();
     }
   }
 
-static void start_subtitle_stream_i(subtitle_stream_t * ret,
-                                    bg_plugin_handle_t * in_handle)
+static void start_text_stream_i(subtitle_stream_t * ret,
+                                bg_plugin_handle_t * in_handle)
   {
   ret->com.in_handle = in_handle;
   ret->com.in_plugin = (bg_input_plugin_t*)(in_handle->plugin);
   
   /* Set stream */
-  if(ret->com.in_plugin->set_subtitle_stream)
+  if(ret->com.in_plugin->set_text_stream)
     {
     if(ret->com.action != STREAM_ACTION_FORGET)
-      ret->com.in_plugin->set_subtitle_stream(ret->com.in_handle->priv,
+      ret->com.in_plugin->set_text_stream(ret->com.in_handle->priv,
                                               ret->com.in_index,
                                               BG_STREAM_ACTION_DECODE);
     else
-      ret->com.in_plugin->set_subtitle_stream(ret->com.in_handle->priv,
+      ret->com.in_plugin->set_text_stream(ret->com.in_handle->priv,
                                               ret->com.in_index,
                                               BG_STREAM_ACTION_OFF);
     }
   }
 
+static void start_overlay_stream_i(subtitle_stream_t * ret,
+                                   bg_plugin_handle_t * in_handle)
+  {
+  ret->com.in_handle = in_handle;
+  ret->com.in_plugin = (bg_input_plugin_t*)(in_handle->plugin);
+  
+  /* Set stream */
+  if(ret->com.in_plugin->set_overlay_stream)
+    {
+    if(ret->com.action == STREAM_ACTION_COPY)
+      ret->com.in_plugin->set_overlay_stream(ret->com.in_handle->priv,
+                                             ret->com.in_index,
+                                             BG_STREAM_ACTION_READRAW);
+    else if(ret->com.action != STREAM_ACTION_FORGET)
+      ret->com.in_plugin->set_overlay_stream(ret->com.in_handle->priv,
+                                             ret->com.in_index,
+                                             BG_STREAM_ACTION_DECODE);
+    else
+      ret->com.in_plugin->set_overlay_stream(ret->com.in_handle->priv,
+                                             ret->com.in_index,
+                                             BG_STREAM_ACTION_OFF);
+    }
+  }
+
 static void set_input_formats(bg_transcoder_t * ret)
   {
   int i;
   for(i = 0; i < ret->num_audio_streams; i++)
     {
-    if(ret->audio_streams[i].com.do_decode || ret->audio_streams[i].com.do_copy)
-      gavl_audio_format_copy(&ret->audio_streams[i].in_format,
-                             &ret->track_info->audio_streams[ret->audio_streams[i].com.in_index].format);
+    audio_stream_t * s = &ret->audio_streams[i];
+    
+    if(!s->com.do_decode && !s->com.do_copy)
+      continue;
+    
+    if(s->com.do_copy)
+      {
+      s->com.psrc =
+        s->com.in_plugin->get_audio_packet_source(s->com.in_handle->priv,
+                                                  s->com.in_index);
+      gavl_audio_format_copy(&s->in_format,
+                             gavl_packet_source_get_audio_format(s->com.psrc));
+                             
+      }
+    else
+      {
+      gavl_audio_source_t * src =
+        s->com.in_plugin->get_audio_source(s->com.in_handle->priv,
+                                           s->com.in_index);
+      gavl_audio_format_copy(&s->in_format,
+                             gavl_audio_source_get_src_format(src));
+      }
     }
   for(i = 0; i < ret->num_video_streams; i++)
     {
-    if(ret->video_streams[i].com.do_decode || ret->video_streams[i].com.do_copy)
-      gavl_video_format_copy(&ret->video_streams[i].in_format,
-                             &ret->track_info->video_streams[ret->video_streams[i].com.in_index].format);
+    video_stream_t * s = &ret->video_streams[i];
+    
+    if(!s->com.do_decode && !s->com.do_copy)
+      continue;
+    
+    gavl_video_format_copy(&s->in_format,
+                           &ret->track_info->video_streams[s->com.in_index].format);
+
+    if(s->com.do_copy)
+      s->com.psrc = s->com.in_plugin->get_video_packet_source(s->com.in_handle->priv,
+                                                              s->com.in_index);
+
     }
-  for(i = 0; i < ret->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ret->num_overlay_streams; i++)
     {
-    if(ret->subtitle_overlay_streams[i].com.do_decode)
-      gavl_video_format_copy(&ret->subtitle_overlay_streams[i].in_format,
-                             &ret->track_info->subtitle_streams[ret->subtitle_overlay_streams[i].com.in_index].format);
+    subtitle_stream_t * s = &ret->overlay_streams[i];
+
+    if(!s->com.do_decode && !s->com.do_copy)
+      continue;
+
+    if(s->com.do_decode)
+      s->vsrc = s->com.in_plugin->get_overlay_source(s->com.in_handle->priv, s->com.in_index);
+    else if(s->com.do_copy)
+      s->com.psrc = s->com.in_plugin->get_overlay_packet_source(s->com.in_handle->priv,
+                                                                s->com.in_index);
+    
+    gavl_video_format_copy(&s->in_format,
+                           &ret->track_info->overlay_streams[s->com.in_index].format);
+    
     }
-  for(i = 0; i < ret->num_subtitle_text_streams; i++)
+  for(i = 0; i < ret->num_text_streams; i++)
     {
-    if(ret->subtitle_text_streams[i].com.com.do_decode)
-      gavl_video_format_copy(&ret->subtitle_text_streams[i].com.in_format,
-                             &ret->track_info->subtitle_streams[ret->subtitle_text_streams[i].com.com.in_index].format);
+    text_stream_t * s = &ret->text_streams[i];
+
+    if(!s->com.com.do_decode)
+      continue;
+
+    s->com.com.psrc = s->com.com.in_plugin->get_text_source(s->com.com.in_handle->priv, s->com.com.in_index);
+    s->timescale = gavl_packet_source_get_timescale(s->com.com.psrc);
+
+    /* This is needed by correct_subtitle_timestamp */
+    s->com.in_format.timescale = s->timescale;
+    s->com.out_format.timescale = s->timescale;
     }
   }
 
@@ -1018,33 +1049,18 @@
                              bg_transcoder_t * t)
   {
   
-  ret->in_func = ret->com.in_plugin->read_audio;
-  ret->in_data = ret->com.in_handle->priv;
-  ret->in_stream = ret->com.in_index;
-  
-  /* We set the frame size so we have roughly half second long audio chunks */
-  ret->in_format.samples_per_frame =
-    gavl_time_to_samples(ret->in_format.samplerate,
-                         GAVL_TIME_SCALE/2);
-  
-  bg_audio_filter_chain_connect_input(ret->fc,
-                                      ret->in_func,
-                                      ret->in_data,
-                                      ret->in_stream);
-  
-  bg_audio_filter_chain_init(ret->fc, &ret->in_format, &ret->pipe_format);
+  ret->asrc = 
+    bg_audio_filter_chain_connect(ret->fc, 
+                                  ret->com.in_plugin->get_audio_source(ret->com.in_handle->priv,
+                                                                       ret->com.in_index));
+  gavl_audio_format_copy(&ret->out_format,
+                         gavl_audio_source_get_src_format(ret->asrc));
 
-  ret->pipe_format.samples_per_frame =
-    gavl_time_to_samples(ret->pipe_format.samplerate,
+  /* We set the frame size so we have roughly half second long audio chunks */
+  ret->out_format.samples_per_frame =
+    gavl_time_to_samples(ret->out_format.samplerate,
                          GAVL_TIME_SCALE/2);
   
-  ret->in_func = bg_audio_filter_chain_read;
-  ret->in_data = ret->fc;
-  ret->in_stream = 0;
-  
-  gavl_audio_format_copy(&ret->out_format,
-                         &ret->pipe_format);
-  
   /* Decide language */
   get_language(ret->in_language,
                ret->out_language,
@@ -1057,7 +1073,7 @@
     bg_encoder_add_audio_stream(t->enc,
                                 &ret->com.m,
                                 &ret->out_format,
-                                ret->com.in_index);
+                                ret->com.in_index, NULL);
   }
 
 static void add_audio_stream_compressed(audio_stream_t * ret,
@@ -1074,15 +1090,15 @@
   ret->com.out_index =
     bg_encoder_add_audio_stream_compressed(t->enc,
                                            &ret->com.m,
-                                           &ret->in_format,
+                                           gavl_packet_source_get_audio_format(ret->com.psrc),
                                            &ret->com.ci,
                                            ret->com.in_index);
   
   }
 
 
-static void add_subtitle_text_stream(subtitle_text_stream_t * ret,
-                                     bg_transcoder_track_subtitle_text_t * s,
+static void add_text_stream(text_stream_t * ret,
+                                     bg_transcoder_track_text_t * s,
                                      bg_transcoder_t * t)
   {
   if(ret->com.com.action == STREAM_ACTION_TRANSCODE)
@@ -1099,10 +1115,10 @@
     
     /* TODO: timescale might get changed by the encoder!!! */
     ret->com.com.out_index =
-      bg_encoder_add_subtitle_text_stream(t->enc,
-                                          &ret->com.com.m,
-                                          ret->com.out_format.timescale,
-                                          ret->com.com.in_index);
+      bg_encoder_add_text_stream(t->enc,
+                                 &ret->com.com.m,
+                                 ret->com.out_format.timescale,
+                                 ret->com.com.in_index, NULL);
     
     }
   else if(ret->com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
@@ -1113,14 +1129,37 @@
        a proper pixelformat for us. Then, we pass the same format as *frame* format to the
        textrenderer */
 
-    if(t->video_streams[ret->com.video_stream].com.do_encode)
+    if(t->video_streams[ret->com.video_stream].com.do_encode ||
+       t->video_streams[ret->com.video_stream].com.do_copy)
       {
+      /* Obtain the video format for a rendered text subtitle stream */
+      gavl_overlay_blend_context_t * ctx;
+      ctx = gavl_overlay_blend_context_create();
+
+      /* This will copy frame dimensions */
+      gavl_video_format_copy(&ret->com.in_format,
+                             &t->video_streams[ret->com.video_stream].in_format);
+      
+      /* Obtain a suitable pixelformat */
+      gavl_overlay_blend_context_init(ctx,
+                                      &t->video_streams[ret->com.video_stream].in_format,
+                                      &ret->com.in_format);
+      gavl_overlay_blend_context_destroy(ctx);
+
+      /* Get the timing right */
+      ret->com.in_format.timescale = ret->timescale;
+      ret->com.in_format.frame_duration = 0;
+      
+      ret->com.in_format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+      ret->com.in_format.timecode_format.int_framerate = 0;
+      
       gavl_video_format_copy(&ret->com.out_format,
-                             &t->video_streams[ret->com.video_stream].out_format);
+                             &ret->com.in_format);
       }
     else
       {
       /* Video stream won't get encoded: Use video format associatd with the text subtitle stream */
+      /* TODO: This is going to fail, no video format is associated with a text stream!!! */
       gavl_video_format_copy(&ret->com.out_format, &ret->com.in_format);
       }
 
@@ -1129,19 +1168,24 @@
                  ret->com.out_language,
                  ret->com.force_language,
                  &ret->com.com.m);
+
+    fprintf(stderr, "Add overlay stream, video format:\n");
+    gavl_video_format_dump(&t->video_streams[ret->com.video_stream].in_format);
+    fprintf(stderr, "Overlay format:\n");
+    gavl_video_format_dump(&ret->com.out_format);
     
     ret->com.com.out_index =
-      bg_encoder_add_subtitle_overlay_stream(t->enc,
-                                             &ret->com.com.m,
-                                             &ret->com.out_format,
-                                             ret->com.com.in_index,
-                                             BG_STREAM_SUBTITLE_TEXT);
+      bg_encoder_add_overlay_stream(t->enc,
+                                    &ret->com.com.m,
+                                    &ret->com.out_format,
+                                    ret->com.com.in_index,
+                                    BG_STREAM_TEXT, NULL);
     }
   }
 
 static void
-add_subtitle_overlay_stream(subtitle_stream_t * ret,
-                            bg_transcoder_track_subtitle_overlay_t * s,
+add_overlay_stream(subtitle_stream_t * ret,
+                            bg_transcoder_track_overlay_t * s,
                             bg_transcoder_t * t)
   {
   gavl_video_format_copy(&ret->out_format, &ret->in_format);
@@ -1154,35 +1198,51 @@
                &ret->com.m);
   
   ret->com.out_index =
-    bg_encoder_add_subtitle_overlay_stream(t->enc,
-                                           &ret->com.m,
-                                           &ret->out_format, ret->com.in_index,
-                                           BG_STREAM_SUBTITLE_OVERLAY);
+    bg_encoder_add_overlay_stream(t->enc,
+                                  &ret->com.m,
+                                  &ret->out_format, ret->com.in_index,
+                                  BG_STREAM_OVERLAY, NULL);
+  }
+
+static void
+add_overlay_stream_compressed(subtitle_stream_t * ret,
+                              bg_transcoder_track_overlay_t * s,
+                              bg_transcoder_t * t)
+  {
+  gavl_video_format_copy(&ret->out_format, &ret->in_format);
+
+  /* Decide language */
+
+  get_language(ret->in_language,
+               ret->out_language,
+               ret->force_language,
+               &ret->com.m);
+  
+  ret->com.out_index =
+    bg_encoder_add_overlay_stream_compressed(t->enc,
+                                             &ret->com.m,
+                                             &ret->out_format,
+                                             &ret->com.ci,
+                                             ret->com.in_index);
   }
 
 static void add_video_stream(video_stream_t * ret,
                              bg_transcoder_t * t)
   {
-  ret->in_func = decode_video_frame;
-  ret->in_data = t;
-  ret->in_stream = ret->com.in_index;
-
-  bg_video_filter_chain_connect_input(ret->fc,
-                                      ret->in_func, ret->in_data, ret->in_stream);
-  
-  bg_video_filter_chain_init(ret->fc, &ret->in_format,
-                             &ret->out_format);
-  ret->in_func   = bg_video_filter_chain_read;
-  ret->in_data   = ret->fc;
-  ret->in_stream = 0;
-  
+  ret->vsrc = 
+    bg_video_filter_chain_connect(ret->fc,
+                                  ret->com.in_plugin->get_video_source(ret->com.in_handle->priv,
+                                                                       ret->com.in_index));
+
+  gavl_video_format_copy(&ret->out_format, gavl_video_source_get_src_format(ret->vsrc));
+
   /* Add the video stream */
 
   ret->com.out_index =
     bg_encoder_add_video_stream(t->enc,
                                 &ret->com.m,
                                 &ret->out_format,
-                                ret->com.in_index);
+                                ret->com.in_index, NULL);
   }
 
 static void add_video_stream_compressed(video_stream_t * ret,
@@ -1221,9 +1281,6 @@
 static int audio_iteration(audio_stream_t*s, bg_transcoder_t * t)
   {
   int ret = 1;
-  int num_samples;
-  int samples_decoded;
-  gavl_audio_frame_t * frame;
   
   /* Get one frame worth of input data */
 
@@ -1233,35 +1290,38 @@
        (t->end_time != GAVL_TIME_UNDEFINED) &&
        (t->end_time > t->start_time))
       {
-      s->samples_to_read = gavl_time_to_samples(s->out_format.samplerate,
-                                                t->end_time - t->start_time);
-      
+      s->com.pts_end = gavl_time_to_samples(s->out_format.samplerate,
+                                            t->end_time - t->start_time);
       }
     else if(t->end_time != GAVL_TIME_UNDEFINED)
       {
-      s->samples_to_read = gavl_time_to_samples(s->out_format.samplerate,
-                                                t->end_time);
+      s->com.pts_end = gavl_time_to_samples(s->out_format.samplerate,
+                                            t->end_time);
       }
     else
-      s->samples_to_read = 0; /* Zero == Infinite */
+      s->com.pts_end = 0; /* Zero == Infinite */
 
+    if(t->start_time != GAVL_TIME_UNDEFINED)
+      s->com.pts_offset = -gavl_time_to_samples(s->out_format.samplerate,
+                                                t->start_time);
     s->initialized = 1;
     }
 
   if(s->com.do_copy)
     {
-    if(!s->com.in_plugin->read_audio_packet(s->com.in_handle->priv,
-                                            s->com.in_index,
-                                            &s->com.packet))
+    gavl_packet_t * pp = &s->com.packet;
+    
+    if(gavl_packet_source_read_packet(s->com.psrc, &pp) != GAVL_SOURCE_OK)
       {
       /* EOF */
       s->com.status = STREAM_STATE_FINISHED;
       return ret;
       }
-    ret = bg_encoder_write_audio_packet(t->enc, &s->com.packet,
-                                        s->com.out_index); 
+    
+    ret = (gavl_packet_sink_put_packet(s->com.psink, &s->com.packet) == GAVL_SINK_OK);
+
     s->samples_read += s->com.packet.duration;
-    if(s->samples_to_read && (s->samples_to_read <= s->samples_read))
+    if(s->com.pts_end && (s->com.pts_end <= s->samples_read))
       s->com.status = STREAM_STATE_FINISHED;
 
     s->com.time = gavl_samples_to_time(s->in_format.samplerate,
@@ -1269,78 +1329,63 @@
     }
   else
     {
-    if(s->samples_to_read &&
-       (s->samples_read + s->out_format.samples_per_frame > s->samples_to_read))
-      num_samples = s->samples_to_read - s->samples_read;
-    else
-      num_samples = s->out_format.samples_per_frame;
+    gavl_source_status_t st;
+    gavl_audio_frame_t * frame = NULL;
 
-    if(s->do_convert_out)
-      frame = s->pipe_frame;
-    else
-      frame = s->out_frame;
-  
-    samples_decoded = s->in_func(s->in_data, frame, s->in_stream,
-                                 num_samples);
-    /* Nothing more to transcode */
-  
-    if(!samples_decoded)
+    if((st = gavl_audio_source_read_frame(s->asrc, &frame)) != GAVL_SOURCE_OK)
       {
       s->com.status = STREAM_STATE_FINISHED;
       return ret;
       }
-    
-    /* Volume normalization */
-    if(s->normalize)
+    frame->timestamp += s->com.pts_offset;
+
+    if(s->com.pts_end && 
+       (s->samples_read + frame->valid_samples > s->com.pts_end))
       {
-      if(t->pass == t->total_passes)
+      frame->valid_samples = s->com.pts_end - s->samples_read;
+      if(frame->valid_samples < 0)
         {
-        gavl_volume_control_apply(s->volume_control, frame);
+        s->com.status = STREAM_STATE_FINISHED;
+        return ret;
         }
-      else if((t->pass > 1) && (t->pass < t->total_passes))
-        frame = NULL;
-      }
-  
-    /* Output conversion */
-    if(s->do_convert_out)
-      {
-      gavl_audio_convert(s->cnv_out, s->pipe_frame, s->out_frame);
-      frame = s->out_frame;
       }
-
+   
     /* Update sample counter before the frame is set to NULL
        after peak-detection */
-    
+
     s->samples_read += frame->valid_samples;
-        
-    /* Peak detection is done for the final frame */
+ 
+    /* Volume normalization */
     if(s->normalize)
       {
-      if(t->pass == 1)
+      if(t->pass == t->total_passes)
+        gavl_volume_control_apply(s->volume_control, frame);
+      else if((t->pass > 1) && (t->pass < t->total_passes))
+        frame = NULL;
+      else if(t->pass == 1)
         {
         gavl_peak_detector_update(s->peak_detector, frame);
         frame = NULL;
         }
       }
+        
     if(frame)
       {
 #ifdef DUMP_AUDIO_TIMESTAMPS
       bg_debug("Output timestamp (audio): %"PRId64"\n",
                frame->timestamp);
 #endif
-      ret = bg_encoder_write_audio_frame(t->enc,
-                                         frame,
-                                         s->com.out_index);
+
+      ret = (gavl_audio_sink_put_frame(s->asink, frame) == GAVL_SINK_OK);
       }
 
     s->com.time = gavl_samples_to_time(s->out_format.samplerate,
                                        s->samples_read);
-
     }
   
   /* Last samples */
   
-  if(s->samples_to_read && (s->samples_to_read <= s->samples_read))
+  if(s->com.pts_end && (s->com.pts_end <= s->samples_read))
     s->com.status = STREAM_STATE_FINISHED;
   
   if(!ret)
@@ -1375,93 +1420,99 @@
                              *start);
   *duration = gavl_time_rescale(s->in_format.timescale, s->out_format.timescale,
                                 *duration);
+  s->subtitle_start_unscaled = gavl_time_unscale(s->out_format.timescale,
+                                                 *start);
   }
 
-static int decode_subtitle_overlay(subtitle_stream_t * s, bg_transcoder_t * t,
-                                   gavl_overlay_t * ovl)
+static gavl_source_status_t
+decode_overlay(subtitle_stream_t * s, bg_transcoder_t * t, gavl_overlay_t ** ovl)
   {
-  int result;
-  subtitle_text_stream_t * st;
+  gavl_source_status_t st;
+  st = gavl_video_source_read_frame(s->vsrc, ovl);
 
-  result = s->com.in_plugin->has_subtitle(s->com.in_handle->priv, s->com.in_index);
-  if(!result)
-    return 0;
-  
-  if(s->com.type == STREAM_TYPE_SUBTITLE_TEXT)
+  if(st != GAVL_SOURCE_OK)
     {
-    st = (subtitle_text_stream_t*)s;
-    result = s->com.in_plugin->read_subtitle_text(s->com.in_handle->priv,
-                                                  &st->text, &st->text_alloc,
-                                                  &st->subtitle_start,
-                                                  &st->subtitle_duration,
-                                                  s->com.in_index);
-    
+    if(st == GAVL_SOURCE_EOF)
+      s->com.status = STREAM_STATE_FINISHED;
+    return st;
+    }
+  if((t->end_time != GAVL_TIME_UNDEFINED) &&
+     (gavl_time_unscale(s->in_format.timescale, (*ovl)->timestamp) >= t->end_time))
+    {
+    st = GAVL_SOURCE_EOF;
+    s->eof = 1;
+    return st;
+    }
+  correct_subtitle_timestamp(s, &((*ovl)->timestamp), &((*ovl)->duration), t);
+  return st;
+  }
 
-    if(!result || ((t->end_time != GAVL_TIME_UNDEFINED) &&
-                   (gavl_time_unscale(s->in_format.timescale, st->subtitle_start) >= t->end_time)))
-      {
-      s->eof = 1;
-      return 0;
-      }
+static gavl_source_status_t
+read_overlay_packet(subtitle_stream_t * s, bg_transcoder_t * t)
+  {
+  gavl_source_status_t st;
+  gavl_packet_t * pp = &s->com.packet;
+  
+  if(s->eof)
+    return GAVL_SOURCE_EOF;
+  
+  st = gavl_packet_source_read_packet(s->com.psrc, &pp);
 
-    correct_subtitle_timestamp(&st->com, &st->subtitle_start,
-                               &st->subtitle_duration, t);
-    
-    ovl->frame->timestamp     = st->subtitle_start;
-    ovl->frame->duration = st->subtitle_duration;
-    
-    bg_text_renderer_render(st->textrenderer, st->text, ovl);
-    }
-  else
+  if(st == GAVL_SOURCE_EOF)
+    s->eof = 1;
+  
+  if(st != GAVL_SOURCE_OK)
+    return st;
+
+  if((t->end_time != GAVL_TIME_UNDEFINED) &&
+     (gavl_time_unscale(s->in_format.timescale, pp->pts) >= t->end_time))
     {
-    result = s->com.in_plugin->read_subtitle_overlay(s->com.in_handle->priv,
-                                                     ovl, s->com.in_index);
-    
-    if(!result ||
-       ((t->end_time != GAVL_TIME_UNDEFINED) &&
-        (gavl_time_unscale(s->in_format.timescale, ovl->frame->timestamp) >= t->end_time)))
-      {
-      s->eof = 1;
-      return 0;
-      }
-    correct_subtitle_timestamp(s, &ovl->frame->timestamp,
-                               &ovl->frame->duration, t);
+    s->eof = 1;
+    return GAVL_SOURCE_EOF;
     }
-  return 1;
+  
+  correct_subtitle_timestamp(s, &s->com.packet.pts,
+                             &s->com.packet.duration, t);
+  
+  return GAVL_SOURCE_OK;
   }
 
-static int decode_subtitle_text(subtitle_text_stream_t * s, bg_transcoder_t * t)
+
+static gavl_source_status_t
+decode_text(text_stream_t * s, bg_transcoder_t * t)
   {
-  int result;
-  result =
-    s->com.com.in_plugin->has_subtitle(s->com.com.in_handle->priv,
-                                       s->com.com.in_index);
-  if(!result)
-    return 0;
+  gavl_source_status_t st;
+  gavl_packet_t * pp = &s->com.com.packet;
+  
+  if(s->com.eof)
+    return GAVL_SOURCE_EOF;
+  
+  st = gavl_packet_source_read_packet(s->com.com.psrc, &pp);
 
-  result = s->com.com.in_plugin->read_subtitle_text(s->com.com.in_handle->priv,
-                                                    &s->text, &s->text_alloc,
-                                                    &s->subtitle_start,
-                                                    &s->subtitle_duration,
-                                                    s->com.com.in_index);
+  if(st == GAVL_SOURCE_EOF)
+    s->com.eof = 1;
   
-  if(!result || ((t->end_time != GAVL_TIME_UNDEFINED) &&
-                 (gavl_time_unscale(s->com.in_format.timescale, s->subtitle_start) >= t->end_time)))
+  if(st != GAVL_SOURCE_OK)
+    return st;
+
+  if((t->end_time != GAVL_TIME_UNDEFINED) &&
+     (gavl_time_unscale(s->com.in_format.timescale, pp->pts) >= t->end_time))
     {
     s->com.eof = 1;
-    return 0;
+    return GAVL_SOURCE_EOF;
     }
-
-  correct_subtitle_timestamp(&s->com, &s->subtitle_start,
-                             &s->subtitle_duration, t);
   
-  return 1;
+  correct_subtitle_timestamp(&s->com, &s->com.com.packet.pts,
+                             &s->com.com.packet.duration, t);
+  
+  return GAVL_SOURCE_OK;
   }
 
-
+#if 0
 static int check_video_blend(video_stream_t * vs,
                              bg_transcoder_t * t, int64_t time)
   {
+  gavl_source_status_t st;
   gavl_overlay_t * tmp_ovl;
   int i;
   subtitle_stream_t * ss;
@@ -1474,14 +1525,13 @@
     
     if(ss->com.status != STREAM_STATE_ON)
       continue;
-
     
     /* Check if the overlay expired */
     if(ss->has_current)
       {
       if(bg_overlay_too_old(time,
-                            ss->current_ovl->frame->timestamp,
-                            ss->current_ovl->frame->duration))
+                            ss->current_ovl->timestamp,
+                            ss->current_ovl->duration))
         {
         tmp_ovl = ss->current_ovl;
         ss->current_ovl = ss->next_ovl;
@@ -1499,7 +1549,7 @@
     if(ss->has_next)
       {
       if(!bg_overlay_too_new(time,
-                             ss->next_ovl->frame->timestamp))
+                             ss->next_ovl->timestamp))
         {
         tmp_ovl = ss->current_ovl;
         ss->current_ovl = ss->next_ovl;
@@ -1510,8 +1560,8 @@
         ss->has_next = 0;
         
         if(bg_overlay_too_old(time,
-                              ss->current_ovl->frame->timestamp,
-                              ss->current_ovl->frame->duration))
+                              ss->current_ovl->timestamp,
+                              ss->current_ovl->duration))
           ss->has_current = 0;
         else
           current_changed = 1;
@@ -1520,27 +1570,32 @@
 
     if(!ss->has_current && !ss->eof)
       {
-      if(decode_subtitle_overlay(ss, t, ss->current_ovl))
+      st = decode_overlay(ss, t, ss->current_ovl);
+      if(st == GAVL_SOURCE_OK)
         {
         ss->has_current = 1;
         current_changed = 1;
         }
+      else if(st == GAVL_SOURCE_EOF)
+        ss->eof = 1;
       else
         continue;
       }
     if(!ss->has_next && !ss->eof)
       {
-      if(decode_subtitle_overlay(ss, t, ss->next_ovl))
+      st = decode_overlay(ss, t, ss->next_ovl);
+      if(st == GAVL_SOURCE_OK)
         ss->has_next = 1;
+      else if(st == GAVL_SOURCE_EOF)
+        ss->eof = 1;
       }
     
     if(ss->has_current &&
        !bg_overlay_too_new(time,
-                           ss->current_ovl->frame->timestamp))
+                           ss->current_ovl->timestamp))
       {
       ss->do_blend = 1;
       ret = 1;
-
       }
     else
       ss->do_blend = 0;
@@ -1555,6 +1610,7 @@
     }
   return ret;
   }
+#endif
 
 #define SWAP_FRAMES \
   tmp_frame=s->in_frame_1;\
@@ -1565,30 +1621,42 @@
   {
   int ret = 1;
   int i;
-  int result;
   
   if(!s->initialized)
     {
+    if((t->start_time != GAVL_TIME_UNDEFINED) &&
+       (t->end_time != GAVL_TIME_UNDEFINED) &&
+       (t->end_time > t->start_time))
+      {
+      s->com.pts_end = gavl_time_scale(s->out_format.timescale,
+                                       t->end_time - t->start_time);
+      }
+    else if(t->end_time != GAVL_TIME_UNDEFINED)
+      {
+      s->com.pts_end = gavl_time_scale(s->out_format.timescale,
+                                       t->end_time);
+      }
+    else
+      s->com.pts_end = 0; /* Zero == Infinite */
+
     if(t->start_time != GAVL_TIME_UNDEFINED)
       {
-      s->start_time_scaled = gavl_time_scale(s->in_format.timescale,
-                                             t->start_time);
-      //      bg_video_converter_reset(s->cnv, s->start_time_scaled);
+      s->com.pts_offset = -gavl_time_scale(s->out_format.timescale,
+                                           t->start_time);
       }
     s->initialized = 1;
     }
 
   if(s->com.do_copy)
     {
-    if(!s->com.in_plugin->read_video_packet(s->com.in_handle->priv,
-                                            s->com.in_index,
-                                            &s->com.packet))
+    gavl_packet_t * pp = &s->com.packet;
+    if(gavl_packet_source_read_packet(s->com.psrc, &pp) != GAVL_SOURCE_OK)
       {
       /* EOF */
       s->com.status = STREAM_STATE_FINISHED;
       return ret;
       }
-
+    
     if((s->com.packet.flags & GAVL_PACKET_TYPE_MASK) != GAVL_PACKET_TYPE_B)
       {
       if(s->flush_b_frames)
@@ -1615,50 +1683,40 @@
       {
       s->b_frames_seen = 1;
       }
-    
-    bg_encoder_write_video_packet(t->enc, &s->com.packet,
-                                  s->com.out_index); 
+    ret = (gavl_packet_sink_put_packet(s->com.psink, &s->com.packet) == GAVL_SINK_OK);
     }
   else
     {
-    result = s->in_func(s->in_data, s->frame, s->in_stream);
-    if(!result)
+    gavl_source_status_t st;
+    gavl_video_frame_t * frame = NULL;
+
+    if((st = gavl_video_source_read_frame(s->vsrc, &frame)) != GAVL_SOURCE_OK)
       {
       s->com.status = STREAM_STATE_FINISHED;
-
       /* Set this also for all attached subtitle streams */
       for(i = 0; i < s->num_subtitle_streams; i++)
         s->subtitle_streams[i]->com.status = STREAM_STATE_FINISHED;
       return ret;
       }
+    frame->timestamp += s->com.pts_offset;
 
     s->com.time = gavl_time_unscale(s->out_format.timescale,
-                                    s->frame->timestamp + s->frame->duration);
+                                    frame->timestamp + frame->duration);
 
-    if((t->end_time != GAVL_TIME_UNDEFINED) &&
-       (s->com.time >= t->end_time))
+    if(s->com.pts_end &&
+       (frame->timestamp + frame->duration >= s->com.pts_end))
       s->com.status = STREAM_STATE_FINISHED;
     
-    //  if(check_video_blend(s, t, s->com.time))
-    if(check_video_blend(s, t, s->frame->timestamp))
+    for(i = 0; i < s->num_subtitle_streams; i++)
       {
-      for(i = 0; i < s->num_subtitle_streams; i++)
-        {
-        if(s->subtitle_streams[i]->do_blend)
-          {
-          gavl_overlay_blend(s->subtitle_streams[i]->blend_context,
-                             s->frame);
-          }
-        }
+      bg_subtitle_handler_update(s->subtitle_streams[i]->sh, frame);
+      gavl_overlay_blend(s->subtitle_streams[i]->blend_context, frame);
       }
 
 #ifdef DUMP_VIDEO_TIMESTAMPS
-    bg_debug("Output timestamp (video): %"PRId64"\n", s->frame->timestamp);
+    bg_debug("Output timestamp (video): %"PRId64"\n", frame->timestamp);
 #endif
-  
-    ret = bg_encoder_write_video_frame(t->enc,
-                                       s->frame,
-                                       s->com.out_index);
+    ret = (gavl_video_sink_put_frame(s->vsink, frame) == GAVL_SINK_OK);
     }
   
   
@@ -1675,81 +1733,101 @@
 
 #define SUBTITLE_TIME_OFFSET (GAVL_TIME_SCALE/2)
 
+static int do_write_subtitle(gavl_time_t time_unscaled,
+                             video_stream_t * vs)
+  {
+  if(!vs->com.do_encode && !vs->com.do_copy)
+    return 1;
+  if(vs->com.status == STREAM_STATE_FINISHED)
+    return 1;
+  if(time_unscaled - vs->com.time < SUBTITLE_TIME_OFFSET)
+    return 1;
+  return 0;
+  }
 
 static int subtitle_iteration(bg_transcoder_t * t)
   {
   int i, ret = 1;
-  subtitle_text_stream_t * st;
+  text_stream_t * ts;
   subtitle_stream_t      * ss;
   video_stream_t         * vs;
-  gavl_video_frame_t * tmp_frame;
+  gavl_source_status_t st;
   
-  for(i = 0; i < t->num_subtitle_text_streams; i++)
+  for(i = 0; i < t->num_text_streams; i++)
     {
-    st = &t->subtitle_text_streams[i];
+    ts = &t->text_streams[i];
 
-    if(!st->com.com.do_encode)
+    if(!ts->com.com.do_encode)
       continue;
     
-    if(st->com.eof)
+    if(ts->com.eof)
       {
-      st->com.com.status = STREAM_STATE_FINISHED;
+      ts->com.com.status = STREAM_STATE_FINISHED;
       continue;
       }
     
     /* Check for decoding */
-    if(!st->com.has_current)
+    if(!ts->com.has_current)
       {
-      if(st->com.com.action == STREAM_ACTION_TRANSCODE)
+      if(ts->com.com.action == STREAM_ACTION_TRANSCODE)
         {
-        st->com.has_current = decode_subtitle_text(st, t);
+        st = decode_text(ts, t);
+        if(st == GAVL_SOURCE_OK)
+          ts->com.has_current = 1;
+        else if(st == GAVL_SOURCE_EOF)
+          ts->com.eof = 1;
         }
-      else if(st->com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
+      else if(ts->com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
         {
-        st->com.has_current = decode_subtitle_overlay((subtitle_stream_t*)st, t, &st->com.ovl1);
-        if(st->com.has_current && st->com.do_convert)
-          {
-          gavl_video_convert(st->com.cnv, st->com.ovl1.frame, st->com.ovl2.frame);
-          tmp_frame = st->com.ovl1.frame;
-          st->com.ovl1.frame = st->com.ovl2.frame;
-          st->com.ovl2.frame = tmp_frame;
-          }
+        st = decode_overlay((subtitle_stream_t*)ts, t, &ts->com.ovl);
+
+        if(st == GAVL_SOURCE_OK)
+          ts->com.has_current = 1;
+        else if(st == GAVL_SOURCE_EOF)
+          ts->com.eof = 1;
         }
       }
-
+    
     /* Check for encoding */
-    if(st->com.has_current)
+    if(ts->com.has_current)
       {
-      vs = &t->video_streams[st->com.video_stream];
-      if(!vs->com.do_encode || (st->subtitle_start - vs->com.time < SUBTITLE_TIME_OFFSET))
+      vs = &t->video_streams[ts->com.video_stream];
+
+      if(do_write_subtitle(ts->com.subtitle_start_unscaled, vs))
         {
-        if(st->com.com.action == STREAM_ACTION_TRANSCODE)
+#if 0
+        fprintf(stderr, "Encode subtitle %"PRId64" %"PRId64" %"PRId64"\n",
+                ts->com.subtitle_start_unscaled,
+                vs->com.time,
+                ts->com.subtitle_start_unscaled -
+                vs->com.time);
+#endif
+        if(ts->com.com.action == STREAM_ACTION_TRANSCODE)
           {
           ret =
-            bg_encoder_write_subtitle_text(t->enc,
-                                           st->text, st->subtitle_start,
-                                           st->subtitle_duration,
-                                           st->com.com.out_index);
+            bg_encoder_write_text(t->enc,
+                                  (char*)(ts->com.com.packet.data),
+                                  ts->com.com.packet.pts,
+                                  ts->com.com.packet.duration,
+                                  ts->com.com.out_index);
 
-          st->com.com.time = gavl_time_unscale(st->com.out_format.timescale,
-                                               st->subtitle_start);
+          ts->com.com.time = gavl_time_unscale(ts->com.out_format.timescale,
+                                               ts->com.com.packet.pts);
           
-          if(st->subtitle_start > t->time)
-            t->time = st->subtitle_start;
+          if(ts->com.com.time > t->time)
+            t->time = ts->com.com.time;
           }
-        else if(st->com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
+        else if(ts->com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
           {
           ret =
-            bg_encoder_write_subtitle_overlay(t->enc,
-                                              &st->com.ovl1,
-                                              st->com.com.out_index);
-          st->com.com.time = gavl_time_unscale(st->com.out_format.timescale,
-                                               st->com.ovl1.frame->timestamp);
+            bg_encoder_write_overlay(t->enc, ts->com.ovl, ts->com.com.out_index);
+          ts->com.com.time = gavl_time_unscale(ts->com.out_format.timescale,
+                                               ts->com.ovl->timestamp);
           
-          if(st->com.com.time > t->time)
-            t->time = st->com.com.time;
+          if(ts->com.com.time > t->time)
+            t->time = ts->com.com.time;
           }
-        st->com.has_current = 0;
+        ts->com.has_current = 0;
         }
       }
     if(!ret)
@@ -1759,11 +1837,11 @@
   if(!ret)
     return ret;
   
-  for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < t->num_overlay_streams; i++)
     {
-    ss = &t->subtitle_overlay_streams[i];
+    ss = &t->overlay_streams[i];
 
-    if(!ss->com.do_encode)
+    if(!ss->com.do_copy && !ss->com.do_encode)
       continue;
     
     if(ss->eof)
@@ -1771,38 +1849,61 @@
       ss->com.status = STREAM_STATE_FINISHED;
       continue;
       }
-    
-    
-    /* Check for decoding */
-    if(!ss->has_current)
+
+    /* Transcode */    
+    if(ss->com.do_encode)
       {
-      ss->has_current = decode_subtitle_overlay(ss, t, &ss->ovl1);
-      if(ss->has_current && ss->do_convert)
+      /* Check for decoding */
+      if(!ss->has_current)
+        ss->has_current = (decode_overlay(ss, t, &ss->ovl) == GAVL_SOURCE_OK);
+      
+      /* Check for encoding */
+      if(ss->has_current)
         {
-        gavl_video_convert(ss->cnv, ss->ovl1.frame, ss->ovl2.frame);
-        tmp_frame = ss->ovl1.frame;
-        ss->ovl1.frame = ss->ovl2.frame;
-        ss->ovl2.frame = tmp_frame;
+        vs = &t->video_streams[ss->video_stream];
+
+        if(do_write_subtitle(ss->subtitle_start_unscaled, vs))
+          {
+          // fprintf(stderr, "Write overlay %ld %ld\n", ss->subtitle_start_unscaled, ss->ovl->timestamp);
+          ret = (gavl_video_sink_put_frame(ss->vsink, ss->ovl) == GAVL_SINK_OK);
+          ss->com.time = gavl_time_unscale(ss->out_format.timescale,
+                                           ss->ovl->timestamp);
+          
+          if(ss->com.time > t->time)
+            t->time = ss->com.time;
+          ss->has_current = 0;
+          }
         }
+      
       }
-
-    /* Check for encoding */
-    if(ss->has_current)
+    else // Copy
       {
-      vs = &t->video_streams[ss->video_stream];
-      if(!vs->com.do_encode || (ss->ovl1.frame->timestamp - vs->com.time < SUBTITLE_TIME_OFFSET))
+      /* Check for reading */
+      if(!ss->has_current)
+        ss->has_current = (read_overlay_packet(ss, t) == GAVL_SOURCE_OK);
+      
+      if(ss->has_current)
         {
-        ret = bg_encoder_write_subtitle_overlay(t->enc,
-                                                &ss->ovl1,
-                                                ss->com.out_index);
-        ss->com.time = gavl_time_unscale(ss->out_format.timescale,
-                                         ss->ovl1.frame->timestamp);
+        vs = &t->video_streams[ss->video_stream];
+
+        if(do_write_subtitle(ss->subtitle_start_unscaled, vs))
+          {
+          fprintf(stderr, "Write overlay packet\n");
+          gavl_packet_dump(&ss->com.packet);
+            
+          ret = (gavl_packet_sink_put_packet(ss->com.psink,
+                                             &ss->com.packet) == GAVL_SINK_OK);
+          ss->com.time = gavl_time_unscale(ss->out_format.timescale,
+                                           ss->com.packet.pts);
           
-        if(ss->com.time > t->time)
-          t->time = ss->com.time;
-        ss->has_current = 0;
+          if(ss->com.time > t->time)
+            t->time = ss->com.time;
+          ss->has_current = 0;
+          }
         }
+      
       }
+    
 
     if(!ret)
       {
@@ -1817,7 +1918,7 @@
 
 #define SP_STR(s) if(!strcmp(name, # s))   \
     { \
-    t->s = bg_strdup(t->s, val->val_str);  \
+    t->s = gavl_strrep(t->s, val->val_str);  \
     return; \
     }
 
@@ -1875,18 +1976,18 @@
           {
           bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot create directory %s: %s, using default",
                  t->output_directory, strerror(errno));
-          t->output_directory = bg_strdup(t->output_directory, t->output_path);
+          t->output_directory = gavl_strrep(t->output_directory, t->output_path);
           }
         }
       else
         bg_log(BG_LOG_INFO, LOG_DOMAIN, "Created directory %s", t->output_directory);
       }
     else
-      t->output_directory = bg_strdup(t->output_directory, t->output_path);
+      t->output_directory = gavl_strrep(t->output_directory, t->output_path);
     
     return;
     }
-  SP_STR(name);
+  // SP_STR(name);
   SP_STR(location);
   SP_STR(plugin);
   SP_STR(subdir);
@@ -2013,15 +2114,15 @@
         free(tmp_string);
         }
       }
-    for(i = 0; i < t->num_subtitle_text_streams; i++)
+    for(i = 0; i < t->num_text_streams; i++)
       {
-      if(t->subtitle_text_streams[i].com.com.do_decode)
+      if(t->text_streams[i].com.com.do_decode)
         {
-        switch(t->subtitle_text_streams[i].com.com.action)
+        switch(t->text_streams[i].com.com.action)
           {
           case STREAM_ACTION_BLEND:
             bg_log(BG_LOG_INFO, LOG_DOMAIN, "Text subtitle stream %d: Blending onto video stream %d",
-                   i+1, t->subtitle_text_streams[i].com.video_stream);
+                   i+1, t->text_streams[i].com.video_stream);
             break;
           case STREAM_ACTION_TRANSCODE:
           case STREAM_ACTION_TRANSCODE_OVERLAY:
@@ -2032,15 +2133,15 @@
       
       }
 
-    for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+    for(i = 0; i < t->num_overlay_streams; i++)
       {
-      if(t->subtitle_overlay_streams[i].com.do_decode)
+      if(t->overlay_streams[i].com.do_decode)
         {
-        switch(t->subtitle_overlay_streams[i].com.action)
+        switch(t->overlay_streams[i].com.action)
           {
           case STREAM_ACTION_BLEND:
             bg_log(BG_LOG_INFO, LOG_DOMAIN, "Overlay subtitle stream %d: Blending onto video stream %d",
-                   i+1, t->subtitle_overlay_streams[i].video_stream);
+                   i+1, t->overlay_streams[i].video_stream);
             break;
           case STREAM_ACTION_TRANSCODE:
           case STREAM_ACTION_TRANSCODE_OVERLAY:
@@ -2186,10 +2287,10 @@
       }
     
     /* Check if we need to blend text subtitles */
-    for(j = 0; j < ret->num_subtitle_text_streams; j++)
+    for(j = 0; j < ret->num_text_streams; j++)
       {
-      if((ret->subtitle_text_streams[i].com.com.action == STREAM_ACTION_BLEND) &&
-         (ret->subtitle_text_streams[i].com.video_stream == i))
+      if((ret->text_streams[j].com.com.action == STREAM_ACTION_BLEND) &&
+         (ret->text_streams[j].com.video_stream == i))
         {
         bg_log(BG_LOG_WARNING, LOG_DOMAIN,
                "Not copying video stream %d: Will blend subtitles", i+1);
@@ -2201,10 +2302,10 @@
       continue;
     
     /* Check if we need to blend overlay subtitles */
-    for(j = 0; j < ret->num_subtitle_overlay_streams; j++)
+    for(j = 0; j < ret->num_overlay_streams; j++)
       {
-      if((ret->subtitle_overlay_streams[i].com.action == STREAM_ACTION_BLEND) &&
-         (ret->subtitle_overlay_streams[i].video_stream == i))
+      if((ret->overlay_streams[j].com.action == STREAM_ACTION_BLEND) &&
+         (ret->overlay_streams[j].video_stream == i))
         {
         bg_log(BG_LOG_WARNING, LOG_DOMAIN,
                "Not copying video stream %d: Will blend subtitles", i+1);
@@ -2229,6 +2330,39 @@
     //    bg_dprintf("Copying compressed video stream %d\n", i+1);
     //    gavl_compression_info_dump(&ret->video_streams[i].com.ci);
     }
+
+  /* Overlay subtitles */
+  for(i = 0; i < ret->num_overlay_streams; i++)
+    {
+    if(!(ret->overlay_streams[i].com.action == STREAM_ACTION_COPY))
+      continue;
+
+    /* Check if we can read compressed data */
+    if(!ret->in_plugin->get_overlay_compression_info ||
+       !ret->in_plugin->get_overlay_compression_info(ret->in_handle->priv,
+                                                   i, &ret->overlay_streams[i].com.ci))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Overlay stream %d cannot be read compressed", i+1);
+      ret->overlay_streams[i].com.action = STREAM_ACTION_TRANSCODE;
+      continue;
+      }
+    
+    /* Check if we can write compressed data */
+    if(!bg_encoder_writes_compressed_overlay(ret->enc,
+                                           &ret->track_info->overlay_streams[i].format,
+                                           &ret->overlay_streams[i].com.ci))
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Overlay stream %d cannot be written compressed", i+1);
+      ret->overlay_streams[i].com.action = STREAM_ACTION_TRANSCODE;
+      continue;
+      }
+
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Copying compressed overlay stream %d", i+1);
+    //    bg_dprintf("Copying compressed overlay stream %d\n", i+1);
+    //    gavl_compression_info_dump(&ret->overlay_streams[i].com.ci);
+    }
+  
+  
   }
 
 static void create_streams(bg_transcoder_t * ret,
@@ -2248,28 +2382,28 @@
     ret->video_streams = calloc(ret->num_video_streams,
                                 sizeof(*ret->video_streams));
 
-  ret->num_subtitle_text_streams = track->num_subtitle_text_streams;
+  ret->num_text_streams = track->num_text_streams;
 
-  if(ret->num_subtitle_text_streams)
-    ret->subtitle_text_streams = calloc(ret->num_subtitle_text_streams,
-                                sizeof(*ret->subtitle_text_streams));
+  if(ret->num_text_streams)
+    ret->text_streams = calloc(ret->num_text_streams,
+                                sizeof(*ret->text_streams));
 
-  ret->num_subtitle_overlay_streams = track->num_subtitle_overlay_streams;
+  ret->num_overlay_streams = track->num_overlay_streams;
 
-  if(ret->num_subtitle_overlay_streams)
-    ret->subtitle_overlay_streams = calloc(ret->num_subtitle_overlay_streams,
-                                           sizeof(*ret->subtitle_overlay_streams));
+  if(ret->num_overlay_streams)
+    ret->overlay_streams = calloc(ret->num_overlay_streams,
+                                           sizeof(*ret->overlay_streams));
   
   /* Prepare streams */
     
   ret->num_audio_streams_real = 0;
   ret->num_video_streams_real = 0;
-  ret->num_subtitle_text_streams_real = 0;
-  ret->num_subtitle_overlay_streams_real = 0;
+  ret->num_text_streams_real = 0;
+  ret->num_overlay_streams_real = 0;
     
   for(i = 0; i < ret->num_audio_streams; i++)
     {
-
+    ret->audio_streams[i].com.t = ret;
     init_audio_stream(&ret->audio_streams[i],
                       &track->audio_streams[i],
                       i, ret->plugin_reg);
@@ -2280,6 +2414,7 @@
   
   for(i = 0; i < ret->num_video_streams; i++)
     {
+    ret->video_streams[i].com.t = ret;
     init_video_stream(&ret->video_streams[i],
                       &track->video_streams[i],
                       i, ret->plugin_reg);
@@ -2288,23 +2423,25 @@
     }
 
   
-  for(i = 0; i < ret->num_subtitle_text_streams; i++)
+  for(i = 0; i < ret->num_text_streams; i++)
     {
-    init_subtitle_text_stream(&ret->subtitle_text_streams[i],
-                              &track->subtitle_text_streams[i]);
+    ret->text_streams[i].com.com.t = ret;
+    init_text_stream(&ret->text_streams[i],
+                     &track->text_streams[i]);
 
-    if(ret->subtitle_text_streams[i].com.com.action == STREAM_ACTION_TRANSCODE)
-      ret->num_subtitle_text_streams_real++;
-    else if(ret->subtitle_text_streams[i].com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
-      ret->num_subtitle_overlay_streams_real++;
+    if(ret->text_streams[i].com.com.action == STREAM_ACTION_TRANSCODE)
+      ret->num_text_streams_real++;
+    else if(ret->text_streams[i].com.com.action == STREAM_ACTION_TRANSCODE_OVERLAY)
+      ret->num_overlay_streams_real++;
     }
   
-  for(i = 0; i < ret->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ret->num_overlay_streams; i++)
     {
-    init_subtitle_overlay_stream(&ret->subtitle_overlay_streams[i],
-                                 &track->subtitle_overlay_streams[i]);
-    if(ret->subtitle_overlay_streams[i].com.action == STREAM_ACTION_TRANSCODE)
-      ret->num_subtitle_overlay_streams_real++;
+    ret->overlay_streams[i].com.t = ret;
+    init_overlay_stream(&ret->overlay_streams[i],
+                        &track->overlay_streams[i]);
+    if(ret->overlay_streams[i].com.action == STREAM_ACTION_TRANSCODE)
+      ret->num_overlay_streams_real++;
     }
   }
 
@@ -2327,20 +2464,21 @@
                            ret->in_handle);
       }
     }
-  for(i = 0; i < ret->num_subtitle_text_streams; i++)
+  for(i = 0; i < ret->num_text_streams; i++)
     {
-    if(ret->subtitle_text_streams[i].com.com.do_decode)
+    if(ret->text_streams[i].com.com.do_decode)
       {
-      start_subtitle_stream_i((subtitle_stream_t*)(&ret->subtitle_text_streams[i]),
+      start_text_stream_i((subtitle_stream_t*)(&ret->text_streams[i]),
                               ret->in_handle);
       }
     }
-  for(i = 0; i < ret->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ret->num_overlay_streams; i++)
     {
-    if(ret->subtitle_overlay_streams[i].com.do_decode)
+    if(ret->overlay_streams[i].com.do_decode ||
+       ret->overlay_streams[i].com.do_copy)
       {
-      start_subtitle_stream_i(&ret->subtitle_overlay_streams[i],
-                              ret->in_handle);
+      start_overlay_stream_i(&ret->overlay_streams[i],
+                             ret->in_handle);
       }
     }
   
@@ -2503,25 +2641,25 @@
   
   /* Subtitles */
 
-  for(i = 0; i < ret->num_subtitle_text_streams; i++)
+  for(i = 0; i < ret->num_text_streams; i++)
     {
-    switch(ret->subtitle_text_streams[i].com.com.action)
+    switch(ret->text_streams[i].com.com.action)
       {
       case STREAM_ACTION_FORGET:
-        ret->subtitle_text_streams[i].com.com.do_decode = 0;
-        ret->subtitle_text_streams[i].com.com.do_encode = 0;
+        ret->text_streams[i].com.com.do_decode = 0;
+        ret->text_streams[i].com.com.do_encode = 0;
         break;
       case STREAM_ACTION_BLEND:
-        if((ret->video_streams[ret->subtitle_text_streams[i].com.video_stream].twopass) ||
+        if((ret->video_streams[ret->text_streams[i].com.video_stream].twopass) ||
            (ret->pass == ret->total_passes))
           {
-          ret->subtitle_text_streams[i].com.com.do_decode = 1;
-          ret->subtitle_text_streams[i].com.com.do_encode = 0;
+          ret->text_streams[i].com.com.do_decode = 1;
+          ret->text_streams[i].com.com.do_encode = 0;
           }
         else
           {
-          ret->subtitle_text_streams[i].com.com.do_decode = 0;
-          ret->subtitle_text_streams[i].com.com.do_encode = 0;
+          ret->text_streams[i].com.com.do_decode = 0;
+          ret->text_streams[i].com.com.do_encode = 0;
           }
         result = 1;
         break;
@@ -2529,76 +2667,89 @@
       case STREAM_ACTION_TRANSCODE_OVERLAY:
         if(ret->pass == ret->total_passes)
           {
-          ret->subtitle_text_streams[i].com.com.do_decode = 1;
-          ret->subtitle_text_streams[i].com.com.do_encode = 1;
+          ret->text_streams[i].com.com.do_decode = 1;
+          ret->text_streams[i].com.com.do_encode = 1;
           result = 1;
           }
         else
           {
-          ret->subtitle_text_streams[i].com.com.do_decode = 0;
-          ret->subtitle_text_streams[i].com.com.do_encode = 0;
+          ret->text_streams[i].com.com.do_decode = 0;
+          ret->text_streams[i].com.com.do_encode = 0;
           }
         break;
       default:
         bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Subtitle stream cannot be handled");
-        ret->subtitle_text_streams[i].com.com.do_decode = 0;
-        ret->subtitle_text_streams[i].com.com.do_encode = 0;
-        ret->subtitle_text_streams[i].com.com.action = STREAM_ACTION_FORGET;
+        ret->text_streams[i].com.com.do_decode = 0;
+        ret->text_streams[i].com.com.do_encode = 0;
+        ret->text_streams[i].com.com.action = STREAM_ACTION_FORGET;
         break;
       }
     
-    if(!ret->subtitle_text_streams[i].com.com.do_decode)
-      ret->subtitle_text_streams[i].com.com.status = STREAM_STATE_OFF;
+    if(!ret->text_streams[i].com.com.do_decode)
+      ret->text_streams[i].com.com.status = STREAM_STATE_OFF;
     else
-      ret->subtitle_text_streams[i].com.com.status = STREAM_STATE_ON;
+      ret->text_streams[i].com.com.status = STREAM_STATE_ON;
     }
 
-  for(i = 0; i < ret->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ret->num_overlay_streams; i++)
     {
-    switch(ret->subtitle_overlay_streams[i].com.action)
+    switch(ret->overlay_streams[i].com.action)
       {
       case STREAM_ACTION_FORGET:
-        ret->subtitle_overlay_streams[i].com.do_decode = 0;
-        ret->subtitle_overlay_streams[i].com.do_encode = 0;
+        ret->overlay_streams[i].com.do_decode = 0;
+        ret->overlay_streams[i].com.do_encode = 0;
         break;
       case STREAM_ACTION_BLEND:
-        if(ret->video_streams[ret->subtitle_overlay_streams[i].video_stream].com.do_encode)
+        if(ret->video_streams[ret->overlay_streams[i].video_stream].com.do_encode)
           {
-          ret->subtitle_overlay_streams[i].com.do_decode = 1;
-          ret->subtitle_overlay_streams[i].com.do_encode = 1;
+          ret->overlay_streams[i].com.do_decode = 1;
+          ret->overlay_streams[i].com.do_encode = 1;
           result = 1;
           }
         else
           {
-          ret->subtitle_overlay_streams[i].com.do_decode = 0;
-          ret->subtitle_overlay_streams[i].com.do_encode = 0;
+          ret->overlay_streams[i].com.do_decode = 0;
+          ret->overlay_streams[i].com.do_encode = 0;
           }
         break;
       case STREAM_ACTION_TRANSCODE:
         if(ret->pass == ret->total_passes)
           {
-          ret->subtitle_overlay_streams[i].com.do_decode = 1;
-          ret->subtitle_overlay_streams[i].com.do_encode = 1;
+          ret->overlay_streams[i].com.do_decode = 1;
+          ret->overlay_streams[i].com.do_encode = 1;
+          result = 1;
+          }
+        else
+          {
+          ret->overlay_streams[i].com.do_decode = 0;
+          ret->overlay_streams[i].com.do_encode = 0;
+          }
+        break;
+      case STREAM_ACTION_COPY:
+        if(ret->pass == ret->total_passes)
+          {
+          ret->overlay_streams[i].com.do_copy = 1;
           result = 1;
           }
         else
           {
-          ret->subtitle_overlay_streams[i].com.do_decode = 0;
-          ret->subtitle_overlay_streams[i].com.do_encode = 0;
+          ret->overlay_streams[i].com.do_decode = 0;
+          ret->overlay_streams[i].com.do_encode = 0;
+          ret->overlay_streams[i].com.do_copy = 0;
           }
         break;
       default:
         bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Subtitle stream cannot be handled");
-        ret->subtitle_overlay_streams[i].com.do_decode = 0;
-        ret->subtitle_overlay_streams[i].com.do_encode = 0;
-        ret->subtitle_overlay_streams[i].com.action = STREAM_ACTION_FORGET;
+        ret->overlay_streams[i].com.do_decode = 0;
+        ret->overlay_streams[i].com.do_encode = 0;
+        ret->overlay_streams[i].com.action = STREAM_ACTION_FORGET;
         break;
       }
     
-    if(!ret->subtitle_overlay_streams[i].com.do_decode)
-      ret->subtitle_overlay_streams[i].com.status = STREAM_STATE_OFF;
+    if(!ret->overlay_streams[i].com.do_decode)
+      ret->overlay_streams[i].com.status = STREAM_STATE_OFF;
     else
-      ret->subtitle_overlay_streams[i].com.status = STREAM_STATE_ON;
+      ret->overlay_streams[i].com.status = STREAM_STATE_ON;
     }
   return result;
   }
@@ -2626,8 +2777,8 @@
                                ret->transcoder_track,
                                BG_STREAM_AUDIO |
                                BG_STREAM_VIDEO |
-                               BG_STREAM_SUBTITLE_TEXT |
-                               BG_STREAM_SUBTITLE_OVERLAY,
+                               BG_STREAM_TEXT |
+                               BG_STREAM_OVERLAY,
                                BG_PLUGIN_FILE);
   }
 
@@ -2672,20 +2823,23 @@
     
     }
     
-  for(i = 0; i < ret->num_subtitle_text_streams; i++)
+  for(i = 0; i < ret->num_text_streams; i++)
     {
-    if(!ret->subtitle_text_streams[i].com.com.do_encode)
+    if(!ret->text_streams[i].com.com.do_encode)
       continue;
-    add_subtitle_text_stream(&ret->subtitle_text_streams[i],
-                             &ret->transcoder_track->subtitle_text_streams[i], ret);
+    add_text_stream(&ret->text_streams[i],
+                    &ret->transcoder_track->text_streams[i], ret);
     }
 
-  for(i = 0; i < ret->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ret->num_overlay_streams; i++)
     {
-    if(!ret->subtitle_overlay_streams[i].com.do_encode)
-      continue;
-    add_subtitle_overlay_stream(&ret->subtitle_overlay_streams[i],
-                                &ret->transcoder_track->subtitle_overlay_streams[i], ret);
+    if(ret->overlay_streams[i].com.do_encode)
+      add_overlay_stream(&ret->overlay_streams[i],
+                         &ret->transcoder_track->overlay_streams[i], ret);
+    else if(ret->overlay_streams[i].com.do_copy)
+      add_overlay_stream_compressed(&ret->overlay_streams[i],
+                                    &ret->transcoder_track->overlay_streams[i], ret);
+      
     
     }
   
@@ -2694,34 +2848,12 @@
 
 static int init_audio_converter(audio_stream_t * ret, bg_transcoder_t * t)
   {
-  gavl_audio_options_t * opt;
   bg_encoder_get_audio_format(t->enc,
                               ret->com.out_index,
                               &ret->out_format);
 
-  gavl_audio_format_copy(&ret->pipe_format, &ret->out_format);
+  gavl_audio_source_set_dst(ret->asrc, 0, &ret->out_format);
 
-  if(ret->options.force_format != GAVL_SAMPLE_NONE)
-    ret->pipe_format.sample_format = ret->options.force_format;
-
-  bg_audio_filter_chain_set_out_format(ret->fc, &ret->pipe_format);
-  
-  /* Initialize output converter */
-  
-  opt = gavl_audio_converter_get_options(ret->cnv_out);
-  gavl_audio_options_copy(opt, ret->options.opt);
-  
-  ret->do_convert_out = gavl_audio_converter_init(ret->cnv_out,
-                                                  &ret->pipe_format,
-                                                  &ret->out_format);
-  
-  /* Create frames (could be left from the previous pass) */
-  
-  if(ret->do_convert_out && !ret->pipe_frame)
-    ret->pipe_frame = gavl_audio_frame_create(&ret->pipe_format);
-  
-  if(!ret->out_frame)
-    ret->out_frame = gavl_audio_frame_create(&ret->out_format);
   return 1;
   }
 
@@ -2748,7 +2880,6 @@
 
 static void subtitle_init_blend(subtitle_stream_t * ss, video_stream_t * vs)
   {
-  subtitle_text_stream_t * sst;
   vs->subtitle_streams =
     realloc(vs->subtitle_streams,
             sizeof(*(vs->subtitle_streams))*(vs->num_subtitle_streams+1));
@@ -2756,66 +2887,87 @@
   vs->num_subtitle_streams++;
 
   /* Check whether to initialize the text renderer */
-  if(ss->com.type == STREAM_TYPE_SUBTITLE_TEXT)
+  if(ss->com.type == STREAM_TYPE_TEXT)
     {
-    sst = (subtitle_text_stream_t*)ss;
-    bg_text_renderer_init(sst->textrenderer,
-                          &vs->out_format,
-                          &ss->in_format);
-    }
-  if(!ss->ovl1.frame) ss->ovl1.frame = gavl_video_frame_create(&ss->in_format);
-  if(!ss->ovl2.frame) ss->ovl2.frame = gavl_video_frame_create(&ss->in_format);
-
-  ss->current_ovl = &ss->ovl1;
-  ss->next_ovl    = &ss->ovl2;
+    text_stream_t * sst = (text_stream_t*)ss;
 
+    ss->vsrc = bg_text_renderer_connect(sst->textrenderer,
+                                        sst->com.com.psrc,
+                                        &vs->out_format,
+                                        &ss->in_format);
+    }
   
   gavl_overlay_blend_context_init(ss->blend_context,
                                   &vs->out_format, &ss->in_format);
+
+  bg_subtitle_handler_init(ss->sh,
+                           &vs->out_format,
+                           ss->vsrc,
+                           gavl_overlay_blend_context_get_sink(ss->blend_context));
+  
   gavl_video_format_copy(&ss->out_format, &vs->out_format);
   }
 
-static void subtitle_init_encode_text(subtitle_text_stream_t * ss,
+static void subtitle_init_encode_text(text_stream_t * ss,
                                       bg_transcoder_t * t)
   {
   /* Nothing to do here for now */
-  bg_encoder_get_subtitle_text_timescale(t->enc,
-                                         ss->com.com.out_index,
-                                         &ss->com.out_format.timescale);
+  bg_encoder_get_text_timescale(t->enc,
+                                ss->com.com.out_index,
+                                &ss->com.out_format.timescale);
+  ss->com.com.psink = bg_encoder_get_text_sink(t->enc, ss->com.com.out_index);
+  }
+
+static void subtitle_init_copy_overlay(subtitle_stream_t * ss,
+                                       bg_transcoder_t * t)
+  {
+  ss->com.psink = bg_encoder_get_overlay_packet_sink(t->enc, ss->com.out_index);
   }
 
 static void subtitle_init_encode_overlay(subtitle_stream_t * ss,
                                          bg_transcoder_t * t)
   {
-  subtitle_text_stream_t * sst;
+  text_stream_t * sst;
 
-  bg_encoder_get_subtitle_overlay_format(t->enc,
-                                         ss->com.out_index,
-                                         &ss->out_format);
-    
+  bg_encoder_get_overlay_format(t->enc, ss->com.out_index, &ss->out_format);
   /* Check whether to initialize the text renderer */
-  if(ss->com.type == STREAM_TYPE_SUBTITLE_TEXT)
+  if(ss->com.type == STREAM_TYPE_TEXT)
     {
-    sst = (subtitle_text_stream_t*)ss;
-    bg_text_renderer_init(sst->textrenderer,
-                          &ss->out_format,
-                          &ss->in_format);
+    video_stream_t * vs;
+    sst = (text_stream_t*)ss;
+    
+    if(ss->video_stream < t->num_video_streams)
+      vs = &t->video_streams[ss->video_stream];
+    else
+      vs = NULL;
+
+    /* We force the text renderer to produce the overlays in the format
+       the output plugin wants. */
+    
+    gavl_video_format_copy(&ss->in_format, &ss->out_format);
+    
+    ss->vsrc = bg_text_renderer_connect(sst->textrenderer,
+                                        ss->com.psrc,
+                                        vs ? &vs->out_format : NULL,
+                                        &ss->in_format);
+    
+    // gavl_video_format_copy(&ss->in_format, gavl_video_source_get_src_format(ss->vsrc));
     
-    //    gavl_video_format_dump(&ss->in_format);
-    //    gavl_video_format_dump(&ss->out_format);
     }
   
-  ss->do_convert = gavl_video_converter_init(ss->cnv, &ss->in_format,
-                                             &ss->out_format);
+  gavl_video_source_set_dst(ss->vsrc, 0, &ss->out_format);
+
+  /* Prevent rescaling since this will done by the source */
+  ss->in_format.timescale = ss->out_format.timescale;
   
-  if(!ss->ovl1.frame)
-    ss->ovl1.frame = gavl_video_frame_create(&ss->in_format);
+  fprintf(stderr, "Input format:\n");
+  gavl_video_format_dump(&ss->in_format);
+  fprintf(stderr, "Output format:\n");
+  gavl_video_format_dump(&ss->out_format);
 
-  if(ss->do_convert)
-    {
-    if(!ss->ovl2.frame)
-      ss->ovl2.frame = gavl_video_frame_create(&ss->out_format);
-    }
+  
+  
+  ss->vsink = bg_encoder_get_overlay_sink(t->enc, ss->com.out_index);
   }
 
 static int init_converters(bg_transcoder_t * ret)
@@ -2823,33 +2975,40 @@
   int i;
   for(i = 0; i < ret->num_audio_streams; i++)
     {
-    if(ret->audio_streams[i].com.do_copy)
+    audio_stream_t * as = ret->audio_streams + i;
+    if(as->com.do_copy)
       {
-      gavl_audio_format_copy(&ret->audio_streams[i].out_format,
-                             &ret->audio_streams[i].in_format);
+      gavl_audio_format_copy(&as->out_format, &as->in_format);
+      as->com.psink = bg_encoder_get_audio_packet_sink(ret->enc, as->com.out_index);
       continue;
       }
-    if(!ret->audio_streams[i].com.do_decode)
+    if(!as->com.do_decode)
       continue;
-    if(!init_audio_converter(&ret->audio_streams[i], ret))
+    if(!init_audio_converter(as, ret))
       return 0;
+    as->asink = bg_encoder_get_audio_sink(ret->enc, as->com.out_index);
     }
+
   for(i = 0; i < ret->num_video_streams; i++)
     {
-    if(ret->video_streams[i].com.do_copy)
+    video_stream_t * vs = ret->video_streams + i;
+    if(vs->com.do_copy)
       {
-      gavl_video_format_copy(&ret->video_streams[i].out_format,
-                             &ret->video_streams[i].in_format);
+      gavl_video_format_copy(&vs->out_format, &vs->in_format);
+      vs->com.psink = bg_encoder_get_video_packet_sink(ret->enc, vs->com.out_index);
       continue;
       }
     
-    if(!ret->video_streams[i].com.do_decode)
+    if(!vs->com.do_decode)
       continue;
 
-    if(!init_video_converter(&ret->video_streams[i], ret))
+    if(!init_video_converter(vs, ret))
       return 0;
-    
-    if(ret->video_streams[i].subtitle_streams)
+ 
+    vs->vsink = bg_encoder_get_video_sink(ret->enc, vs->com.out_index);    
+
+    /* These could be left over from the last pass */
+    if(vs->subtitle_streams)
       {
       free(ret->video_streams[i].subtitle_streams);
       ret->video_streams[i].subtitle_streams = NULL;
@@ -2857,39 +3016,42 @@
       }
     }
 
-  for(i = 0; i < ret->num_subtitle_text_streams; i++)
+  for(i = 0; i < ret->num_text_streams; i++)
     {
-    if(!ret->subtitle_text_streams[i].com.com.do_decode)
+    if(!ret->text_streams[i].com.com.do_decode)
       continue;
 
-    switch(ret->subtitle_text_streams[i].com.com.action)
+    switch(ret->text_streams[i].com.com.action)
       {
       case STREAM_ACTION_BLEND:
-        subtitle_init_blend((subtitle_stream_t*)(&ret->subtitle_text_streams[i]),
-                            &ret->video_streams[ret->subtitle_text_streams[i].com.video_stream]);
+        subtitle_init_blend((subtitle_stream_t*)(&ret->text_streams[i]),
+                            &ret->video_streams[ret->text_streams[i].com.video_stream]);
         break;
       case STREAM_ACTION_TRANSCODE:
-        subtitle_init_encode_text((&ret->subtitle_text_streams[i]), ret);
+        subtitle_init_encode_text((&ret->text_streams[i]), ret);
         break;
       case STREAM_ACTION_TRANSCODE_OVERLAY:
-        subtitle_init_encode_overlay((subtitle_stream_t*)&ret->subtitle_text_streams[i], ret);
+        subtitle_init_encode_overlay((subtitle_stream_t*)&ret->text_streams[i], ret);
         break;
       }
     }
 
-  for(i = 0; i < ret->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < ret->num_overlay_streams; i++)
     {
-    if(!ret->subtitle_overlay_streams[i].com.do_decode)
+    subtitle_stream_t * os = ret->overlay_streams + i;
+    if(!os->com.do_decode && !os->com.do_copy)
       continue;
 
-    switch(ret->subtitle_overlay_streams[i].com.action)
+    switch(os->com.action)
       {
       case STREAM_ACTION_BLEND:
-        subtitle_init_blend(&ret->subtitle_overlay_streams[i],
-                            &ret->video_streams[ret->subtitle_overlay_streams[i].video_stream]);
+        subtitle_init_blend(os, &ret->video_streams[os->video_stream]);
         break;
       case STREAM_ACTION_TRANSCODE:
-        subtitle_init_encode_overlay(&ret->subtitle_overlay_streams[i], ret);
+        subtitle_init_encode_overlay(os, ret);
+        break;
+      case STREAM_ACTION_COPY:
+        subtitle_init_copy_overlay(os, ret);
         break;
       }
     }
@@ -2914,7 +3076,7 @@
     else if(ret->pass == ret->total_passes)
       {
       gavl_volume_control_set_format(ret->audio_streams[i].volume_control,
-                                     &ret->audio_streams[i].pipe_format);
+                                     &ret->audio_streams[i].out_format);
       /* Set the volume */
       gavl_peak_detector_get_peak(ret->audio_streams[i].peak_detector,
                                   NULL, NULL, &absolute);
@@ -2958,10 +3120,12 @@
                        bg_metadata_set_parameter,
                        &ret->metadata);
 
+  ret->name = gavl_strrep(ret->name, bg_transcoder_track_get_name(track));
+  
   /* Postprocess only: Send messages and return */
   if(ret->pp_only)
     {
-    ret->output_filename = bg_strdup(ret->output_filename, ret->location);
+    ret->output_filename = gavl_strrep(ret->output_filename, ret->location);
     
     send_init_messages(ret);
     ret->state = STREAM_STATE_FINISHED;
@@ -3017,11 +3181,11 @@
   if(ret->set_start_time && ret->set_end_time)
     ret->duration = ret->end_time - ret->start_time;
   else if(ret->set_start_time)
-    ret->duration = ret->track_info->duration - ret->start_time;
+    ret->duration = bg_track_info_get_duration(ret->track_info) - ret->start_time;
   else if(ret->set_end_time)
     ret->duration = ret->end_time;
   else
-    ret->duration = ret->track_info->duration;
+    ret->duration = bg_track_info_get_duration(ret->track_info);
   
   /* Start timer */
 
@@ -3053,12 +3217,6 @@
   
   /* Free all resources */
 
-  if(s->out_frame)
-    gavl_audio_frame_destroy(s->out_frame);
-  if(s->pipe_frame)
-    gavl_audio_frame_destroy(s->pipe_frame);
-  if(s->cnv_out)
-    gavl_audio_converter_destroy(s->cnv_out);
   if(s->fc)
     bg_audio_filter_chain_destroy(s->fc);
   if(s->volume_control)
@@ -3097,17 +3255,15 @@
 
 static void cleanup_subtitle_stream(subtitle_stream_t * s)
   {
-  subtitle_text_stream_t * ts;
+  text_stream_t * ts;
   cleanup_stream(&s->com);
-  if(s->ovl1.frame)
-    gavl_video_frame_destroy(s->ovl1.frame);
-  if(s->ovl2.frame)
-    gavl_video_frame_destroy(s->ovl2.frame);
   if(s->blend_context)
     gavl_overlay_blend_context_destroy(s->blend_context);
-  if(s->com.type == STREAM_TYPE_SUBTITLE_TEXT)
+  if(s->sh)
+    bg_subtitle_handler_destroy(s->sh);
+  if(s->com.type == STREAM_TYPE_TEXT)
     {
-    ts = (subtitle_text_stream_t*)s;
+    ts = (text_stream_t*)s;
     if(ts->textrenderer) bg_text_renderer_destroy(ts->textrenderer);
     }
   }
@@ -3132,11 +3288,14 @@
   if(t->pp_only)
     return;
   
-  if(t->in_plugin->stop)
-    t->in_plugin->stop(t->in_handle->priv);
-
-  t->in_plugin->close(t->in_handle->priv);
-  bg_plugin_unref(t->in_handle);
+  if(t->in_plugin)
+    {
+    if(t->in_plugin->stop)
+      t->in_plugin->stop(t->in_handle->priv);
+    t->in_plugin->close(t->in_handle->priv);
+    }
+  if(t->in_handle)
+    bg_plugin_unref(t->in_handle);
   t->in_handle = NULL;
   }
 
@@ -3249,15 +3408,15 @@
      a specified time */
   if(t->end_time == GAVL_TIME_UNDEFINED)
     {
-    for(i = 0; i < t->num_subtitle_text_streams; i++)
+    for(i = 0; i < t->num_text_streams; i++)
       {
-      if(t->subtitle_text_streams[i].com.com.status != STREAM_STATE_ON)
+      if(t->text_streams[i].com.com.status != STREAM_STATE_ON)
         continue;
       done = 0;
       }
-    for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+    for(i = 0; i < t->num_overlay_streams; i++)
       {
-      if(t->subtitle_overlay_streams[i].com.status != STREAM_STATE_ON)
+      if(t->overlay_streams[i].com.status != STREAM_STATE_ON)
         continue;
       done = 0;
       }
@@ -3407,23 +3566,23 @@
     cleanup_audio_stream(&t->audio_streams[i]);
     }
 
-  for(i = 0; i < t->num_subtitle_text_streams; i++)
+  for(i = 0; i < t->num_text_streams; i++)
     {
-    cleanup_subtitle_stream((subtitle_stream_t*)(&t->subtitle_text_streams[i]));
+    cleanup_subtitle_stream((subtitle_stream_t*)(&t->text_streams[i]));
     }
-  for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < t->num_overlay_streams; i++)
     {
-    cleanup_subtitle_stream(&t->subtitle_overlay_streams[i]);
+    cleanup_subtitle_stream(&t->overlay_streams[i]);
     }
       
   if(t->audio_streams)
     free(t->audio_streams);
   if(t->video_streams)
     free(t->video_streams);
-  if(t->subtitle_text_streams)
-    free(t->subtitle_text_streams);
-  if(t->subtitle_overlay_streams)
-    free(t->subtitle_overlay_streams);
+  if(t->text_streams)
+    free(t->text_streams);
+  if(t->overlay_streams)
+    free(t->overlay_streams);
   
   /* Free metadata */

gmerlin-1.2.0.tar.gz/lib/transcoder_pp.c -> gmerlin-4256.tar.gz/lib/transcoder_pp.c Changed

gmerlin-1.2.0.tar.gz/lib/transcoder_track.c -> gmerlin-4256.tar.gz/lib/transcoder_track.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -101,8 +101,13 @@
                               GAVL_META_LANGUAGE);
       
       if(tag)
+        {
         bg_cfg_section_set_parameter_string(t->audio_streams[i].general_section,
                                             "in_language", tag);
+        bg_cfg_section_set_parameter_string(t->audio_streams[i].general_section,
+                                            "language", tag);
+        }
+      gavl_metadata_copy(&t->audio_streams[i].m, &track_info->audio_streams[i].m);
       }
     }
 
@@ -117,47 +122,58 @@
       {
       t->video_streams[i].general_section = bg_cfg_section_copy(general_section);
       t->video_streams[i].filter_section = bg_cfg_section_copy(filter_section);
+      gavl_metadata_copy(&t->video_streams[i].m, &track_info->video_streams[i].m);
       }
     }
 
-  if(t->num_subtitle_text_streams)
+  if(t->num_text_streams)
     {
     general_section = bg_cfg_section_find_subsection(track_defaults_section,
-                                                     "subtitle_text");
+                                                     "text");
     textrenderer_section = bg_cfg_section_find_subsection(track_defaults_section,
                                                           "textrenderer");
-    for(i = 0; i < t->num_subtitle_text_streams; i++)
+    for(i = 0; i < t->num_text_streams; i++)
       {
-      t->subtitle_text_streams[i].general_section = bg_cfg_section_copy(general_section);
-      t->subtitle_text_streams[i].textrenderer_section = bg_cfg_section_copy(textrenderer_section);
+      t->text_streams[i].general_section = bg_cfg_section_copy(general_section);
+      t->text_streams[i].textrenderer_section = bg_cfg_section_copy(textrenderer_section);
 
-      in_index = t->subtitle_text_streams[i].in_index;
+      in_index = t->text_streams[i].in_index;
 
-      tag = gavl_metadata_get(&track_info->subtitle_streams[i].m,
+      tag = gavl_metadata_get(&track_info->text_streams[in_index].m,
                               GAVL_META_LANGUAGE);
-            
+      
       if(tag)
-        bg_cfg_section_set_parameter_string(t->subtitle_text_streams[i].general_section,
+        {
+        bg_cfg_section_set_parameter_string(t->text_streams[i].general_section,
                                             "in_language",
                                             tag);
+        bg_cfg_section_set_parameter_string(t->text_streams[i].general_section,
+                                            "language", tag);
+        }
+      gavl_metadata_copy(&t->text_streams[i].m, &track_info->text_streams[in_index].m);
       }
     }
 
-  if(t->num_subtitle_overlay_streams)
+  if(t->num_overlay_streams)
     {
     general_section = bg_cfg_section_find_subsection(track_defaults_section,
-                                                     "subtitle_overlay");
-    for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+                                                     "overlay");
+    for(i = 0; i < t->num_overlay_streams; i++)
       {
-      t->subtitle_overlay_streams[i].general_section = bg_cfg_section_copy(general_section);
-      in_index = t->subtitle_overlay_streams[i].in_index;
+      t->overlay_streams[i].general_section = bg_cfg_section_copy(general_section);
+      in_index = t->overlay_streams[i].in_index;
 
-      tag = gavl_metadata_get(&track_info->subtitle_streams[in_index].m,
+      tag = gavl_metadata_get(&track_info->overlay_streams[in_index].m,
                               GAVL_META_LANGUAGE);
       
       if(tag)
-        bg_cfg_section_set_parameter_string(t->subtitle_overlay_streams[i].general_section,
+        {
+        bg_cfg_section_set_parameter_string(t->overlay_streams[i].general_section,
                                             "in_language", tag);
+        bg_cfg_section_set_parameter_string(t->overlay_streams[i].general_section,
+                                            "language", tag);
+        }
+      gavl_metadata_copy(&t->overlay_streams[i].m, &track_info->overlay_streams[in_index].m);
       }
     }
   
@@ -166,12 +182,6 @@
 static const bg_parameter_info_t parameters_general[] =
   {
     {
-      .name =      "name",
-      .long_name = TRS("Name"),
-      .type =      BG_PARAMETER_STRING,
-      .flags =     BG_PARAMETER_HIDE_DIALOG,
-    },
-    {
       .name =      "location",
       .long_name = TRS("Location"),
       .type =      BG_PARAMETER_STRING,
@@ -226,13 +236,13 @@
       .flags =     BG_PARAMETER_HIDE_DIALOG,
     },
     {
-      .name =      "subtitle_text_encoder",
+      .name =      "text_encoder",
       .long_name = "Subtitle text encoder",
       .type =      BG_PARAMETER_STRING,
       .flags =     BG_PARAMETER_HIDE_DIALOG,
     },
     {
-      .name =      "subtitle_overlay_encoder",
+      .name =      "overlay_encoder",
       .long_name = "Subtitle overlay encoder",
       .type =      BG_PARAMETER_STRING,
       .flags =     BG_PARAMETER_HIDE_DIALOG,
@@ -279,7 +289,7 @@
 
 /* Subtitle text parameters */
 
-static const bg_parameter_info_t general_parameters_subtitle_text[] =
+static const bg_parameter_info_t general_parameters_text[] =
   {
     {
       .name =        "action",
@@ -344,17 +354,19 @@
 
 /* Subtitle overlay parameters */
 
-static const bg_parameter_info_t general_parameters_subtitle_overlay[] =
+static const bg_parameter_info_t general_parameters_overlay[] =
   {
     {
       .name =        "action",
       .long_name =   TRS("Action"),
       .type =        BG_PARAMETER_STRINGLIST,
       .multi_names =  (char const *[]){ "forget",
+                                        "copy",
                                         "transcode",
                                         "blend",
                                         NULL },
       .multi_labels = (char const *[]){ TRS("Forget"),
+                                        TRS("Copy (if possible)"),
                                         TRS("Transcode"),
                                         TRS("Blend onto video"),
                                         NULL },
@@ -401,12 +413,12 @@
 
   /* Create subtitle parameters. These depend on the number of video streams */
 
-  for(i = 0; i < track->num_subtitle_text_streams; i++)
+  for(i = 0; i < track->num_text_streams; i++)
     {
     /* Forget, Dump, Blend #1, Blend #2 ... */
-    track->subtitle_text_streams[i].general_parameters =
-      bg_parameter_info_copy_array(general_parameters_subtitle_text);
-    info = track->subtitle_text_streams[i].general_parameters;
+    track->text_streams[i].general_parameters =
+      bg_parameter_info_copy_array(general_parameters_text);
+    info = track->text_streams[i].general_parameters;
 
     if(track->num_video_streams > 1)
       {
@@ -415,13 +427,13 @@
       }
     
     }
-  for(i = 0; i < track->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < track->num_overlay_streams; i++)
     {
     /* Forget, Blend #1, Blend #2 ... */
 
-    track->subtitle_overlay_streams[i].general_parameters =
-      bg_parameter_info_copy_array(general_parameters_subtitle_overlay);
-    info = track->subtitle_overlay_streams[i].general_parameters;
+    track->overlay_streams[i].general_parameters =
+      bg_parameter_info_copy_array(general_parameters_overlay);
+    info = track->overlay_streams[i].general_parameters;
 
     if(track->num_video_streams > 1)
       {
@@ -524,8 +536,7 @@
     
     while(track->general_parameters[i].name)
       {
-      if(!strcmp(track->general_parameters[i].name, "name") ||
-         !strcmp(track->general_parameters[i].name, "set_end_time") ||
+      if(!strcmp(track->general_parameters[i].name, "set_end_time") ||
          !strcmp(track->general_parameters[i].name, "end_time"))
         track->general_parameters[i].flags &= ~BG_PARAMETER_HIDE_DIALOG;
       i++;
@@ -551,9 +562,9 @@
   if(language && info)
     return bg_sprintf("%s [%s]", info, bg_get_language_name(language));
   else if(language)
-    return bg_strdup(NULL, bg_get_language_name(language));
+    return gavl_strdup(bg_get_language_name(language));
   else if(info)
-    return bg_strdup(NULL, info);
+    return gavl_strdup(info);
   else
     return NULL;
   }
@@ -568,9 +579,11 @@
                       bg_plugin_registry_t * plugin_reg)
   {
   int i;
-  int subtitle_text_index, subtitle_overlay_index;
+  gavl_time_t duration;
   const bg_input_plugin_t * input;
   input = (bg_input_plugin_t *)input_plugin->plugin;
+
+  duration = bg_track_info_get_duration(track_info);
   
   /* General parameters */
   
@@ -580,34 +593,23 @@
   i = 0;
   while(track->general_parameters[i].name)
     {
-    if(!strcmp(track->general_parameters[i].name, "name"))
-      {
-      if(track_info->name)
-        track->general_parameters[i].val_default.val_str =
-          bg_strdup(NULL, track_info->name);
-      else
-        track->general_parameters[i].val_default.val_str =
-          bg_get_track_name_default(location, track_index, total_tracks);
-      track->general_parameters[i].flags &= ~BG_PARAMETER_HIDE_DIALOG;
-      }
-    
-    else if(!strcmp(track->general_parameters[i].name, "duration"))
-      track->general_parameters[i].val_default.val_time = track_info->duration;
+    if(!strcmp(track->general_parameters[i].name, "duration"))
+      track->general_parameters[i].val_default.val_time = duration;
     else if(!strcmp(track->general_parameters[i].name, "subdir"))
       {
       if(input->get_disc_name)
         track->general_parameters[i].val_default.val_str =
-          bg_strdup(track->general_parameters[i].val_default.val_str,
+          gavl_strrep(track->general_parameters[i].val_default.val_str,
                     input->get_disc_name(input_plugin->priv));
       }
     else if(!strcmp(track->general_parameters[i].name, "flags"))
       track->general_parameters[i].val_default.val_i = track_info->flags;
     else if(!strcmp(track->general_parameters[i].name, "location"))
-      track->general_parameters[i].val_default.val_str = bg_strdup(NULL, location);
+      track->general_parameters[i].val_default.val_str = gavl_strdup(location);
 
     else if(!strcmp(track->general_parameters[i].name, "plugin"))
       track->general_parameters[i].val_default.val_str =
-        bg_strdup(NULL, input_info->name);
+        gavl_strdup(input_info->name);
     else if(!strcmp(track->general_parameters[i].name, "prefer_edl"))
       {
       if(input_plugin->edl)
@@ -629,15 +631,15 @@
       if(track_info->flags & BG_TRACK_SEEKABLE)
         {
         track->general_parameters[i].flags &= ~BG_PARAMETER_HIDE_DIALOG;
-        track->general_parameters[i].val_max.val_time = track_info->duration;
+        track->general_parameters[i].val_max.val_time = duration;
         }
       }
     else if(!strcmp(track->general_parameters[i].name, "end_time"))
       {
-      if(track_info->duration != GAVL_TIME_UNDEFINED)
+      if(duration != GAVL_TIME_UNDEFINED)
         {
-        track->general_parameters[i].val_max.val_time = track_info->duration;
-        track->general_parameters[i].val_default.val_time = track_info->duration;
+        track->general_parameters[i].val_max.val_time = duration;
+        track->general_parameters[i].val_default.val_time = duration;
         }
       track->general_parameters[i].flags &= ~BG_PARAMETER_HIDE_DIALOG;
       }
@@ -660,7 +662,7 @@
 
   /* Chapter list */
   if(track_info->chapter_list)
-    track->chapter_list = bg_chapter_list_copy(track_info->chapter_list);
+    track->chapter_list = gavl_chapter_list_copy(track_info->chapter_list);
   
   /* Audio streams */
   
@@ -694,59 +696,40 @@
     }
 
   /* Subtitle streams */
+
+  track->num_text_streams = track_info->num_text_streams;
+  track->num_overlay_streams = track_info->num_overlay_streams;
+  
+  if(track->num_text_streams)
+    track->text_streams =
+      calloc(track->num_text_streams,
+             sizeof(*(track->text_streams)));
   
-  if(track_info->num_subtitle_streams)
+  if(track->num_overlay_streams)
+    track->overlay_streams =
+      calloc(track->num_overlay_streams,
+             sizeof(*(track->overlay_streams)));
+  
+  for(i = 0; i < track_info->num_text_streams; i++)
     {
-    for(i = 0; i < track_info->num_subtitle_streams; i++)
-      {
-      if(track_info->subtitle_streams[i].is_text)
-        track->num_subtitle_text_streams++;
-      else
-        track->num_subtitle_overlay_streams++;
-      }
-
-    if(track->num_subtitle_text_streams)
-      track->subtitle_text_streams =
-        calloc(track->num_subtitle_text_streams,
-               sizeof(*(track->subtitle_text_streams)));
-    
-    if(track->num_subtitle_overlay_streams)
-      track->subtitle_overlay_streams =
-        calloc(track->num_subtitle_overlay_streams,
-               sizeof(*(track->subtitle_overlay_streams)));
-    
-    subtitle_text_index = 0;
-    subtitle_overlay_index = 0;
-    
-    for(i = 0; i < track_info->num_subtitle_streams; i++)
-      {
-      if(track_info->subtitle_streams[i].is_text)
-        {
-        track->subtitle_text_streams[subtitle_text_index].label =
-          create_stream_label(&track_info->subtitle_streams[i].m);
-        track->subtitle_text_streams[subtitle_text_index].in_index = i;
-        subtitle_text_index++;
-        }
-      else
-        {
-        track->subtitle_overlay_streams[subtitle_overlay_index].label =
-          create_stream_label(&track_info->subtitle_streams[i].m);
-        track->subtitle_overlay_streams[subtitle_overlay_index].in_index = i;
-        
-        subtitle_overlay_index++;
-        }
-      }
-    
+    track->text_streams[i].label =
+      create_stream_label(&track_info->text_streams[i].m);
+    track->text_streams[i].in_index = i;
     }
- 
+  for(i = 0; i < track_info->num_overlay_streams; i++)
+    {
+    track->overlay_streams[i].label =
+      create_stream_label(&track_info->overlay_streams[i].m);
+    track->overlay_streams[i].in_index = i;
+    }
+  
   create_subtitle_parameters(track);
   create_filter_parameters(track, plugin_reg);
   }
 
-static void enable_streams(bg_input_plugin_t * plugin, void * priv, 
+static int enable_streams(bg_input_plugin_t * plugin, void * priv, 
                            int track,
-                           int num_audio_streams, int num_video_streams,
-                           int num_subtitle_streams)
+                           bg_track_info_t * info)
   {
   int i;
 
@@ -755,7 +738,7 @@
 
   if(plugin->set_audio_stream)
     {
-    for(i = 0; i < num_audio_streams; i++)
+    for(i = 0; i < info->num_audio_streams; i++)
       {
       plugin->set_audio_stream(priv, i, BG_STREAM_ACTION_DECODE);
       }
@@ -763,22 +746,30 @@
 
   if(plugin->set_video_stream)
     {
-    for(i = 0; i < num_video_streams; i++)
+    for(i = 0; i < info->num_video_streams; i++)
       {
       plugin->set_video_stream(priv, i, BG_STREAM_ACTION_DECODE);
       }
     }
-  if(plugin->set_subtitle_stream)
+  if(plugin->set_text_stream)
     {
-    for(i = 0; i < num_subtitle_streams; i++)
+    for(i = 0; i < info->num_text_streams; i++)
       {
-      plugin->set_subtitle_stream(priv, i, BG_STREAM_ACTION_DECODE);
+      plugin->set_text_stream(priv, i, BG_STREAM_ACTION_DECODE);
+      }
+    }
+  if(plugin->set_overlay_stream)
+    {
+    for(i = 0; i < info->num_overlay_streams; i++)
+      {
+      plugin->set_overlay_stream(priv, i, BG_STREAM_ACTION_DECODE);
       }
     }
 
-  if(plugin->start)
-    plugin->start(priv);
-
+  if(plugin->start && !plugin->start(priv))
+    return 0;
+  
+  return 1;
   }
 
 static void disable_streams(bg_input_plugin_t * plugin, void * priv)
@@ -796,6 +787,7 @@
                            bg_cfg_section_t * encoder_section,
                            char * name)
   {
+  const char * real_url;
   int i;
 
   bg_transcoder_track_t * ret = NULL;
@@ -853,22 +845,21 @@
     track_info = input->get_track_info(plugin_handle->priv, track);
     
     if(name)
-      track_info->name = bg_strdup(track_info->name, name);
+      gavl_metadata_set(&track_info->metadata, GAVL_META_LABEL, name);
+    else
+      bg_set_track_name_default(track_info, url);
     
     new_track = calloc(1, sizeof(*new_track));
     ret = new_track;
     
-    if(track_info->url)
+    if((real_url = gavl_metadata_get(&track_info->metadata, GAVL_META_REFURL)))
       {
-      new_track->url = bg_strdup(new_track->url, track_info->url);
+      new_track->url = gavl_strrep(new_track->url, real_url);
       }
     else
       {
-      enable_streams(input, plugin_handle->priv, 
-                     track,
-                     track_info->num_audio_streams,
-                     track_info->num_video_streams,
-                     track_info->num_subtitle_streams);
+      if(!enable_streams(input, plugin_handle->priv, track, track_info))
+        goto fail;
       streams_enabled = 1;
       }
     
@@ -891,7 +882,9 @@
       track_info = input->get_track_info(plugin_handle->priv, i);
 
       if(name)
-        track_info->name = bg_strdup(track_info->name, name);
+        gavl_metadata_set(&track_info->metadata, GAVL_META_LABEL, name);
+      else
+        bg_set_track_name_default(track_info, url);
       
       new_track = calloc(1, sizeof(*new_track));
       
@@ -906,17 +899,15 @@
         end_track = new_track;
         }
 
-      if(track_info->url)
+      if((real_url = gavl_metadata_get(&track_info->metadata, GAVL_META_REFURL)))
         {
-        new_track->url = bg_strdup(new_track->url, track_info->url);
+        new_track->url = gavl_strrep(new_track->url, real_url);
         }
       else
         {
-        enable_streams(input, plugin_handle->priv, 
-                       i,
-                       track_info->num_audio_streams,
-                       track_info->num_video_streams,
-                       track_info->num_subtitle_streams);
+        if(!enable_streams(input, plugin_handle->priv, i, track_info))
+          goto fail;
+           
         streams_enabled = 1;
         }
       
@@ -935,8 +926,33 @@
       }
     }
   bg_plugin_unref(plugin_handle);
-  
   return ret;
+
+  fail:
+
+  if(ret)
+    {
+    bg_transcoder_track_t * tmp;
+
+    tmp = ret->next;
+
+    while(1)
+      {
+      bg_transcoder_track_destroy(ret);
+      ret = tmp;
+
+      if(!ret)
+        break;
+      
+      tmp = ret->next;
+      }
+    }
+  
+  disable_streams(input, plugin_handle->priv);
+  if(plugin_handle)
+    bg_plugin_unref(plugin_handle);
+  
+  return NULL;
   }
 
 static bg_transcoder_track_t * remove_redirectors(bg_transcoder_track_t * entries,
@@ -946,13 +962,10 @@
   {
   bg_transcoder_track_t * before, * e;
   bg_transcoder_track_t * new_entry, * end_entry;
-  int done = 0;
   const char * plugin_name = NULL;
   const bg_plugin_info_t * info;
   
-  done = 1;
   e = entries;
-
   
   while(e)
     {
@@ -1167,16 +1180,16 @@
     track->video_encoder_section = NULL;
     }
 
-  if(track->subtitle_text_encoder_section)
+  if(track->text_encoder_section)
     {
-    bg_cfg_section_destroy(track->subtitle_text_encoder_section);
-    track->subtitle_text_encoder_section = NULL;
+    bg_cfg_section_destroy(track->text_encoder_section);
+    track->text_encoder_section = NULL;
     }
 
-  if(track->subtitle_overlay_encoder_section)
+  if(track->overlay_encoder_section)
     {
-    bg_cfg_section_destroy(track->subtitle_overlay_encoder_section);
-    track->subtitle_overlay_encoder_section = NULL;
+    bg_cfg_section_destroy(track->overlay_encoder_section);
+    track->overlay_encoder_section = NULL;
     }
   
   for(i = 0; i < track->num_audio_streams; i++)
@@ -1197,26 +1210,26 @@
       }
     }
 
-  for(i = 0; i < track->num_subtitle_text_streams; i++)
+  for(i = 0; i < track->num_text_streams; i++)
     {
-    if(track->subtitle_text_streams[i].encoder_section_text)
+    if(track->text_streams[i].encoder_section_text)
       {
-      bg_cfg_section_destroy(track->subtitle_text_streams[i].encoder_section_text);
-      track->subtitle_text_streams[i].encoder_section_text = NULL;
+      bg_cfg_section_destroy(track->text_streams[i].encoder_section_text);
+      track->text_streams[i].encoder_section_text = NULL;
       }
-    if(track->subtitle_text_streams[i].encoder_section_overlay)
+    if(track->text_streams[i].encoder_section_overlay)
       {
-      bg_cfg_section_destroy(track->subtitle_text_streams[i].encoder_section_overlay);
-      track->subtitle_text_streams[i].encoder_section_overlay = NULL;
+      bg_cfg_section_destroy(track->text_streams[i].encoder_section_overlay);
+      track->text_streams[i].encoder_section_overlay = NULL;
       }
     }
 
-  for(i = 0; i < track->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < track->num_overlay_streams; i++)
     {
-    if(track->subtitle_overlay_streams[i].encoder_section)
+    if(track->overlay_streams[i].encoder_section)
       {
-      bg_cfg_section_destroy(track->subtitle_overlay_streams[i].encoder_section);
-      track->subtitle_overlay_streams[i].encoder_section = NULL;
+      bg_cfg_section_destroy(track->overlay_streams[i].encoder_section);
+      track->overlay_streams[i].encoder_section = NULL;
       }
     }
   }
@@ -1242,6 +1255,7 @@
     
     if(t->audio_streams[i].label) free(t->audio_streams[i].label);
     bg_parameter_info_destroy_array(t->audio_streams[i].filter_parameters);
+    gavl_metadata_free(&t->audio_streams[i].m);
     }
   for(i = 0; i < t->num_video_streams; i++)
     {
@@ -1255,34 +1269,37 @@
     
     if(t->video_streams[i].label) free(t->video_streams[i].label);
     bg_parameter_info_destroy_array(t->video_streams[i].filter_parameters);
+    gavl_metadata_free(&t->video_streams[i].m);
     }
-  for(i = 0; i < t->num_subtitle_text_streams; i++)
-    {
-    if(t->subtitle_text_streams[i].general_section)
-      bg_cfg_section_destroy(t->subtitle_text_streams[i].general_section);
-    if(t->subtitle_text_streams[i].encoder_section_text)
-      bg_cfg_section_destroy(t->subtitle_text_streams[i].encoder_section_text);
-    if(t->subtitle_text_streams[i].encoder_section_overlay)
-      bg_cfg_section_destroy(t->subtitle_text_streams[i].encoder_section_overlay);
-    if(t->subtitle_text_streams[i].textrenderer_section)
-      bg_cfg_section_destroy(t->subtitle_text_streams[i].textrenderer_section);
+  for(i = 0; i < t->num_text_streams; i++)
+    {
+    if(t->text_streams[i].general_section)
+      bg_cfg_section_destroy(t->text_streams[i].general_section);
+    if(t->text_streams[i].encoder_section_text)
+      bg_cfg_section_destroy(t->text_streams[i].encoder_section_text);
+    if(t->text_streams[i].encoder_section_overlay)
+      bg_cfg_section_destroy(t->text_streams[i].encoder_section_overlay);
+    if(t->text_streams[i].textrenderer_section)
+      bg_cfg_section_destroy(t->text_streams[i].textrenderer_section);
     
-    if(t->subtitle_text_streams[i].general_parameters)
-      bg_parameter_info_destroy_array(t->subtitle_text_streams[i].general_parameters);
+    if(t->text_streams[i].general_parameters)
+      bg_parameter_info_destroy_array(t->text_streams[i].general_parameters);
 
     
-    if(t->subtitle_text_streams[i].label) free(t->subtitle_text_streams[i].label);
+    if(t->text_streams[i].label) free(t->text_streams[i].label);
+    gavl_metadata_free(&t->text_streams[i].m);
     }
-  for(i = 0; i < t->num_subtitle_overlay_streams; i++)
+  for(i = 0; i < t->num_overlay_streams; i++)
     {
-    if(t->subtitle_overlay_streams[i].general_section)
-      bg_cfg_section_destroy(t->subtitle_overlay_streams[i].general_section);
-    if(t->subtitle_overlay_streams[i].encoder_section)
-      bg_cfg_section_destroy(t->subtitle_overlay_streams[i].encoder_section);
+    if(t->overlay_streams[i].general_section)
+      bg_cfg_section_destroy(t->overlay_streams[i].general_section);
+    if(t->overlay_streams[i].encoder_section)
+      bg_cfg_section_destroy(t->overlay_streams[i].encoder_section);
     
-    if(t->subtitle_overlay_streams[i].general_parameters)
-      bg_parameter_info_destroy_array(t->subtitle_overlay_streams[i].general_parameters);
-    if(t->subtitle_overlay_streams[i].label) free(t->subtitle_overlay_streams[i].label);
+    if(t->overlay_streams[i].general_parameters)
+      bg_parameter_info_destroy_array(t->overlay_streams[i].general_parameters);
+    if(t->overlay_streams[i].label) free(t->overlay_streams[i].label);
+    gavl_metadata_free(&t->overlay_streams[i].m);
     }
   
   
@@ -1301,10 +1318,10 @@
     bg_cfg_section_destroy(t->audio_encoder_section);
   if(t->video_encoder_section)
     bg_cfg_section_destroy(t->video_encoder_section);
-  if(t->subtitle_text_encoder_section)
-    bg_cfg_section_destroy(t->subtitle_text_encoder_section);
-  if(t->subtitle_overlay_encoder_section)
-    bg_cfg_section_destroy(t->subtitle_overlay_encoder_section);
+  if(t->text_encoder_section)
+    bg_cfg_section_destroy(t->text_encoder_section);
+  if(t->overlay_encoder_section)
+    bg_cfg_section_destroy(t->overlay_encoder_section);
   
   if(t->general_parameters)
     bg_parameter_info_destroy_array(t->general_parameters);
@@ -1312,7 +1329,7 @@
     bg_parameter_info_destroy_array(t->metadata_parameters);
 
   if(t->chapter_list)
-    bg_chapter_list_destroy(t->chapter_list);
+    gavl_chapter_list_destroy(t->chapter_list);
   
   if(t->url)
     free(t->url);
@@ -1346,7 +1363,6 @@
  transcoding in the second pass. This enables higher quality within the given bitrate constraints but roughly doubles the video encoding time."),
     },
     BG_GAVL_PARAM_CONVERSION_QUALITY,
-    BG_GAVL_PARAM_FRAMERATE,
     BG_GAVL_PARAM_ALPHA,
     BG_GAVL_PARAM_RESAMPLE_CHROMA,
     BG_GAVL_PARAM_THREADS,
@@ -1395,10 +1411,8 @@
       .help_string = TRS("This will enable 2 pass transcoding. In the first pass, the peak volume\
  is detected. In the second pass, the stream is transcoded with normalized volume.")
     },
-    BG_GAVL_PARAM_FORCE_SAMPLEFORMAT,
     BG_GAVL_PARAM_CONVERSION_QUALITY,
     BG_GAVL_PARAM_AUDIO_DITHER_MODE,
-    BG_GAVL_PARAM_SAMPLERATE,
     BG_GAVL_PARAM_RESAMPLE_MODE,
     BG_GAVL_PARAM_CHANNEL_SETUP,
     { /* End of parameters */ }
@@ -1422,15 +1436,15 @@
   }
 
 const bg_parameter_info_t *
-bg_transcoder_track_subtitle_text_get_general_parameters()
+bg_transcoder_track_text_get_general_parameters()
   {
-  return general_parameters_subtitle_text;
+  return general_parameters_text;
   }
 
 const bg_parameter_info_t *
-bg_transcoder_track_subtitle_overlay_get_general_parameters()
+bg_transcoder_track_overlay_get_general_parameters()
   {
-  return general_parameters_subtitle_overlay;
+  return general_parameters_overlay;
   }
 
 const bg_parameter_info_t *
@@ -1447,9 +1461,9 @@
 
   memset(&val, 0, sizeof(val));
   memset(&info, 0, sizeof(info));
-  info.name = "name";
-    
-  bg_cfg_section_get_parameter(t->general_section, &info, &val);
+  info.name = "label";
+  
+  bg_cfg_section_get_parameter(t->metadata_section, &info, &val);
   return val.val_str;
   }
 
@@ -1467,17 +1481,17 @@
   return ret;
   }
 
-const char * bg_transcoder_track_get_subtitle_text_encoder(bg_transcoder_track_t * t)
+const char * bg_transcoder_track_get_text_encoder(bg_transcoder_track_t * t)
   {
   const char * ret;
-  bg_cfg_section_get_parameter_string(t->general_section, "subtitle_text_encoder", &ret);
+  bg_cfg_section_get_parameter_string(t->general_section, "text_encoder", &ret);
   return ret;
   }
 
-const char * bg_transcoder_track_get_subtitle_overlay_encoder(bg_transcoder_track_t * t)
+const char * bg_transcoder_track_get_overlay_encoder(bg_transcoder_track_t * t)
   {
   const char * ret;
-  bg_cfg_section_get_parameter_string(t->general_section, "subtitle_overlay_encoder", &ret);
+  bg_cfg_section_get_parameter_string(t->general_section, "overlay_encoder", &ret);
   return ret;
   }
 
@@ -1556,14 +1570,14 @@
                                       "video_encoder", info->video_info->name);
 
   bg_cfg_section_set_parameter_string(track->general_section,
-                                      "subtitle_text_encoder",
-                                      (info->subtitle_text_info) ?
-                                      info->subtitle_text_info->name : info->video_info->name);
+                                      "text_encoder",
+                                      (info->text_info) ?
+                                      info->text_info->name : info->video_info->name);
 
   bg_cfg_section_set_parameter_string(track->general_section,
-                                      "subtitle_overlay_encoder",
-                                      (info->subtitle_overlay_info) ?
-                                      info->subtitle_overlay_info->name : info->video_info->name);
+                                      "overlay_encoder",
+                                      (info->overlay_info) ?
+                                      info->overlay_info->name : info->video_info->name);
   
   bg_transcoder_track_create_encoder_sections(track, info);
   }
@@ -1605,7 +1619,7 @@
   if(bg_plugin_registry_get_encode_pp(plugin_reg))
     {
     plugin_info = bg_plugin_registry_get_default(plugin_reg, BG_PLUGIN_ENCODER_PP, BG_PLUGIN_PP);
-    g->pp_plugin = bg_strdup(NULL, plugin_info->name);
+    g->pp_plugin = gavl_strdup(plugin_info->name);
     plugin_section = bg_plugin_registry_get_section(plugin_reg, plugin_info->name);
     g->pp_section = bg_cfg_section_copy(plugin_section);
     }
@@ -1816,58 +1830,58 @@
     bg_cfg_section_set_parameter_int(encoder_section, "encode_audio_to_video", 1);
     }
   /* Text subtitles */
-  name = bg_transcoder_track_get_subtitle_text_encoder(t);
+  name = bg_transcoder_track_get_text_encoder(t);
 
   if(name && strcmp(name, video_name))
     {
-    bg_cfg_section_set_parameter_int(encoder_section, "encode_subtitle_text_to_video", 0);
-    bg_cfg_section_set_parameter_string(encoder_section, "subtitle_text_encoder", name);
+    bg_cfg_section_set_parameter_int(encoder_section, "encode_text_to_video", 0);
+    bg_cfg_section_set_parameter_string(encoder_section, "text_encoder", name);
 
-    dst = bg_cfg_section_find_subsection(encoder_section, "subtitle_text_encoder");
+    dst = bg_cfg_section_find_subsection(encoder_section, "text_encoder");
     dst = bg_cfg_section_find_subsection(dst, name);
     
-    if(t->subtitle_text_encoder_section)
-      bg_cfg_section_transfer(t->subtitle_text_encoder_section, dst);
+    if(t->text_encoder_section)
+      bg_cfg_section_transfer(t->text_encoder_section, dst);
     
-    if(t->subtitle_text_streams && t->subtitle_text_streams->encoder_section_text)
+    if(t->text_streams && t->text_streams->encoder_section_text)
       {
-      dst = bg_cfg_section_find_subsection(dst, "$subtitle_text");
-      bg_cfg_section_transfer(t->subtitle_text_streams->encoder_section_text, dst);
+      dst = bg_cfg_section_find_subsection(dst, "$text");
+      bg_cfg_section_transfer(t->text_streams->encoder_section_text, dst);
       }
     
     }
   else
     {
-    bg_cfg_section_set_parameter_int(encoder_section, "encode_subtitle_text_to_video", 1);
-    bg_cfg_section_set_parameter_string(encoder_section, "subtitle_text_encoder", 0);
+    bg_cfg_section_set_parameter_int(encoder_section, "encode_text_to_video", 1);
+    bg_cfg_section_set_parameter_string(encoder_section, "text_encoder", 0);
     }
   
   /* Overlay subtitles */
-  name = bg_transcoder_track_get_subtitle_overlay_encoder(t);
+  name = bg_transcoder_track_get_overlay_encoder(t);
   
   if(name && strcmp(name, video_name))
     {
-    bg_cfg_section_set_parameter_int(encoder_section, "encode_subtitle_overlay_to_video", 0);
-    bg_cfg_section_set_parameter_string(encoder_section, "subtitle_overlay_encoder", name);
+    bg_cfg_section_set_parameter_int(encoder_section, "encode_overlay_to_video", 0);
+    bg_cfg_section_set_parameter_string(encoder_section, "overlay_encoder", name);
 
-    dst = bg_cfg_section_find_subsection(encoder_section, "subtitle_overlay_encoder");
+    dst = bg_cfg_section_find_subsection(encoder_section, "overlay_encoder");
     dst = bg_cfg_section_find_subsection(dst, name);
     
-    if(t->subtitle_overlay_encoder_section)
-      bg_cfg_section_transfer(t->subtitle_overlay_encoder_section, dst);
+    if(t->overlay_encoder_section)
+      bg_cfg_section_transfer(t->overlay_encoder_section, dst);
     
-    dst = bg_cfg_section_find_subsection(dst, "$subtitle_overlay");
+    dst = bg_cfg_section_find_subsection(dst, "$overlay");
     
-    if(t->subtitle_overlay_streams && t->subtitle_overlay_streams->encoder_section)
-      bg_cfg_section_transfer(t->subtitle_overlay_streams->encoder_section, dst);
+    if(t->overlay_streams && t->overlay_streams->encoder_section)
+      bg_cfg_section_transfer(t->overlay_streams->encoder_section, dst);
     
-    else if(t->subtitle_text_streams && t->subtitle_text_streams->encoder_section_overlay)
-      bg_cfg_section_transfer(t->subtitle_text_streams->encoder_section_overlay, dst);
+    else if(t->text_streams && t->text_streams->encoder_section_overlay)
+      bg_cfg_section_transfer(t->text_streams->encoder_section_overlay, dst);
     }
   else
     {
-    bg_cfg_section_set_parameter_int(encoder_section, "encode_subtitle_overlay_to_video", 1);
-    bg_cfg_section_set_parameter_string(encoder_section, "subtitle_overlay_encoder", NULL);
+    bg_cfg_section_set_parameter_int(encoder_section, "encode_overlay_to_video", 1);
+    bg_cfg_section_set_parameter_string(encoder_section, "overlay_encoder", NULL);
     }
   }
 
@@ -1882,8 +1896,8 @@
   {
   delete_subsection(s, "$audio");
   delete_subsection(s, "$video");
-  delete_subsection(s, "$subtitle_text");
-  delete_subsection(s, "$subtitle_overlay");
+  delete_subsection(s, "$text");
+  delete_subsection(s, "$overlay");
   }
 
 #define DELETE_SECTION(s) if(s) { bg_cfg_section_destroy(s); s = NULL; }
@@ -1899,27 +1913,27 @@
 
   static const uint32_t stream_flags = BG_STREAM_AUDIO |
     BG_STREAM_VIDEO |
-    BG_STREAM_SUBTITLE_TEXT |
-    BG_STREAM_SUBTITLE_OVERLAY;
+    BG_STREAM_TEXT |
+    BG_STREAM_OVERLAY;
   
   
   /* Delete config sections */
   DELETE_SECTION(t->audio_encoder_section);
   DELETE_SECTION(t->video_encoder_section);
-  DELETE_SECTION(t->subtitle_text_encoder_section);
-  DELETE_SECTION(t->subtitle_overlay_encoder_section);
+  DELETE_SECTION(t->text_encoder_section);
+  DELETE_SECTION(t->overlay_encoder_section);
 
   for(i = 0; i < t->num_audio_streams; i++)
     DELETE_SECTION(t->audio_streams[i].encoder_section);
   for(i = 0; i < t->num_video_streams; i++)
     DELETE_SECTION(t->video_streams[i].encoder_section);
-  for(i = 0; i < t->num_subtitle_text_streams; i++)
+  for(i = 0; i < t->num_text_streams; i++)
     {
-    DELETE_SECTION(t->subtitle_text_streams[i].encoder_section_text);
-    DELETE_SECTION(t->subtitle_text_streams[i].encoder_section_overlay);
+    DELETE_SECTION(t->text_streams[i].encoder_section_text);
+    DELETE_SECTION(t->text_streams[i].encoder_section_overlay);
     }
-  for(i = 0; i < t->num_subtitle_overlay_streams; i++)
-    DELETE_SECTION(t->subtitle_overlay_streams[i].encoder_section);
+  for(i = 0; i < t->num_overlay_streams; i++)
+    DELETE_SECTION(t->overlay_streams[i].encoder_section);
   
   /* Audio encoder */
   name = bg_encoder_section_get_plugin(plugin_reg,
@@ -1997,82 +2011,320 @@
 
   name = bg_encoder_section_get_plugin(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_TEXT,
+                                       BG_STREAM_TEXT,
                                        stream_flags);
   
-  bg_cfg_section_set_parameter_string(t->general_section, "subtitle_text_encoder", name);
+  bg_cfg_section_set_parameter_string(t->general_section, "text_encoder", name);
 
   bg_encoder_section_get_plugin_config(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_TEXT,
+                                       BG_STREAM_TEXT,
                                        stream_flags,
                                        &s,
                                        NULL);
   if(s)
     {
-    t->subtitle_text_encoder_section = bg_cfg_section_copy(s);
-    clean_section(t->subtitle_text_encoder_section);
+    t->text_encoder_section = bg_cfg_section_copy(s);
+    clean_section(t->text_encoder_section);
     }
   
   bg_encoder_section_get_stream_config(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_TEXT,
+                                       BG_STREAM_TEXT,
                                        stream_flags,
                                        &s,
                                        NULL);
 
   bg_encoder_section_get_stream_config(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_OVERLAY,
+                                       BG_STREAM_OVERLAY,
                                        stream_flags,
                                        &s1,
                                        NULL);
 
   if(s)
     {
-    for(i = 0; i < t->num_subtitle_text_streams; i++)
-      t->subtitle_text_streams[i].encoder_section_text = bg_cfg_section_copy(s);
+    for(i = 0; i < t->num_text_streams; i++)
+      t->text_streams[i].encoder_section_text = bg_cfg_section_copy(s);
     }
 
   if(s1)
     {
-    for(i = 0; i < t->num_subtitle_text_streams; i++)
-      t->subtitle_text_streams[i].encoder_section_overlay = bg_cfg_section_copy(s);
+    for(i = 0; i < t->num_text_streams; i++)
+      t->text_streams[i].encoder_section_overlay = bg_cfg_section_copy(s1);
     }
   
   /* Subtitle overlay encoder */
 
   name = bg_encoder_section_get_plugin(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_OVERLAY,
+                                       BG_STREAM_OVERLAY,
                                        stream_flags);
   
-  bg_cfg_section_set_parameter_string(t->general_section, "subtitle_overlay_encoder", name);
+  bg_cfg_section_set_parameter_string(t->general_section, "overlay_encoder", name);
 
   bg_encoder_section_get_plugin_config(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_OVERLAY,
+                                       BG_STREAM_OVERLAY,
                                        stream_flags,
                                        &s,
                                        NULL);
   if(s)
     {
-    t->subtitle_overlay_encoder_section = bg_cfg_section_copy(s);
-    clean_section(t->subtitle_overlay_encoder_section);
+    t->overlay_encoder_section = bg_cfg_section_copy(s);
+    clean_section(t->overlay_encoder_section);
     }
     
   bg_encoder_section_get_stream_config(plugin_reg,
                                        encoder_section,
-                                       BG_STREAM_SUBTITLE_OVERLAY,
+                                       BG_STREAM_OVERLAY,
                                        stream_flags,
                                        &s,
                                        NULL);
 
   if(s)
     {
-    for(i = 0; i < t->num_subtitle_overlay_streams; i++)
-      t->subtitle_overlay_streams[i].encoder_section = bg_cfg_section_copy(s);
+    for(i = 0; i < t->num_overlay_streams; i++)
+      t->overlay_streams[i].encoder_section = bg_cfg_section_copy(s);
     }
 
   
   }
+
+#define COPY_STREAM_STRING(name)     ret[i].name = gavl_strdup(s[i].name)
+#define COPY_STREAM_SECTION(name)    if(s[i].name) ret[i].name = bg_cfg_section_copy(s[i].name)
+#define COPY_STREAM_PARAMETERS(name) if(s[i].name) ret[i].name = bg_parameter_info_copy_array(s[i].name)
+#define COPY_STREAM_METADATA(name)   gavl_metadata_init(&ret[i].name); gavl_metadata_copy(&ret[i].name, &s[i].name)
+
+static bg_transcoder_track_audio_t * copy_audio(bg_transcoder_track_audio_t * s, int num)
+  {
+  int i;
+  bg_transcoder_track_audio_t * ret = calloc(num, sizeof(*ret));
+
+  /* Copy static members */
+  memcpy(ret, s, num * sizeof(*ret));
+
+  for(i = 0; i < num; i++)
+    {
+    /* Copy strings */
+    COPY_STREAM_STRING(label);
+
+    /* Copy parameters */
+    COPY_STREAM_PARAMETERS(general_parameters);
+    COPY_STREAM_PARAMETERS(filter_parameters);
+
+    /* Copy sections */
+    COPY_STREAM_SECTION(general_section);
+    COPY_STREAM_SECTION(encoder_section);
+    COPY_STREAM_SECTION(filter_section);
+    
+    /* Copy metadata */
+    COPY_STREAM_METADATA(m);
+    
+    }
+  
+
+  return ret;
+  }
+
+static bg_transcoder_track_video_t * copy_video(bg_transcoder_track_video_t * s, int num)
+  {
+  int i;
+  bg_transcoder_track_video_t * ret = calloc(num, sizeof(*ret));
+
+  /* Copy static members */
+  memcpy(ret, s, num * sizeof(*ret));
+
+  for(i = 0; i < num; i++)
+    {
+    /* Copy strings */
+    COPY_STREAM_STRING(label);
+  
+    /* Copy parameters */
+    COPY_STREAM_PARAMETERS(general_parameters);
+    COPY_STREAM_PARAMETERS(filter_parameters);
+    
+    /* Copy sections */
+    COPY_STREAM_SECTION(general_section);
+    COPY_STREAM_SECTION(encoder_section);
+    COPY_STREAM_SECTION(filter_section);
+    
+    /* Copy metadata */
+    COPY_STREAM_METADATA(m);
+    
+    }
+  
+  return ret;
+  }
+
+static bg_transcoder_track_text_t * copy_text(bg_transcoder_track_text_t * s, int num)
+  {
+  int i;
+  bg_transcoder_track_text_t * ret = calloc(num, sizeof(*ret));
+
+  /* Copy static members */
+  memcpy(ret, s, num * sizeof(*ret));
+
+  for(i = 0; i < num; i++)
+    {
+    /* Copy strings */
+    COPY_STREAM_STRING(label);
+  
+    /* Copy parameters */
+    COPY_STREAM_PARAMETERS(general_parameters);
+    
+    /* Copy sections */
+    COPY_STREAM_SECTION(general_section);
+    COPY_STREAM_SECTION(textrenderer_section);
+    COPY_STREAM_SECTION(encoder_section_text);
+    COPY_STREAM_SECTION(encoder_section_overlay);
+    
+    /* Copy metadata */
+    COPY_STREAM_METADATA(m);
+    
+    }
+  
+  return ret;
+  }
+
+static bg_transcoder_track_overlay_t * copy_overlay(bg_transcoder_track_overlay_t * s, int num)
+  {
+  int i;
+  bg_transcoder_track_overlay_t * ret = calloc(num, sizeof(*ret));
+  
+  /* Copy static members */
+  memcpy(ret, s, num * sizeof(*ret));
+  
+  for(i = 0; i < num; i++)
+    {
+    /* Copy strings */
+    COPY_STREAM_STRING(label);
+  
+    /* Copy parameters */
+    COPY_STREAM_PARAMETERS(general_parameters);
+    
+    /* Copy sections */
+    COPY_STREAM_SECTION(general_section);
+    COPY_STREAM_SECTION(encoder_section);
+    
+    /* Copy metadata */
+    COPY_STREAM_METADATA(m);
+    
+    }
+  
+  return ret;
+  }
+
+#undef COPY_STREAM_STRING
+#undef COPY_STREAM_SECTION
+#undef COPY_STREAM_PARAMETERS
+#undef COPY_STREAM_METADATA
+
+#define COPY_STRING(name)     ret->name = gavl_strdup(t->name)
+#define COPY_SECTION(name)    if(t->name) ret->name = bg_cfg_section_copy(t->name)
+#define COPY_PARAMETERS(name) if(t->name) ret->name = bg_parameter_info_copy_array(t->name)
+#define COPY_METADATA(name)   gavl_metadata_init(&ret->name); gavl_metadata_copy(&ret->name, &t->name)
+
+bg_transcoder_track_t *
+bg_transcoder_track_copy(const bg_transcoder_track_t * t)
+  {
+  bg_transcoder_track_t * ret;
+  ret = calloc(1, sizeof(*ret));
+
+  /* Copy static data */
+  memcpy(ret, t, sizeof(*ret));
+  
+  COPY_STRING(url);
+  
+  COPY_SECTION(input_section);
+  COPY_SECTION(metadata_section);
+  COPY_SECTION(general_section);
+
+  COPY_SECTION(audio_encoder_section);
+  COPY_SECTION(video_encoder_section);
+  COPY_SECTION(text_encoder_section);
+  COPY_SECTION(overlay_encoder_section);
+
+  COPY_PARAMETERS(metadata_parameters);
+  COPY_PARAMETERS(general_parameters);
+
+  ret->audio_streams   = copy_audio(t->audio_streams,     t->num_audio_streams);
+  ret->video_streams   = copy_video(t->video_streams,     t->num_video_streams);
+  ret->text_streams    = copy_text(t->text_streams,       t->num_text_streams);
+  ret->overlay_streams = copy_overlay(t->overlay_streams, t->num_overlay_streams);
+
+  if(t->chapter_list)
+    ret->chapter_list = gavl_chapter_list_copy(t->chapter_list);
+
+  ret->next = NULL;
+  
+  return ret;
+  }
+
+#undef COPY_STRING
+#undef COPY_SECTION
+#undef COPY_PARAMETERS
+#undef COPY_METADATA
+
+bg_transcoder_track_t *
+bg_transcoder_track_split_at_chapters(bg_transcoder_track_t * t)
+  {
+  int i;
+  bg_transcoder_track_t * new_track;
+  bg_transcoder_track_t * ret = NULL;
+  gavl_time_t time;
+  const char * label_orig = NULL;
+  char * label_new;
+  
+  if(!t->chapter_list || (t->chapter_list->num_chapters < 2))
+    return t;
+  
+  bg_cfg_section_get_parameter_string(t->metadata_section, "label", &label_orig);
+  
+  for(i = 0; i < t->chapter_list->num_chapters; i++)
+    {
+    new_track = bg_transcoder_track_copy(t);
+
+    if(new_track->chapter_list)
+      {
+      gavl_chapter_list_destroy(new_track->chapter_list);
+      new_track->chapter_list = NULL;
+      }
+    
+    if(i > 0)
+      {
+      time = gavl_time_unscale(t->chapter_list->timescale, 
+                               t->chapter_list->chapters[i].time);
+      
+      bg_cfg_section_set_parameter_int(new_track->general_section,
+                                       "set_start_time", 1);
+      bg_cfg_section_set_parameter_time(new_track->general_section,
+                                        "start_time", time);
+      }
+    if(i < t->chapter_list->num_chapters-1)
+      {
+      time = gavl_time_unscale(t->chapter_list->timescale, 
+                               t->chapter_list->chapters[i+1].time);
+      
+      bg_cfg_section_set_parameter_int(new_track->general_section,
+                                       "set_end_time", 1);
+      bg_cfg_section_set_parameter_time(new_track->general_section,
+                                       "end_time", time);
+      }
+    
+    
+    if(label_orig)
+      label_new = bg_sprintf("%s (Chapter %02d)", label_orig, i+1);
+    else
+      label_new = bg_sprintf("Chapter %02d", i+1);
+
+    bg_cfg_section_set_parameter_string(new_track->metadata_section,
+                                        "label", label_new);
+    
+    
+    ret = bg_transcoder_tracks_append(ret, new_track);
+    }
+
+  bg_transcoder_track_destroy(t);
+  return ret;
+  }

gmerlin-1.2.0.tar.gz/lib/transcoder_track_xml.c -> gmerlin-4256.tar.gz/lib/transcoder_track_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -59,6 +59,13 @@
     section_2_xml(s->encoder_section, node);
     xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
     }
+
+  if(s->m.num_tags)
+    {
+    node = xmlNewTextChild(parent, NULL, (xmlChar*)"METADATA", NULL);
+    bg_metadata_2_xml(node, &s->m);
+    xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+    }
   }
 
 static void video_stream_2_xml(xmlNodePtr parent,
@@ -86,10 +93,17 @@
     section_2_xml(s->encoder_section, node);
     xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
     }
+  if(s->m.num_tags)
+    {
+    node = xmlNewTextChild(parent, NULL, (xmlChar*)"METADATA", NULL);
+    bg_metadata_2_xml(node, &s->m);
+    xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+    }
+
   }
 
-static void subtitle_text_stream_2_xml(xmlNodePtr parent,
-                                       bg_transcoder_track_subtitle_text_t * s)
+static void text_stream_2_xml(xmlNodePtr parent,
+                                       bg_transcoder_track_text_t * s)
   {
   xmlNodePtr node;
   char * tmp_string;
@@ -121,10 +135,16 @@
     section_2_xml(s->encoder_section_overlay, node);
     xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
     }
+  if(s->m.num_tags)
+    {
+    node = xmlNewTextChild(parent, NULL, (xmlChar*)"METADATA", NULL);
+    bg_metadata_2_xml(node, &s->m);
+    xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+    }
   }
 
-static void subtitle_overlay_stream_2_xml(xmlNodePtr parent,
-                                          bg_transcoder_track_subtitle_overlay_t * s)
+static void overlay_stream_2_xml(xmlNodePtr parent,
+                                          bg_transcoder_track_overlay_t * s)
   {
   xmlNodePtr node;
   char * tmp_string;
@@ -144,6 +164,12 @@
     section_2_xml(s->encoder_section, node);
     xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
     }
+  if(s->m.num_tags)
+    {
+    node = xmlNewTextChild(parent, NULL, (xmlChar*)"METADATA", NULL);
+    bg_metadata_2_xml(node, &s->m);
+    xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+    }
   
   xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
   }
@@ -199,17 +225,17 @@
     xmlAddChild(xml_track, BG_XML_NEW_TEXT("\n"));
     }
 
-  if(track->subtitle_text_encoder_section)
+  if(track->text_encoder_section)
     {
-    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"SUBTITLE_TEXT_ENCODER", NULL);
-    section_2_xml(track->subtitle_text_encoder_section, node);
+    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"TEXT_ENCODER", NULL);
+    section_2_xml(track->text_encoder_section, node);
     xmlAddChild(xml_track, BG_XML_NEW_TEXT("\n"));
     }
 
-  if(track->subtitle_overlay_encoder_section)
+  if(track->overlay_encoder_section)
     {
-    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"SUBTITLE_OVERLAY_ENCODER", NULL);
-    section_2_xml(track->subtitle_overlay_encoder_section, node);
+    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"OVERLAY_ENCODER", NULL);
+    section_2_xml(track->overlay_encoder_section, node);
     xmlAddChild(xml_track, BG_XML_NEW_TEXT("\n"));
     }
   
@@ -244,29 +270,29 @@
       }
     xmlAddChild(xml_track, BG_XML_NEW_TEXT("\n"));
     }
-  if(track->num_subtitle_text_streams)
+  if(track->num_text_streams)
     {
-    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"SUBTITLE_TEXT_STREAMS", NULL);
+    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"TEXT_STREAMS", NULL);
     xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
     
-    for(i = 0; i < track->num_subtitle_text_streams; i++)
+    for(i = 0; i < track->num_text_streams; i++)
       {
       stream_node = xmlNewTextChild(node, NULL, (xmlChar*)"STREAM", NULL);
       xmlAddChild(stream_node, BG_XML_NEW_TEXT("\n"));
-      subtitle_text_stream_2_xml(stream_node, &track->subtitle_text_streams[i]);
+      text_stream_2_xml(stream_node, &track->text_streams[i]);
       xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
       }
     }
-  if(track->num_subtitle_overlay_streams)
+  if(track->num_overlay_streams)
     {
-    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"SUBTITLE_OVERLAY_STREAMS", NULL);
+    node = xmlNewTextChild(xml_track, NULL, (xmlChar*)"OVERLAY_STREAMS", NULL);
     xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
     
-    for(i = 0; i < track->num_subtitle_overlay_streams; i++)
+    for(i = 0; i < track->num_overlay_streams; i++)
       {
       stream_node = xmlNewTextChild(node, NULL, (xmlChar*)"STREAM", NULL);
       xmlAddChild(stream_node, BG_XML_NEW_TEXT("\n"));
-      subtitle_overlay_stream_2_xml(stream_node, &track->subtitle_overlay_streams[i]);
+      overlay_stream_2_xml(stream_node, &track->overlay_streams[i]);
       xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
       }
     }
@@ -336,30 +362,21 @@
   xmlDocPtr xml_doc;
   
   xml_doc = transcoder_tracks_2_xml(t, g, 0);
-  
-  xmlSaveFile(filename, xml_doc);
+
+  bg_xml_save_file(xml_doc, filename, 1);
   xmlFreeDoc(xml_doc);
   }
 
 char *
 bg_transcoder_tracks_selected_to_xml(bg_transcoder_track_t * t)
   {
-  bg_xml_output_mem_t ctx;
-  xmlOutputBufferPtr b;
-  
+  char * ret;
   xmlDocPtr xml_doc;
   xml_doc = transcoder_tracks_2_xml(t, NULL, 1);
 
-  memset(&ctx, 0, sizeof(ctx));
-
-  b = xmlOutputBufferCreateIO(bg_xml_write_callback,
-                              bg_xml_close_callback,
-                              &ctx, NULL);
-  
-  xmlSaveFileTo(b, xml_doc, NULL);
-  
+  ret = bg_xml_save_to_memory(xml_doc);
   xmlFreeDoc(xml_doc);
-  return ctx.buffer;
+  return ret;
   }
 
 /* Load */
@@ -388,7 +405,7 @@
   tmp_string = BG_XML_GET_PROP(xml_stream, "label");
   if(tmp_string)
     {
-    s->label = bg_strdup(s->label, tmp_string);
+    s->label = gavl_strrep(s->label, tmp_string);
     xmlFree(tmp_string);
     }
   
@@ -414,6 +431,10 @@
       {
       s->encoder_section = xml_2_section(xml_doc, node);
       }
+    else if(!BG_XML_STRCMP(node->name, "METADATA"))
+      {
+      bg_xml_2_metadata(xml_doc, node, &s->m);
+      }
     node = node->next;
     }
   }
@@ -426,7 +447,7 @@
   tmp_string = BG_XML_GET_PROP(xml_stream, "label");
   if(tmp_string)
     {
-    s->label = bg_strdup(s->label, tmp_string);
+    s->label = gavl_strrep(s->label, tmp_string);
     xmlFree(tmp_string);
     }
 
@@ -452,12 +473,16 @@
       {
       s->encoder_section = xml_2_section(xml_doc, node);
       }
+    else if(!BG_XML_STRCMP(node->name, "METADATA"))
+      {
+      bg_xml_2_metadata(xml_doc, node, &s->m);
+      }
     node = node->next;
     }
   
   }
 
-static void xml_2_subtitle_text(bg_transcoder_track_subtitle_text_t * s,
+static void xml_2_text(bg_transcoder_track_text_t * s,
                                 xmlDocPtr xml_doc, xmlNodePtr xml_stream)
   {
   xmlNodePtr node;
@@ -465,7 +490,7 @@
   tmp_string = BG_XML_GET_PROP(xml_stream, "label");
   if(tmp_string)
     {
-    s->label = bg_strdup(s->label, tmp_string);
+    s->label = gavl_strrep(s->label, tmp_string);
     xmlFree(tmp_string);
     }
 
@@ -501,11 +526,15 @@
       {
       s->encoder_section_overlay = xml_2_section(xml_doc, node);
       }
+    else if(!BG_XML_STRCMP(node->name, "METADATA"))
+      {
+      bg_xml_2_metadata(xml_doc, node, &s->m);
+      }
     node = node->next;
     }
   }
 
-static void xml_2_subtitle_overlay(bg_transcoder_track_subtitle_overlay_t * s,
+static void xml_2_overlay(bg_transcoder_track_overlay_t * s,
                                    xmlDocPtr xml_doc, xmlNodePtr xml_stream)
   {
   xmlNodePtr node;
@@ -513,7 +542,7 @@
   tmp_string = BG_XML_GET_PROP(xml_stream, "label");
   if(tmp_string)
     {
-    s->label = bg_strdup(s->label, tmp_string);
+    s->label = gavl_strrep(s->label, tmp_string);
     xmlFree(tmp_string);
     }
   tmp_string = BG_XML_GET_PROP(xml_stream, "in_index");
@@ -540,6 +569,10 @@
       {
       s->encoder_section = xml_2_section(xml_doc, node);
       }
+    else if(!BG_XML_STRCMP(node->name, "METADATA"))
+      {
+      bg_xml_2_metadata(xml_doc, node, &s->m);
+      }
     
     node = node->next;
     }
@@ -564,17 +597,17 @@
                                         "audio_encoder", NULL);
 
   bg_cfg_section_get_parameter_string(t->general_section,
-                                      "subtitle_text_encoder", &name);
+                                      "text_encoder", &name);
 
   if(name && !strcmp(name, video_name))
     bg_cfg_section_set_parameter_string(t->general_section,
-                                        "subtitle_text_encoder", NULL);
+                                        "text_encoder", NULL);
   
   bg_cfg_section_get_parameter_string(t->general_section,
-                                      "subtitle_overlay_encoder", &name);
+                                      "overlay_encoder", &name);
   if(name && !strcmp(name, video_name))
     bg_cfg_section_set_parameter_string(t->general_section,
-                                        "subtitle_overlay_encoder", NULL);
+                                        "overlay_encoder", NULL);
   }
 
 static int xml_2_track(bg_transcoder_track_t * t,
@@ -611,10 +644,10 @@
       t->audio_encoder_section = xml_2_section(xml_doc, node);
     else if(!BG_XML_STRCMP(node->name, "VIDEO_ENCODER"))
       t->video_encoder_section = xml_2_section(xml_doc, node);
-    else if(!BG_XML_STRCMP(node->name, "SUBTITLE_TEXT_ENCODER"))
-      t->subtitle_text_encoder_section = xml_2_section(xml_doc, node);
-    else if(!BG_XML_STRCMP(node->name, "SUBTITLE_OVERLAY_ENCODER"))
-      t->subtitle_overlay_encoder_section = xml_2_section(xml_doc, node);
+    else if(!BG_XML_STRCMP(node->name, "TEXT_ENCODER"))
+      t->text_encoder_section = xml_2_section(xml_doc, node);
+    else if(!BG_XML_STRCMP(node->name, "OVERLAY_ENCODER"))
+      t->overlay_encoder_section = xml_2_section(xml_doc, node);
     else if(!BG_XML_STRCMP(node->name, "AUDIO_STREAMS"))
       {
       /* Count streams */
@@ -689,24 +722,24 @@
 
     /* Subtitle text streams */
 
-    else if(!BG_XML_STRCMP(node->name, "SUBTITLE_TEXT_STREAMS"))
+    else if(!BG_XML_STRCMP(node->name, "TEXT_STREAMS"))
       {
       /* Count streams */
 
-      t->num_subtitle_text_streams = 0;
+      t->num_text_streams = 0;
 
       child_node = node->children;
       while(child_node)
         {
         if(child_node->name && !BG_XML_STRCMP(child_node->name, "STREAM"))
-          t->num_subtitle_text_streams++;
+          t->num_text_streams++;
         child_node = child_node->next;
         }
 
       /* Allocate streams */
       
-      t->subtitle_text_streams =
-        calloc(t->num_subtitle_text_streams, sizeof(*(t->subtitle_text_streams)));
+      t->text_streams =
+        calloc(t->num_text_streams, sizeof(*(t->text_streams)));
       
       /* Load streams */
       
@@ -717,7 +750,7 @@
         {
         if(child_node->name && !BG_XML_STRCMP(child_node->name, "STREAM"))
           {
-          xml_2_subtitle_text(&t->subtitle_text_streams[i], xml_doc, child_node);
+          xml_2_text(&t->text_streams[i], xml_doc, child_node);
           i++;
           }
         child_node = child_node->next;
@@ -726,24 +759,24 @@
 
     /* Subtitle overlay streams */
 
-    else if(!BG_XML_STRCMP(node->name, "SUBTITLE_OVERLAY_STREAMS"))
+    else if(!BG_XML_STRCMP(node->name, "OVERLAY_STREAMS"))
       {
       /* Count streams */
 
-      t->num_subtitle_overlay_streams = 0;
+      t->num_overlay_streams = 0;
 
       child_node = node->children;
       while(child_node)
         {
         if(child_node->name && !BG_XML_STRCMP(child_node->name, "STREAM"))
-          t->num_subtitle_overlay_streams++;
+          t->num_overlay_streams++;
         child_node = child_node->next;
         }
 
       /* Allocate streams */
       
-      t->subtitle_overlay_streams =
-        calloc(t->num_subtitle_overlay_streams, sizeof(*(t->subtitle_overlay_streams)));
+      t->overlay_streams =
+        calloc(t->num_overlay_streams, sizeof(*(t->overlay_streams)));
       
       /* Load streams */
       
@@ -754,7 +787,7 @@
         {
         if(child_node->name && !BG_XML_STRCMP(child_node->name, "STREAM"))
           {
-          xml_2_subtitle_overlay(&t->subtitle_overlay_streams[i], xml_doc, child_node);
+          xml_2_overlay(&t->overlay_streams[i], xml_doc, child_node);
           i++;
           }
         child_node = child_node->next;
@@ -794,7 +827,7 @@
 
       if(tmp_string)
         {
-        g->pp_plugin = bg_strdup(g->pp_plugin, tmp_string);
+        g->pp_plugin = gavl_strrep(g->pp_plugin, tmp_string);
         xmlFree(tmp_string);
         }
       }
@@ -874,7 +907,7 @@
   if(!filename)
     return NULL;
   
-  xml_doc = bg_xml_parse_file(filename);
+  xml_doc = bg_xml_parse_file(filename, 1);
   
   ret = transcoder_tracks_load(xml_doc,
                                g, plugin_reg);

gmerlin-1.2.0.tar.gz/lib/translation.c -> gmerlin-4256.tar.gz/lib/translation.c Changed

gmerlin-1.2.0.tar.gz/lib/tree.c -> gmerlin-4256.tar.gz/lib/tree.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -32,6 +32,9 @@
 #include <dirent.h>
 
 /* Gmerlin includes */
+
+#include <gavl/metatags.h>
+
 #include <config.h>
 #include <gmerlin/translation.h>
 
@@ -277,13 +280,13 @@
                                com->userpass_callback_data))
       return 0;
     /* Store user and password in the common area so we can use it later on */
-    com->username = bg_strdup(com->username, *user);
-    com->password = bg_strdup(com->password, *pass);
+    com->username = gavl_strrep(com->username, *user);
+    com->password = gavl_strrep(com->password, *pass);
     }
   else
     {
-    *user = bg_strdup(*user, com->username);
-    *pass = bg_strdup(*pass, com->password);
+    *user = gavl_strrep(*user, com->username);
+    *pass = gavl_strrep(*pass, com->password);
     }
   return 1;
   }
@@ -345,7 +348,7 @@
       ret->children = append_album(ret->children, plugin_album);
       }
     
-    plugin_album->name  = bg_strdup(plugin_album->name,
+    plugin_album->name  = gavl_strrep(plugin_album->name,
                                     TRD(info->long_name, info->gettext_domain));
 
     
@@ -362,16 +365,16 @@
                             info->devices[j].device)))
           {
           device_album = bg_album_create(&ret->com, type, plugin_album);
-          device_album->device = bg_strdup(device_album->device,
+          device_album->device = gavl_strrep(device_album->device,
                                            info->devices[j].device);
           if(info->devices[j].name)
             {
-            device_album->name = bg_strdup(device_album->name,
+            device_album->name = gavl_strrep(device_album->name,
                                            info->devices[j].name);
             }
           else
             {
-            device_album->name = bg_strdup(device_album->name,
+            device_album->name = gavl_strrep(device_album->name,
                                            info->devices[j].device);
             }
           device_album->plugin_info = info;
@@ -411,11 +414,13 @@
   ret->com.inotify_fd = inotify_init();
 #endif
   
-  ret->filename = bg_strdup(ret->filename, filename);
+  ret->filename = gavl_strrep(ret->filename, filename);
   pos1 = strrchr(ret->filename, '/');
   
-  ret->com.directory = bg_strndup(ret->com.directory, ret->filename, pos1);
+  ret->com.directory = gavl_strnrep(ret->com.directory, ret->filename, pos1);
 
+  bg_media_tree_upnp_create(ret);
+  
   return ret;
   }
 
@@ -432,16 +437,16 @@
   if(!ret->incoming)
     {
     ret->incoming = bg_album_create(&ret->com, BG_ALBUM_TYPE_INCOMING, NULL);
-    ret->incoming->name  = bg_strdup(ret->incoming->name, TR("Incoming"));
-    ret->incoming->xml_file  = bg_strdup(ret->incoming->xml_file,
+    ret->incoming->name  = gavl_strrep(ret->incoming->name, TR("Incoming"));
+    ret->incoming->xml_file  = gavl_strrep(ret->incoming->xml_file,
                                          "incoming.xml");
     ret->children = append_album(ret->children, ret->incoming);
     }
   if(!ret->com.favourites)
     {
     ret->com.favourites = bg_album_create(&ret->com, BG_ALBUM_TYPE_FAVOURITES, NULL);
-    ret->com.favourites->name  = bg_strdup(ret->com.favourites->name, TR("Favourites"));
-    ret->com.favourites->xml_file  = bg_strdup(ret->com.favourites->xml_file, "favourites.xml");
+    ret->com.favourites->name  = gavl_strrep(ret->com.favourites->name, TR("Favourites"));
+    ret->com.favourites->xml_file  = gavl_strrep(ret->com.favourites->xml_file, "favourites.xml");
     ret->children = append_album(ret->children, ret->com.favourites);
     }
   
@@ -488,6 +493,8 @@
 #ifdef HAVE_INOTIFY
   close(t->com.inotify_fd);
 #endif
+
+  bg_media_tree_upnp_destroy(t);
   
   free(t);
   }
@@ -599,6 +606,8 @@
     case BG_ALBUM_TYPE_REMOVABLE:
     case BG_ALBUM_TYPE_PLUGIN:
     case BG_ALBUM_TYPE_TUNER:
+    case BG_ALBUM_TYPE_UPNP:
+    case BG_ALBUM_TYPE_UPNP_ROOT:
       return 0;
     case BG_ALBUM_TYPE_INCOMING:
     case BG_ALBUM_TYPE_FAVOURITES:
@@ -624,6 +633,8 @@
     case BG_ALBUM_TYPE_REMOVABLE:
     case BG_ALBUM_TYPE_PLUGIN:
     case BG_ALBUM_TYPE_TUNER:
+    case BG_ALBUM_TYPE_UPNP:
+    case BG_ALBUM_TYPE_UPNP_ROOT:
       return 0;
     case BG_ALBUM_TYPE_INCOMING:
     case BG_ALBUM_TYPE_FAVOURITES:
@@ -729,6 +740,8 @@
     case BG_ALBUM_TYPE_REMOVABLE:
     case BG_ALBUM_TYPE_PLUGIN:
     case BG_ALBUM_TYPE_TUNER:
+    case BG_ALBUM_TYPE_UPNP:
+    case BG_ALBUM_TYPE_UPNP_ROOT:
       return 0;
     case BG_ALBUM_TYPE_REGULAR:
     case BG_ALBUM_TYPE_INCOMING:
@@ -1076,16 +1089,20 @@
 bg_plugin_handle_t *
 bg_media_tree_get_current_track(bg_media_tree_t * t, int * index)
   {
+  int track_index;
   bg_track_info_t * track_info;
   const bg_plugin_info_t * info;
   bg_input_plugin_t * input_plugin;
   bg_plugin_handle_t * ret = NULL;
-
+  
   if(!t->com.current_entry || !t->com.current_album)
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Doubleclick on a track first");
     goto fail;
     }
+
+  track_index = t->com.current_entry->index;
+
   if((t->com.current_album->type == BG_ALBUM_TYPE_REMOVABLE) ||
      (t->com.current_album->type == BG_ALBUM_TYPE_TUNER))
     {
@@ -1101,21 +1118,17 @@
       info = bg_plugin_find_by_filename(t->com.plugin_reg,
                                         t->com.current_entry->location,
                                         (BG_PLUGIN_INPUT));
-#if 0    
-    if(!info)
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s: no plugin found");
-      goto fail;
-      }
-#endif
+
     bg_log(BG_LOG_INFO, LOG_DOMAIN, "Loading %s (plugin: %s)",
            (char*)t->com.current_entry->location,
            (info ? info->name : "auto"));
     bg_album_common_prepare_callbacks(&t->com, t->com.current_entry);
-    if(!bg_input_plugin_load(t->com.plugin_reg,
-                             t->com.current_entry->location, info,
-                             &ret, &t->com.input_callbacks,
-                             !!(t->com.current_entry->flags & BG_ALBUM_ENTRY_EDL)))
+
+    if(!bg_input_plugin_load_full(t->com.plugin_reg,
+                                  t->com.current_entry->location, info,
+                                  &ret, &t->com.input_callbacks,
+                                  !!(t->com.current_entry->flags & BG_ALBUM_ENTRY_EDL),
+                                  &track_index))
       {
       bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Loading %s failed",
              (char*)t->com.current_entry->location);
@@ -1123,8 +1136,7 @@
       }
     input_plugin = (bg_input_plugin_t*)(ret->plugin);
     }
-  track_info = input_plugin->get_track_info(ret->priv,
-                                            t->com.current_entry->index);
+  track_info = input_plugin->get_track_info(ret->priv, track_index);
   if(!track_info)
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Selecting track %d for %s failed",
@@ -1134,13 +1146,16 @@
     }
   bg_album_update_entry(t->com.current_album,
                         t->com.current_entry, track_info, 1, 0);
-
+  /* Set the displayed name in the player */
+  gavl_metadata_set(&track_info->metadata, GAVL_META_LABEL,
+                    t->com.current_entry->name);
+  
   bg_album_common_set_auth_info(&t->com, t->com.current_entry);
   
   //  bg_album_changed(t->com.current_album);
     
   if(index)
-    *index = t->com.current_entry->index;
+    *index = track_index;
   return ret;
   
   fail:
@@ -1231,7 +1246,7 @@
   if(!strcmp(name, "add_directory_path"))
     {
     val->val_str =
-      bg_strdup(val->val_str, tree->add_directory_path);
+      gavl_strrep(val->val_str, tree->add_directory_path);
     return 1;
     }
   return 9;
@@ -1250,15 +1265,15 @@
     }
   else if(!strcmp(name, "metadata_format"))
     {
-    tree->com.metadata_format = bg_strdup(tree->com.metadata_format, val->val_str);
+    tree->com.metadata_format = gavl_strrep(tree->com.metadata_format, val->val_str);
     }
   else if(!strcmp(name, "blacklist"))
     {
-    tree->com.blacklist = bg_strdup(tree->com.blacklist, val->val_str);
+    tree->com.blacklist = gavl_strrep(tree->com.blacklist, val->val_str);
     }
   else if(!strcmp(name, "blacklist_files"))
     {
-    tree->com.blacklist_files = bg_strdup(tree->com.blacklist_files, val->val_str);
+    tree->com.blacklist_files = gavl_strrep(tree->com.blacklist_files, val->val_str);
     }
   else if(!strcmp(name, "purge_directory"))
     {
@@ -1267,7 +1282,7 @@
   else if(!strcmp(name, "add_directory_path"))
     {
     tree->add_directory_path = 
-      bg_strdup(tree->add_directory_path, val->val_str);
+      gavl_strrep(tree->add_directory_path, val->val_str);
     }
   }
 
@@ -1315,21 +1330,19 @@
   struct dirent * dent_ptr;
   const char * pos1;
   struct stat stat_buf;
-  char * urls[2];
   bg_album_t * a;
 
   if(subdirs_to_subalbums || !depth)
     a = bg_media_tree_append_album(t, parent);
   else
     a = parent;
-    
+  
   if(parent)
     bg_album_set_expanded(parent, 1);
   
   bg_album_open(a);
   bg_album_set_expanded(a, 1);
-
-
+  
   if(subdirs_to_subalbums || !depth)
     {
     pos1 = strrchr(directory, '/');
@@ -1348,9 +1361,6 @@
   dir = opendir(directory);
   if(!dir)
     return;
-
-  urls[0] = filename;
-  urls[1] = NULL;
   
   while(!readdir_r(dir, &dent.d, &dent_ptr))
     {
@@ -1372,6 +1382,8 @@
       add_directory(t, a, filename, recursive, subdirs_to_subalbums,
                     watch,
                     plugin, prefer_edl, depth + 1);
+      //      if(t->change_callback)
+      //        t->change_callback(t, t->change_callback_data);
       }
     else if(S_ISREG(stat_buf.st_mode))
       {
@@ -1386,9 +1398,13 @@
                                     NULL,
                                     0);
       }
-    if(t->change_callback)
-      t->change_callback(t, t->change_callback_data);
+    //    if(t->change_callback)
+    //      t->change_callback(t, t->change_callback_data);
     }
+
+  if(t->change_callback)
+    t->change_callback(t, t->change_callback_data);
+
   closedir(dir);
   bg_album_sort_entries(a);
   bg_album_sort_children(a);
@@ -1413,7 +1429,7 @@
   add_directory(t, parent, directory, recursive, subdirs_to_subalbums,
                 watch,
                 plugin, prefer_edl, 0);
-  t->add_directory_path = bg_strdup(t->add_directory_path, directory);
+  t->add_directory_path = gavl_strrep(t->add_directory_path, directory);
 
   pos = strrchr(t->add_directory_path, '/');
 
@@ -1503,8 +1519,8 @@
     }
   else
     {
-    com->username = bg_strdup(com->username, entry->username);
-    com->password = bg_strdup(com->password, entry->password);
+    com->username = gavl_strrep(com->username, entry->username);
+    com->password = gavl_strrep(com->password, entry->password);
     com->save_auth = !!(entry->flags & BG_ALBUM_ENTRY_SAVE_AUTH);
     }
   
@@ -1516,8 +1532,8 @@
   if(!com->username || !com->password)
     return;
 
-  entry->username = bg_strdup(entry->username, com->username);
-  entry->password = bg_strdup(entry->password, com->password);
+  entry->username = gavl_strrep(entry->username, com->username);
+  entry->password = gavl_strrep(entry->password, com->password);
 
   if(com->save_auth)
     entry->flags |= BG_ALBUM_ENTRY_SAVE_AUTH;
@@ -1609,6 +1625,9 @@
   struct timeval timeout;
 
   fd_set read_fds;
+
+  /* Update upnp stuff */
+  bg_media_tree_upnp_update(t);
   
   /* Wait for event */
   timeout.tv_sec = 0;
@@ -1643,7 +1662,26 @@
 
 #else
 
-void bg_media_tree_check_sync(bg_media_tree_t * t) { }
+void bg_media_tree_check_sync(bg_media_tree_t * t)
+  {
+  bg_media_tree_upnp_update(t);
+  }
 
 #endif
 
+static void foreach_album(bg_album_t * list, 
+                          void (*func)(bg_album_t * a, void * data), void * data)
+  {
+  while(list)
+    {
+    func(list, data);
+    foreach_album(list->children, func, data);
+    list = list->next;
+    }
+  }
+                          
+void bg_media_tree_foreach(bg_media_tree_t * t,
+                           void (*func)(bg_album_t * a, void * data), void * data)
+  {
+  foreach_album(t->children, func, data);
+  }

gmerlin-4256.tar.gz/lib/tree_upnp.c Added

@@ -0,0 +1,568 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+/* Gmerlin includes */
+
+#include <string.h>
+#include <unistd.h>
+
+// #include <gavl/metatags.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/tree.h>
+#include <treeprivate.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#include <gmerlin/xmlutils.h>
+#include <gmerlin/bgsocket.h>
+#include <gmerlin/http.h>
+
+#include <gmerlin/upnp/devicedesc.h>
+#include <gmerlin/upnp/soap.h>
+
+
+#define LOG_DOMAIN "tree_upnp"
+
+// #define DUMP_DIDL
+
+static xmlDocPtr browse_upnp(const char * url, const char * id, int self)
+  {
+
+  const char * browse_flag = self ? "BrowseMetadata" : "BrowseDirectChildren";
+  xmlDocPtr ret = NULL;
+  const char * didl;
+
+  bg_soap_t soap;
+
+  bg_soap_init(&soap, url, "ContentDirectory", 1, "Browse");
+
+  bg_soap_request_add_argument(soap.req, "ObjectID", id);
+  bg_soap_request_add_argument(soap.req, "BrowseFlag", browse_flag);
+  bg_soap_request_add_argument(soap.req, "Filter", "*");
+  bg_soap_request_add_argument(soap.req, "StartingIndex", "0");
+  bg_soap_request_add_argument(soap.req, "RequestedCount", "0");
+  bg_soap_request_add_argument(soap.req, "SortCriteria", "");
+  
+  if(!bg_soap_request(&soap))
+    goto fail;
+
+  if(!(didl = bg_soap_response_get_argument(soap.res, "Result")))
+    goto fail;
+  
+#ifdef DUMP_DIDL
+  fprintf(stderr, "Got DIDL: %s\n", didl);
+#endif
+  
+  ret = xmlParseMemory(didl, strlen(didl));
+  
+  fail:
+  
+  bg_soap_free(&soap);
+  return ret;
+  }
+
+#define MAX_ERROR 0x7FFFFFFF
+
+static int check_icon(xmlNodePtr icon_node)
+  {
+  const char * str;
+  xmlNodePtr node;
+  int width, height, depth;
+  const char * mimetype;
+  int ret = 0;
+  
+  node = bg_xml_find_node_child(icon_node, "width");
+  if(!node || !(str = bg_xml_node_get_text_content(node)))
+    return MAX_ERROR;
+  width = atoi(str);
+  
+  node = bg_xml_find_node_child(icon_node, "height");
+  if(!node || !(str = bg_xml_node_get_text_content(node)))
+    return MAX_ERROR;
+  height = atoi(str);
+
+  node = bg_xml_find_node_child(icon_node, "depth");
+  if(!node || !(str = bg_xml_node_get_text_content(node)))
+    return MAX_ERROR;
+  depth = atoi(str);
+  
+  node = bg_xml_find_node_child(icon_node, "depth");
+  if(!node || !(mimetype = bg_xml_node_get_text_content(node)))
+    return MAX_ERROR;
+
+  ret += abs(width - 16);
+  ret += abs(height - 16);
+  ret += 10 * abs(depth - 32);
+
+  if(strcmp(mimetype, "image/png"))
+    {
+    if(!strcmp(mimetype, "image/bmp") ||
+       !strcmp(mimetype, "image/x-ms-bmp"))
+      ret += 10;
+    else if(!strcmp(mimetype, "image/jpeg"))
+      ret += 20;
+    else
+      ret += 100;
+    }
+  return ret;
+  }
+
+static char * make_url(const char * url, const char * base)
+  {
+  if(!strncasecmp(url, "http://", 7))
+    return gavl_strdup(url);
+  else if((base[strlen(base)-1] == '/') && (url[0] == '/'))
+    return bg_sprintf("%s%s", base, url+1);
+  else if((base[strlen(base)-1] == '/') || (url[0] == '/'))
+    return bg_sprintf("%s%s", base, url);
+  else
+    return bg_sprintf("%s/%s", base, url);
+  }
+
+static void add_upnp_server(bg_media_tree_t * t, const char * desc_url)
+  {
+  xmlNodePtr dev_node = NULL;
+  xmlNodePtr service_node = NULL; 
+  xmlNodePtr icon_node = NULL;
+  xmlNodePtr list_node;
+  xmlNodePtr node;
+  int icon_error;
+  int icon_error_min = -1;
+  
+  const char * control_url_c = NULL;
+  const char * icon_url_c = NULL;
+  char * icon_url      = NULL;
+  const char * server_name   = NULL;
+  char * url_base      = NULL;
+  char * control_url = NULL;
+
+  bg_album_t * a;
+  bg_album_t * tmp;
+  xmlDocPtr doc = bg_xml_from_url(desc_url);
+  
+  if(!doc)
+    goto fail;
+  
+  /* URL Base */
+
+  url_base = bg_upnp_device_description_get_url_base(desc_url, doc);
+
+  /* Find the device node belonging to the media server */
+  
+  if(!(dev_node = bg_upnp_device_description_get_device_node(doc, "MediaServer", 1)))
+    goto fail;
+  
+  /* Name */
+
+  node = bg_xml_find_node_child(dev_node, "friendlyName");
+  if(!node)
+    goto fail;
+  server_name = bg_xml_node_get_text_content(node);
+  
+  /* Get control URL */
+  if(!(service_node = bg_upnp_device_description_get_service_node(dev_node, "ContentDirectory", 1)))
+    goto fail;
+  
+  node = bg_xml_find_node_child(service_node, "controlURL");
+  if(!node)
+    goto fail;
+
+  control_url_c = bg_xml_node_get_text_content(node);
+
+  /* Icon */
+  list_node = bg_xml_find_node_child(dev_node, "iconList");
+
+  if(list_node)
+    {
+    while(1)
+      {
+      icon_node = bg_xml_find_next_node_child_by_name(list_node, icon_node, "icon");
+      if(!icon_node)
+        break;
+
+      icon_error = check_icon(icon_node);
+
+      if((icon_error_min == -1) || (icon_error < icon_error_min))
+        {
+        node = bg_xml_find_node_child(icon_node, "url");
+        if(node && (icon_url_c = bg_xml_node_get_text_content(node)))
+          icon_error_min = icon_error;
+        }
+      }
+    }
+  
+  /* Create root album for this server */
+
+  control_url =  make_url(control_url_c, url_base);
+  icon_url =  make_url(icon_url_c, url_base);
+  
+  //  fprintf(stderr, "Got UPNP Server. Name: %s, control URL: %s icon URL: %s\n",
+  //          server_name, control_url, icon_url);
+
+  /* Create album */
+  a = bg_album_create(&t->com, BG_ALBUM_TYPE_UPNP_ROOT, NULL);
+  a->name = gavl_strdup(server_name);
+
+  gavl_metadata_set_nocpy(&a->m, BG_ALBUM_CONTROL_URL, control_url);
+  gavl_metadata_set_nocpy(&a->m, BG_ALBUM_ICON_URL, icon_url);
+  gavl_metadata_set(&a->m, BG_ALBUM_DESC_URL, desc_url);
+  gavl_metadata_set(&a->m, BG_ALBUM_UPNP_ID, "0");
+  
+  control_url = NULL;
+  icon_url = NULL;
+  
+  /* Put into chain */
+  tmp = t->children;
+  if(!tmp)
+    t->children = a;
+  else
+    {
+    while(1)
+      {
+      if((!tmp->next) || (tmp->next->type == BG_ALBUM_TYPE_PLUGIN))
+        break;
+      tmp = tmp->next;
+      }
+    a->next = tmp->next;
+    tmp->next = a;
+    }
+
+  if(t->change_callback)
+    t->change_callback(t, t->change_callback_data);
+  
+  //  browse_upnp(control_url, "0", 0);
+    
+  fail:
+  if(doc)
+    xmlFreeDoc(doc);
+  if(control_url)
+    free(control_url);
+  if(icon_url)
+    free(icon_url);
+  if(url_base)
+    free(url_base);
+  }
+
+static void remove_upnp_server(bg_media_tree_t * t, const char * desc_url)
+  {
+  const char * url;
+  bg_album_t * a = t->children;
+  bg_album_t * before = NULL;
+
+  while(a)
+    {
+    if((a->type == BG_ALBUM_TYPE_UPNP_ROOT) &&
+       (url = gavl_metadata_get(&a->m, BG_ALBUM_DESC_URL)) &&
+       !strcmp(url, desc_url))
+      break;
+    before = a;
+    a = a->next;
+    }
+
+  if(!a)
+    return;
+
+  if(before)
+    before->next = a->next;
+  else
+    t->children = a->next;
+
+  a->next = NULL;
+  bg_album_destroy(a);
+
+  if(t->change_callback)
+    t->change_callback(t, t->change_callback_data);
+  
+  }
+
+static void ssdp_callback(void * priv, int add, const char * type,
+                          int version, const char * desc_url)
+  {
+  bg_media_tree_t * t = priv;
+
+  if(!type || !desc_url || strcmp(type, "MediaServer") || (version < 1))
+    return;
+  
+  if(add)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Adding upnp media server, URL: %s",
+           desc_url);
+    add_upnp_server(t, desc_url);
+    }
+  else
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing upnp media server, URL: %s",
+           desc_url);
+    remove_upnp_server(t, desc_url);
+    }
+  }
+
+void bg_media_tree_upnp_create(bg_media_tree_t * t)
+  {
+  t->ssdp = bg_ssdp_create(NULL, 1, NULL);
+  if(t->ssdp)
+    bg_ssdp_set_callback(t->ssdp, ssdp_callback, t);
+  }
+
+void bg_media_tree_upnp_update(bg_media_tree_t * t)
+  {
+  if(t->ssdp)
+    bg_ssdp_update(t->ssdp);
+  }
+
+void bg_media_tree_upnp_destroy(bg_media_tree_t * t)
+  {
+  if(t->ssdp)
+    bg_ssdp_destroy(t->ssdp);
+  }
+
+static int get_year(xmlNodePtr node)
+  {
+  const char * str;
+  int dummy1, dummy2, ret;
+
+  str = bg_xml_node_get_child_content(node, "date");
+
+  if(str && (sscanf(str, "%d-%d-%d", &ret, &dummy1, &dummy2) == 3))
+    return ret;
+  else
+    return -1;
+  }
+
+/* Load didl */
+
+static void load_container(bg_album_t * a, xmlNodePtr node)
+  {
+  const char * klass;
+  const char * title;
+  const char * str;
+
+  int year;
+  bg_album_t * child;
+  
+  klass = bg_xml_node_get_child_content(node, "class");
+  if(!klass)
+    return;
+
+  child = bg_album_create(a->com,
+                          BG_ALBUM_TYPE_UPNP,
+                          a);
+  
+  title = bg_xml_node_get_child_content(node, "title");
+
+  if(!strcmp(klass, "object.container.album.musicAlbum"))
+    {
+    year = get_year(node);
+    if(year > 0)
+      child->name = bg_sprintf("%s (%d)", title, year);
+    }
+  
+  if(!child->name) 
+    child->name = gavl_strdup(title);
+  
+  //  fprintf(stderr, "Loading album\n");
+  
+  str = BG_XML_GET_PROP(node, "id");
+  if(str)
+    gavl_metadata_set(&child->m, BG_ALBUM_UPNP_ID, str);
+  
+  /* Add to list */
+  a->children = bg_album_append_to_list(a->children, child);
+  }
+
+
+static void load_item(bg_album_t * a, xmlNodePtr node)
+  {
+  bg_album_entry_t * e;
+  const char * title;
+  const char * artist;
+  int year;
+  const char * klass;
+  const char * str;
+  xmlNodePtr res;
+  int num_res;
+  
+  e = bg_album_entry_create();
+
+  title = bg_xml_node_get_child_content(node, "title");
+  klass = bg_xml_node_get_child_content(node, "class");
+  if(!klass)
+    return;
+
+  if(!strncasecmp(klass, "object.item.videoItem", 21))
+    {
+    e->num_audio_streams = 1;
+    e->num_video_streams = 1;
+    e->duration = GAVL_TIME_UNDEFINED;
+
+    if(!strcmp(klass, "object.item.videoItem.movie"))
+      {
+      year = get_year(node);
+      if(year > 0)
+        e->name = bg_sprintf("%s (%d)", title, year);
+      }
+    }
+  else if(!strncasecmp(klass, "object.item.audioItem", 21))
+    {
+    e->num_audio_streams = 1;
+    e->duration = GAVL_TIME_UNDEFINED;
+
+    artist = bg_xml_node_get_child_content(node, "artist");
+
+    if(artist && title)
+      e->name = bg_sprintf("%s - %s", artist, title);
+    }
+  else if(!strncasecmp(klass, "object.item.imageItem", 21))
+    {
+    e->num_still_streams = 1;
+    }
+  else
+    {
+    bg_album_entry_destroy(e);
+    return;
+    }
+  
+  if(!e->name)
+    {
+    if(title)
+      e->name = gavl_strdup(title);
+    else
+      e->name = gavl_strdup(TR("Unnamed item"));
+    }
+  
+  /* Get locations */
+  res = NULL;
+  num_res = 0;
+  while((res = bg_xml_find_next_node_child_by_name(node, res, "res")))
+    {
+    /* Try to extract duration */
+    if(!num_res && (str = BG_XML_GET_PROP(res, "duration")))
+      {
+      if(!gavl_time_parse(str, &e->duration))
+        e->duration = GAVL_TIME_UNDEFINED;
+      }
+
+    str = bg_xml_node_get_text_content(res);
+    if(!strncmp(str, "file://", 7))
+      {
+      char * tmp_string = bg_uri_to_string(str, -1);
+      if(!access(tmp_string, R_OK | W_OK))
+        e->location = tmp_string;
+      else
+        free(tmp_string);
+      }
+    else if(!strncmp(str, "http://", 7))
+      e->location = gavl_strdup(str);
+    
+    num_res++;
+
+    if(e->location)
+      break;
+    }
+  
+  bg_album_insert_entries_before(a, e, NULL);
+  }
+
+static int load_didl(bg_album_t * a)
+  {
+  xmlDocPtr didl_doc = NULL;
+  xmlNodePtr didl_node;
+  xmlNodePtr di;
+  
+  bg_album_t * tmp;
+  const char * control_url = NULL;
+  const char * id = NULL;
+  int ret = 0;
+  //  fprintf(stderr, "Load didl\n");
+  
+  /* Get control URL */
+  tmp = a;
+  while(tmp)
+    {
+    if(tmp->type == BG_ALBUM_TYPE_UPNP_ROOT)
+      {
+      control_url = gavl_metadata_get(&tmp->m,
+                                      BG_ALBUM_CONTROL_URL);
+      break;
+      }
+    tmp = tmp->parent;
+    }
+
+  if(!control_url)
+    goto fail;
+
+  id = gavl_metadata_get(&a->m, BG_ALBUM_UPNP_ID);
+  if(!id)
+    goto fail;
+  
+  /* Load didl */
+  didl_doc = browse_upnp(control_url, id, 0);
+  if(!didl_doc)
+    goto fail;
+
+  /* Browse through the items */
+
+  didl_node = bg_xml_find_next_doc_child(didl_doc, NULL);
+  
+  di = NULL;
+  
+  while((di = bg_xml_find_next_node_child(didl_node, di)))
+    {
+    if(!BG_XML_STRCMP(di->name, "item"))
+      load_item(a, di);
+    else if(!BG_XML_STRCMP(di->name, "container"))
+      load_container(a, di);
+    }
+  
+  a->flags |= BG_ALBUM_HAS_DIDL;
+
+  ret = 1;
+  fail:
+  if(didl_doc)
+    xmlFreeDoc(didl_doc);
+  
+  return ret;
+  }
+
+int bg_album_open_upnp(bg_album_t * a)
+  {
+  if(!(a->flags & BG_ALBUM_HAS_DIDL))
+    return load_didl(a);
+  return 1;
+  }
+
+void bg_album_close_upnp(bg_album_t * a)
+  {
+
+  }
+
+void bg_album_expand_upnp(bg_album_t * a)
+  {
+  if(!(a->flags & BG_ALBUM_HAS_DIDL))
+    load_didl(a);
+  }
+
+void bg_album_collapse(bg_album_t * a)
+  {
+  
+  }

gmerlin-1.2.0.tar.gz/lib/tree_xml.c -> gmerlin-4256.tar.gz/lib/tree_xml.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -27,19 +27,6 @@
 #include <treeprivate.h>
 #include <gmerlin/utils.h>
 
-static bg_album_t * append_album(bg_album_t * list, bg_album_t * new_album)
-  {
-  bg_album_t * a;
-  if(!list)
-    return new_album;
-
-  a = list;
-    
-  while(a->next)
-    a = a->next;
-  a->next = new_album;
-  return list;
-  }
 
 /* tree_xml.c */
 
@@ -106,13 +93,13 @@
     tmp_string = (char*)xmlNodeListGetString(xml_doc, child->children, 1);
 
     if(!BG_XML_STRCMP(child->name, "NAME"))
-      ret->name = bg_strdup(ret->name, tmp_string);
+      ret->name = gavl_strrep(ret->name, tmp_string);
     else if(!BG_XML_STRCMP(child->name, "LOCATION"))
-      ret->xml_file = bg_strdup(ret->xml_file, tmp_string);
+      ret->xml_file = gavl_strrep(ret->xml_file, tmp_string);
     else if(!BG_XML_STRCMP(child->name, "DEVICE"))
-      ret->device = bg_strdup(ret->device, tmp_string);
+      ret->device = gavl_strrep(ret->device, tmp_string);
     else if(!BG_XML_STRCMP(child->name, "WATCH_DIR"))
-      ret->watch_dir = bg_strdup(ret->watch_dir, tmp_string);
+      ret->watch_dir = gavl_strrep(ret->watch_dir, tmp_string);
     else if(!BG_XML_STRCMP(child->name, "PLUGIN"))
       ret->plugin_info = bg_plugin_find_by_name(ret->com->plugin_reg, tmp_string);
     if(tmp_string)
@@ -156,7 +143,7 @@
       {
       child_album = load_album(xml_doc, tree, node, ret);
       if(child_album)
-        ret->children = append_album(ret->children, child_album);
+        ret->children = bg_album_append_to_list(ret->children, child_album);
       }
     node = node->next;
     }
@@ -170,7 +157,7 @@
   xmlNodePtr node;
   bg_album_t * new_album;
   
-  xml_doc = bg_xml_parse_file(tree->filename);
+  xml_doc = bg_xml_parse_file(tree->filename, 1);
   
   if(!xml_doc)
     return;
@@ -193,7 +180,7 @@
         {
         new_album = load_album(xml_doc, tree, node, NULL);
         if(new_album)
-          tree->children = append_album(tree->children, new_album);
+          tree->children = bg_album_append_to_list(tree->children, new_album);
         }
       else if(!BG_XML_STRCMP(node->name, "CFG_SECTION"))
         {
@@ -220,6 +207,9 @@
     }
   else if(album->type == BG_ALBUM_TYPE_REMOVABLE)
     return;
+  else if((album->type == BG_ALBUM_TYPE_UPNP) ||
+          (album->type == BG_ALBUM_TYPE_UPNP_ROOT))
+    return;
   
   /* Create XML album */
       
@@ -306,7 +296,8 @@
     }
 
   filename = bg_sprintf("%s/%s", tree->com.directory, "tree.xml");
-  xmlSaveFile(filename, xml_doc);
+
+  bg_xml_save_file(xml_doc, filename, 1);
   free(filename);
 
   xmlFreeDoc(xml_doc);

gmerlin-4256.tar.gz/lib/upnp Added

gmerlin-4256.tar.gz/lib/upnp/Makefile.am Added

gmerlin-4256.tar.gz/lib/upnp/client.c Added

@@ -0,0 +1,122 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+
+#include <gmerlin/upnp/device.h>
+
+static int check_client_generic(const gavl_metadata_t * m)
+  {
+  return 1;
+  }
+
+static int check_client_gmerlin_web (const gavl_metadata_t * m)
+  {
+  if(gavl_metadata_get(m, "X-Gmerlin-Webclient"))
+    return 1;
+  return 0;
+  }
+
+static int check_client_gmerlin_client(const gavl_metadata_t * m)
+  {
+  if(gavl_metadata_get(m, "X-Gmerlin-Client"))
+    return 1;
+  return 0;
+  }
+
+static const bg_upnp_client_t clients[] =
+  {
+    {
+      .check = check_client_gmerlin_web,
+#if 0
+      .mimetypes = (const char*[]) { "audio/ogg",  // Firefox
+                                     "audio/mpeg", // Chrome
+                                     "image/jpeg",
+                                     "video/x-msvideo",
+                                     NULL },
+#endif
+      /* Everything can be downloaded */
+      .mimetypes = (const char*[]) { "*/*",  // Firefox
+                                     NULL },
+      .flags = BG_UPNP_CLIENT_MULTIPLE_RES | BG_UPNP_CLIENT_GMERLIN_NS,
+    },
+    {
+      .check = check_client_gmerlin_client,
+      .mimetypes = (const char*[]) { "*/*", NULL },
+      .flags = BG_UPNP_CLIENT_MULTIPLE_RES |
+      BG_UPNP_CLIENT_ORIG_LOCATION | BG_UPNP_CLIENT_GMERLIN_NS,
+    },
+    {
+      .check = check_client_generic,
+      .mimetypes = (const char*[]) { "audio/mpeg",
+                                     "video/x-msvideo",
+                                     "image/jpeg", 
+                                     NULL },
+    },
+    { /* End */ },
+  };
+
+const bg_upnp_client_t * bg_upnp_detect_client(const gavl_metadata_t * m)
+  {
+  int i = 0;
+  while(clients[i].check)
+    {
+    if(clients[i].check(m))
+      return &clients[i];
+    i++;
+    }
+  return NULL;
+  }
+
+int bg_upnp_client_supports_mimetype(const bg_upnp_client_t * cl,
+                                     const char * mimetype)
+  {
+  int i = 0;
+
+  if(!strcmp(cl->mimetypes[0], "*/*"))
+    return 1;
+  
+  while(cl->mimetypes[i])
+    {
+    /* Directly supported */
+    if(!strcmp(cl->mimetypes[i], mimetype))
+      return 1;
+    i++;
+    }
+  return 0;
+  }
+
+const char *
+bg_upnp_client_translate_mimetype(const bg_upnp_client_t * cl,
+                                  const char * mimetype)
+  {
+  int i;
+  if(!cl->mt)
+    return mimetype;
+
+  while(cl->mt[i].gmerlin)
+    {
+    if(!strcmp(cl->mt[i].gmerlin, mimetype))
+      return cl->mt[i].client;
+    i++;
+    }
+  return mimetype;
+  }

gmerlin-4256.tar.gz/lib/upnp/connectionmanager.c Added

@@ -0,0 +1,179 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/servicepriv.h>
+#include <upnp/mediaserver.h>
+#include <string.h>
+
+/* Service actions */
+
+#define ARG_Source                1
+#define ARG_Sink                  2
+#define ARG_ConnectionIDs         3
+#define ARG_ConnectionID          4
+
+#define ARG_RcsID                 5
+#define ARG_AVTransportID         6
+#define ARG_ProtocolInfo          7
+#define ARG_PeerConnectionManager 8
+#define ARG_PeerConnectionID      9
+#define ARG_Direction             10
+#define ARG_Status                11
+
+static int GetProtocolInfo(bg_upnp_service_t * s)
+  {
+  return 0;
+  }
+
+
+static int GetCurrentConnectionIDs(bg_upnp_service_t * s)
+  {
+  return 0;
+  }
+
+
+static int GetCurrentConnectionInfo(bg_upnp_service_t * s)
+  {
+  return 0;
+  }
+
+
+/* Initialize service description */
+
+static void init_service_desc(bg_upnp_service_desc_t * d)
+  {
+  bg_upnp_sv_val_t  val;
+  bg_upnp_sv_desc_t * sv;
+  bg_upnp_sa_desc_t * sa;
+
+  /* State variables */
+  
+  bg_upnp_service_desc_add_sv(d, "SourceProtocolInfo",
+                              BG_UPNP_SV_EVENT, BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "SinkProtocolInfo",
+                              BG_UPNP_SV_EVENT, BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "CurrentConnectionIDs",
+                              BG_UPNP_SV_EVENT, BG_UPNP_SV_STRING);
+
+  sv = bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_ConnectionStatus",
+                                   BG_UPNP_SV_ARG_ONLY,
+                                   BG_UPNP_SV_STRING);
+  
+  val.s = "OK";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  val.s = "ContentFormatMismatch";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  val.s = "InsufficientBandwidth";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  val.s = "UnreliableChannel";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  val.s = "Unknown";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_ConnectionManager",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  
+  sv = bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_Direction",
+                                   BG_UPNP_SV_ARG_ONLY,
+                                   BG_UPNP_SV_STRING);
+  
+  val.s = "Output";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  val.s = "Input";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_ProtocolInfo",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_ConnectionID",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_AVTransportID",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_RcsID",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+
+  /* Actions */
+
+  sa = bg_upnp_service_desc_add_action(d, "GetProtocolInfo", GetProtocolInfo);
+  bg_upnp_sa_desc_add_arg_out(sa, "Source",
+                              "SourceProtocolInfo", 0, ARG_Source);
+  bg_upnp_sa_desc_add_arg_out(sa, "Sink",
+                              "SinkProtocolInfo", 0, ARG_Sink);
+  
+  /*
+  sa = bg_upnp_service_desc_add_action(d, "PrepareForConnection");
+  sa = bg_upnp_service_desc_add_action(d, "ConnectionComplete");
+  */
+
+  sa = bg_upnp_service_desc_add_action(d, "GetCurrentConnectionIDs",
+                                       GetCurrentConnectionIDs);
+  bg_upnp_sa_desc_add_arg_out(sa, "ConnectionIDs",
+                              "CurrentConnectionIDs", 0,
+                              ARG_ConnectionIDs);
+  
+  sa = bg_upnp_service_desc_add_action(d, "GetCurrentConnectionInfo",
+                                       GetCurrentConnectionInfo);
+  bg_upnp_sa_desc_add_arg_in(sa, "ConnectionID",
+                             "A_ARG_TYPE_ConnectionID", 0,
+                             ARG_ConnectionID);
+
+  bg_upnp_sa_desc_add_arg_out(sa, "RcsID",
+                              "A_ARG_TYPE_RcsID", 0,
+                              ARG_RcsID);
+  
+  bg_upnp_sa_desc_add_arg_out(sa, "AVTransportID",
+                              "A_ARG_TYPE_AVTransportID", 0,
+                              ARG_AVTransportID);
+  
+  bg_upnp_sa_desc_add_arg_out(sa, "ProtocolInfo",
+                              "A_ARG_TYPE_ProtocolInfo", 0,
+                              ARG_ProtocolInfo);
+
+  bg_upnp_sa_desc_add_arg_out(sa, "PeerConnectionManager",
+                              "A_ARG_TYPE_ConnectionManager", 0,
+                              ARG_PeerConnectionManager);
+  
+  bg_upnp_sa_desc_add_arg_out(sa, "PeerConnectionID",
+                              "A_ARG_TYPE_ConnectionID", 0,
+                              ARG_PeerConnectionID);
+
+  bg_upnp_sa_desc_add_arg_out(sa, "Direction",
+                              "A_ARG_TYPE_Direction", 0,
+                              ARG_Direction);
+
+  bg_upnp_sa_desc_add_arg_out(sa, "Status",
+                              "A_ARG_TYPE_ConnectionStatus", 0,
+                              ARG_Status);
+  }
+
+void bg_upnp_service_init_connection_manager(bg_upnp_service_t * ret,
+                                             const char * name)
+  {
+  bg_upnp_service_init(ret, name, "ConnectionManager", 1);
+  init_service_desc(&ret->desc);
+  bg_upnp_service_start(ret);
+  }

gmerlin-4256.tar.gz/lib/upnp/contentdirectory.c Added

@@ -0,0 +1,1332 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/devicepriv.h>
+#include <upnp/mediaserver.h>
+#include <upnp/didl.h>
+
+#include <string.h>
+#include <ctype.h>
+
+#include <gmerlin/utils.h>
+#include <fnmatch.h>
+
+/* Service actions */
+
+#define ARG_SearchCaps        1
+#define ARG_SortCaps          2
+#define ARG_Id                3
+#define ARG_ObjectID          4
+#define ARG_BrowseFlag        5
+#define ARG_Filter            6
+#define ARG_StartingIndex     7
+#define ARG_RequestedCount    8
+#define ARG_SortCriteria      9
+#define ARG_Result            10
+#define ARG_NumberReturned    11
+#define ARG_TotalMatches      12
+#define ARG_UpdateID          13
+
+static int GetSearchCapabilities(bg_upnp_service_t * s)
+  {
+  char * ret = calloc(1, 1);
+  bg_upnp_service_set_arg_out_string(&s->req, ARG_SearchCaps, ret);
+  return 0;
+  }
+
+static int GetSortCapabilities(bg_upnp_service_t * s)
+  {
+  char * ret = calloc(1, 1);
+  bg_upnp_service_set_arg_out_string(&s->req, ARG_SortCaps, ret);
+  return 0;
+  }
+
+
+static int GetSystemUpdateID(bg_upnp_service_t * s)
+  {
+  bg_upnp_service_set_arg_out_int(&s->req, ARG_Id, 1);
+  return 0;
+  }
+
+/* DIDL stuff */
+
+static void set_res_format(xmlNodePtr child, void * f, char ** filter,
+                           const bg_upnp_transcoder_t * transcoder)
+  {
+  /* Format specific stuff */
+  if(bg_db_object_get_type(f) == BG_DB_OBJECT_AUDIO_FILE)
+    {
+    /* Audio attributes */
+
+    bg_db_audio_file_t * af = (bg_db_audio_file_t *)f;
+
+    if(bg_didl_filter_attribute("res", "bitrate", filter))
+      {
+      if(transcoder)
+        bg_didl_set_attribute_int(child, "bitrate", transcoder->get_bitrate(f) / 8);
+      else if(isdigit(af->bitrate[0]))
+        bg_didl_set_attribute_int(child, "bitrate", 1000 * atoi(af->bitrate) / 8);
+      }
+    if(bg_didl_filter_attribute("res", "sampleFrequency", filter))
+      bg_didl_set_attribute_int(child, "sampleFrequency", af->samplerate);
+    if(bg_didl_filter_attribute("res", "nrAudioChannels", filter))
+      bg_didl_set_attribute_int(child, "nrAudioChannels", af->channels);
+
+    /* Duration (optional) */
+    if((af->file.obj.duration > 0) &&
+       bg_didl_filter_attribute("res", "duration", filter))
+      {
+      char buf[GAVL_TIME_STRING_LEN_MS];
+      gavl_time_prettyprint_ms(af->file.obj.duration, buf);
+      BG_XML_SET_PROP(child, "duration", buf);
+      }
+    }
+  else if(bg_db_object_get_type(f) & BG_DB_FLAG_IMAGE)
+    {
+    char * str;
+    bg_db_image_file_t * imf = (bg_db_image_file_t *)f;
+    if(bg_didl_filter_attribute("res", "resolution", filter))
+      {
+      str = bg_sprintf("%dx%d", imf->width, imf->height);
+      BG_XML_SET_PROP(child, "resolution", str);
+      free(str);
+      }
+    }
+  else if(bg_db_object_get_type(f) & BG_DB_FLAG_VIDEO)
+    {
+    char * str;
+    bg_db_video_file_t * vf = (bg_db_video_file_t *)f;
+    if(bg_didl_filter_attribute("res", "resolution", filter))
+      {
+      str = bg_sprintf("%dx%d", vf->width, vf->height);
+      BG_XML_SET_PROP(child, "resolution", str);
+      free(str);
+      }
+    /* Duration (optional) */
+    if((vf->file.obj.duration > 0) &&
+       bg_didl_filter_attribute("res", "duration", filter))
+      {
+      char buf[GAVL_TIME_STRING_LEN_MS];
+      gavl_time_prettyprint_ms(vf->file.obj.duration, buf);
+      BG_XML_SET_PROP(child, "duration", buf);
+      }
+    }
+  
+  }
+
+static char * encode_path_uri(const char * path)
+  {
+  const char * end;
+  const char * pos = strrchr(path, '/');
+
+  if(!pos)
+    return NULL;
+  pos++;
+
+  end = strrchr(pos, '.');
+  if(end)
+    return bg_string_to_uri(pos, end - pos);
+  else
+    return bg_string_to_uri(pos, -1);
+  }
+
+static void bg_didl_create_res_file(xmlDocPtr doc,
+                                    xmlNodePtr node,
+                                    void * f, const char * url_base, 
+                                    char ** filter,
+                                    const bg_upnp_client_t * cl)
+  {
+  bg_db_file_t * file = f;
+  char * tmp_string;
+  xmlNodePtr child;
+  int i;
+  int num = 0;
+  char * uri_enc = NULL;
+  const char * ext;
+  const char * client_mimetype = NULL;
+  
+  if(!bg_didl_filter_element("res", filter))
+    return;
+
+  client_mimetype = bg_upnp_client_translate_mimetype(cl, file->mimetype);
+  
+  /* Local file */
+  if(cl->flags & BG_UPNP_CLIENT_ORIG_LOCATION)  
+    {
+
+    tmp_string = bg_string_to_uri(file->path, -1);
+    child = bg_xml_append_child_node(node, "res", tmp_string);
+    free(tmp_string);
+ 
+    tmp_string = bg_sprintf("*:*:%s:*", client_mimetype);
+    BG_XML_SET_PROP(child, "protocolInfo", tmp_string);
+    free(tmp_string);
+
+    set_res_format(child, f, filter, NULL);
+    if(bg_didl_filter_attribute("res", "size", filter))
+      bg_didl_set_attribute_int(child, "size", file->obj.size);
+    num++;
+    }
+
+  if(num && !(cl->flags & BG_UPNP_CLIENT_MULTIPLE_RES))
+    return;
+
+  /* Original (via http) */
+  if(bg_upnp_client_supports_mimetype(cl, file->mimetype))
+    {
+    if(!uri_enc)
+      uri_enc = encode_path_uri(file->path);
+
+    ext = strrchr(file->path, '.');
+    if(!ext)
+      ext = "";
+    
+    tmp_string = bg_sprintf("%smedia/%"PRId64"/%s%s", url_base, bg_db_object_get_id(f), uri_enc, ext);
+    
+    child = bg_xml_append_child_node(node, "res", tmp_string);
+    free(tmp_string);
+    
+    tmp_string = bg_sprintf("http-get:*:%s:*",
+                            bg_upnp_client_translate_mimetype(cl, file->mimetype));
+    BG_XML_SET_PROP(child, "protocolInfo", tmp_string);
+    free(tmp_string);
+    
+    num++;
+
+    set_res_format(child, f, filter, NULL);
+
+    if(bg_didl_filter_attribute("res", "size", filter))
+      bg_didl_set_attribute_int(child, "size", file->obj.size);
+    }
+
+  if(num && !(cl->flags & BG_UPNP_CLIENT_MULTIPLE_RES))
+    goto end;
+
+  i = 0;
+  while(bg_upnp_transcoders[i].name)
+    {
+    /* Skip unusable transcoders */
+    if(fnmatch(bg_upnp_transcoders[i].in_mimetype, file->mimetype, 0) ||
+       !strcmp(file->mimetype, bg_upnp_transcoders[i].out_mimetype) ||
+       !bg_upnp_client_supports_mimetype(cl, bg_upnp_transcoders[i].out_mimetype))
+      {
+      i++;
+      continue;
+      }
+
+    client_mimetype = bg_upnp_client_translate_mimetype(cl, bg_upnp_transcoders[i].out_mimetype);
+    
+    if(!uri_enc)
+      uri_enc = encode_path_uri(file->path);
+    
+    tmp_string = bg_sprintf("%stranscode/%"PRId64"/%s/%s%s", url_base,
+                            bg_db_object_get_id(f), bg_upnp_transcoders[i].name,
+                            uri_enc, bg_upnp_transcoders[i].ext);
+    child = bg_xml_append_child_node(node, "res", tmp_string);
+    free(tmp_string);
+    
+    tmp_string =
+      bg_upnp_transcoders[i].make_protocol_info(f,
+                                                bg_upnp_client_translate_mimetype(cl, bg_upnp_transcoders[i].out_mimetype));
+    
+    BG_XML_SET_PROP(child, "protocolInfo", tmp_string);
+    free(tmp_string);
+#if 0    
+    if(bg_didl_filter_attribute("res", "size", filter))
+      bg_didl_set_attribute_int(child, "size",
+                                bg_upnp_transcoder_get_size(bg_upnp_transcoders[i].transcoder, f));
+#endif
+    set_res_format(child, f, filter, &bg_upnp_transcoders[i]);
+
+    num++;
+
+    if(num && !(cl->flags & BG_UPNP_CLIENT_MULTIPLE_RES))
+      goto end;
+    i++;
+    }
+  
+  end:
+  if(uri_enc)
+    free(uri_enc);
+  }
+
+static const struct
+  {
+  const char * mimetype;
+  const char * extension;
+  }
+pls_formats[] =
+  {
+    { "audio/x-scpls",   "pls" },
+    { "audio/x-mpegurl", "m3u" },
+    { /* End */                },
+  };
+  
+static void bg_didl_create_res_pls(xmlDocPtr doc,
+                                   xmlNodePtr node,
+                                   void * f, const char * url_base, 
+                                   char ** filter,
+                                   const bg_upnp_client_t * cl)
+  {
+  xmlNodePtr child;
+  char * tmp_string;
+  int i = 0;
+  
+  while(pls_formats[i].mimetype)
+    {
+    // fprintf(stderr, "bg_didl_create_res_pls %d\n", i);
+    if(bg_upnp_client_supports_mimetype(cl, pls_formats[i].mimetype))
+      {
+      tmp_string = bg_sprintf("%s%s/%"PRId64"/playlist.%s",
+                              url_base,
+                              pls_formats[i].extension,
+                              bg_db_object_get_id(f),
+                              pls_formats[i].extension);
+      
+      child = bg_xml_append_child_node(node, "res", tmp_string);
+      free(tmp_string);
+      
+      tmp_string = bg_sprintf("http-get:*:%s:*", bg_upnp_client_translate_mimetype(cl, pls_formats[i].mimetype));
+      BG_XML_SET_PROP(child, "protocolInfo", tmp_string);
+      free(tmp_string);
+      }
+    i++;
+    
+    if(i && !(cl->flags & BG_UPNP_CLIENT_MULTIPLE_RES))
+      return;
+    }
+  }
+
+#define QUERY_PLS_AS_STREAM (1<<0)
+
+static const struct
+  {
+  const char * mimetype;
+  int max_width;
+  int max_height;
+  const char * profile;
+  }
+image_profiles[] =
+  {
+    {
+       .mimetype   = "image/jpeg",
+       .max_width  = 160,
+       .max_height = 160,
+       .profile    = "JPEG_TN",
+    },
+    {
+       .mimetype   = "image/jpeg",
+       .max_width  = 640,
+       .max_height = 480,
+       .profile    = "JPEG_SM",
+    },
+    {
+       .mimetype   = "image/jpeg",
+       .max_width  = 1024,
+       .max_height = 768,
+       .profile    = "JPEG_MED",
+    },
+    {
+       .mimetype   = "image/jpeg",
+       .max_width  = 4096,
+       .max_height = 4096,
+       .profile    = "JPEG_LRG",
+    },
+    {
+       .mimetype   = "image/png",
+       .max_width  = 160,
+       .max_height = 160,
+       .profile    = "PNG_TN",
+    },
+    {
+       .mimetype   = "image/png",
+       .max_width  = 4096,
+       .max_height = 4096,
+       .profile    = "PNG_LRG",
+    },
+    { /* */ }
+  };
+
+static const char * get_dlna_image_profile(bg_db_object_t * obj)
+  {
+  int i = 0;
+  bg_db_image_file_t * img = (bg_db_image_file_t*)(obj);
+
+  while(image_profiles[i].mimetype)
+    {
+    if(!strcmp(img->file.mimetype, image_profiles[i].mimetype) &&
+       (img->width <= image_profiles[i].max_width) &&
+       (img->height <= image_profiles[i].max_height))
+      return image_profiles[i].profile;
+    else
+      i++;
+    }
+  return NULL;
+  }
+  
+typedef struct
+  {
+  const char * upnp_parent;
+  int parent_type;
+  xmlDocPtr didl;
+  bg_upnp_device_t * dev;
+  char ** filter;
+  bg_db_t * db;
+  const bg_upnp_client_t * cl;
+  int flags;
+  char * url_base;
+  } query_t;
+
+static void add_album_art(xmlNodePtr node, int64_t cover_id, query_t * q)
+  {
+  bg_db_object_t * cover;
+  bg_db_object_t * cover_thumb; 
+  char * tmp_string;
+  xmlNodePtr child;
+  char * uri_enc = NULL;
+  char * ext = NULL;
+  bg_db_file_t * f;
+  int64_t id;
+  cover = bg_db_object_query(q->db, cover_id);
+  cover_thumb = bg_db_get_thumbnail(q->db, cover_id, 160, 160, -1, "image/jpeg");
+
+  /* Cover thumbnail */
+  if(cover_thumb)
+    {
+    id = bg_db_object_get_id(cover_thumb);
+    tmp_string = bg_sprintf("%smedia/%"PRId64"/%"PRId64".jpg", q->url_base,
+                            id, id);
+    
+    child = bg_didl_add_element_string(q->didl, node, "upnp:albumArtURI", tmp_string, NULL);
+    free(tmp_string);
+
+    if(child)
+      {
+      xmlNsPtr dlna_ns;
+      dlna_ns = xmlNewNs(child,
+                         (xmlChar*)"urn:schemas-dlna-org:metadata-1-0/",
+                         (xmlChar*)"dlna");
+      xmlSetNsProp(child, dlna_ns, (const xmlChar*)"profileID",
+                   (const xmlChar*)"JPEG_TN");
+      }
+    bg_db_object_unref(cover_thumb);
+    }
+
+  /* Original size */
+
+  f = (bg_db_file_t*)cover;
+  
+  if(!uri_enc)
+    uri_enc = encode_path_uri(f->path);
+  
+  ext = strrchr(f->path, '.');
+  if(!ext)
+    ext = "";
+  
+  tmp_string = bg_sprintf("%smedia/%"PRId64"/%s%s", q->url_base, cover_id, uri_enc, ext); 
+  child = bg_didl_add_element_string(q->didl, node,
+                                     "upnp:albumArtURI", tmp_string, NULL);
+  free(tmp_string);
+  
+  if(child)
+    {
+    const char * dlna_id;
+    xmlNsPtr dlna_ns;
+    dlna_id = get_dlna_image_profile(cover);
+    
+    if(dlna_id)
+      {
+      dlna_ns = xmlNewNs(child,
+                         (xmlChar*)"urn:schemas-dlna-org:metadata-1-0/",
+                         (xmlChar*)"dlna");
+      xmlSetNsProp(child, dlna_ns,
+                   (const xmlChar*)"profileID",
+                   (const xmlChar*)dlna_id);
+      }
+    }
+  
+  if(uri_enc)
+    free(uri_enc);
+
+  bg_db_object_unref(cover);
+  }
+
+static void add_movie_art(xmlNodePtr node, int64_t poster_id, query_t * q)
+  {
+  void * poster_thumb;
+  void * poster;
+
+  poster = bg_db_object_query(q->db, poster_id);
+  poster_thumb = bg_db_get_thumbnail(q->db, poster_id, 220, 330, -1, "image/jpeg");
+
+  if(poster)
+    {
+    bg_didl_create_res_file(q->didl, node, poster, q->url_base, q->filter, q->cl);
+    bg_db_object_unref(poster);
+    }
+  if(poster_thumb)
+    {
+    bg_didl_create_res_file(q->didl, node, poster_thumb, q->url_base, q->filter, q->cl);
+    bg_db_object_unref(poster_thumb);
+    }
+  }
+
+static void add_video_info(query_t * q, xmlNodePtr node,
+                           const bg_db_video_info_t * info)
+  {
+  int i;
+  bg_didl_set_title(q->didl, node, info->title);
+
+  /* Genre */
+  if(info->genres)
+    {
+    i = 0;
+    while(info->genres[i])
+      {
+      bg_didl_add_element_string(q->didl, node, "upnp:genre",
+                                 info->genres[i], q->filter);
+      i++;
+      }
+    }
+  /* Directors */
+  if(info->directors)
+    {
+    i = 0;
+    while(info->directors[i])
+      {
+      bg_didl_add_element_string(q->didl, node, "upnp:director",
+                                 info->directors[i], q->filter);
+      i++;
+      }
+    }
+  /* Actors */
+  if(info->actors)
+    {
+    i = 0;
+    while(info->actors[i])
+      {
+      bg_didl_add_element_string(q->didl, node, "upnp:actor",
+                                 info->actors[i], q->filter);
+      i++;
+      }
+    }
+  /* Plot */
+  if(info->plot)
+    bg_didl_add_element_string(q->didl, node, "upnp:longDescription",
+                               info->plot, q->filter);
+
+  /* Date */
+  bg_didl_set_date(q->didl, node, &info->date, q->filter);
+
+  /* Gmerlin specific infos */
+  if(q->cl->flags & BG_UPNP_CLIENT_GMERLIN_NS)
+    {
+    if(info->title_orig)
+      {
+      bg_didl_add_element_string(q->didl, node, "gmerlin:originalTitle",
+                                 info->title_orig, q->filter);
+      }
+    if(info->countries)
+      {
+      i = 0;
+      while(info->countries[i])
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:productionCountry",
+                                   info->countries[i], q->filter);
+        i++;
+        }
+      }
+    if(info->audio_languages)
+      {
+      i = 0;
+      while(info->audio_languages[i])
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:audioLanguage",
+                                   bg_get_language_name(info->audio_languages[i]), q->filter);
+        i++;
+        }
+      }
+
+    if(info->subtitle_languages)
+      {
+      i = 0;
+      while(info->subtitle_languages[i])
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:subtitleLanguage",
+                                   bg_get_language_name(info->subtitle_languages[i]), q->filter);
+        i++;
+        }
+      }
+    }
+  }
+
+static int num_fake_children(bg_db_object_t * obj);
+
+/* 
+ *  UPNP IDs are build the following way:
+ *
+ *  object_id $ parent_id $ grandparent_id ...
+ *  This was we can map the same db objects into arbitrary locations into the
+ *  tree and they always have unique upnp IDs as required by the standard.
+ */
+
+static
+xmlNodePtr bg_didl_add_object(query_t * q, bg_db_object_t * obj, 
+                              const char * upnp_parent, const char * upnp_id)
+  {
+  const char * pos;
+  char * tmp_string;
+  xmlNodePtr node;
+  xmlNodePtr child;
+  bg_db_object_type_t type;
+  int is_container = 0;
+  
+  type = bg_db_object_get_type(obj);
+
+  if(type & (BG_DB_FLAG_CONTAINER|BG_DB_FLAG_VCONTAINER))
+    {
+    if((type != BG_DB_OBJECT_PLAYLIST) ||
+       !(q->flags & QUERY_PLS_AS_STREAM))
+      is_container = 1;
+    }
+  else
+    is_container = 0;
+  
+  if(is_container)
+    node = bg_didl_add_container(q->didl);
+  else
+    node = bg_didl_add_item(q->didl);
+  
+  if(upnp_id)
+    {
+    BG_XML_SET_PROP(node, "id", upnp_id);
+    pos = strchr(upnp_id, '$');
+    if(pos)
+      BG_XML_SET_PROP(node, "parentID", pos+1);
+    else
+      BG_XML_SET_PROP(node, "parentID", "-1");
+    }
+  else if(upnp_parent)
+    {
+    tmp_string = bg_sprintf("%"PRId64"$%s", obj->id, upnp_parent);
+    BG_XML_SET_PROP(node, "id", tmp_string);
+    free(tmp_string);
+    BG_XML_SET_PROP(node, "parentID", upnp_parent);
+    }
+  /* Required */
+  BG_XML_SET_PROP(node, "restricted", "1");
+
+  /* Optional */
+  if(is_container &&
+     bg_didl_filter_attribute("container", "childCount", q->filter))
+    bg_didl_set_attribute_int(node, "childCount",
+                              obj->children + num_fake_children(obj));
+  
+  switch(type)
+    {
+    case BG_DB_OBJECT_AUDIO_FILE:
+      {
+      bg_db_audio_file_t * o = (bg_db_audio_file_t *)obj;
+#if 0
+      if(o->artist && o->title)
+        {
+        tmp_string = bg_sprintf("%s - %s", o->artist, o->title);
+        bg_didl_set_title(q->didl, node,  tmp_string);
+        free(tmp_string);
+        }
+      else
+#endif
+        if(o->title)
+        bg_didl_set_title(q->didl, node,  o->title);
+      else
+        bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.item.audioItem.musicTrack");
+      //      bg_didl_set_class(didl, node,  "object.item.audioItem");
+
+      bg_didl_create_res_file(q->didl, node, obj, q->url_base, q->filter, q->cl);
+      
+      if(o->artist)
+        {
+        bg_didl_add_element_string(q->didl, node, "upnp:artist", o->artist, q->filter);
+        bg_didl_add_element_string(q->didl, node, "dc:creator", o->artist, q->filter);
+        }
+      if(o->genre)
+        bg_didl_add_element_string(q->didl, node, "upnp:genre", o->genre, q->filter);
+      if(o->album)
+        bg_didl_add_element_string(q->didl, node, "upnp:album", o->album, q->filter);
+
+      if(o->track > 0)
+        bg_didl_add_element_int(q->didl, node, "upnp:originalTrackNumber", o->track,
+                             q->filter);
+      
+      bg_didl_set_date(q->didl, node, &o->date, q->filter);
+#if 1
+      /* Album art */
+      if(o->album && bg_didl_filter_element("upnp:albumArtURI", q->filter))
+        {
+        bg_db_audio_album_t * album = bg_db_object_query(q->db, o->album_id);
+        if(album)
+          {
+          if(album->cover_id > 0)
+            add_album_art(node, album->cover_id, q);
+          bg_db_object_unref(album);
+          }
+        }
+#endif
+      //      bg_didl_create_res_file(didl, node, obj, q->url_base, q->filter, q->cl);
+      }
+      break;
+    case BG_DB_OBJECT_VIDEO_FILE:
+    case BG_DB_OBJECT_PHOTO:
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.item");
+      break;
+    case BG_DB_OBJECT_ROOT:
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.container");
+      break;
+    case BG_DB_OBJECT_AUDIO_ALBUM:
+      {
+      bg_db_audio_album_t * o = (bg_db_audio_album_t *)obj;
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.container.album.musicAlbum");
+      bg_didl_set_date(q->didl, node, &o->date, q->filter);
+      if(o->artist)
+        {
+        bg_didl_add_element_string(q->didl, node, "upnp:artist", o->artist, q->filter);
+        bg_didl_add_element_string(q->didl, node, "dc:creator", o->artist, q->filter);
+        }
+      if(o->genre)
+        bg_didl_add_element_string(q->didl, node, "upnp:genre", o->genre, q->filter);
+
+      if((o->cover_id > 0) && bg_didl_filter_element("upnp:albumArtURI", q->filter))
+        add_album_art(node, o->cover_id, q);
+
+      bg_didl_create_res_pls(q->didl, node, o, q->url_base, q->filter, q->cl);
+      
+      if((child = bg_didl_add_element_string(q->didl, node, "upnp:searchClass",
+                                          "object.item.audioItem.musicTrack",
+                                          q->filter)))
+        BG_XML_SET_PROP(child, "includeDerived", "false");
+      }
+      break;
+    case BG_DB_OBJECT_CONTAINER:
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.container");
+      break;
+    case BG_DB_OBJECT_DIRECTORY:
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.container.storageFolder");
+      /* Optional */
+      bg_didl_add_element_int(q->didl, node, "upnp:storageUsed", obj->size, q->filter);
+      break;
+    case BG_DB_OBJECT_PLAYLIST:
+      
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+
+      if(q->flags & QUERY_PLS_AS_STREAM)
+        {
+        bg_didl_set_class(q->didl, node,
+                          "object.item.audioItem.audioBroadcast");
+
+        /* Res */
+        if(bg_didl_filter_element("res", q->filter))
+          {
+          char * tmp_string;
+          tmp_string = bg_sprintf("%sondemand/%"PRId64,
+                                  q->url_base, bg_db_object_get_id(obj));
+          child = bg_xml_append_child_node(node, "res", tmp_string);
+          free(tmp_string);
+          BG_XML_SET_PROP(child, "protocolInfo", "http-get:*:audio/mpeg:*");
+          }
+
+        }
+      else
+        {
+        bg_didl_set_class(q->didl, node,
+                          "object.container.playlistContainer");
+        bg_didl_create_res_pls(q->didl, node, obj, q->url_base,
+                               q->filter, q->cl);
+        }
+      break;
+    case BG_DB_OBJECT_RADIO_URL:
+      {
+      bg_db_url_t * u = (bg_db_url_t *)obj;
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+
+      bg_didl_set_class(q->didl, node,
+                        "object.item.audioItem.audioBroadcast");
+      /* Res */
+      /* TODO: Add res elements for the original format */
+
+      if(bg_didl_filter_element("res", q->filter))
+        {
+        char * tmp_string;
+        tmp_string = bg_sprintf("%sondemand/%"PRId64"/stream.mp3",
+                                q->url_base, bg_db_object_get_id(obj));
+        child = bg_xml_append_child_node(node, "res", tmp_string);
+        free(tmp_string);
+        BG_XML_SET_PROP(child, "protocolInfo", "http-get:*:audio/mpeg:*");
+        }
+      
+      if((q->cl->flags & BG_UPNP_CLIENT_GMERLIN_NS) && u->station_url)
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:stationURL",
+                                   u->station_url, q->filter);
+        }
+      }
+      break;
+    case BG_DB_OBJECT_VFOLDER:
+    case BG_DB_OBJECT_VFOLDER_LEAF:
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.container");
+      break;
+    case BG_DB_OBJECT_MOVIE:
+      {
+      bg_db_movie_t * o = (bg_db_movie_t*)obj;
+      bg_didl_set_class(q->didl, node,  "object.item.videoItem.movie");
+      add_video_info(q, node, &o->info);
+      bg_didl_create_res_file(q->didl, node, obj, q->url_base, q->filter, q->cl);
+      
+      if(o->info.poster_id > 0)
+        add_movie_art(node, o->info.poster_id, q);
+      }
+      break;
+    case BG_DB_OBJECT_MOVIE_MULTIPART:
+      {
+      bg_db_video_container_t * o = (bg_db_video_container_t*)obj;
+      bg_didl_set_class(q->didl, node,  "object.container.album.videoAlbum");
+      add_video_info(q, node, &o->info);
+      if(o->info.poster_id > 0)
+        add_movie_art(node, o->info.poster_id, q);
+
+      if(q->cl->flags & BG_UPNP_CLIENT_GMERLIN_NS)
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:subType",
+                                   "multifileMovie", q->filter);
+        }
+      }
+      break;
+    case BG_DB_OBJECT_SEASON:
+      {
+      bg_db_video_container_t * o = (bg_db_video_container_t*)obj;
+      bg_didl_set_class(q->didl, node,  "object.container.album.videoAlbum");
+      add_video_info(q, node, &o->info);
+      bg_didl_create_res_pls(q->didl, node, obj,
+                             q->url_base, q->filter, q->cl);
+      if(o->info.poster_id > 0)
+        add_movie_art(node, o->info.poster_id, q);
+      if(q->cl->flags & BG_UPNP_CLIENT_GMERLIN_NS)
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:subType",
+                                   "season", q->filter);
+        }
+      }
+      break;
+    case BG_DB_OBJECT_TVSERIES:
+      {
+      bg_db_video_container_t * o = (bg_db_video_container_t*)obj;
+      bg_didl_set_class(q->didl, node,  "object.container.album.videoAlbum");
+      add_video_info(q, node, &o->info);
+      if(o->info.poster_id > 0)
+        add_movie_art(node, o->info.poster_id, q);
+#if 1
+      if(q->cl->flags & BG_UPNP_CLIENT_GMERLIN_NS)
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:subType",
+                                   "tvSeries", q->filter);
+        }
+#endif
+      }
+      break;
+    case BG_DB_OBJECT_VIDEO_EPISODE:
+      {
+      bg_db_movie_t * o = (bg_db_movie_t*)obj;
+      bg_didl_set_class(q->didl, node,  "object.item.videoItem.movie");
+      add_video_info(q, node, &o->info);
+      bg_didl_create_res_file(q->didl, node, obj, q->url_base, q->filter, q->cl);
+      if(q->cl->flags & BG_UPNP_CLIENT_GMERLIN_NS)
+        {
+        bg_didl_add_element_string(q->didl, node, "gmerlin:subType",
+                                   "episode", q->filter);
+        bg_didl_add_element_int(q->didl, node, "gmerlin:episodeIndex",
+                                o->file.index, q->filter);
+        }
+      
+      //      if(o->info.poster_id > 0)
+      //        add_movie_art(node, o->info.poster_id, q);
+      }
+      break;
+    case BG_DB_OBJECT_MOVIE_PART:
+      {
+      // bg_db_video_file_t * o = (bg_db_video_file_t*)obj;
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.item.videoItem.movie");
+      bg_didl_create_res_file(q->didl, node, obj, q->url_base,
+                              q->filter, q->cl);
+      }
+      break;
+    /* The following objects should never get returned */
+    default:
+      bg_didl_set_title(q->didl, node,  bg_db_object_get_label(obj));
+      bg_didl_set_class(q->didl, node,  "object.item");
+      break;
+    }
+
+  return NULL;
+  }
+
+static void query_callback(void * priv, void * obj)
+  {
+  query_t * q = priv;
+  bg_didl_add_object(q, obj, q->upnp_parent, NULL);
+  }
+
+/* We add some fake objects, which are not present in the dabatase */
+
+static int num_fake_children(bg_db_object_t * obj)
+  {
+  bg_db_object_type_t type;
+  type = bg_db_object_get_type(obj);
+  if(type == BG_DB_OBJECT_VFOLDER_LEAF)
+    {
+    bg_db_vfolder_t * vf;
+
+    vf = (bg_db_vfolder_t *)obj;
+
+    if(vf->type == BG_DB_OBJECT_PLAYLIST)
+      return 1;
+    
+    }
+  return 0;
+  }
+
+/* Add a fake object to a parent container */
+static void add_playlist_streams_container(bg_db_object_t * parent, query_t * q,
+                                           const char * id, const char * parent_id)
+  {
+  char * tmp_string;
+  xmlNodePtr node;
+  node = bg_didl_add_container(q->didl);
+  bg_didl_set_title(q->didl, node,  "Playlist streams");
+  bg_didl_set_class(q->didl, node,  "object.container");
+
+  if(parent_id)
+    {
+    tmp_string = bg_sprintf("pls-streams$%s", parent_id);
+    BG_XML_SET_PROP(node, "id", tmp_string);
+    free(tmp_string);
+    }
+  else
+    BG_XML_SET_PROP(node, "id", id);
+
+  BG_XML_SET_PROP(node, "restricted", "1");
+
+  if(bg_didl_filter_attribute("container", "childCount", q->filter))
+    bg_didl_set_attribute_int(node, "childCount", parent->children);
+  }
+
+static void add_fake_child(bg_db_object_t * parent,
+                           query_t * q, const char * parent_id,
+                           int index)
+  {
+  bg_db_object_type_t type;
+    
+  type = bg_db_object_get_type(parent);
+  if(type == BG_DB_OBJECT_VFOLDER_LEAF)
+    {
+    bg_db_vfolder_t * vf;
+
+    vf = (bg_db_vfolder_t *)parent;
+
+    if(vf->type == BG_DB_OBJECT_PLAYLIST)
+      add_playlist_streams_container(parent, q, NULL, parent_id);
+    }
+  }
+
+/* Get children of a fake container */
+static int browse_fake_children(query_t * q,
+                                const char * upnp_id, int start,
+                                int num, int * total_matches)
+  {
+  if(!strncmp(upnp_id, "pls-streams$", 12))
+    {
+    int64_t id;
+    q->upnp_parent = upnp_id;
+    q->flags |= QUERY_PLS_AS_STREAM;
+
+    id = strtoll(upnp_id + 12, NULL, 10);
+    
+    return bg_db_query_children(q->db, id, query_callback, q,
+                                start, num, total_matches);
+    }
+  return 0;
+  }
+
+/* Get children of a fake container */
+static int browse_fake_metadata(query_t * q,
+                                const char * upnp_id)
+  {
+  if(!strncmp(upnp_id, "pls-streams$", 12))
+    {
+    int64_t id;
+    bg_db_object_t * obj;
+    id = strtoll(upnp_id + 12, NULL, 10);
+    obj = bg_db_object_query(q->db, id);
+    add_playlist_streams_container(obj, q, upnp_id, NULL);
+    bg_db_object_unref(obj);
+    }
+  return 1;
+  }
+
+
+  
+static int Browse(bg_upnp_service_t * s)
+  {
+  const char * var;
+  bg_mediaserver_t * priv;
+  int64_t id;
+  char * ret;  
+  query_t q;
+  const char * ObjectID =
+    bg_upnp_service_get_arg_in_string(&s->req, ARG_ObjectID);
+  const char * BrowseFlag =
+    bg_upnp_service_get_arg_in_string(&s->req, ARG_BrowseFlag);
+  const char * Filter =
+    bg_upnp_service_get_arg_in_string(&s->req, ARG_Filter);
+  int StartingIndex =
+    bg_upnp_service_get_arg_in_int(&s->req, ARG_StartingIndex);
+  int RequestedCount =
+    bg_upnp_service_get_arg_in_int(&s->req, ARG_RequestedCount);
+
+  int NumberReturned = 0;
+  int TotalMatches = 1;
+  
+  priv = s->dev->priv;
+  
+  //  fprintf(stderr, "Browse: Id: %s, Flag: %s, Filter: %s, Start: %d, Num: %d\n",
+  //          ObjectID, BrowseFlag, Filter, StartingIndex, RequestedCount);
+
+  memset(&q, 0, sizeof(q));
+  
+  q.dev = s->dev;
+
+  if(strcmp(Filter, "*"))
+    q.filter = bg_strbreak(Filter, ',');
+  else
+    q.filter = NULL;
+  
+  q.db = priv->db;
+  q.cl = bg_upnp_detect_client(s->req.req);
+  q.didl = bg_didl_create(!!(q.cl->flags & BG_UPNP_CLIENT_GMERLIN_NS));
+
+  if((var = gavl_metadata_get(s->req.req, "Host")))
+    q.url_base = bg_sprintf("http://%s/", var);
+  else
+    q.url_base = gavl_strdup(q.dev->url_base);
+  
+  bg_db_start_transaction(priv->db);
+  
+  /* Special feature: We also parse m3u files if they
+     point to real files */
+  if(!strncmp(ObjectID, "#EXTM3U", 7))
+    {
+    int i;
+    char * pos;
+    bg_db_object_t * obj;
+    char * tmp_string;
+    char ** lines = bg_strbreak(ObjectID, '\n');
+    i = 0;
+    while(lines[i])
+      {
+      if((pos = strchr(lines[i], '\r')))
+        *pos = '\0';
+      i++;
+      }
+    
+    i = 0;
+    while(lines[i])
+      {
+      if((*(lines[i]) != '#') &&
+         ((id = bg_db_file_by_path(priv->db, lines[i])) > 0))
+        {
+        tmp_string = bg_sprintf("%"PRId64"$0", id);
+        obj = bg_db_object_query(priv->db, id);
+        bg_didl_add_object(&q, obj, NULL, tmp_string);
+        bg_db_object_unref(obj);
+        NumberReturned++;
+        TotalMatches++;
+        free(tmp_string);
+        }
+      i++;
+      }
+    }
+  else if(isdigit(ObjectID[0]))
+    {
+    bg_db_object_t * obj;
+    id = strtoll(ObjectID, NULL, 10);
+    
+    if(!strcmp(BrowseFlag, "BrowseMetadata"))
+      {
+      obj = bg_db_object_query(priv->db, id);
+
+      if(strstr(ObjectID, "pls-streams"))
+        q.flags |= QUERY_PLS_AS_STREAM;
+            
+      bg_didl_add_object(&q, obj, NULL, ObjectID);
+      bg_db_object_unref(obj);
+      NumberReturned = 1;
+      TotalMatches = 1;
+      }
+    else
+      {
+      int num_fake, i;
+      q.upnp_parent = ObjectID;
+      NumberReturned =
+        bg_db_query_children(priv->db, id,
+                             query_callback, &q,
+                             StartingIndex, RequestedCount, &TotalMatches);
+      obj = bg_db_object_query(priv->db, id);
+
+      num_fake = num_fake_children(obj);
+
+      TotalMatches += num_fake;
+
+      for(i = 0; i < num_fake; i++)
+        {
+        add_fake_child(obj, &q, ObjectID, i);
+        NumberReturned++;
+        
+        if(RequestedCount && (NumberReturned == RequestedCount))
+          break;
+        }
+      bg_db_object_unref(obj);
+      }
+    }
+  else
+    {
+    if(!strcmp(BrowseFlag, "BrowseMetadata"))
+      {
+      browse_fake_metadata(&q, ObjectID);
+      NumberReturned = 1;
+      TotalMatches = 1;
+      }
+    else
+      {
+      NumberReturned =
+        browse_fake_children(&q, ObjectID, StartingIndex, RequestedCount, &TotalMatches);
+      }
+    }
+  
+  ret = bg_xml_save_to_memory_opt(q.didl, XML_SAVE_NO_DECL);
+  
+  bg_upnp_service_set_arg_out_int(&s->req, ARG_NumberReturned, NumberReturned);
+  bg_upnp_service_set_arg_out_int(&s->req, ARG_TotalMatches, TotalMatches);
+  
+  //  fprintf(stderr, "didl-test:\n%s\n", ret);
+
+  //  fprintf(stderr, "NumberReturned: %d, TotalMatches: %d\n",
+  //          NumberReturned, TotalMatches);
+  
+  // Remove trailing linebreak
+  if(ret[strlen(ret)-1] == '\n')
+    ret[strlen(ret)-1] = '\0';
+  
+  xmlFreeDoc(q.didl);
+
+  if(q.filter)
+    bg_strbreak_free(q.filter);
+  if(q.url_base)
+    free(q.url_base);
+  
+  bg_db_end_transaction(priv->db);
+  
+  bg_upnp_service_set_arg_out_string(&s->req, ARG_Result, ret);
+  bg_upnp_service_set_arg_out_int(&s->req, ARG_UpdateID, 0);
+  
+  //  fprintf(stderr, "didl:\n%s\n", ret);
+  return 1;
+  }
+
+
+/* Initialize service description */
+
+static void init_service_desc(bg_upnp_service_desc_t * d)
+  {
+  bg_upnp_sv_val_t  val;
+  bg_upnp_sv_desc_t * sv;
+  bg_upnp_sa_desc_t * sa;
+
+  /*
+    bg_upnp_service_desc_add_sv(d, "TransferIDs",
+                                BG_UPNP_SV_EVENT,
+                                BG_UPNP_SV_STRING);
+
+   */
+  
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_ObjectID",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_Result",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  //  Optional
+  //  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_SearchCriteria",
+  //                              BG_UPNP_SV_ARG_ONLY,
+  //                              BG_UPNP_SV_STRING);
+
+  sv = bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_BrowseFlag",
+                                   BG_UPNP_SV_ARG_ONLY,
+                                   BG_UPNP_SV_STRING);
+
+  val.s = "BrowseMetadata";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  val.s = "BrowseDirectChildren";
+  bg_upnp_sv_desc_add_allowed(sv, &val);
+  
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_Filter",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_SortCriteria",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_Index",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_Count",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_UpdateID",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+  /*
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_TransferID",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_INT4);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_TransferStatus",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_TransferLength",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_TransferTotal",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_TagValueList",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "A_ARG_TYPE_URI",
+                              BG_UPNP_SV_ARG_ONLY,
+                              BG_UPNP_SV_STRING);
+  */
+
+  bg_upnp_service_desc_add_sv(d, "SearchCapabilities",
+                              0, BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "SortCapabilities",
+                              0, BG_UPNP_SV_STRING);
+  bg_upnp_service_desc_add_sv(d, "SystemUpdateID",
+                              BG_UPNP_SV_EVENT, BG_UPNP_SV_INT4);
+  /*
+  bg_upnp_service_desc_add_sv(d, "ContainerUpdateIDs",
+                              BG_UPNP_SV_EVENT, BG_UPNP_SV_STRING);
+  */
+
+  /* Actions */
+
+  sa = bg_upnp_service_desc_add_action(d, "GetSearchCapabilities",
+                                       GetSearchCapabilities);
+
+  bg_upnp_sa_desc_add_arg_out(sa, "SearchCaps",
+                              "SearchCapabilities", 0,
+                              ARG_SearchCaps);
+
+  sa = bg_upnp_service_desc_add_action(d, "GetSortCapabilities",
+                                       GetSortCapabilities);
+  bg_upnp_sa_desc_add_arg_out(sa, "SortCaps",
+                              "SortCapabilities", 0,
+                              ARG_SortCaps);
+  
+  sa = bg_upnp_service_desc_add_action(d, "GetSystemUpdateID",
+                                       GetSystemUpdateID);
+
+  bg_upnp_sa_desc_add_arg_out(sa, "Id",
+                              "SystemUpdateID", 0,
+                              ARG_Id);
+
+  sa = bg_upnp_service_desc_add_action(d, "Browse", Browse);
+  bg_upnp_sa_desc_add_arg_in(sa, "ObjectID",
+                             "A_ARG_TYPE_ObjectID", 0,
+                             ARG_ObjectID);
+  bg_upnp_sa_desc_add_arg_in(sa, "BrowseFlag",
+                             "A_ARG_TYPE_BrowseFlag", 0,
+                             ARG_BrowseFlag);
+  bg_upnp_sa_desc_add_arg_in(sa, "Filter",
+                             "A_ARG_TYPE_Filter", 0,
+                             ARG_Filter);
+  bg_upnp_sa_desc_add_arg_in(sa, "StartingIndex",
+                             "A_ARG_TYPE_Index", 0,
+                             ARG_StartingIndex);
+  bg_upnp_sa_desc_add_arg_in(sa, "RequestedCount",
+                             "A_ARG_TYPE_Count", 0,
+                             ARG_RequestedCount);
+  bg_upnp_sa_desc_add_arg_in(sa, "SortCriteria",
+                             "A_ARG_TYPE_SortCriteria", 0,
+                             ARG_SortCriteria);
+  
+  bg_upnp_sa_desc_add_arg_out(sa, "Result",
+                              "A_ARG_TYPE_Result", 0,
+                              ARG_Result);
+  bg_upnp_sa_desc_add_arg_out(sa, "NumberReturned",
+                              "A_ARG_TYPE_Count", 0,
+                              ARG_NumberReturned);
+  bg_upnp_sa_desc_add_arg_out(sa, "TotalMatches",
+                              "A_ARG_TYPE_Count", 0,
+                              ARG_TotalMatches);
+  bg_upnp_sa_desc_add_arg_out(sa, "UpdateID",
+                              "A_ARG_TYPE_UpdateID", 0,
+                              ARG_UpdateID);
+  
+  /*
+
+    sa = bg_upnp_service_desc_add_action(d, "Search");
+    sa = bg_upnp_service_desc_add_action(d, "CreateObject");
+    sa = bg_upnp_service_desc_add_action(d, "DestroyObject");
+    sa = bg_upnp_service_desc_add_action(d, "UpdateObject");
+    sa = bg_upnp_service_desc_add_action(d, "ImportResource");
+    sa = bg_upnp_service_desc_add_action(d, "ExportResource");
+    sa = bg_upnp_service_desc_add_action(d, "StopTransferResource");
+    sa = bg_upnp_service_desc_add_action(d, "GetTransferProgress");
+  */
+
+  
+  
+  }
+
+
+void bg_upnp_service_init_content_directory(bg_upnp_service_t * ret,
+                                            const char * name,
+                                            bg_db_t * db)
+  {
+  bg_upnp_service_init(ret, name, "ContentDirectory", 1);
+  init_service_desc(&ret->desc);
+  bg_upnp_service_start(ret);
+  }

gmerlin-4256.tar.gz/lib/upnp/device.c Added

@@ -0,0 +1,278 @@
+/*****************************************************************
+ * Gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/devicepriv.h>
+#include <string.h>
+#include <gmerlin/http.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/upnp/devicedesc.h>
+#include <sys/utsname.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "upnpdevice"
+
+void bg_upnp_device_send_description(const gavl_metadata_t * req,
+                                     bg_upnp_device_t * dev, int fd, const char * desc)
+  {
+  int len;
+  gavl_metadata_t res;
+  
+  len = strlen(desc);
+  bg_http_response_init(&res, "HTTP/1.1", 200, "OK");
+  gavl_metadata_set_int(&res, "CONTENT-LENGTH", len);
+  gavl_metadata_set(&res, "CONTENT-TYPE", "text/xml; charset=UTF-8");
+  gavl_metadata_set(&res, "SERVER", dev->server_string);
+
+  bg_http_check_keepalive(req, &res);
+  //  gavl_metadata_set(&res, "CONNECTION", "close");
+
+#if 0  
+  fprintf(stderr, "Send description\n");
+  gavl_metadata_dump(&res, 2);
+  fprintf(stderr, "%s\n", desc);
+#endif
+  if(!bg_http_response_write(fd, &res))
+    goto fail;
+  
+  bg_socket_write_data(fd, (const uint8_t*)desc, len);
+  fail:
+  gavl_metadata_free(&res);
+  }
+
+int
+bg_upnp_device_handle_request(bg_upnp_device_t * dev, int fd,
+                              const char * method,
+                              const char * path,
+                              const gavl_metadata_t * header)
+  {
+  int i;
+  const char * pos;
+
+#if 0 // Handled by core  
+  if(strncmp(path, "/upnp/", 6))
+    return 0;
+  path += 6;
+#endif
+  
+  /* Check for description */
+
+  if(!strcmp(path, "desc.xml"))
+    {
+    bg_upnp_device_send_description(header, dev, fd, dev->description);
+    return 1;
+    }
+
+  pos = strchr(path, '/');
+  if(!pos)
+    return 0;
+  
+  for(i = 0; i < dev->num_services; i++)
+    {
+    if((strlen(dev->services[i].name) == (pos - path)) &&
+       (!strncmp(dev->services[i].name, path, pos - path)))
+      {
+      /* Found service */
+      path = pos + 1;
+
+      return bg_upnp_service_handle_request(&dev->services[i], fd,
+                                            method, path, header);
+      }
+    }
+  return 0;
+  }
+
+void
+bg_upnp_device_destroy(bg_upnp_device_t * dev)
+  {
+  int i;
+  if(dev->ssdp)
+    bg_ssdp_destroy(dev->ssdp);
+
+  for(i = 0; i < dev->num_services; i++)
+    bg_upnp_service_free(&dev->services[i]);
+  if(dev->services)
+    free(dev->services);
+
+  if(dev->url_base)
+    free(dev->url_base);
+  if(dev->type)
+    free(dev->type);
+  if(dev->name)
+    free(dev->name);
+  if(dev->model_name)
+    free(dev->model_name);
+  if(dev->model_description)
+    free(dev->model_description);
+  if(dev->server_string)
+    free(dev->server_string);
+  if(dev->timer)
+    gavl_timer_destroy(dev->timer);
+  if(dev->description)
+    free(dev->description);
+
+  if(dev->destroy)
+    dev->destroy(dev->priv);
+
+  bg_ssdp_root_device_free(&dev->ssdp_dev);
+
+  free(dev);
+  }
+
+char * bg_upnp_make_server_string(void)
+  {
+  struct utsname os_info;
+  uname(&os_info);
+  return bg_sprintf("%s/%s, UPnP/1.0, "PACKAGE"/"VERSION,
+                    os_info.sysname, os_info.release);
+  
+  }
+
+void bg_upnp_device_init(bg_upnp_device_t * ret, bg_socket_address_t * addr,
+                         uuid_t uuid, const char * name, const char * type, 
+                         int version, int num_services,
+                         const char * model_name,
+                         const char * model_description,
+                         const bg_upnp_icon_t * icons)
+  {
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+  ret->num_services = num_services;
+  ret->services = calloc(ret->num_services, sizeof(*ret->services));
+  ret->sa = addr;
+
+  ret->url_base = bg_sprintf("http://%s/",
+                             bg_socket_address_to_string(ret->sa, addr_str));
+  
+  uuid_copy(ret->uuid, uuid);
+  ret->name = gavl_strdup(name);
+  ret->type = gavl_strdup(type);
+  ret->version = version;
+  ret->icons = icons;
+
+  ret->model_name        = gavl_strdup(model_name);
+  ret->model_description = gavl_strdup(model_description);
+
+  ret->server_string = bg_upnp_make_server_string();
+  //  bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+  //         "Using server string: %s", ret->server_string);
+
+  ret->timer = gavl_timer_create();
+  gavl_timer_start(ret->timer);
+  
+  }
+
+static void create_description(bg_upnp_device_t * dev)
+  {
+  int i;
+  xmlDocPtr doc;
+  doc = bg_upnp_device_description_create(dev->url_base, dev->type, dev->version);
+  bg_upnp_device_description_set_name(doc, dev->name);
+  bg_upnp_device_description_set_manufacturer(doc, "Gmerlin Project");
+  bg_upnp_device_description_set_manufacturer_url(doc, "http://gmerlin.sourceforge.net");
+  bg_upnp_device_description_set_model_description(doc, dev->model_description);
+  bg_upnp_device_description_set_model_name(doc, dev->model_name);
+  bg_upnp_device_description_set_model_number(doc, VERSION);
+  bg_upnp_device_description_set_model_url(doc, "http://gmerlin.sourceforge.net");
+  bg_upnp_device_description_set_serial_number(doc, "1");
+  bg_upnp_device_description_set_uuid(doc, dev->uuid);
+
+  if(dev->icons)
+    {
+    i = 0;
+    while(dev->icons[i].location)
+      {
+      bg_upnp_device_description_add_icon(doc, 
+                                          dev->icons[i].mimetype, 
+                                          dev->icons[i].width, dev->icons[i].height, 
+                                          dev->icons[i].depth, dev->icons[i].location);
+      i++;
+      }
+    }
+
+  for(i = 0; i < dev->num_services; i++)
+    {
+    bg_upnp_device_description_add_service(doc, dev->services[i].type, 
+                                                dev->services[i].version, 
+                                                dev->services[i].name);
+    }
+  dev->description = bg_xml_save_to_memory(doc);
+  xmlFreeDoc(doc);
+  
+  //  fprintf(stderr, "Created device description:\n%s\n", dev->description);
+  
+  }
+
+static void create_ssdp(bg_upnp_device_t * dev)
+  {
+  int i;
+  char addr_string[BG_SOCKET_ADDR_STR_LEN];
+  /* Create ssdp device description */
+  dev->ssdp_dev.uuid = calloc(37, 1);
+  uuid_unparse_lower(dev->uuid, dev->ssdp_dev.uuid);
+   
+  bg_socket_address_to_string(dev->sa, addr_string);
+  dev->ssdp_dev.url = bg_sprintf("http://%s/upnp/desc.xml", addr_string);
+  dev->ssdp_dev.type = gavl_strdup(dev->type);
+  dev->ssdp_dev.version = dev->version;
+  
+  dev->ssdp_dev.num_services = dev->num_services;
+  dev->ssdp_dev.services = calloc(dev->ssdp_dev.num_services, sizeof(*dev->ssdp_dev.services));
+  
+  for(i = 0; i < dev->ssdp_dev.num_services; i++)
+    {
+    dev->ssdp_dev.services[i].type = gavl_strdup(dev->services[i].type);
+    dev->ssdp_dev.services[i].version = dev->services[i].version;
+    }
+  dev->ssdp = bg_ssdp_create(&dev->ssdp_dev, 0, dev->server_string);
+  }
+
+int
+bg_upnp_device_create_common(bg_upnp_device_t * dev)
+  {
+  int i;
+  /* Set the device pointers in the servives */
+  for(i = 0; i < dev->num_services; i++)
+    dev->services[i].dev = dev;
+  
+  create_ssdp(dev);
+  create_description(dev);
+  return 1;
+  }
+
+
+int
+bg_upnp_device_ping(bg_upnp_device_t * dev)
+  {
+  int i;
+  int ret = 0;
+  gavl_time_t current_time = gavl_timer_get(dev->timer);
+  ret += bg_ssdp_update(dev->ssdp);
+
+  for(i = 0; i < dev->num_services; i++)
+    {
+    ret += bg_upnp_service_remove_expired_subsriptions(&dev->services[i], current_time);
+    }
+  return ret;
+  }
+
+const char * bg_upnp_device_get_server_string(bg_upnp_device_t * d)
+  {
+  return d->server_string;
+  }

gmerlin-4256.tar.gz/lib/upnp/devicedesc.c Added

@@ -0,0 +1,444 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+
+#include <gmerlin/upnp/device.h>
+#include <gmerlin/upnp/devicedesc.h>
+
+#include <gmerlin/utils.h>
+
+xmlDocPtr bg_upnp_device_description_create(const char * url_base,
+                                            const char * type, int version)
+  {
+  xmlDocPtr ret;
+  xmlNodePtr root;
+  xmlNodePtr node;
+  xmlNsPtr ns;
+  char * tmp_string;
+  
+  ret = xmlNewDoc((xmlChar*)"1.0");
+
+  root = xmlNewDocRawNode(ret, NULL, (xmlChar*)"root", NULL);
+  xmlDocSetRootElement(ret, root);
+
+  ns =
+    xmlNewNs(root,
+             (xmlChar*)"urn:schemas-upnp-org:device-1-0",
+             NULL);
+  xmlSetNs(root, ns);
+  xmlAddChild(root, BG_XML_NEW_TEXT("\n"));
+  
+  node = bg_xml_append_child_node(root, "specVersion", NULL);
+  bg_xml_append_child_node(node, "major", "1");
+  bg_xml_append_child_node(node, "minor", "0");
+  
+  bg_xml_append_child_node(root, "URLBase", url_base);
+  
+  node = bg_xml_append_child_node(root, "device", NULL);
+  
+  tmp_string = bg_sprintf("urn:schemas-upnp-org:device:%s:%d", type, version);
+  bg_xml_append_child_node(node, "deviceType", tmp_string);
+  free(tmp_string);
+
+  bg_xml_append_child_node(node, "presentationURL", url_base);
+
+
+  return ret;
+  }
+
+static xmlNodePtr get_device_node(xmlDocPtr ptr)
+  {
+  xmlNodePtr node;
+
+  if(!(node = bg_xml_find_doc_child(ptr, "root")) ||
+     !(node = bg_xml_find_node_child(node, "device")))
+    return NULL;
+  return node;
+  }
+
+void bg_upnp_device_description_set_name(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "friendlyName", name);
+  }
+
+void bg_upnp_device_description_set_manufacturer(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "manufacturer", name);
+  }
+
+void bg_upnp_device_description_set_manufacturer_url(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "manufacturerURL", name);
+  }
+
+void bg_upnp_device_description_set_model_description(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "modelDescription", name);
+  }
+
+void bg_upnp_device_description_set_model_name(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "modelName", name);
+  }
+
+void bg_upnp_device_description_set_model_number(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "modelNumber", name);
+  }
+
+void bg_upnp_device_description_set_model_url(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "modelURL", name);
+  }
+
+void bg_upnp_device_description_set_serial_number(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "serialNumber", name);
+  }
+
+void bg_upnp_device_description_set_uuid(xmlDocPtr ptr, uuid_t uuid)
+  {
+  char uuid_str[37];
+  char * tmp_string;
+  xmlNodePtr node = get_device_node(ptr);
+
+  uuid_unparse_lower(uuid, uuid_str);
+  tmp_string = bg_sprintf("uuid:%s", uuid_str);
+  bg_xml_append_child_node(node, "UDN", tmp_string);
+  free(tmp_string);
+  }
+
+void bg_upnp_device_description_set_upc(xmlDocPtr ptr, const char * name)
+  {
+  xmlNodePtr node = get_device_node(ptr);
+  bg_xml_append_child_node(node, "UPC", name);
+  }
+
+void bg_upnp_device_description_add_service(xmlDocPtr ptr,
+                                            const char * type, int version, const char * name)
+  {
+  char * tmp_string;
+  xmlNodePtr servicelist;
+  xmlNodePtr service;
+  
+  xmlNodePtr node = get_device_node(ptr);
+
+  servicelist = bg_xml_find_node_child(node, "serviceList");
+  
+  if(!servicelist)
+    servicelist = bg_xml_append_child_node(node, "serviceList", NULL);
+  
+  service = bg_xml_append_child_node(servicelist, "service", NULL);
+
+  tmp_string = bg_sprintf("urn:schemas-upnp-org:service:%s:%d", type, version);
+  bg_xml_append_child_node(service, "serviceType", tmp_string);
+  free(tmp_string);
+  
+  tmp_string = bg_sprintf("urn:upnp-org:serviceId:%s", type);
+  bg_xml_append_child_node(service, "serviceId", tmp_string);
+  free(tmp_string);
+
+  tmp_string = bg_sprintf("/upnp/%s/desc.xml", name);
+  bg_xml_append_child_node(service, "SCPDURL", tmp_string);
+  free(tmp_string);
+  
+  tmp_string = bg_sprintf("/upnp/%s/control", name);
+  bg_xml_append_child_node(service, "controlURL", tmp_string);
+  free(tmp_string);
+
+  tmp_string = bg_sprintf("/upnp/%s/event", name);
+  bg_xml_append_child_node(service, "eventSubURL", tmp_string);
+  free(tmp_string);
+  
+  }
+
+void bg_upnp_device_description_add_icon(xmlDocPtr ptr,
+                                         const char * mimetype,
+                                         int width, int height, int depth, const char * url)
+  {
+  char * tmp_string;
+  xmlNodePtr iconlist;
+  xmlNodePtr icon;
+  xmlNodePtr node = get_device_node(ptr);
+
+  iconlist = bg_xml_find_node_child(node, "iconList");
+  if(!iconlist)
+    iconlist = xmlNewTextChild(node, NULL, (xmlChar*)"iconList", NULL);
+
+  icon = xmlNewTextChild(iconlist, NULL, (xmlChar*)"icon", NULL);
+  bg_xml_append_child_node(icon, "mimetype", mimetype);
+
+  tmp_string = bg_sprintf("%d", width);
+  bg_xml_append_child_node(icon, "width", tmp_string);
+  free(tmp_string);
+
+  tmp_string = bg_sprintf("%d", height);
+  bg_xml_append_child_node(icon, "height", tmp_string);
+  free(tmp_string);
+
+  tmp_string = bg_sprintf("%d", depth);
+  bg_xml_append_child_node(icon, "depth", tmp_string);
+  free(tmp_string);
+  
+  bg_xml_append_child_node(icon, "url", url);
+  }
+
+/* Functions for upnp Clients */
+
+static char * get_url_base(const char * desc_url)
+  {
+  char * ret;
+  char * host;
+  int port = -1;
+  if(!bg_url_split(desc_url,
+                   NULL,
+                   NULL,
+                   NULL,
+                   &host,
+                   &port,
+                   NULL))
+    {
+    return NULL;
+    }
+  if(port == -1)
+    ret = bg_sprintf("http://%s", host);
+  else
+    ret = bg_sprintf("http://%s:%d", host, port);
+  free(host);
+  return ret;
+  }
+
+char * bg_upnp_device_description_get_url_base(const char * desc_url, xmlDocPtr doc)
+  {
+  xmlNodePtr root;
+  xmlNodePtr node;
+
+  root = bg_xml_find_doc_child(doc, "root");
+  if(!root)
+    goto fail;
+
+  node = bg_xml_find_node_child(root, "URLBase");
+  if(node)
+    return gavl_strdup(bg_xml_node_get_text_content(node));
+  else
+    return get_url_base(desc_url);
+  
+  
+  fail:
+  return NULL;
+  }
+
+static int check_device(xmlNodePtr node, const char * device, int version)
+  {
+  xmlNodePtr type_node;
+  int device_len;
+  const char * type;
+
+  device_len = strlen(device);
+  
+  type_node = bg_xml_find_node_child(node, "deviceType");
+  if(!type_node)
+    return 0;
+
+  type = bg_xml_node_get_text_content(type_node);
+  if(!type)
+    return 0;
+
+  if(strncmp(type, "urn:schemas-upnp-org:device:", 28))
+    return 0;
+
+  type += 28;
+
+  if(strncmp(type, device, device_len))
+    return 0;
+
+  type += device_len;
+
+  if(*type != ':')
+    return 0;
+  
+  if(atoi(type + 1) < version)
+    return 0;
+
+  return 1;
+  }
+
+xmlNodePtr bg_upnp_device_description_get_device_node(xmlDocPtr doc, const char * device, int version)
+  {
+  xmlNodePtr root;
+  xmlNodePtr dev_node = NULL;
+  xmlNodePtr list_node;
+  
+  root = bg_xml_find_doc_child(doc, "root");
+  if(!root)
+    goto fail;
+  
+  dev_node = bg_xml_find_node_child(root, "device");
+  
+  if(dev_node)
+    {
+    if(!check_device(dev_node, device, version))
+      dev_node = NULL;
+    }
+  
+  if(!dev_node)
+    {
+    /* Look for an embedded media server */
+    list_node = bg_xml_find_node_child(root, "deviceList");
+    if(!list_node)
+      goto fail;
+
+    while(1)
+      {
+      dev_node = bg_xml_find_next_node_child_by_name(list_node,
+                                                     dev_node, "device");
+      if(!dev_node || check_device(dev_node, device, version))
+        break;
+      }
+    }
+  
+  fail:
+  return dev_node;
+  }
+
+static int check_service(xmlNodePtr node, const char * service, int version)
+  {
+  xmlNodePtr type_node;
+  int service_len;
+  const char * type;
+
+  service_len = strlen(service);
+  
+  type_node = bg_xml_find_node_child(node, "serviceType");
+  if(!type_node)
+    return 0;
+
+  type = bg_xml_node_get_text_content(type_node);
+  if(!type)
+    return 0;
+
+  if(strncmp(type, "urn:schemas-upnp-org:service:", 29))
+    return 0;
+
+  type += 29;
+
+  if(strncmp(type, service, service_len))
+    return 0;
+
+  type += service_len;
+
+  if(*type != ':')
+    return 0;
+  
+  if(atoi(type + 1) < version)
+    return 0;
+
+  return 1;
+  }
+
+xmlNodePtr bg_upnp_device_description_get_service_node(xmlNodePtr dev_node, const char * service, int version)
+  {
+  xmlNodePtr list_node;
+  xmlNodePtr service_node = NULL;
+  
+  if(!(list_node = bg_xml_find_node_child(dev_node, "serviceList")))
+    goto fail;
+  
+  while(1)
+    {
+    service_node = bg_xml_find_next_node_child_by_name(list_node, service_node, "service");
+    if(!service_node || check_service(service_node, service, version))
+      break;
+    }
+  
+  fail:
+  return service_node;
+  }
+
+static char * make_url(const char * url, const char * base)
+  {
+  if(!strncasecmp(url, "http://", 7))
+    return gavl_strdup(url);
+  else if((base[strlen(base)-1] == '/') && (url[0] == '/'))
+    return bg_sprintf("%s%s", base, url+1);
+  else if((base[strlen(base)-1] == '/') || (url[0] == '/'))
+    return bg_sprintf("%s%s", base, url);
+  else
+    return bg_sprintf("%s/%s", base, url);
+  }
+
+char *
+bg_upnp_device_description_get_control_url(xmlNodePtr service_node,
+                                           const char * url_base)
+  {
+  const char * control_url_c;
+  xmlNodePtr node;
+
+  node = bg_xml_find_node_child(service_node, "controlURL");
+  if(!node)
+    return NULL;
+
+  control_url_c = bg_xml_node_get_text_content(node);
+  return make_url(control_url_c, url_base);
+  }
+
+char *
+bg_upnp_device_description_get_service_description(xmlNodePtr service_node,
+                                                   const char * url_base)
+  {
+  const char * control_url_c;
+  xmlNodePtr node;
+
+  node = bg_xml_find_node_child(service_node, "SCPDURL");
+  if(!node)
+    return NULL;
+
+  control_url_c = bg_xml_node_get_text_content(node);
+  return make_url(control_url_c, url_base);
+  }
+
+int bg_upnp_service_description_has_action(xmlDocPtr desc, const char * action)
+  {
+  xmlNodePtr action_list;
+  xmlNodePtr node = NULL;
+  xmlNodePtr name;
+
+  if(!(action_list = bg_xml_find_doc_child(desc, "scpd")) ||
+     !(action_list = bg_xml_find_node_child(action_list, "actionList")))
+    return 0;
+  
+  while((node = bg_xml_find_next_node_child_by_name(action_list, node, "action")))
+    {
+    if((name = bg_xml_find_node_child(node, "name")) &&
+       !strcmp(action, bg_xml_node_get_text_content(name)))
+      return 1;
+    }
+  return 0;
+  }

gmerlin-4256.tar.gz/lib/upnp/didl.c Added

@@ -0,0 +1,223 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/devicepriv.h>
+#include <upnp/mediaserver.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <gmerlin/utils.h>
+#include <upnp/didl.h>
+
+xmlDocPtr bg_didl_create(int gmerlin_ns)
+  {
+  xmlDocPtr doc;  
+  xmlNodePtr didl;
+  
+  doc = xmlNewDoc((xmlChar*)"1.0");
+  didl = xmlNewDocRawNode(doc, NULL, (xmlChar*)"DIDL-Lite", NULL);
+  xmlDocSetRootElement(doc, didl);
+
+  xmlNewNs(didl,
+           (xmlChar*)"http://purl.org/dc/elements/1.1/",
+           (xmlChar*)"dc");
+
+  xmlNewNs(didl,
+           (xmlChar*)"urn:schemas-upnp-org:metadata-1-0/upnp/",
+           (xmlChar*)"upnp");
+  xmlNewNs(didl,
+           (xmlChar*)"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/",
+           NULL);
+
+  if(gmerlin_ns)
+    xmlNewNs(didl,
+             (xmlChar*)"http://gmerlin.sourceforge.net/",
+             (xmlChar*)"gmerlin");
+  
+  return doc;
+  }
+
+xmlNodePtr bg_didl_add_item(xmlDocPtr doc)
+  {
+  xmlNodePtr parent = bg_xml_find_next_doc_child(doc, NULL);
+  xmlNodePtr node;
+  node = xmlNewTextChild(parent, NULL, (xmlChar*)"item", NULL);
+  xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+  xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
+  return node;
+  }
+
+xmlNodePtr bg_didl_add_container(xmlDocPtr doc)
+  {
+  xmlNodePtr parent = bg_xml_find_next_doc_child(doc, NULL);
+  xmlNodePtr node = xmlNewTextChild(parent, NULL, (xmlChar*)"container", NULL);
+  xmlAddChild(parent, BG_XML_NEW_TEXT("\n"));
+  xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
+  return node;
+  }
+
+xmlNodePtr bg_didl_add_element(xmlDocPtr doc,
+                                   xmlNodePtr node,
+                                   const char * name,
+                                   const char * value)
+  {
+  xmlNodePtr ret;
+  char * pos;
+  char buf[128];
+  strncpy(buf, name, 127);
+  buf[127] = '\0';
+
+  pos = strchr(buf, ':');
+  if(pos)
+    {
+    xmlNsPtr ns;
+    *pos = '\0';
+    pos++;
+    ns = xmlSearchNs(doc, node, (const xmlChar *)buf);
+    ret= xmlNewTextChild(node, ns, (const xmlChar*)pos,
+                           (const xmlChar*)value);
+    }
+  else  
+    ret= xmlNewTextChild(node, NULL, (const xmlChar*)name,
+                           (const xmlChar*)value);
+  xmlAddChild(node, BG_XML_NEW_TEXT("\n"));
+  return ret;
+  }
+
+void bg_didl_set_class(xmlDocPtr doc,
+                           xmlNodePtr node,
+                           const char * klass)
+  {
+  bg_didl_add_element(doc, node, "upnp:class", klass);
+  }
+
+void bg_didl_set_title(xmlDocPtr doc,
+                           xmlNodePtr node,
+                           const char * title)
+  {
+  bg_didl_add_element(doc, node, "dc:title", title);
+  }
+
+int bg_didl_filter_element(const char * name, char ** filter)
+  {
+  int i = 0;
+  const char * pos;
+  if(!filter)
+    return 1;
+
+  while(filter[i])
+    {
+    if(!strcmp(filter[i], name))
+      return 1;
+
+    // res@size implies res
+    if((pos = strchr(filter[i], '@')) &&
+       (pos - filter[i] == strlen(name)) &&
+       !strncmp(filter[i], name, pos - filter[i]))
+      return 1;
+     i++;
+    }
+  return 0;
+  }
+
+int bg_didl_filter_attribute(const char * element, const char * attribute, char ** filter)
+  {
+  int i = 0;
+  int allow_empty = 0;
+  int len = strlen(element);
+  
+  if(!filter)
+    return 1;
+
+  if(!strcmp(element, "item") ||
+     !strcmp(element, "container"))
+    allow_empty = 1;
+  
+  while(filter[i])
+    {
+    if(!strncmp(filter[i], element, len) &&
+       (*(filter[i] + len) == '@') &&
+       !strcmp(filter[i] + len + 1, attribute))
+      return 1;
+
+    if(allow_empty &&
+       (*(filter[i]) == '@') &&
+       !strcmp(filter[i] + 1, attribute))
+      return 1;
+      
+    i++;
+    }
+  return 0;
+  }
+
+xmlNodePtr bg_didl_add_element_string(xmlDocPtr doc,
+                                    xmlNodePtr node,
+                                    const char * name,
+                                    const char * content, char ** filter)
+  {
+  if(!bg_didl_filter_element(name, filter))
+    return NULL;
+  return bg_didl_add_element(doc, node, name, content);
+  }
+
+xmlNodePtr bg_didl_add_element_int(xmlDocPtr doc,
+                                       xmlNodePtr node,
+                                       const char * name,
+                                       int64_t content, char ** filter)
+  {
+  char buf[128];
+  if(!bg_didl_filter_element(name, filter))
+    return NULL;
+  snprintf(buf, 127, "%"PRId64, content);
+  return bg_didl_add_element(doc, node, name, buf);
+  }
+
+/* Filtering must be done by the caller!! */
+void bg_didl_set_attribute_int(xmlNodePtr node, const char * name, int64_t val)
+  {
+  char buf[128];
+  snprintf(buf, 127, "%"PRId64, val);
+  BG_XML_SET_PROP(node, name, buf);
+  }
+
+void bg_didl_set_date(xmlDocPtr didl, xmlNodePtr node,
+                             const bg_db_date_t * date_c, char ** filter)
+  {
+  bg_db_date_t date;
+  char date_string[BG_DB_DATE_STRING_LEN];
+  
+  if(date_c->year == 9999)
+    return;
+  
+  if(!bg_didl_filter_element("dc:date", filter))
+    return;
+  
+  memcpy(&date, date_c, sizeof(date));
+  if(!date.day)
+    date.day = 1;
+  if(!date.month)
+    date.month = 1;
+
+  bg_db_date_to_string(&date, date_string);
+  
+  bg_didl_add_element(didl, node, "dc:date", date_string);
+  }

gmerlin-4256.tar.gz/lib/upnp/mediaserver.c Added

@@ -0,0 +1,65 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <upnp/devicepriv.h>
+#include <upnp/mediaserver.h>
+#include <stdlib.h>
+
+static void destroy_func(void * data)
+  {
+  bg_mediaserver_t * priv = data;
+  free(priv);
+  }
+
+bg_upnp_device_t *
+bg_upnp_create_media_server(bg_socket_address_t * addr,
+                            uuid_t uuid,
+                            const char * name,
+                            const bg_upnp_icon_t * icons,
+                            bg_db_t * db)
+  {
+  bg_mediaserver_t * priv;
+  bg_upnp_device_t * ret;
+  ret = calloc(1, sizeof(*ret));
+
+  priv = calloc(1, sizeof(*priv));
+
+  ret->destroy = destroy_func;
+  ret->priv = priv;
+  priv->db = db;  
+
+  bg_upnp_device_init(ret, addr, uuid, name, "MediaServer", 1, 2,
+                      "Gmerlin media server", 
+                      "Gmerlin media server",
+                      icons);
+
+  bg_upnp_service_init_content_directory(&ret->services[0],
+                                         "cd", db);
+
+  bg_upnp_service_init_connection_manager(&ret->services[1],
+                                          "cm");
+  
+  //  bg_upnp_service_init(&ret->services[1], "cm", "ConnectionManager", 1);
+  
+  bg_upnp_device_create_common(ret);
+  return ret;
+  }
+

gmerlin-4256.tar.gz/lib/upnp/service.c Added

@@ -0,0 +1,141 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+//#include <upnp_service.h>
+#include <upnp/devicepriv.h>
+
+#include <gmerlin/utils.h>
+#include <string.h>
+
+int
+bg_upnp_service_start(bg_upnp_service_t * s)
+  {
+  int i, idx;
+  
+  /* Get the related state variables of all action arguments */
+  if(!bg_upnp_service_desc_resolve_refs(&s->desc))
+    return 0;
+  
+  /* Create XML Description */
+  s->description = bg_upnp_service_desc_2_xml(&s->desc);
+
+  /* Get evented variables */
+  for(i = 0; i < s->desc.num_sv; i++)
+    {
+    if(s->desc.sv[i].flags & BG_UPNP_SV_EVENT)
+      s->num_event_vars++;
+    }
+  s->event_vars = calloc(s->num_event_vars, sizeof(*s->event_vars));
+
+  idx = 0;
+  for(i = 0; i < s->desc.num_sv; i++)
+    {
+    if(s->desc.sv[i].flags & BG_UPNP_SV_EVENT)
+      {
+      s->event_vars[idx].sv = &s->desc.sv[i];
+      idx++;
+      }
+    }
+
+  /* Get the maximum number of input- and output args so we can
+     allocate our request structure */
+
+  for(i = 0; i < s->desc.num_sa; i++)
+    {
+    if(s->req.args_in_alloc < s->desc.sa[i].num_args_in)
+      s->req.args_in_alloc = s->desc.sa[i].num_args_in;
+    
+    if(s->req.args_out_alloc < s->desc.sa[i].num_args_out)
+      s->req.args_out_alloc = s->desc.sa[i].num_args_out;
+    }
+  
+  s->req.args_in  = calloc(s->req.args_in_alloc, sizeof(*s->req.args_in));
+  s->req.args_out = calloc(s->req.args_out_alloc, sizeof(*s->req.args_out));
+  
+  return 1;
+  }
+
+void bg_upnp_service_init(bg_upnp_service_t * ret,
+                          const char * name, const char * type, int version)
+  {
+  ret->name = gavl_strdup(name);
+  ret->type = gavl_strdup(type);
+  ret->version = version;
+  }
+
+int
+bg_upnp_service_handle_request(bg_upnp_service_t * s, int fd,
+                               const char * method,
+                               const char * path,
+                               const gavl_metadata_t * header)
+  {
+  if(!strcmp(path, "desc.xml"))
+    {
+    /* Send service description */
+    bg_upnp_device_send_description(header, s->dev, fd, s->description);
+    return 1;
+    }
+  else if(!strcmp(path, "control"))
+    {
+    /* Service control */
+    bg_upnp_service_handle_action_request(s, fd, method, header);
+    return 1;
+    }
+  else if(!strcmp(path, "event"))
+    {
+    /* Service events */
+    bg_upnp_service_handle_event_request(s, fd, method, header);
+    return 1;
+    }
+  return 0; // 404
+  }
+
+void bg_upnp_service_free(bg_upnp_service_t * s)
+  {
+  int i;
+  if(s->name)
+    free(s->name);
+  if(s->type)
+    free(s->type);
+  bg_upnp_service_desc_free(&s->desc);
+  if(s->description)
+    free(s->description);
+
+  for(i = 0; i < s->num_es; i++)
+    {
+    if(s->es[i].url)
+      free(s->es[i].url);
+    }
+
+  for(i = 0; i < s->num_event_vars; i++)
+    bg_upnp_sv_val_free(&s->event_vars[i].val);
+  if(s->event_vars)
+    free(s->event_vars);
+  
+
+  if(s->es)
+    free(s->es);
+
+  if(s->req.args_in)
+    free(s->req.args_in);
+  if(s->req.args_out)
+    free(s->req.args_out);
+  }

gmerlin-4256.tar.gz/lib/upnp/service_action.c Added

@@ -0,0 +1,214 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/devicepriv.h>
+#include <string.h>
+
+#include <gmerlin/upnp/soap.h>
+
+#include <gmerlin/utils.h>
+#include <gmerlin/http.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "upnp.action"
+
+// #define DUMP_SOAP
+
+static const bg_upnp_soap_arg_t *
+get_in_arg_by_id(bg_upnp_soap_request_t * req,
+                 int id)
+  {
+  int i;
+  for(i = 0; i < req->num_args_in; i++)
+    {
+    if(req->args_in[i].desc->id == id)
+      return &req->args_in[i];
+    }
+  bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No input argument for ID %d", id);
+  return NULL;
+  }
+
+int
+bg_upnp_service_get_arg_in_int(bg_upnp_soap_request_t * req,
+                               int id)
+  {
+  const bg_upnp_soap_arg_t * arg = get_in_arg_by_id(req, id);
+  if(arg)
+    return arg->val.i;
+  return 0;
+  }
+
+const char *
+bg_upnp_service_get_arg_in_string(bg_upnp_soap_request_t * req,
+                                  int id)
+  {
+  const bg_upnp_soap_arg_t * arg = get_in_arg_by_id(req, id);
+  if(arg)
+    return arg->val.s;
+  return NULL;
+  }
+
+static bg_upnp_soap_arg_t *
+get_out_arg_by_id(bg_upnp_soap_request_t * req,
+                 int id)
+  {
+  int i;
+  for(i = 0; i < req->num_args_out; i++)
+    {
+    if(req->args_out[i].desc->id == id)
+      return &req->args_out[i];
+    }
+  bg_log(BG_LOG_ERROR, LOG_DOMAIN, "No output argument for ID %d", id);
+  return NULL;
+  }
+
+
+void
+bg_upnp_service_set_arg_out_int(bg_upnp_soap_request_t * req,
+                                int id, int val)
+  {
+  bg_upnp_soap_arg_t * arg = get_out_arg_by_id(req, id);
+  if(arg)
+    arg->val.i = val;
+  }
+
+void
+bg_upnp_service_set_arg_out_string(bg_upnp_soap_request_t * req,
+                                   int id, char * val)
+  {
+  bg_upnp_soap_arg_t * arg = get_out_arg_by_id(req, id);
+  if(arg)
+    arg->val.s = val;
+  }
+
+#define TIMEOUT 500
+
+static void cleanup_string(uint8_t * data,  int *len1)
+  {
+  int i = 0;
+  int len = *len1;
+  
+  while(i < len)
+    {
+    if((data[i] < 0x20) &&
+       (data[i] != '\r') &&
+       (data[i] != '\n') &&
+       (data[i] != '\0'))
+      {
+      if(i < len - 1)
+        memmove(data + i, data + i + 1, len - 1 - i);
+      len--;
+      }
+    else
+      i++;
+    }
+  *len1 = len;
+  }
+
+int
+bg_upnp_service_handle_action_request(bg_upnp_service_t * s, int fd,
+                                      const char * method,
+                                      const gavl_metadata_t * header)
+  {
+  gavl_metadata_t res;
+  int content_length = -1;
+  char * buf = NULL;
+  int ret = 0;
+  int len;
+  
+  gavl_metadata_init(&res);
+  
+  if(!strcmp(method, "POST"))
+    {
+    if(!gavl_metadata_get_int_i(header, "CONTENT-LENGTH", &content_length))
+      {
+      /* Error */
+      goto fail;
+      }
+
+    buf = malloc(content_length + 1);
+    if(bg_socket_read_data(fd, (uint8_t*)buf,
+                           content_length, TIMEOUT) < content_length)
+      {
+      /* Error */
+      goto fail;
+      }
+    buf[content_length] = '\0';
+
+    len = content_length + 1;
+    cleanup_string((uint8_t*)buf, &len);
+    content_length = len - 1;
+    
+#ifdef DUMP_SOAP
+    fprintf(stderr, "Got SOAP request\n");
+    gavl_metadata_dump(header, 0);
+    // fprintf(stderr, "%s\n", buf);
+    gavl_hexdump((uint8_t*)buf, content_length, 16);
+#endif
+    if(!bg_upnp_soap_request_from_xml(s, buf, content_length, header))
+      {
+      /* Error */
+      goto fail;
+      }
+    
+    if(!s->req.action->func(s))
+      {
+      /* Error */
+      goto fail;
+      }
+    
+    free(buf);
+    buf = bg_upnp_soap_response_to_xml(s, &content_length);
+    bg_http_response_init(&res, "HTTP/1.1", 200, "OK");
+    gavl_metadata_set_int(&res, "CONTENT-LENGTH", content_length);
+    gavl_metadata_set(&res, "CONTENT-TYPE", "text/xml; charset=\"utf-8\"");
+
+    bg_http_check_keepalive(header, &res);
+    
+    // gavl_metadata_set(&res, "CONNECTION", "CLOSE");
+    bg_http_header_set_date(&res, "DATE");
+    bg_http_header_set_empty_var(&res, "EXT");
+    gavl_metadata_set(&res, "SERVER", s->dev->server_string);
+#ifdef DUMP_SOAP
+    fprintf(stderr, "Sending SOAP response\n");
+    gavl_metadata_dump(&res, 0);
+    fprintf(stderr, "%s\n", buf);
+#endif
+    if(bg_http_response_write(fd, &res))
+      bg_socket_write_data(fd, (uint8_t*)buf, content_length);
+    }
+  else
+    {
+    
+    }
+
+  ret = 1;
+  
+  fail:
+  
+  bg_upnp_soap_request_cleanup(&s->req);
+  
+  if(buf)
+    free(buf);
+  
+  gavl_metadata_free(&res);
+  return ret;
+  }

gmerlin-4256.tar.gz/lib/upnp/service_event.c Added

@@ -0,0 +1,384 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/devicepriv.h>
+
+#include <gmerlin/utils.h>
+#include <gmerlin/http.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "upnp.event"
+
+#include <string.h>
+#include <unistd.h> // close
+
+#define CLIENT_TIMEOUT 500
+
+static char * create_event(bg_upnp_service_t * s, int * len)
+  {
+  char * ret;
+  int i;
+  xmlNodePtr propset;
+  xmlNodePtr node;
+  
+  xmlNsPtr ns;
+  xmlDocPtr doc = xmlNewDoc((xmlChar*)"1.0");
+  propset = xmlNewDocRawNode(doc, NULL, (xmlChar*)"propertyset", NULL);
+  xmlDocSetRootElement(doc, propset);
+  ns = xmlNewNs(propset,
+                (xmlChar*)"urn:schemas-upnp-org:event-1-0",
+                (xmlChar*)"e");
+  xmlSetNs(propset, ns);
+  
+  for(i = 0; i < s->num_event_vars; i++)
+    {
+    node = xmlNewChild(propset, ns, (xmlChar*)"property", NULL);
+    switch(s->event_vars[i].sv->type)
+      {
+      case BG_UPNP_SV_INT4:
+        {
+        char buf[16];
+        snprintf(buf, 16, "%d", s->event_vars[i].val.i);
+        node = xmlNewChild(node, NULL, (xmlChar*)s->event_vars[i].sv->name, (xmlChar*)buf);
+        xmlSetNs(node, NULL);
+        }
+        break;
+      case BG_UPNP_SV_STRING:
+        node = xmlNewChild(node, NULL, (xmlChar*)s->event_vars[i].sv->name,
+                    (xmlChar*)(s->event_vars[i].val.s ?
+                               s->event_vars[i].val.s : ""));
+        xmlSetNs(node, NULL);
+        break;
+      }
+    }
+  ret = bg_xml_save_to_memory(doc);
+  *len = strlen(ret);
+  xmlFreeDoc(doc);
+  return ret;
+  }
+
+static int send_event(bg_upnp_event_subscriber_t * es,
+                      char * event, int len)
+  {
+  gavl_metadata_t m;
+  bg_socket_address_t * addr = NULL;
+  char * path = NULL;
+  char * host = NULL;
+  int port;
+  int fd = -1;
+  char * tmp_string;
+  int result = 0;
+  
+  gavl_metadata_init(&m);
+  
+  /* Parse URL */
+  if(!bg_url_split(es->url,
+                   NULL, NULL, NULL,
+                   &host, &port, &path))
+    goto fail;
+  
+  addr = bg_socket_address_create();
+
+  if(!bg_socket_address_set(addr, host, port, SOCK_STREAM))
+    goto fail;
+  
+  if((fd = bg_socket_connect_inet(addr, 500)) < 0)
+    goto fail;
+
+  if(path)
+    bg_http_request_init(&m, "NOTIFY", path, "HTTP/1.1");
+  else
+    bg_http_request_init(&m, "NOTIFY", "/", "HTTP/1.1");
+    
+  tmp_string = bg_sprintf("%s:%d", host, port);
+  gavl_metadata_set(&m, "HOST", tmp_string);
+  free(tmp_string);
+  
+  gavl_metadata_set(&m, "CONTENT-TYPE", "text/xml");
+  gavl_metadata_set_int(&m, "CONTENT-LENGTH", len);
+  gavl_metadata_set(&m, "NT", "upnp:event");
+  gavl_metadata_set(&m, "NTS", "upnp:propchange");
+  tmp_string = bg_sprintf("uuid:%s", es->uuid);  
+  gavl_metadata_set(&m, "SID", tmp_string);
+  free(tmp_string);
+  gavl_metadata_set_long(&m, "SEQ", es->key++);
+
+  //  fprintf(stderr, "Sending event: %s (%d %d)\n", es->url, len, strlen(event));
+  //  gavl_metadata_dump(&m, 0);
+  //  fprintf(stderr, "%s\n", event);
+  
+  if(!bg_http_request_write(fd, &m))
+    {
+    goto fail;
+    }
+  if(!bg_socket_write_data(fd, (uint8_t*)event, len))
+    {
+    goto fail;
+    }
+  gavl_metadata_free(&m);
+  gavl_metadata_init(&m);
+  
+  if(!bg_http_response_read(fd, &m, CLIENT_TIMEOUT))
+    goto fail;
+  //  fprintf(stderr, "Got response:\n");
+  //  gavl_metadata_dump(&m, 0);
+
+  if(bg_http_response_get_status_int(&m) != 200)
+    goto fail;
+  result = 1;
+  fail:
+
+  gavl_metadata_free(&m);
+  if(path)
+    free(path);
+  if(host)
+    free(host);
+  if(fd >= 0)
+    close(fd);
+  if(addr)
+    bg_socket_address_destroy(addr);
+  
+  return result;
+  }
+
+static int get_timeout_seconds(const char * timeout, int * ret)
+  {
+  if(!strncmp(timeout, "Second-", 7))
+    {
+    *ret = atoi(timeout + 7);
+    return 1;
+    }
+  else if(!strcmp(timeout, "infinite"))
+    {
+    *ret = 1800; // We don't like infinite subscriptions
+    return 1;
+    }
+  return 0;
+  }
+
+static int add_subscription(bg_upnp_service_t * s, int fd,
+                            const char * callback, const char * timeout)
+  {
+  const char * start, *end;
+  uuid_t uuid;
+  bg_upnp_event_subscriber_t * es;
+  gavl_metadata_t res;
+  int seconds;
+  int result = 0;
+  char * event = NULL;
+  int len;
+  
+  gavl_metadata_init(&res);
+
+  if(s->num_es + 1 > s->es_alloc)
+    {
+    s->es_alloc += 8;
+    s->es = realloc(s->es, s->es_alloc * sizeof(*s->es));
+    memset(s->es + s->num_es, 0, (s->es_alloc - s->num_es) * sizeof(*s->es));
+    }
+  es = s->es + s->num_es;
+  memset(es, 0, sizeof(*es));
+  
+  /* UUID */
+  uuid_generate(uuid);
+  uuid_unparse(uuid, es->uuid);
+  
+  /* Timeout */
+
+  if(!get_timeout_seconds(timeout, &seconds))
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 400, "Bad Request");
+    goto fail;
+    }
+  es->expire_time = gavl_timer_get(s->dev->timer) + seconds * GAVL_TIME_SCALE;
+  
+  /* Callback */
+  start = strchr(callback, '<');
+  if(!start)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 412, "Precondition Failed");
+    goto fail;
+    }
+  start++;
+  end = strchr(callback, '>');
+  if(!end)
+    {
+    bg_http_response_init(&res, "HTTP/1.1", 412, "Precondition Failed");
+    goto fail;
+    }
+  es->url = gavl_strndup(start, end);
+
+  bg_http_response_init(&res, "HTTP/1.1", 200, "OK");
+  gavl_metadata_set(&res, "SERVER", s->dev->server_string);
+  gavl_metadata_set_nocpy(&res, "SID", bg_sprintf("uuid:%s", es->uuid));
+  gavl_metadata_set_nocpy(&res, "TIMEOUT", bg_sprintf("Second-%d", seconds));
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Got new event subscription: uuid: %s, url: %s, timeout: %d",
+         es->uuid, es->url, seconds);
+
+  bg_http_response_write(fd, &res);  
+
+  event = create_event(s, &len);
+  //  fprintf(stderr, "%s", event);
+
+  send_event(es, event, len);
+
+  result = 1;
+  
+  fail:
+
+  if(!result)
+    {
+    if(es->url)
+      free(es->url);
+    bg_http_response_write(fd, &res);
+    }
+  else
+    s->num_es++;
+
+  if(event)
+    free(event);
+  gavl_metadata_free(&res);
+  return result;
+  }
+
+static int find_subscription(bg_upnp_service_t * s, const char * sid)
+  {
+  int i;
+  for(i = 0; i < s->num_es; i++)
+    {
+    if(!strcmp(s->es[i].uuid, sid + 5))
+      return i;
+    }
+  return -1;
+  }
+
+static void delete_subscription(bg_upnp_service_t * s, int idx)
+  {
+  if(s->es[idx].url)
+    free(s->es[idx].url);
+  if(idx < s->num_es - 1)
+    memmove(s->es + idx, s->es + idx + 1, (s->num_es - 1 - idx) * sizeof(*s->es));
+  s->num_es--;
+  }
+
+int
+bg_upnp_service_handle_event_request(bg_upnp_service_t * s, int fd,
+                                     const char * method,
+                                     const gavl_metadata_t * header)
+  {
+  gavl_metadata_t res;
+  const char * nt;
+  const char * callback;
+  const char * timeout;
+  const char * sid;
+  
+  nt =       gavl_metadata_get(header, "NT");
+  callback = gavl_metadata_get(header, "CALLBACK");
+  timeout =  gavl_metadata_get(header, "TIMEOUT");
+  sid =      gavl_metadata_get(header, "SID");
+
+  gavl_metadata_init(&res);
+  
+  if(!strcmp(method, "SUBSCRIBE"))
+    {
+    if(nt && callback && !sid) // New subscription
+      {
+      if(!strcmp(nt, "upnp:event"))
+        {
+        add_subscription(s, fd, callback, timeout);
+        return 1;
+        }
+      else
+        {
+        bg_http_response_init(&res, "HTTP/1.1", 412, "Precondition Failed");
+        }
+      }
+    else if(!nt && !callback && sid) // Renew subscription
+      {
+      int seconds = 1800;
+      int idx = find_subscription(s, sid);
+
+      if(idx < 0)
+        bg_http_response_init(&res, "HTTP/1.1", 412, "Precondition Failed");
+      else if(timeout && !get_timeout_seconds(timeout, &seconds))
+        bg_http_response_init(&res, "HTTP/1.1", 400, "Bad Request");
+      else
+        {
+        bg_http_response_init(&res, "HTTP/1.1", 200, "Ok");
+        s->es[idx].expire_time = gavl_timer_get(s->dev->timer) + seconds * GAVL_TIME_SCALE;
+        bg_log(BG_LOG_INFO, LOG_DOMAIN, "Renewing subscription: uuid: %s, url: %s",
+               s->es[idx].uuid, s->es[idx].url);
+        }
+      }
+    else
+      {
+      bg_http_response_init(&res, "HTTP/1.1", 400, "Bad Request");
+      }
+    }
+  else if(!strcmp(method, "UNSUBSCRIBE"))
+    {
+    if(sid)
+      {
+      int idx = find_subscription(s, sid);
+      if(idx >= 0)
+        {
+        bg_log(BG_LOG_INFO, LOG_DOMAIN, "Got unsubscription: uuid: %s, url: %s",
+               s->es[idx].uuid, s->es[idx].url);
+        delete_subscription(s, idx);
+        bg_http_response_init(&res, "HTTP/1.1", 200, "Ok");
+        }
+      else
+        bg_http_response_init(&res, "HTTP/1.1", 412, "Precondition Failed");
+      }
+    else
+      bg_http_response_init(&res, "HTTP/1.1", 400, "Bad Request");
+    }
+  else
+    bg_http_response_init(&res, "HTTP/1.1", 400, "Bad Request");
+  
+  bg_http_response_write(fd, &res);
+  gavl_metadata_free(&res);
+  return 1;
+  }
+
+int
+bg_upnp_service_remove_expired_subsriptions(bg_upnp_service_t * s,
+                                            gavl_time_t current_time)
+  {
+  int i = 0;
+  int ret = 0;
+  
+  while(i < s->num_es)
+    {
+    //    fprintf(stderr, "Checking subscription: %"PRId64" %"PRId64"\n",
+    //            s->es[i].expire_time, current_time);
+    if(s->es[i].expire_time < current_time)
+      {
+      bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing expired subscription %s",
+             s->es[i].uuid);
+      delete_subscription(s, i);    
+      ret++;
+      }
+    else
+      i++;
+    }
+  return ret;
+  }

gmerlin-4256.tar.gz/lib/upnp/servicedesc.c Added

@@ -0,0 +1,350 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <upnp/servicepriv.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "upnp.servicedesc"
+
+#include <string.h>
+
+
+
+/* Values */
+
+char * bg_upnp_val_to_string(bg_upnp_sv_type_t type,
+                             const bg_upnp_sv_val_t * val)
+  {
+  switch(type)
+    {
+    case BG_UPNP_SV_INT4:
+      return bg_sprintf("%d", val->i);
+      break;
+    case BG_UPNP_SV_STRING:
+      return gavl_strdup(val->s);
+      break;
+    }
+  return NULL;
+  }
+
+int bg_upnp_string_to_val(bg_upnp_sv_type_t type,
+                          const char * str, bg_upnp_sv_val_t * val)
+  {
+  switch(type)
+    {
+    case BG_UPNP_SV_INT4:
+      {
+      char * rest;
+      val->i = strtol(str, &rest, 10);
+      if(*rest != '\0')
+        return 0;
+      return 1;
+      }
+      break;
+    case BG_UPNP_SV_STRING:
+      val->s = gavl_strrep(val->s, str);
+      return 1;
+      break;
+    }
+  return 0;
+  }
+
+void bg_upnp_sv_val_free(bg_upnp_sv_val_t * val)
+  {
+  if(val->s)
+    {
+    free(val->s);
+    val->s = NULL;
+    }
+  }
+
+void bg_upnp_sv_val_copy(bg_upnp_sv_type_t type,
+                         bg_upnp_sv_val_t * dst,
+                         const bg_upnp_sv_val_t * src)
+  {
+   switch(type)
+    {
+    case BG_UPNP_SV_INT4:
+      dst->i = src->i;
+      break;
+    case BG_UPNP_SV_STRING:
+      dst->s = gavl_strrep(dst->s, src->s);
+      break;
+    }
+  }
+
+/* State variable */
+
+void bg_upnp_sv_desc_set_default(bg_upnp_sv_desc_t * d,
+                                 bg_upnp_sv_val_t * val)
+  {
+  bg_upnp_sv_val_copy(d->type, &d->def, val);
+  d->flags |= BG_UPNP_SV_HAS_DEFAULT;
+  }
+
+void bg_upnp_sv_desc_set_range(bg_upnp_sv_desc_t * d,
+                               bg_upnp_sv_val_t * min,
+                               bg_upnp_sv_val_t * max,
+                               bg_upnp_sv_val_t * step)
+  {
+  bg_upnp_sv_val_copy(d->type, &d->range.min, min); 
+  bg_upnp_sv_val_copy(d->type, &d->range.max, max); 
+  bg_upnp_sv_val_copy(d->type, &d->range.step, step); 
+  d->flags |= BG_UPNP_SV_HAS_RANGE;
+  }
+
+void bg_upnp_sv_desc_add_allowed(bg_upnp_sv_desc_t * d,
+                                 bg_upnp_sv_val_t * val)
+  {
+  if(d->num_allowed + 1 > d->allowed_alloc)
+    {
+    d->allowed_alloc += 8;
+    d->allowed = realloc(d->allowed, d->allowed_alloc * sizeof(*d->allowed));
+    memset(d->allowed + d->num_allowed, 0, (d->allowed_alloc - d->num_allowed) * sizeof(*d->allowed));
+    }
+  bg_upnp_sv_val_copy(d->type, d->allowed + d->num_allowed, val);
+  d->num_allowed++;
+  }
+
+void bg_upnp_sv_desc_free(bg_upnp_sv_desc_t * d)
+  {
+  bg_upnp_sv_val_free(&d->def);
+  bg_upnp_sv_val_free(&d->range.min);
+  bg_upnp_sv_val_free(&d->range.max);
+  bg_upnp_sv_val_free(&d->range.step);
+  free(d->name);
+  if(d->allowed)
+    {
+    int i;
+    for(i = 0; i < d->num_allowed; i++)
+      bg_upnp_sv_val_free(&d->allowed[i]);
+    free(d->allowed);
+    }
+  }
+
+/* Argument for an action */
+
+void bg_upnp_arg_desc_free(bg_upnp_sa_arg_desc_t * d)
+  {
+  if(d->name)
+    free(d->name);
+  if(d->rsv_name)
+    free(d->rsv_name);
+  }
+
+/* Description of a service action */
+
+static void add_sa_arg(bg_upnp_sa_arg_desc_t ** argp, int * nump, int * allocp,
+                       const char * name,
+                       const char * rsv_name, int flags, int id)
+  {
+  int num = *nump;
+  int alloc = *allocp;
+  bg_upnp_sa_arg_desc_t * arg = *argp;
+
+  if(num + 1 > alloc)
+    {
+    alloc += 8;
+    arg = realloc(arg, alloc * sizeof(*arg));
+    memset(arg + num, 0, (alloc - num)*sizeof(*arg));
+    }
+  arg[num].name = gavl_strdup(name);
+  arg[num].rsv_name = gavl_strdup(rsv_name);
+  arg[num].flags = flags;
+  arg[num].id = id;
+  
+  num++;
+
+  *nump = num;
+  *allocp = alloc;
+  *argp = arg;
+  }
+
+static void free_sa_args(bg_upnp_sa_arg_desc_t * arg, int num)
+  {
+  if(arg)
+    {
+    int i;
+    for(i = 0; i < num; i++)
+      bg_upnp_arg_desc_free(arg + i) ;
+    free(arg);
+    }
+  }
+
+void
+bg_upnp_sa_desc_add_arg_in(bg_upnp_sa_desc_t * d, const char * name,
+                           const char * rsv_name, int flags, int id)
+  {
+  add_sa_arg(&d->args_in, &d->num_args_in, &d->args_in_alloc,
+             name, rsv_name, flags, id);
+  }
+
+void
+bg_upnp_sa_desc_add_arg_out(bg_upnp_sa_desc_t * d, const char * name,
+                            const char * rsv_name, int flags, int id)
+  {
+  add_sa_arg(&d->args_out, &d->num_args_out, &d->args_out_alloc,
+             name, rsv_name, flags, id);
+  }
+
+void bg_upnp_sa_desc_free(bg_upnp_sa_desc_t * d)
+  {
+  if(d->name)
+    free(d->name);
+  free_sa_args(d->args_in, d->num_args_in);
+  free_sa_args(d->args_out, d->num_args_out);
+  }
+
+static const bg_upnp_sa_arg_desc_t *
+sa_arg_by_name(const bg_upnp_sa_arg_desc_t * args,
+               int num, const char * name)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    {
+    if(!strcmp(args[i].name, name))
+      return &args[i];
+    }
+  return NULL;
+  }
+
+const bg_upnp_sa_arg_desc_t *
+bg_upnp_sa_desc_in_arg_by_name(const bg_upnp_sa_desc_t * d, const char * name)
+  {
+  return sa_arg_by_name(d->args_in, d->num_args_in, name);
+  }
+
+const bg_upnp_sa_arg_desc_t *
+bg_upnp_sa_desc_out_arg_by_name(const bg_upnp_sa_desc_t * d, const char * name)
+  {
+  return sa_arg_by_name(d->args_out, d->num_args_out, name);
+  }
+
+/* Service description */
+
+// Add state variable
+bg_upnp_sv_desc_t *
+bg_upnp_service_desc_add_sv(bg_upnp_service_desc_t * d, const char * name,
+                            int flags, bg_upnp_sv_type_t type)
+  {
+  bg_upnp_sv_desc_t * ret;
+  if(d->num_sv + 1 > d->sv_alloc)
+    {
+    d->sv_alloc += 8;
+    d->sv = realloc(d->sv, d->sv_alloc * sizeof(*d->sv));
+    memset(d->sv + d->num_sv, 0, (d->sv_alloc - d->num_sv) * sizeof(*d->sv));
+    }
+  ret = d->sv + d->num_sv;
+  ret->name = gavl_strdup(name);
+  ret->flags = flags;
+  ret->type = type;
+  d->num_sv++;
+  return ret;
+  }
+
+bg_upnp_sa_desc_t *
+bg_upnp_service_desc_add_action(bg_upnp_service_desc_t * d, const char * name,
+                                bg_upnp_service_func func)
+  {
+  bg_upnp_sa_desc_t * ret;
+  if(d->num_sa + 1 > d->sa_alloc)
+    {
+    d->sa_alloc += 8;
+    d->sa = realloc(d->sa, d->sa_alloc * sizeof(*d->sa));
+    memset(d->sa + d->num_sa, 0, (d->sa_alloc - d->num_sa) * sizeof(*d->sa));
+    }
+  ret = d->sa + d->num_sa;
+  ret->name = gavl_strdup(name);
+  ret->func = func;  
+  d->num_sa++;
+  return ret;
+  }
+
+void bg_upnp_service_desc_free(bg_upnp_service_desc_t * d)
+  {
+  int i;
+  if(d->sa)
+    {
+    for(i = 0; i < d->num_sa; i++)
+      bg_upnp_sa_desc_free(d->sa + i);
+    free(d->sa);
+    }
+  if(d->sv)
+    {
+    for(i = 0; i < d->num_sv; i++)
+      bg_upnp_sv_desc_free(d->sv + i);
+    free(d->sv);
+    }
+  }
+
+const bg_upnp_sv_desc_t *
+bg_upnp_service_desc_sv_by_name(bg_upnp_service_desc_t * d, const char * name)
+  {
+  int i;
+  for(i = 0; i < d->num_sv; i++)
+    {
+    if(!strcmp(d->sv[i].name, name))
+      return &d->sv[i];
+    }
+  return NULL;
+  }
+
+const bg_upnp_sa_desc_t *
+bg_upnp_service_desc_sa_by_name(bg_upnp_service_desc_t * d, const char * name)
+  {
+  int i;
+  for(i = 0; i < d->num_sa; i++)
+    {
+    if(!strcmp(d->sa[i].name, name))
+      return &d->sa[i];
+    }
+  return NULL;
+  }
+
+static int resolve_sv_refs(bg_upnp_service_desc_t * d,
+                           bg_upnp_sa_arg_desc_t * args, int num)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    {
+    args[i].rsv = bg_upnp_service_desc_sv_by_name(d, args[i].rsv_name);
+    if(!args[i].rsv)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Couldn't find state variable %s",
+             args[i].rsv_name);
+      return 0;
+      }
+    }
+  return 1;
+  }
+
+int bg_upnp_service_desc_resolve_refs(bg_upnp_service_desc_t * d)
+  {
+  int i;
+  for(i = 0; i < d->num_sa; i++)
+    {
+    if(!resolve_sv_refs(d, d->sa[i].args_in, d->sa[i].num_args_in) ||
+       !resolve_sv_refs(d, d->sa[i].args_out, d->sa[i].num_args_out))
+      return 0;
+    }
+  return 1;
+  }

gmerlin-4256.tar.gz/lib/upnp/servicedesc_xml.c Added

@@ -0,0 +1,222 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <upnp/servicepriv.h>
+#include <gmerlin/utils.h>
+
+
+
+
+/* XML Stuff */
+
+static xmlDocPtr bg_upnp_service_description_create()
+  {
+  xmlDocPtr ret;
+  xmlNodePtr root;
+  xmlNsPtr ns;
+  xmlNodePtr node;
+  
+  
+  ret = xmlNewDoc((xmlChar*)"1.0");
+  root = xmlNewDocRawNode(ret, NULL, (xmlChar*)"scpd", NULL);
+  xmlDocSetRootElement(ret, root);
+
+  ns =
+    xmlNewNs(root,
+             (xmlChar*)"urn:schemas-upnp-org:service-1-0",
+             NULL);
+  xmlSetNs(root, ns);
+
+  node = xmlNewTextChild(root, NULL, (xmlChar*)"specVersion", NULL);
+  bg_xml_append_child_node(node, "major", "1");
+  bg_xml_append_child_node(node, "minor", "0");
+
+  node = xmlNewTextChild(root, NULL, (xmlChar*)"actionList", NULL);
+  node = xmlNewTextChild(root, NULL, (xmlChar*)"serviceStateTable", NULL);
+  return ret;
+  }
+
+static xmlNodePtr bg_upnp_service_description_add_action(xmlDocPtr doc, const char * name)
+  {
+  xmlNodePtr node;
+
+  if(!(node = bg_xml_find_doc_child(doc, "scpd")) ||
+     !(node = bg_xml_find_node_child(node, "actionList")))
+    return NULL;
+
+  node = xmlNewTextChild(node, NULL, (xmlChar*)"action", NULL);
+  bg_xml_append_child_node(node, "name", name);
+  xmlNewTextChild(node, NULL, (xmlChar*)"argumentList", NULL);
+  return node;
+  }
+
+static void bg_upnp_service_action_add_argument(xmlNodePtr node,
+                                                const char * name, int out, int retval,
+                                                const char * related_statevar)
+  {
+  if(!(node = bg_xml_find_node_child(node, "argumentList")))
+    return;
+
+  node = xmlNewTextChild(node, NULL, (xmlChar*)"argument", NULL);
+  bg_xml_append_child_node(node, "name", name);
+
+  bg_xml_append_child_node(node, "direction", (out ? "out" : "in"));
+
+  if(retval)
+    xmlNewTextChild(node, NULL, (xmlChar*)"retval", NULL);
+
+  bg_xml_append_child_node(node, "relatedStateVariable", related_statevar);
+  }
+
+static xmlNodePtr
+bg_upnp_service_description_add_statevar(xmlDocPtr doc,
+                                         const char * name,
+                                         int events,
+                                         const char * data_type)
+  {
+  xmlNodePtr node;
+  
+  if(!(node = bg_xml_find_doc_child(doc, "scpd")) ||
+     !(node = bg_xml_find_node_child(node, "serviceStateTable")))
+    return NULL;
+
+  node = xmlNewTextChild(node, NULL, (xmlChar*)"stateVariable", NULL);
+
+  BG_XML_SET_PROP(node, "sendEvents", (events ? "yes" : "no"));
+
+  bg_xml_append_child_node(node, "name", name);
+  bg_xml_append_child_node(node, "dataType", data_type);
+  return node;
+  }
+
+static void
+bg_upnp_service_statevar_add_allowed_value(xmlNodePtr node,
+                                           const char * val)
+  {
+  xmlNodePtr allowedlist = bg_xml_find_node_child(node, "allowedValueList");
+  
+  if(!allowedlist)
+    allowedlist = xmlNewTextChild(node, NULL, (xmlChar*)"allowedValueList", NULL);
+  bg_xml_append_child_node(allowedlist, "allowedValue", val);
+  }
+
+static void
+bg_upnp_service_statevar_set_allowed_value_range(xmlNodePtr node, const char * min, 
+                                                 const char * max, const char * step)
+  {
+  xmlNodePtr allowedrange = xmlNewTextChild(node, NULL, (xmlChar*)"allowedValueRange", NULL);
+  bg_xml_append_child_node(allowedrange, "minimum", min);
+  bg_xml_append_child_node(allowedrange, "maximum", max);
+  bg_xml_append_child_node(allowedrange, "step", step);
+  }
+
+static void
+bg_upnp_service_statevar_set_default(xmlNodePtr node, const char * def)
+  {
+  bg_xml_append_child_node(node, "defaultValue", def);
+  }
+
+
+static const struct
+  {
+  const char * name;
+  bg_upnp_sv_type_t t;
+  } sv_types[] =
+  {
+     { "i4",     BG_UPNP_SV_INT4 },
+     { "string", BG_UPNP_SV_STRING },
+     { },
+  };
+
+static const char * sv_type_to_string(bg_upnp_sv_type_t t)
+   {
+   int i = 0;
+   while(sv_types[i].name)
+     {
+     if(sv_types[i].t == t)
+       return sv_types[i].name;
+     i++;
+     }
+   return NULL;
+   }
+
+char * bg_upnp_service_desc_2_xml(bg_upnp_service_desc_t * d)
+  {
+  int i, j;
+  xmlDocPtr doc;
+  char * ret;
+
+  doc = bg_upnp_service_description_create();
+  /* Actions */
+  
+  for(i = 0; i < d->num_sa; i++)
+    {
+    xmlNodePtr action;
+    action = bg_upnp_service_description_add_action(doc, d->sa[i].name);
+    
+    for(j = 0; j < d->sa[i].num_args_in; j++)
+      {
+      bg_upnp_service_action_add_argument(action, 
+                                          d->sa[i].args_in[j].name, 0, 0,
+                                          d->sa[i].args_in[j].rsv_name);
+      }
+    for(j = 0; j < d->sa[i].num_args_out; j++)
+      {
+      bg_upnp_service_action_add_argument(action, 
+                                          d->sa[i].args_out[j].name, 1, 
+                                          !!(d->sa[i].args_out[j].flags & BG_UPNP_ARG_RETVAL),
+                                          d->sa[i].args_out[j].rsv_name);
+      }
+    }
+  for(i = 0; i < d->num_sv; i++)
+    {
+    xmlNodePtr sv;    
+    sv = bg_upnp_service_description_add_statevar(doc, d->sv[i].name,
+                                                  d->sv[i].flags & BG_UPNP_SV_EVENT,
+                                                  sv_type_to_string(d->sv[i].type));
+    if(d->sv[i].flags & BG_UPNP_SV_HAS_DEFAULT)
+      {
+      char * tmp_string = bg_upnp_val_to_string(d->sv[i].type, &d->sv[i].def);
+      bg_upnp_service_statevar_set_default(sv, tmp_string);
+      free(tmp_string);
+      }
+    for(j = 0; j < d->sv[i].num_allowed; j++)
+      {
+      char * tmp_string = bg_upnp_val_to_string(d->sv[i].type, &d->sv[i].allowed[j]);
+      bg_upnp_service_statevar_add_allowed_value(sv, tmp_string);
+      free(tmp_string);
+      }
+    if(d->sv[i].flags & BG_UPNP_SV_HAS_RANGE)
+      {
+      char * min, * max, *step;
+      min = bg_upnp_val_to_string(d->sv[i].type, &d->sv[i].range.min);
+      max = bg_upnp_val_to_string(d->sv[i].type, &d->sv[i].range.max);
+      step = bg_upnp_val_to_string(d->sv[i].type, &d->sv[i].range.step);
+      bg_upnp_service_statevar_set_allowed_value_range(sv, min, max, step);
+      free(min);
+      free(max);
+      free(step);
+      }
+    }
+  ret = bg_xml_save_to_memory(doc);
+  xmlFreeDoc(doc);
+  return ret;
+  }

gmerlin-4256.tar.gz/lib/upnp/soap.c Added

@@ -0,0 +1,438 @@
+#include <string.h>
+#include <unistd.h>
+
+#include <config.h>
+
+#include <gmerlin/translation.h>
+#include <gmerlin/log.h>
+
+#include <gmerlin/upnp/soap.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/http.h>
+
+#include <upnp/servicepriv.h>
+
+#define TYPE_REQUEST  0
+#define TYPE_RESPONSE 1
+#define TYPE_FAULT    2
+
+#define LOG_DOMAIN "soap"
+
+#define DUMP_SOAP
+
+static xmlDocPtr soap_create_common()
+  {
+  xmlNsPtr soap_ns;
+  xmlDocPtr  xml_doc;
+  xmlNodePtr xml_env;
+  
+  xml_doc = xmlNewDoc((xmlChar*)"1.0");
+  xml_env = xmlNewDocRawNode(xml_doc, NULL, (xmlChar*)"Envelope", NULL);
+  xmlDocSetRootElement(xml_doc, xml_env);
+  soap_ns =
+    xmlNewNs(xml_env,
+             (xmlChar*)"http://schemas.xmlsoap.org/soap/envelope/",
+             (xmlChar*)"s");
+  xmlSetNs(xml_env, soap_ns);
+
+  xmlSetNsProp(xml_env, soap_ns, (xmlChar*)"encodingStyle", 
+               (xmlChar*)"http://schemas.xmlsoap.org/soap/encoding/");
+
+  xmlNewChild(xml_env, soap_ns, (xmlChar*)"Body", NULL);
+  return xml_doc;
+  }
+
+static xmlNodePtr get_body(xmlDocPtr doc)
+  {
+  xmlNodePtr node;
+
+  if(!(node = bg_xml_find_doc_child(doc, "Envelope")) ||
+     !(node = bg_xml_find_node_child(node, "Body")))
+    return NULL;
+  return node;  
+  }
+
+
+static xmlDocPtr soap_create(const char * function, const char * service,
+                             int version, int response)
+  {
+  char * tmp_string;
+  xmlDocPtr  xml_doc;
+  xmlNodePtr xml_body;
+  xmlNodePtr xml_action;
+
+  xmlNsPtr upnp_ns;
+
+  xml_doc = soap_create_common();
+  xml_body = get_body(xml_doc);
+    
+  if(response)
+    {
+    tmp_string = bg_sprintf("%sResponse", function);
+    xml_action = xmlNewChild(xml_body, NULL, (xmlChar*)tmp_string, NULL);
+    free(tmp_string);
+    }
+  else
+    xml_action = xmlNewChild(xml_body, NULL, (xmlChar*)function, NULL);
+
+  tmp_string = bg_sprintf("urn:schemas-upnp-org:service:%s:%d",
+                          service, version);
+
+  upnp_ns = xmlNewNs(xml_action, (xmlChar*)tmp_string,  (xmlChar*)"u");
+  free(tmp_string);
+
+  xmlSetNs(xml_action, upnp_ns);
+
+  return xml_doc;
+  }
+
+xmlDocPtr bg_soap_create_request(const char * function,
+                                 const char * service, int version)
+  {
+  return soap_create(function, service, version, 0);
+  }
+
+xmlDocPtr bg_soap_create_response(const char * function,
+                                  const char * service, int version)
+  {
+  return soap_create(function, service, version, 1);
+  }
+
+xmlNodePtr bg_soap_get_function(xmlDocPtr doc)
+  {
+  xmlNodePtr node;
+
+  if(!(node = bg_xml_find_doc_child(doc, "Envelope")) ||
+     !(node = bg_xml_find_node_child(node, "Body")) ||
+     !(node = bg_xml_find_next_node_child(node, NULL)))
+    return NULL;
+  return node;  
+  }
+
+xmlNodePtr bg_soap_request_add_argument(xmlDocPtr doc, const char * name,
+                                        const char * value)
+  {
+  xmlNodePtr ret;
+  xmlNodePtr node = bg_soap_get_function(doc);
+  ret = bg_xml_append_child_node(node, name, value);
+  xmlSetNs(ret, NULL);
+  return ret;
+  }
+
+const char *
+bg_soap_response_get_argument(xmlDocPtr doc, const char * name)
+  {
+  xmlNodePtr node;
+  if(!(node = bg_soap_get_function(doc)) ||
+     !(node = bg_xml_find_node_child(node, name)))
+    return NULL;
+  return bg_xml_node_get_text_content(node);
+  }
+
+
+xmlNodePtr bg_soap_request_next_argument(xmlNodePtr function, xmlNodePtr arg)
+  {
+  return bg_xml_find_next_node_child(function, arg);
+  }
+
+int
+bg_upnp_soap_request_from_xml(bg_upnp_service_t * s,
+                              const char * xml, int len, const gavl_metadata_t * req)
+  {
+  xmlDocPtr doc;
+  xmlNodePtr function;
+  xmlNodePtr arg;
+  int i;
+  
+  doc = xmlParseMemory(xml, len);
+  if(!doc || (function = bg_soap_get_function(doc)))
+    {
+    /* Error */
+    }
+
+  s->req.req = req;
+  
+  s->req.action =
+    bg_upnp_service_desc_sa_by_name(&s->desc, (char*)function->name);
+
+  if(s->req.action)
+    {
+    /* Error */
+    // 401 Invalid Action 
+    
+    }
+  
+  arg = NULL;
+
+  while((arg = bg_soap_request_next_argument(function, arg)))
+    {
+    if(s->req.num_args_in == s->req.action->num_args_in)
+      break;
+    
+    //    fprintf(stderr, "Got arg: %s, value: %s\n", arg->name,
+    //            bg_xml_node_get_text_content(arg));
+    
+    s->req.args_in[s->req.num_args_in].desc = 
+      bg_upnp_sa_desc_in_arg_by_name(s->req.action, (char*)arg->name);
+    
+    if(s->req.args_in[s->req.num_args_in].desc)
+      {
+      /* Extract value */
+      if(!bg_upnp_string_to_val(s->req.args_in[s->req.num_args_in].desc->rsv->type,
+                                bg_xml_node_get_text_content(arg),
+                                &s->req.args_in[s->req.num_args_in].val))
+        {
+        /* 402 Invalid Args */
+        }
+      
+      s->req.num_args_in++;
+      }
+    else // Unknown arg
+      {
+      /* Warning */
+      }
+    }
+
+  /* Prepare output arguments */
+  for(i = 0; i < s->req.action->num_args_out; i++)
+    s->req.args_out[i].desc = &s->req.action->args_out[i];
+  s->req.num_args_out = s->req.action->num_args_out;
+
+  xmlFreeDoc(doc);
+  
+  return 1;
+  }
+
+char *
+bg_upnp_soap_response_to_xml(bg_upnp_service_t * s, int * len)
+  {
+  int i;
+  char buf[32];
+  const char * value;
+  char * ret;  
+  xmlDocPtr doc = soap_create(s->req.action->name,
+                              s->type, s->version, 1);
+
+  for(i = 0; i < s->req.num_args_out; i++)
+    {
+    switch(s->req.args_out[i].desc->rsv->type)
+      {
+      case BG_UPNP_SV_INT4:
+        snprintf(buf, 32, "%d", s->req.args_out[i].val.i);
+        value = buf;
+        break;
+      case BG_UPNP_SV_STRING:
+        value = s->req.args_out[i].val.s;
+        break;
+      }
+    bg_soap_request_add_argument(doc, s->req.args_out[i].desc->name,
+                                 value);
+    }
+  ret = bg_xml_save_to_memory(doc);
+  *len = strlen(ret);
+
+  //  fprintf(stderr, "SOAP response:\n%s\n", ret);
+
+  xmlFreeDoc(doc);
+  return ret;
+  }
+
+void bg_upnp_soap_request_cleanup(bg_upnp_soap_request_t * req)
+  {
+  int i;
+  for(i = 0; i < req->num_args_in; i++)
+    bg_upnp_sv_val_free(&req->args_in[i].val);
+  req->num_args_in = 0;
+
+  for(i = 0; i < req->num_args_out; i++)
+    bg_upnp_sv_val_free(&req->args_out[i].val);
+  req->num_args_out = 0;
+  req->action = NULL;
+  }
+
+int bg_soap_init(bg_soap_t * s, const char * url, const char * service,
+                 int version, const char * function)
+  {
+  int ret = 0;
+  char * tmp_string;
+  char * path = NULL;
+  char * request_host = NULL;
+  
+  memset(s, 0, sizeof(*s));
+  
+  if(!bg_url_split(url, NULL, NULL, NULL, &s->host, &s->port, &path))
+    goto fail;
+
+  if(s->port == -1)
+    {
+    request_host = gavl_strdup(s->host);
+    s->port = 80;
+    }
+  else
+    request_host = bg_sprintf("%s:%d", s->host, s->port);
+  
+  bg_http_request_init(&s->req_hdr, "POST", path, "HTTP/1.1");
+  gavl_metadata_set(&s->req_hdr, "HOST", request_host);
+  gavl_metadata_set(&s->req_hdr, "X-Gmerlin-Client", "1");
+  gavl_metadata_set(&s->req_hdr, "Connection", "close");
+  
+  tmp_string = bg_sprintf("\"urn:schemas-upnp-org:service:%s:%d#%s\"",
+                          service, version, function); 
+
+  gavl_metadata_set_nocpy(&s->req_hdr, "SOAPACTION", tmp_string);
+  gavl_metadata_set(&s->req_hdr, "Content-Type", "text/xml; charset=\"utf-8\"");
+
+  s->req = bg_soap_create_request(function, service, version);
+
+  s->function = function;
+  
+  ret = 1;
+  fail:
+
+  if(path)
+    free(path);
+  
+  return ret;
+  
+  }
+
+/* Write request and get answer */
+int bg_soap_request(bg_soap_t * s)
+  {
+  char * req_str = NULL;
+  int req_len;
+  bg_socket_address_t * addr = NULL;
+  int fd;
+  int ret = 0;
+  int status;
+  const char * str;
+  char * res = NULL;
+  int res_len;
+  xmlNodePtr node;
+  char * tmp_string;
+  
+  req_str = bg_xml_save_to_memory(s->req);
+  req_len = strlen(req_str);
+
+  gavl_metadata_set_int(&s->req_hdr, "Content-Length", req_len);
+  
+  addr = bg_socket_address_create();
+  bg_socket_address_set(addr, s->host, s->port, SOCK_STREAM);
+
+  fd = bg_socket_connect_inet(addr, 5000);
+  if(fd < 0)
+    goto fail;
+
+#ifdef DUMP_SOAP
+  bg_dprintf("Sending SOAP request\n");
+  gavl_metadata_dump(&s->req_hdr, 0);
+  bg_dprintf("%s\n", req_str);
+#endif
+  
+  if(!bg_http_request_write(fd, &s->req_hdr) ||
+     (write(fd, req_str, req_len) < req_len))
+    goto fail;
+  
+  if(!bg_http_response_read(fd, &s->res_hdr, 60000))
+    goto fail;
+
+#ifdef DUMP_SOAP
+  fprintf(stderr, "Response:\n");
+  gavl_metadata_dump(&s->res_hdr, 2);
+#endif
+  
+  status = bg_http_response_get_status_int(&s->res_hdr);
+  if(status != 200)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "SOAP request failed: %d %s", status, 
+            bg_http_response_get_status_str(&s->res_hdr));
+    }
+  
+  str = gavl_metadata_get_i(&s->res_hdr, "Content-Type");
+  if(!str)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "SOAP request failed, no content type in response");
+    goto fail;
+    }
+
+  if(strncasecmp(str, "text/xml", 8))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "SOAP request failed, invalid content type %s in response",
+           str);
+    goto fail;
+    }
+  
+  if(!(res = (char*)bg_http_read_body(fd, &s->res_hdr, &res_len)))
+    goto fail;
+
+#ifdef DUMP_SOAP
+  fprintf(stderr, "%s\n", res);
+#endif
+  
+  s->res = xmlParseMemory(res, res_len);
+  
+  if(!(node = bg_xml_find_doc_child(s->res, "Envelope")))
+    goto fail;
+
+  if(!(node = bg_xml_find_node_child(node, "Body")))
+    goto fail;
+
+  if(status != 200)
+    {
+    xmlNodePtr err_code;
+    xmlNodePtr err_str;
+    
+    if(!(node = bg_xml_find_node_child(node, "Fault")))
+      goto fail;
+    if(!(node = bg_xml_find_node_child(node, "detail")))
+      goto fail;
+    if(!(node = bg_xml_find_node_child(node, "UPnPError")))
+      goto fail;
+
+    if(!(err_code = bg_xml_find_node_child(node, "errorCode")))
+      goto fail;
+    if(!(err_str = bg_xml_find_node_child(node, "errorDescription")))
+      goto fail;
+    
+
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "SOAP request failed. HTTP code: %d %s UPNP code: %s %s", 
+           status, bg_http_response_get_status_str(&s->res_hdr),
+           bg_xml_node_get_text_content(err_code),
+           bg_xml_node_get_text_content(err_str));
+    goto fail;
+    }
+
+  tmp_string = bg_sprintf("%sResponse", s->function);
+  node = bg_xml_find_node_child(node, tmp_string);
+  free(tmp_string);
+  if(!node)
+    goto fail;
+
+  s->res_node = node;
+  
+  ret = 1;
+  fail:
+
+  if(addr)
+    bg_socket_address_destroy(addr);
+  if(req_str)
+    free(req_str);
+  if(res)
+    free(res);
+  
+  return ret;
+  }
+
+void bg_soap_free(bg_soap_t * s)
+  {
+  gavl_metadata_free(&s->req_hdr);
+  gavl_metadata_free(&s->res_hdr);
+
+  if(s->req)
+    xmlFreeDoc(s->req);
+  if(s->res)
+    xmlFreeDoc(s->res);
+  if(s->host)
+    free(s->host);
+  }
+

gmerlin-4256.tar.gz/lib/upnp/ssdp.c Added

@@ -0,0 +1,952 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <gavl/gavl.h>
+#include <gavl/metadata.h>
+
+#include <gmerlin/upnp/ssdp.h>
+#include <gmerlin/upnp/device.h>
+
+#include <gmerlin/bgsocket.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/http.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "ssdp"
+
+#include <gmerlin/utils.h>
+
+#include <unistd.h>
+
+// #define DUMP_UDP
+// #define DUMP_DEVS
+// #define DUMP_HEADERS
+
+#define UDP_BUFFER_SIZE 2048
+
+#define QUEUE_SIZE 10
+
+// #define META_METHOD "$METHOD"
+// #define META_STATUS "$STATUS"
+
+#define NOTIFY_INTERVAL (900*GAVL_TIME_SCALE) // max-age / 2
+
+typedef struct
+  {
+  char * st;
+  bg_socket_address_t * addr;
+  gavl_time_t time; // GAVL_TIME_UNDEFINED means empty
+  int times_sent;
+  } queue_element_t;
+
+struct bg_ssdp_s
+  {
+  int mcast_fd;
+  int ucast_fd;
+  gavl_timer_t * timer;
+  bg_socket_address_t * sender_addr;
+  bg_socket_address_t * local_addr;
+  bg_socket_address_t * mcast_addr;
+  uint8_t buf[UDP_BUFFER_SIZE];
+
+  int discover_remote;
+  const bg_ssdp_root_device_t * local_dev;
+
+  int num_remote_devs;
+  int remote_devs_alloc;
+
+  bg_ssdp_root_device_t * remote_devs;
+
+  const char * server_string;
+  char * server_string_priv;
+  
+  queue_element_t queue[QUEUE_SIZE];
+
+#ifdef DUMP_DEVS
+  gavl_time_t last_dump_time;
+#endif
+
+  gavl_time_t last_notify_time;
+
+  bg_ssdp_callback_t cb;
+  void * cb_data;
+  };
+
+void bg_ssdp_set_callback(bg_ssdp_t * s, bg_ssdp_callback_t cb, void * data)
+  {
+  s->cb = cb;
+  s->cb_data = data;
+  }
+
+// TYPE:VERSION
+
+static char * extract_type_version(const char * str, int * version)
+  {
+  char * ret;
+  const char * pos;
+  
+  pos = strchr(str, ':');
+  if(!pos)
+    return NULL;
+
+  ret = gavl_strndup(str, pos);
+  pos++;
+  if(*pos == '\0')
+    {
+    free(ret);
+    return NULL;
+    }
+  *version = atoi(pos);
+  return ret;
+  }
+
+
+static int 
+find_root_dev_by_location(bg_ssdp_t * s, const char * loc)
+  {
+  int i;
+  for(i = 0; i < s->num_remote_devs; i++)
+    {
+    if(!strcmp(s->remote_devs[i].url, loc))
+      return i;
+    }
+  return -1;
+  }
+
+static int 
+find_embedded_dev_by_uuid(const bg_ssdp_root_device_t * dev, const char * uuid)
+  {
+  int i;
+  for(i = 0; i < dev->num_devices; i++)
+    {
+    if(!strcmp(dev->devices[i].uuid, uuid))
+      return i;
+    }
+  return -1;
+  }
+
+static const char * is_device_type(const char * str)
+  {
+  if(gavl_string_starts_with_i(str, "urn:schemas-upnp-org:device:"))
+    return str + 28;
+  return NULL;
+  }
+
+static const char * is_service_type(const char * str)
+  {
+  if(gavl_string_starts_with_i(str, "urn:schemas-upnp-org:service:"))
+    return str + 29;
+  return NULL;
+  }
+
+static bg_ssdp_service_t * find_service(bg_ssdp_service_t * s, int num, const char * type)
+  {
+  int i;
+  int len;
+  const char * pos;
+  
+  if((pos = strchr(type, ':')))
+    len = pos - type;
+  else
+    len = strlen(type);
+
+  for(i = 0; i < num; i++)
+    {
+    if((strlen(s[i].type) == len) &&
+       !strncmp(s[i].type, type, len))
+      return &s[i];
+    }
+  return NULL;
+  }
+
+static bg_ssdp_service_t * device_find_service(bg_ssdp_device_t * dev, const char * type)
+  {
+  return find_service(dev->services, dev->num_services, type);
+  }
+
+static bg_ssdp_service_t * root_device_find_service(bg_ssdp_root_device_t * dev, const char * type)
+  {
+  return find_service(dev->services, dev->num_services, type);
+  }
+
+static bg_ssdp_service_t * add_service(bg_ssdp_service_t ** sp, int * nump)
+  {
+  bg_ssdp_service_t * ret;
+
+  bg_ssdp_service_t * s = *sp;
+  int num = *nump;
+
+  s = realloc(s, (num+1) * sizeof(*s));
+
+  ret = &s[num];
+  memset(ret, 0, sizeof(*ret));
+  num++;
+
+  *sp = s;
+  *nump = num;
+
+  return ret;  
+  }
+
+static bg_ssdp_service_t * device_add_service(bg_ssdp_device_t * dev)
+  {
+  return add_service(&dev->services, &dev->num_services);
+  }
+
+static bg_ssdp_service_t * root_device_add_service(bg_ssdp_root_device_t * dev)
+  {
+  return add_service(&dev->services, &dev->num_services);
+  }
+
+static bg_ssdp_root_device_t *
+add_root_dev(bg_ssdp_t * s, const char * loc)
+  {
+  bg_ssdp_root_device_t * ret;
+  
+  if(s->num_remote_devs + 1 > s->remote_devs_alloc)
+    {
+    s->remote_devs_alloc += 16;
+    s->remote_devs =
+      realloc(s->remote_devs,
+              s->remote_devs_alloc * sizeof(*s->remote_devs));
+    memset(s->remote_devs + s->num_remote_devs, 0,
+           (s->remote_devs_alloc - s->num_remote_devs) *
+           sizeof(*s->remote_devs));
+    }
+  ret = s->remote_devs + s->num_remote_devs;
+  ret->url = gavl_strdup(loc);
+  s->num_remote_devs++;
+  return ret;
+  }
+
+static void
+del_remote_dev(bg_ssdp_t * s, int idx)
+  {
+  int i;
+  bg_ssdp_root_device_t * dev = &s->remote_devs[idx];
+
+  if(s->cb && dev->url)
+    {
+    for(i = 0; i < dev->num_devices; i++)
+      s->cb(s->cb_data, 0, dev->devices[i].type,
+            dev->devices[i].version, dev->url);
+    s->cb(s->cb_data, 0, dev->type, dev->version, dev->url);
+    }
+
+  bg_ssdp_root_device_free(dev);
+  
+  if(idx < s->num_remote_devs - 1)
+    memmove(dev, dev+1, 
+            sizeof(*dev) * (s->num_remote_devs - 1 - idx));
+  
+  s->num_remote_devs--;
+
+  dev = &s->remote_devs[s->num_remote_devs];
+  memset(dev, 0, sizeof(*dev)); // Clear memory since it will be reused
+
+  }
+
+static char * search_string =
+"M-SEARCH * HTTP/1.1\r\n"
+"Host:239.255.255.250:1900\r\n"
+"ST: ssdp:all\r\n"
+"Man:\"ssdp:discover\"\r\n"
+"MX:3\r\n\r\n";
+
+bg_ssdp_t * bg_ssdp_create(bg_ssdp_root_device_t * local_dev,
+                           int discover_remote, const char * server_string)
+  {
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+  bg_ssdp_t * ret = calloc(1, sizeof(*ret));
+  
+  ret->discover_remote = discover_remote;
+  ret->local_dev = local_dev;
+
+  if(server_string)
+    ret->server_string = server_string;
+  else
+    {
+    ret->server_string_priv = bg_upnp_make_server_string();
+    ret->server_string = ret->server_string_priv;
+    }
+  
+  ret->last_notify_time = GAVL_TIME_UNDEFINED;
+  
+#ifdef DUMP_DEVS
+  if(ret->local_dev)
+    {
+    gavl_dprintf("Local root device:\n");
+    bg_ssdp_root_device_dump(ret->local_dev);
+    }
+#endif
+  
+  ret->sender_addr = bg_socket_address_create();
+  ret->local_addr  = bg_socket_address_create();
+  ret->mcast_addr  = bg_socket_address_create();
+
+  if(ret->local_dev)
+    {
+    /* If we advertise a device, we need to bind onto the same interface */
+    char * host = NULL;
+    bg_url_split(ret->local_dev->url,
+                 NULL,
+                 NULL,
+                 NULL,
+                 &host,
+                 NULL,
+                 NULL);
+    bg_socket_address_set(ret->local_addr, host, 0, SOCK_DGRAM);
+    free(host);
+    }
+  else if(!bg_socket_address_set_local(ret->local_addr, 0))
+    goto fail;
+
+  if(!bg_socket_address_set(ret->mcast_addr, "239.255.255.250", 1900, SOCK_DGRAM))
+    goto fail;
+
+  ret->mcast_fd = bg_udp_socket_create_multicast(ret->mcast_addr);
+  ret->ucast_fd = bg_udp_socket_create(ret->local_addr);
+  
+  bg_log(BG_LOG_INFO, LOG_DOMAIN, "Unicast socket bound at %s", 
+         bg_socket_address_to_string(ret->local_addr, addr_str));
+  
+  /* Send seach packet */
+  if(ret->discover_remote)
+    {
+    bg_udp_socket_send(ret->ucast_fd, (uint8_t*)search_string,
+                       strlen(search_string), ret->mcast_addr);
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Sent discovery packet");
+    }
+  ret->timer = gavl_timer_create(ret->timer);
+  gavl_timer_start(ret->timer);
+
+  /* Create send queue */
+  if(ret->local_dev)
+    {
+    int i;
+    for(i = 0; i < QUEUE_SIZE; i++)
+      {
+      ret->queue[i].addr = bg_socket_address_create();
+      ret->queue[i].time = GAVL_TIME_UNDEFINED;
+      }
+    }
+  return ret;
+
+  fail:
+  bg_ssdp_destroy(ret);
+  return NULL;
+  }
+
+static char * uuid_from_usn(const char * usn)
+  {
+  const char * pos;
+  if(gavl_string_starts_with(usn, "uuid:"))
+    {
+    pos = strchr(usn+5, ':');
+    if(!pos)
+      pos = usn + 5 + strlen(usn + 5);
+    return gavl_strndup(usn+5, pos);
+    }
+  return NULL;
+  }
+
+static void update_device(bg_ssdp_t * s, const char * type,
+                          gavl_metadata_t * m)
+  {
+  int idx;
+  int max_age = 0;
+  const char * loc;
+  const char * usn;
+  const char * cc; 
+  const char * pos;
+  char * uuid;
+  const char * type_version;
+
+  bg_ssdp_root_device_t * dev;
+  bg_ssdp_device_t * edev;
+  
+  loc = gavl_metadata_get_i(m, "LOCATION");
+  if(!loc)
+    return;
+
+  /* Get max age */
+  cc = gavl_metadata_get_i(m, "CACHE-CONTROL");
+  if(!cc || 
+     !gavl_string_starts_with(cc, "max-age") ||
+     !(pos = strchr(cc, '=')))
+    return;
+  pos++;
+  max_age = atoi(pos);
+
+  /* Get UUID */
+  usn = gavl_metadata_get_i(m, "USN");
+  if(!usn)
+    return;
+
+  if(!(uuid = uuid_from_usn(usn)))
+    return;
+  
+  idx = find_root_dev_by_location(s, loc);
+
+  if(idx >= 0)
+    dev = &s->remote_devs[idx];
+  else
+    dev = add_root_dev(s, loc);
+  
+  dev->expire_time = gavl_timer_get(s->timer) + GAVL_TIME_SCALE * max_age;
+  
+  if(!strcasecmp(type, "upnp:rootdevice"))
+    {
+    /* Set root uuid if not known already */
+    if(!dev->uuid)
+      dev->uuid = gavl_strdup(uuid);
+    goto end;
+    }
+  
+  /* If we have no uuid of the root device yet, we can't do much more */
+  if(!dev->uuid)
+    goto end;
+
+  if(gavl_string_starts_with_i(type, "uuid:"))
+    {
+    /* Can't do much here */
+    goto end;
+    }
+
+  if(!strcmp(uuid, dev->uuid))
+    {
+    /* Message is for root device */
+    edev = NULL;
+    }
+  else
+    {
+    idx = find_embedded_dev_by_uuid(dev, uuid);
+    if(idx >= 0)
+      edev = &dev->devices[idx];
+    else
+      edev = bg_ssdp_device_add_device(dev, uuid);
+    }
+
+  if((type_version = is_device_type(type)))
+    {
+    if(edev)
+      {
+      if(!edev->type)
+        {
+        edev->type = extract_type_version(type_version, &edev->version);
+        if(s->cb)
+          s->cb(s->cb_data, 1, edev->type, edev->version, loc);
+        }
+      }
+    else if(!dev->type)
+      {
+      dev->type = extract_type_version(type_version, &dev->version);
+      if(s->cb)
+        s->cb(s->cb_data, 1, dev->type, dev->version, loc);
+
+      }
+    }
+  else if((type_version = is_service_type(type)))
+    {
+    bg_ssdp_service_t * s = NULL;
+    
+    if(edev)
+      {
+      if(!device_find_service(edev, type_version))
+        s = device_add_service(edev);
+      }
+    else
+      {
+      if(!root_device_find_service(dev, type_version))
+        s = root_device_add_service(dev);
+      }    
+    if(s)
+      s->type = extract_type_version(type_version, &s->version);
+    }
+  end:
+  if(uuid)
+    free(uuid);  
+  }
+
+static void schedule_reply(bg_ssdp_t * s, const char * st,
+                           const bg_socket_address_t * sender,
+                           gavl_time_t current_time, int mx)
+  {
+  int i, idx = -1;
+  for(i = 0; i < QUEUE_SIZE; i++)
+    {
+    if(!s->queue[i].st)
+      {
+      idx = i;
+      break;
+      }
+    }
+  if(idx == -1)
+    {
+    bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Cannot schedule search reply, queue full");
+    return;
+    }
+  s->queue[idx].st = gavl_strdup(st);
+
+  s->queue[idx].time = current_time;
+  s->queue[idx].time += (int64_t)((double)rand() / (double)RAND_MAX * (double)(mx * GAVL_TIME_SCALE));
+  bg_socket_address_copy(s->queue[idx].addr, sender);
+  }
+
+// static void setup_header(bg_ssdp_root_device_t * dev, 
+
+static void flush_reply_packet(bg_ssdp_t * s, const gavl_metadata_t * h,
+                               bg_socket_address_t * sender)
+  {
+  int len = 0;
+  char * str = bg_http_response_to_string(h, &len);
+  //  fprintf(stderr, "Sending search reply:\n%s\n", str);
+  bg_udp_socket_send(s->ucast_fd, (uint8_t*)str, len, sender);
+  free(str);
+  }
+                               
+static void flush_reply(bg_ssdp_t * s, queue_element_t * q)
+  {
+  const char * type_version;
+  gavl_metadata_t h;
+  int i;
+  gavl_metadata_init(&h);
+  bg_http_response_init(&h, "HTTP/1.1", 200, "OK");
+  gavl_metadata_set(&h, "CACHE-CONTROL", "max-age=1800");
+  bg_http_header_set_empty_var(&h, "EXT");
+  gavl_metadata_set(&h, "LOCATION", s->local_dev->url);
+  gavl_metadata_set(&h, "SERVER", s->server_string);
+  
+  if(!strcasecmp(q->st, "ssdp:all"))
+    {
+    /*
+     *  uuid:device-UUID::upnp:rootdevice
+     *  uuid:device-UUID (for each root- and embedded dev)
+     *  uuid:device-UUID::urn:schemas-upnp-org:device:deviceType:v (for each root- and embedded dev)
+     *  uuid:device-UUID::urn:schemas-upnp-org:service:serviceType:v  (for each service)
+     */
+    /* Root device */
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_root_usn(s->local_dev));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_root_nt(s->local_dev));
+    flush_reply_packet(s, &h, q->addr);
+  
+    /* Device UUID */
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_device_uuid_usn(s->local_dev, -1));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_device_uuid_nt(s->local_dev, -1));
+    flush_reply_packet(s, &h, q->addr);
+  
+    /* TODO: Embedded devices would come here */
+
+    /* Device Type */
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_device_type_usn(s->local_dev, -1));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_device_type_nt(s->local_dev, -1));
+    flush_reply_packet(s, &h, q->addr);
+    /* TODO: Embedded devices would come here */
+
+    for(i = 0; i < s->local_dev->num_services; i++)
+      {
+      gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_service_type_usn(s->local_dev, -1, i));
+      gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_service_type_nt(s->local_dev, -1, i));
+      flush_reply_packet(s, &h, q->addr);
+      }
+    gavl_metadata_free(&h);
+    }
+  else if(!strcasecmp(q->st, "upnp:rootdevice"))
+    {
+    /* Root device */
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_root_usn(s->local_dev));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_root_nt(s->local_dev));
+    flush_reply_packet(s, &h, q->addr);
+    }
+  else if(gavl_string_starts_with_i(q->st, "uuid:"))
+    {
+    int dev = find_embedded_dev_by_uuid(s->local_dev, q->st+5);
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_device_uuid_usn(s->local_dev, dev));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_device_uuid_nt(s->local_dev, dev));
+    flush_reply_packet(s, &h, q->addr);
+    }
+  else if((type_version = is_device_type(q->st)))
+    {
+    int dev;
+    bg_ssdp_has_device_str(s->local_dev, type_version, &dev);
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_device_type_usn(s->local_dev, dev));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_device_type_nt(s->local_dev, dev));
+    flush_reply_packet(s, &h, q->addr);
+    }
+  else if((type_version = is_service_type(q->st)))
+    {
+    int dev, srv;
+    bg_ssdp_has_service_str(s->local_dev, type_version, &dev, &srv);
+    gavl_metadata_set_nocpy(&h, "USN", bg_ssdp_get_service_type_usn(s->local_dev, dev, srv));
+    gavl_metadata_set_nocpy(&h, "ST",  bg_ssdp_get_service_type_nt(s->local_dev, dev, srv));
+    flush_reply_packet(s, &h, q->addr);
+    }
+  free(q->st);
+  q->st = NULL;
+  gavl_metadata_free(&h);
+  }
+
+static int flush_queue(bg_ssdp_t * s, gavl_time_t current_time)
+  {
+  int ret = 0;
+  int i;
+  for(i = 0; i < QUEUE_SIZE; i++)
+    {
+    if(!s->queue[i].st || (s->queue[i].time > current_time))
+      continue;
+
+    flush_reply(s, &s->queue[i]);
+    ret++;
+    }
+  return ret;
+  }
+
+
+static void handle_multicast(bg_ssdp_t * s, const char * buffer,
+                             bg_socket_address_t * sender, gavl_time_t current_time)
+  {
+  const char * var;
+  gavl_metadata_t m;
+  gavl_metadata_init(&m);
+   
+  if(!bg_http_request_from_string(&m, buffer))
+    goto fail;
+#ifdef DUMP_HEADERS
+  gavl_dprintf("handle_multicast\n"); 
+  gavl_metadata_dump(&m, 2);
+#endif
+  
+  var = bg_http_request_get_method(&m);
+  
+  if(!var)
+    goto fail;
+
+  if(!strcasecmp(var, "M-SEARCH"))
+    {
+    int mx;
+    const char * type_version;
+    
+    /* Got search request */
+    if(!s->local_dev)
+      goto fail;
+
+    //    fprintf(stderr, "Got search request\n");
+    //    gavl_metadata_dump(&m, 0);
+    
+    if(!gavl_metadata_get_int_i(&m, "MX", &mx))
+      goto fail;
+    
+    var = gavl_metadata_get_i(&m, "ST");
+    
+    if(!strcasecmp(var, "ssdp:all"))
+      {
+      schedule_reply(s, var, sender,
+                     current_time, mx);
+      }
+    else if(!strcasecmp(var, "upnp:rootdevice"))
+      {
+      schedule_reply(s, var, sender,
+                     current_time, mx);
+      }
+    else if(gavl_string_starts_with_i(var, "uuid:"))
+      {
+      if(!strcmp(var + 5, s->local_dev->uuid) ||
+         find_embedded_dev_by_uuid(s->local_dev, var + 5))
+        schedule_reply(s, var, sender,
+                       current_time, mx);
+      }
+    else if((type_version = is_device_type(var)))
+      {
+      if(bg_ssdp_has_device_str(s->local_dev, type_version, NULL))
+        schedule_reply(s, var, sender,
+                       current_time, mx);
+      }
+    else if((type_version = is_service_type(var)))
+      {
+      //      fprintf(stderr, "Got service search\n");
+      if(bg_ssdp_has_service_str(s->local_dev, type_version, NULL, NULL))
+        schedule_reply(s, var, sender,
+                       current_time, mx);
+      }
+    
+    /*
+     *  Ignoring
+     *  urn:domain-name:device:deviceType:v 
+     *  and
+     *  urn:domain-name:service:serviceType:v
+     */
+    
+    }
+  else if(!strcasecmp(var, "NOTIFY"))
+    {
+    const char * nt;
+    const char * nts;
+    /* Got notify request */
+    if(!s->discover_remote)
+      goto fail;
+
+    nts = gavl_metadata_get_i(&m, "NTS");
+    
+    if(!strcmp(nts, "ssdp:alive"))
+      {
+      if(!(nt = gavl_metadata_get_i(&m, "NT")))
+        goto fail;
+      
+      update_device(s, nt, &m);
+      }
+    else if(!strcmp(nts, "ssdp:byebye"))
+      {
+      /* We delete the entire root device */
+      char * uuid;
+      const char * usn;
+      int i;
+
+      // fprintf(stderr, "Got byebye message\n");
+      
+      if(!(usn = gavl_metadata_get(&m, "USN")) ||
+         !(uuid = uuid_from_usn(usn)))
+        goto fail;
+
+      i = 0; 
+      
+      while(i < s->num_remote_devs)
+        {
+        if((s->remote_devs[i].uuid && !strcmp(s->remote_devs[i].uuid, uuid)) ||
+           (find_embedded_dev_by_uuid(&s->remote_devs[i], uuid) >= 0))
+          {
+          del_remote_dev(s, i);
+          break;
+          }
+        else
+          i++;
+        }
+      free(uuid);
+      }
+    }
+  
+  fail:
+  gavl_metadata_free(&m);
+  }
+
+static void handle_unicast(bg_ssdp_t * s, const char * buffer,
+                           bg_socket_address_t * sender)
+  {
+  const char * st;
+  gavl_metadata_t m;
+  gavl_metadata_init(&m);
+
+  if(!bg_http_response_from_string(&m, buffer))
+    goto fail;
+
+#ifdef DUMP_HEADERS
+  gavl_dprintf("handle_unicast\n");
+  gavl_metadata_dump(&m, 2);
+#endif
+  
+  if(!(st = gavl_metadata_get_i(&m, "ST")))
+    goto fail;
+  
+  update_device(s, st, &m);
+
+  
+  fail:
+  gavl_metadata_free(&m);
+  }
+
+static void flush_notify(bg_ssdp_t * s, const gavl_metadata_t * h)
+  {
+  int len = 0;
+  char * str = bg_http_request_to_string(h, &len);
+  bg_udp_socket_send(s->ucast_fd, (uint8_t*)str, len, s->mcast_addr);
+  //  fprintf(stderr, "Notify:\n%s", str);
+  free(str);
+  }
+
+static void notify(bg_ssdp_t * s, int alive)
+  {
+  int i;
+  gavl_metadata_t m;
+  gavl_metadata_init(&m);
+
+  /* Common fields */
+  bg_http_request_init(&m, "NOTIFY", "*", "HTTP/1.1");
+  gavl_metadata_set(&m, "HOST", "239.255.255.250:1900");
+
+  if(alive)
+    {
+    gavl_metadata_set(&m, "CACHE-CONTROL", "max-age=1800");
+    gavl_metadata_set(&m, "NTS", "ssdp:alive");
+    }
+  else
+    {
+    gavl_metadata_set(&m, "NTS", "ssdp:byebye");
+    }
+  
+  gavl_metadata_set(&m, "SERVER", s->server_string);
+  gavl_metadata_set(&m, "LOCATION", s->local_dev->url);
+  
+  /* Root device */
+  gavl_metadata_set_nocpy(&m, "USN", bg_ssdp_get_root_usn(s->local_dev));
+  gavl_metadata_set_nocpy(&m, "NT",  bg_ssdp_get_root_nt(s->local_dev));
+  flush_notify(s, &m);
+  
+  /* Device UUID */
+  gavl_metadata_set_nocpy(&m, "USN", bg_ssdp_get_device_uuid_usn(s->local_dev, -1));
+  gavl_metadata_set_nocpy(&m, "NT",  bg_ssdp_get_device_uuid_nt(s->local_dev, -1));
+  flush_notify(s, &m);
+  
+  /* TODO: Embedded devices would come here */
+
+  /* Device Type */
+  gavl_metadata_set_nocpy(&m, "USN", bg_ssdp_get_device_type_usn(s->local_dev, -1));
+  gavl_metadata_set_nocpy(&m, "NT",  bg_ssdp_get_device_type_nt(s->local_dev, -1));
+  flush_notify(s, &m);
+  /* TODO: Embedded devices would come here */
+
+  for(i = 0; i < s->local_dev->num_services; i++)
+    {
+    gavl_metadata_set_nocpy(&m, "USN", bg_ssdp_get_service_type_usn(s->local_dev, -1, i));
+    gavl_metadata_set_nocpy(&m, "NT",  bg_ssdp_get_service_type_nt(s->local_dev, -1, i));
+    flush_notify(s, &m);
+    }
+  gavl_metadata_free(&m);
+  }
+
+int bg_ssdp_update(bg_ssdp_t * s)
+  {
+  int len;
+  int i;
+  gavl_time_t current_time;
+#ifdef DUMP_UDP
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+#endif
+  int ret = 0;
+  
+  /* Delete expired devices */
+  current_time = gavl_timer_get(s->timer);
+  i = 0;  
+  while(i < s->num_remote_devs)
+    {
+    if(s->remote_devs[i].expire_time < current_time)
+      del_remote_dev(s, i);
+    else
+      i++;
+    }
+
+  /* Read multicast messages */
+  while(bg_socket_can_read(s->mcast_fd, 0))
+    {
+    len = bg_udp_socket_receive(s->mcast_fd, s->buf, UDP_BUFFER_SIZE, s->sender_addr);
+    if(len <= 0)
+      continue;
+    s->buf[len] = '\0';
+    handle_multicast(s, (const char *)s->buf, s->sender_addr, current_time);
+#ifdef DUMP_UDP
+    fprintf(stderr, "Got SSDP multicast message from %s\n%s",
+            bg_socket_address_to_string(s->sender_addr, addr_str), (char*)s->buf);
+#endif
+    ret++;
+    }
+
+  /* Read unicast messages */
+  while(bg_socket_can_read(s->ucast_fd, 0))
+    {
+    len = bg_udp_socket_receive(s->ucast_fd, s->buf, UDP_BUFFER_SIZE, s->sender_addr);
+    if(len <= 0)
+      continue;
+    s->buf[len] = '\0';
+    handle_unicast(s, (const char *)s->buf, s->sender_addr);
+#ifdef DUMP_UDP
+    fprintf(stderr, "Got SSDP unicast message from %s\n%s",
+            bg_socket_address_to_string(s->sender_addr, addr_str), (char*)s->buf);
+#endif
+    ret++;
+    }
+
+#ifdef DUMP_DEVS
+  if((current_time - s->last_dump_time > 10 * GAVL_TIME_SCALE) && s->discover_remote)
+    {
+    gavl_dprintf("Root devices: %d\n", s->num_remote_devs);
+    for(i = 0; i < s->num_remote_devs; i++)
+      bg_ssdp_root_device_dump(&s->remote_devs[i]);
+    s->last_dump_time = current_time;
+    }
+#endif
+
+  ret += flush_queue(s, current_time);
+
+  if(s->local_dev &&
+     ((s->last_notify_time == GAVL_TIME_UNDEFINED) ||
+      (current_time - s->last_notify_time > NOTIFY_INTERVAL)))
+    {
+    notify(s, 1);
+    s->last_notify_time = current_time;
+    }
+  
+  return ret;
+  }
+
+void bg_ssdp_destroy(bg_ssdp_t * s)
+  {
+  int i;
+  /* If we advertised a local device, unadvertise it */
+  if(s->local_dev)
+    {
+    notify(s, 0);
+    }
+  for(i = 0; i < QUEUE_SIZE; i++)
+    {
+    if(s->queue[i].addr)
+      bg_socket_address_destroy(s->queue[i].addr);
+    if(s->queue[i].st)
+      free(s->queue[i].st);
+    }
+
+  if(s->remote_devs)
+    {
+    for(i = 0; i < s->num_remote_devs; i++)
+      bg_ssdp_root_device_free(&s->remote_devs[i]);
+    free(s->remote_devs);
+    }
+
+  close(s->ucast_fd);
+  close(s->mcast_fd);
+  
+  if(s->local_addr) 
+    bg_socket_address_destroy(s->local_addr);
+  if(s->mcast_addr) 
+    bg_socket_address_destroy(s->mcast_addr);
+  if(s->sender_addr) 
+    bg_socket_address_destroy(s->sender_addr);
+
+  if(s->timer)
+    gavl_timer_destroy(s->timer);
+
+  if(s->server_string_priv)
+    free( s->server_string_priv);
+  free(s);
+  }
+

gmerlin-4256.tar.gz/lib/upnp/ssdp_device.c Added

@@ -0,0 +1,371 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <config.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <gavl/gavl.h>
+#include <gavl/metadata.h>
+
+#include <gmerlin/upnp/ssdp.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "ssdpdevice"
+
+#include <gmerlin/utils.h>
+
+static int match_type_version(const char * type_req, int ver_req,
+                              const char * type_avail, int ver_avail)
+  {
+  return !strcmp(type_req, type_avail) && (ver_avail >= ver_req);
+  }
+
+static int match_type_version_str(const char * req,
+                                  const char * type_avail, int ver_avail)
+  {
+  const char * pos;
+  pos = strchr(req, ':');
+  if(!pos)
+    return 0;
+
+  if((strlen(type_avail) != pos - req) ||
+     strncmp(req, type_avail, pos - req))
+    return 0;
+
+  pos++;
+  if(atoi(pos) > ver_avail)
+    return 0;
+  return 1;
+  }
+
+int
+bg_ssdp_has_device(const bg_ssdp_root_device_t * dev, const char * type, int version, int * dev_index)
+  {
+  int i;
+  if(match_type_version(type, version, dev->type, dev->version))
+    {
+    if(dev_index)
+      *dev_index = -1;
+    return 1;
+    }
+  
+  for(i = 0; i < dev->num_devices; i++)
+    {
+    if(match_type_version(type, version, dev->devices[i].type, dev->devices[i].version))
+      {
+      if(dev_index)
+        *dev_index = i;
+      return 1;
+      }
+    }
+  return 0;
+  }
+
+int
+bg_ssdp_has_device_str(const bg_ssdp_root_device_t * dev, const char * type_version, int * dev_index)
+  {
+  int i;
+  if(match_type_version_str(type_version, dev->type, dev->version))
+    {
+    if(dev_index)
+      *dev_index = -1;
+    return 1;
+    }
+  
+  for(i = 0; i < dev->num_devices; i++)
+    {
+    if(match_type_version_str(type_version, dev->devices[i].type, dev->devices[i].version))
+      {
+      if(dev_index)
+        *dev_index = i;
+      return 1;
+      }
+    }
+  return 0;
+  }
+
+static int lookup_service(bg_ssdp_service_t * s, int num, const char * type, int version)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    {
+    if(match_type_version(type, version, s[i].type, s[i].version))
+      return i;
+    }
+  return -1;
+  }
+
+static int lookup_service_str(bg_ssdp_service_t * s, int num, const char * type_version)
+  {
+  int i;
+  for(i = 0; i < num; i++)
+    {
+    if(match_type_version_str(type_version, s[i].type, s[i].version))
+      return i;
+    }
+  return -1;
+  }
+
+int
+bg_ssdp_has_service(const bg_ssdp_root_device_t * dev, const char * type,
+                    int version, int * dev_index, int * srv_index)
+  {
+  int idx, i;
+
+  idx = lookup_service(dev->services, dev->num_services, type, version);
+
+  if(idx >= 0)
+    {
+    if(dev_index)
+      *dev_index = -1;
+
+    if(srv_index)
+      *srv_index = idx;
+    return 1;
+    }
+
+  for(i = 0; i < dev->num_devices; i++)
+    {
+    idx = lookup_service(dev->devices[i].services, dev->devices[i].num_services, type, version);
+
+    if(idx >= 0)
+      {
+      if(dev_index)
+        *dev_index = i;
+      
+      if(srv_index)
+        *srv_index = idx;
+      return 1;
+      }
+    }
+  return 0;
+  }
+
+int
+bg_ssdp_has_service_str(const bg_ssdp_root_device_t * dev,
+                        const char * type_version, int * dev_index, int * srv_index)
+  {
+  int idx, i;
+
+  idx = lookup_service_str(dev->services, dev->num_services, type_version);
+
+  if(idx >= 0)
+    {
+    if(dev_index)
+      *dev_index = -1;
+
+    if(srv_index)
+      *srv_index = idx;
+    return 1;
+    }
+
+  for(i = 0; i < dev->num_devices; i++)
+    {
+    idx = lookup_service_str(dev->devices[i].services, dev->devices[i].num_services, type_version);
+
+    if(idx >= 0)
+      {
+      if(dev_index)
+        *dev_index = i;
+      
+      if(srv_index)
+        *srv_index = idx;
+      return 1;
+      }
+    }
+  return 0;
+  }
+
+void
+bg_ssdp_root_device_dump(const bg_ssdp_root_device_t * d)
+  {
+  int i, j;
+  gavl_dprintf("Root device\n");
+  gavl_diprintf(2, "Location: %s\n", d->url);
+  gavl_diprintf(2, "UUID: %s\n", d->uuid);
+  if(d->type)
+    gavl_diprintf(2, "Type: %s.%d\n", d->type, d->version);
+  gavl_diprintf(2, "Devices: %d\n", d->num_devices);
+  for(i = 0; i < d->num_devices; i++)
+    {
+    gavl_diprintf(4, "UUID: %s\n", d->devices[i].uuid);
+    gavl_diprintf(4, "Type: %s.%d\n", d->devices[i].type, d->devices[i].version);
+    gavl_diprintf(4, "Services: %d\n", d->devices[i].num_services);
+    for(j = 0; j < d->devices[i].num_services; j++)
+      {
+      gavl_diprintf(6, "Type: %s.%d\n", d->devices[i].services[j].type, d->devices[i].services[j].version);
+      }
+    }
+  gavl_diprintf(2, "Services: %d\n", d->num_services);
+  for(j = 0; j < d->num_services; j++)
+    {
+    gavl_diprintf(4, "Type: %s.%d\n", d->services[j].type,
+                  d->services[j].version);
+    }
+
+  }
+
+void
+bg_ssdp_service_free(bg_ssdp_service_t * s)
+  {
+  if(s->type)
+    free(s->type);
+  }
+
+void
+bg_ssdp_device_free(bg_ssdp_device_t * dev)
+  {
+  int i;
+  for(i = 0; i < dev->num_services; i++)
+    bg_ssdp_service_free(&dev->services[i]);
+  if(dev->services)
+    free(dev->services);
+  if(dev->type)
+    free(dev->type);
+  if(dev->uuid)
+    free(dev->uuid);
+
+  }
+
+bg_ssdp_device_t *
+bg_ssdp_device_add_device(bg_ssdp_root_device_t * dev, const char * uuid)
+  {
+  bg_ssdp_device_t * ret;
+  dev->devices = realloc(dev->devices, (dev->num_devices+1)*sizeof(*dev->devices));
+  ret = dev->devices + dev->num_devices;
+  memset(ret, 0, sizeof(*ret));
+  ret->uuid = gavl_strdup(uuid);
+  //  fprintf(stderr, "bg_ssdp_device_add_device\n");
+  dev->num_devices++;
+  return ret;
+  }
+
+void
+bg_ssdp_root_device_free(bg_ssdp_root_device_t * dev)
+  {
+  int i;
+  for(i = 0; i < dev->num_services; i++)
+    bg_ssdp_service_free(&dev->services[i]);
+  if(dev->services)
+    free(dev->services);
+
+  for(i = 0; i < dev->num_devices; i++)
+    bg_ssdp_device_free(&dev->devices[i]);
+  if(dev->devices)
+    free(dev->devices);
+
+  if(dev->uuid)
+    free(dev->uuid);
+  if(dev->url)
+    free(dev->url);
+  if(dev->type)
+    free(dev->type);
+  }
+
+/* Get USN / NT */
+
+char * bg_ssdp_get_service_type_usn(const bg_ssdp_root_device_t * d, int dev, int serv)
+  {
+  if(dev < 0)
+    {
+    return bg_sprintf("uuid:%s::urn:schemas-upnp-org:service:%s:%d",
+                      d->uuid,
+                      d->services[serv].type,
+                      d->services[serv].version);
+    }
+  else
+    {
+    return bg_sprintf("uuid:%s::urn:schemas-upnp-org:device:%s:%d",
+                      d->devices[dev].uuid,
+                      d->devices[dev].services[serv].type,
+                      d->devices[dev].services[serv].version);
+    }
+  }
+
+char * bg_ssdp_get_device_type_usn(const bg_ssdp_root_device_t * d, int dev)
+  {
+  if(dev < 0)
+    {
+    return bg_sprintf("uuid:%s::urn:schemas-upnp-org:device:%s:%d",
+                      d->uuid,
+                      d->type,
+                      d->version);
+    }
+  else
+    {
+    return bg_sprintf("uuid:%s::urn:schemas-upnp-org:device:%s:%d",
+                      d->devices[dev].uuid,
+                      d->devices[dev].type,
+                      d->devices[dev].version);
+    }
+  }
+
+
+char * bg_ssdp_get_device_uuid_usn(const bg_ssdp_root_device_t * d, int dev)
+  {
+  if(dev < 0)
+    return bg_sprintf("uuid:%s", d->uuid);
+  else
+    return bg_sprintf("uuid:%s", d->devices[dev].uuid);
+  }
+
+char * bg_ssdp_get_root_usn(const bg_ssdp_root_device_t * d)
+  {
+  return bg_sprintf("uuid:%s::upnp:rootdevice",
+                    d->uuid);
+  }
+
+char * bg_ssdp_get_service_type_nt(const bg_ssdp_root_device_t * d, int dev, int serv)
+  {
+  if(dev < 0)
+    return bg_sprintf("urn:schemas-upnp-org:service:%s:%d",
+                     d->services[serv].type,
+                     d->services[serv].version);
+  else
+    return bg_sprintf("urn:schemas-upnp-org:service:%s:%d",
+                     d->devices[dev].services[serv].type,
+                     d->devices[dev].services[serv].version);
+  }
+
+char * bg_ssdp_get_device_type_nt(const bg_ssdp_root_device_t * d, int dev)
+  {
+  if(dev < 0)
+    return bg_sprintf("urn:schemas-upnp-org:device:%s:%d",
+                     d->type, d->version);
+  else
+    return bg_sprintf("urn:schemas-upnp-org:device:%s:%d",
+                     d->devices[dev].type,
+                     d->devices[dev].version);
+  }
+
+char * bg_ssdp_get_device_uuid_nt(const bg_ssdp_root_device_t * d, int dev)
+  {
+  if(dev < 0)
+    return bg_sprintf("uuid:%s", d->uuid);
+  else
+    return bg_sprintf("uuid:%s", d->devices[dev].uuid);
+  }
+
+char * bg_ssdp_get_root_nt(const bg_ssdp_root_device_t * d)
+  {
+  return gavl_strdup("upnp:rootdevice");
+  }

gmerlin-4256.tar.gz/lib/upnp/transcoder.c Added

@@ -0,0 +1,361 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/upnp/device.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+
+#include <string.h>
+
+/* dlna stuff (taken from libdlna) */
+
+/* DLNA.ORG_PS: play speed parameter (integer)
+ *     0 invalid play speed
+ *     1 normal play speed
+ */
+typedef enum {
+  DLNA_ORG_PLAY_SPEED_INVALID = 0,
+  DLNA_ORG_PLAY_SPEED_NORMAL = 1,
+} dlna_org_play_speed_t;
+
+/* DLNA.ORG_CI: conversion indicator parameter (integer)
+ *     0 not transcoded
+ *     1 transcoded
+ */
+typedef enum {
+  DLNA_ORG_CONVERSION_NONE = 0,
+  DLNA_ORG_CONVERSION_TRANSCODED = 1,
+} dlna_org_conversion_t;
+
+/* DLNA.ORG_OP: operations parameter (string)
+ *     "00" (or "0") neither time seek range nor range supported
+ *     "01" range supported
+ *     "10" time seek range supported
+ *     "11" both time seek range and range supported
+ */
+typedef enum {
+  DLNA_ORG_OPERATION_NONE                  = 0x00,
+  DLNA_ORG_OPERATION_RANGE                 = 0x01,
+  DLNA_ORG_OPERATION_TIMESEEK              = 0x10,
+} dlna_org_operation_t;
+
+/* DLNA.ORG_FLAGS, padded with 24 trailing 0s
+ *     80000000  31  senderPaced
+ *     40000000  30  lsopTimeBasedSeekSupported
+ *     20000000  29  lsopByteBasedSeekSupported
+ *     10000000  28  playcontainerSupported
+ *      8000000  27  s0IncreasingSupported
+ *      4000000  26  sNIncreasingSupported
+ *      2000000  25  rtspPauseSupported
+ *      1000000  24  streamingTransferModeSupported
+ *       800000  23  interactiveTransferModeSupported
+ *       400000  22  backgroundTransferModeSupported
+ *       200000  21  connectionStallingSupported
+ *       100000  20  dlnaVersion15Supported
+ *
+ *     Example: (1 << 24) | (1 << 22) | (1 << 21) | (1 << 20)
+ *       DLNA.ORG_FLAGS=01700000[000000000000000000000000] // [] show padding
+ */
+typedef enum {
+  DLNA_ORG_FLAG_SENDER_PACED               = (1 << 31),
+  DLNA_ORG_FLAG_TIME_BASED_SEEK            = (1 << 30),
+  DLNA_ORG_FLAG_BYTE_BASED_SEEK            = (1 << 29),
+  DLNA_ORG_FLAG_PLAY_CONTAINER             = (1 << 28),
+  DLNA_ORG_FLAG_S0_INCREASE                = (1 << 27),
+  DLNA_ORG_FLAG_SN_INCREASE                = (1 << 26),
+  DLNA_ORG_FLAG_RTSP_PAUSE                 = (1 << 25),
+  DLNA_ORG_FLAG_STREAMING_TRANSFER_MODE    = (1 << 24),
+  DLNA_ORG_FLAG_INTERACTIVE_TRANSFER_MODE  = (1 << 23),
+  DLNA_ORG_FLAG_BACKGROUND_TRANSFER_MODE   = (1 << 22),
+  DLNA_ORG_FLAG_CONNECTION_STALL           = (1 << 21),
+  DLNA_ORG_FLAG_DLNA_V15                   = (1 << 20),
+} dlna_org_flags_t;
+
+static char * get_log_options()
+  {
+  const char * syslog_name;
+  int level;
+  level = bg_log_get_verbose_level();
+  syslog_name = bg_log_syslog_name();
+  if(syslog_name)
+    return bg_sprintf("-v %d -syslog %s", level, syslog_name);
+  else
+    return bg_sprintf("-v %d", level);
+  }
+
+#if 1
+static char * create_dlna_info(dlna_org_conversion_t ci,
+                               dlna_org_operation_t op,
+                               dlna_org_flags_t flags, const char * type)
+  {
+  return
+    bg_sprintf("DLNA.ORG_CI=%d;DLNA.ORG_OP=%.2x;DLNA.ORG_PN=%s;DLNA.ORG_FLAGS=%.8x%.24x",
+               ci, op, type, flags, 0);
+  }
+
+
+/* LPCM */
+static int is_supported_lpcm(bg_plugin_registry_t * plugin_reg)
+  {
+  return 1;
+  }
+
+static char * make_command_lpcm(const char * source_file, double seek_time)
+  {
+  return bg_sprintf("gavf-decode -seek %f -vs m -ts m -os m -as d -i \"%s\" -oopt t=120000 | "
+                    "gavf-encode -enc \"a2v=0:ae=e_wav{format=raw}\" "
+                    "-ac \"bits=16:be=1\" -o -", seek_time, source_file);
+  }
+
+static char * make_protocol_info_lpcm(bg_db_object_t * obj, const char * mimetype)
+  {
+  bg_db_audio_file_t * af;
+  char * ret;
+  char * dlna;
+
+  if(!mimetype)
+    mimetype = "audio/L16";
+  
+  if(bg_db_object_get_type(obj) != BG_DB_OBJECT_AUDIO_FILE)
+    return NULL;
+
+  af = (bg_db_audio_file_t *)obj;
+
+  dlna = create_dlna_info(DLNA_ORG_CONVERSION_TRANSCODED,
+                          DLNA_ORG_OPERATION_NONE,
+                          DLNA_ORG_FLAG_STREAMING_TRANSFER_MODE |
+                          DLNA_ORG_FLAG_BACKGROUND_TRANSFER_MODE |
+                          DLNA_ORG_FLAG_CONNECTION_STALL |
+                          DLNA_ORG_FLAG_DLNA_V15,
+                          "LPCM");
+
+  ret =  bg_sprintf("http-get:*:%s:rate=%d;channels=%d;%s", mimetype, af->samplerate,
+                    af->channels, dlna);
+  free(dlna);
+  return ret;
+  }
+
+static void set_header_lpcm(bg_db_object_t * obj,
+                            const gavl_metadata_t * req,
+                            gavl_metadata_t * res, const char * mimetype)
+  {
+  char * tmp_string;
+  bg_db_audio_file_t * af;
+  //  int64_t content_length;
+
+  if(bg_db_object_get_type(obj) != BG_DB_OBJECT_AUDIO_FILE)
+    return;
+  af = (bg_db_audio_file_t *)obj;
+
+  if(!mimetype)
+    mimetype = "audio/L16";
+  
+  tmp_string = bg_sprintf("%s;rate=%d;channels=%d", mimetype,
+                          af->samplerate, af->channels); 
+
+
+  gavl_metadata_set(res, "Content-Type", tmp_string);
+  free(tmp_string);
+#if 0
+  content_length = gavl_time_scale(af->samplerate, obj->duration);
+  content_length *= 2 * af->channels;
+  content_length += 1024 * af->channels;
+  tmp_string = bg_sprintf("%"PRId64, content_length); 
+  gavl_metadata_set(res, "Content-Length", tmp_string);
+  free(tmp_string);
+#endif
+  gavl_metadata_set(res, "transferMode.dlna.org", "Streaming");
+  
+  tmp_string = create_dlna_info(DLNA_ORG_CONVERSION_TRANSCODED,
+                                DLNA_ORG_OPERATION_NONE,
+                                DLNA_ORG_FLAG_STREAMING_TRANSFER_MODE |
+                                DLNA_ORG_FLAG_BACKGROUND_TRANSFER_MODE |
+                                DLNA_ORG_FLAG_CONNECTION_STALL |
+                                DLNA_ORG_FLAG_DLNA_V15,
+                                "LPCM");
+  gavl_metadata_set(res, "contentFeatures.dlna.org", tmp_string);
+  
+  free(tmp_string);
+  }
+
+static int get_bitrate_lpcm(bg_db_object_t * obj)
+  {
+  bg_db_audio_file_t * af;
+  af = (bg_db_audio_file_t *)obj;
+  return af->samplerate * af->channels * 2 * 8;
+  }
+#endif
+
+/* mp3 */
+
+static int is_supported_mp3(bg_plugin_registry_t * plugin_reg)
+  {
+  return 1;
+  }
+
+static char * make_command_mp3(const char * source_file, double seek_time)
+  {
+  char * log, *ret;
+  log = get_log_options();
+  ret = bg_sprintf("gavf-decode -seek %f -vs m -ts m -os m -as d -i \"%s\" %s | "
+                    "gavf-encode -enc \"a2v=0:ae=e_lame{do_id3v1=0:do_id3v2=0}\" "
+                    "-ac cbr_bitrate=320 %s -o -", seek_time, source_file, log, log);
+  free(log);
+  return ret;
+  }
+
+static char * make_protocol_info_mp3(bg_db_object_t * obj, const char * mimetype)
+  {
+  if(!mimetype)
+    mimetype = "audio/mpeg";
+  
+  return bg_sprintf("http-get:*:%s:*", mimetype);
+  }
+                    
+
+static void set_header_mp3(bg_db_object_t * obj,
+                           const gavl_metadata_t * req,
+                           gavl_metadata_t * res, const char * mimetype)
+  {
+  if(!mimetype)
+    mimetype = "audio/mpeg";
+  gavl_metadata_set(res, "Content-Type", mimetype);
+  }
+
+static int get_bitrate_mp3(bg_db_object_t * obj)
+  {
+  return 320000;
+  }
+
+/* Vorbis (for firefox) */
+
+static int is_supported_vorbis(bg_plugin_registry_t * plugin_reg)
+  {
+  return 1;
+  }
+
+static char * make_command_vorbis(const char * source_file, double seek_time)
+  {
+  char * log, *ret;
+  log = get_log_options();
+
+  ret = bg_sprintf("gavf-decode -seek %f -vs m -ts m -os m -as d -i \"%s\" %s | "
+                   "gavf-encode -enc \"a2v=0:ae=e_vorbis\" "
+                   "-ac \"bitrate_mode=vbr:quality=5.0\" %s -o -", seek_time, source_file, log, log);
+  free(log);
+  return ret;
+  }
+
+static char * make_protocol_info_vorbis(bg_db_object_t * obj, const char * mimetype)
+  {
+  if(!mimetype)
+    mimetype = "audio/ogg";
+  
+  return bg_sprintf("http-get:*:%s:*", mimetype);
+  }
+                    
+
+static void set_header_vorbis(bg_db_object_t * obj,
+                              const gavl_metadata_t * req,
+                              gavl_metadata_t * res, const char * mimetype)
+  {
+  char * tmp_string;
+  if(!mimetype)
+    mimetype = "audio/ogg";
+
+  gavl_metadata_set(res, "Content-Type", mimetype);
+  if(obj->duration > 0)
+    {
+    tmp_string = bg_sprintf("%f", gavl_time_to_seconds(obj->duration));
+    gavl_metadata_set(res, "X-Content-Duration", tmp_string);
+    free(tmp_string);
+    }
+  }
+
+static int get_bitrate_vorbis(bg_db_object_t * obj)
+  {
+  return 0;
+  }
+
+const bg_upnp_transcoder_t bg_upnp_transcoders[] =
+  {
+#if 1
+    {
+      .is_supported = is_supported_lpcm,
+      .make_command = make_command_lpcm,
+      .make_protocol_info = make_protocol_info_lpcm,
+      .set_header = set_header_lpcm,
+      .get_bitrate = get_bitrate_lpcm,
+      .name         = "lpcm-dlna",
+      .in_mimetype  = "audio/*",
+      .out_mimetype = "audio/L16",
+      .ext          = "",
+    },
+#endif
+    {
+      .is_supported = is_supported_mp3,
+      .make_command = make_command_mp3,
+      .make_protocol_info = make_protocol_info_mp3,
+      .set_header = set_header_mp3,
+      .get_bitrate = get_bitrate_mp3,
+      .name         = "mp3-320",
+      .in_mimetype  = "audio/*",
+      .out_mimetype = "audio/mpeg",
+      .ext          = ".mp3",
+    },
+    {
+      .is_supported = is_supported_vorbis,
+      .make_command = make_command_vorbis,
+      .make_protocol_info = make_protocol_info_vorbis,
+      .set_header = set_header_vorbis,
+      .get_bitrate = get_bitrate_vorbis,
+      .name         = "vorbis",
+      .in_mimetype  = "audio/*",
+      .out_mimetype = "audio/ogg",
+      .ext          = ".ogg",
+    },
+    { /* */ }
+  };
+
+const bg_upnp_transcoder_t *
+bg_upnp_transcoder_by_name(const char * name)
+  {
+  int i = 0;
+  const char * pos = strchr(name, '/');
+  if(!pos)
+    pos = name + strlen(name);
+  
+  while(bg_upnp_transcoders[i].is_supported)
+    {
+    if(strlen(bg_upnp_transcoders[i].name) == (pos - name) &&
+       !strncmp(name, bg_upnp_transcoders[i].name, pos - name))
+      return &bg_upnp_transcoders[i];
+    i++;
+    }
+  return NULL;
+  }
+
+int64_t bg_upnp_transcoder_get_size(const bg_upnp_transcoder_t * t,
+                                    bg_db_object_t * obj)
+  {
+  int bitrate = t->get_bitrate(obj);
+  return (int64_t)(bitrate / 8 * gavl_time_to_seconds(obj->duration) + 0.5);
+  }

gmerlin-1.2.0.tar.gz/lib/urilist.c -> gmerlin-4256.tar.gz/lib/urilist.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,16 +29,18 @@
 
 #define HOSTNAME_MAX_LEN 512
 
+static const char * reserved =
+  ":?#[]@!$&'()*+,;=";
+
 static int do_substitute(uint8_t c)
   {
-  if(!isalnum(c) &&
-     (c != '-') && 
-     (c != '_') && 
-     (c != '~') && 
-     (c != ':') && 
-     (c != '/') && 
-     (c != '.'))
-    return 1;
+  int idx = 0;
+  while(reserved[idx] != '\0')
+    {
+    if(c == reserved[idx])
+      return 1;
+    idx++;
+    }
   if((c <= 32) || (c >= 127))
     return 1;
   return 0;
@@ -171,7 +173,6 @@
   char ** ret;
   const char * pos1;
   const char * pos2;
-  int end;
   int num_uris;
   int num_added;
 
@@ -180,7 +181,6 @@
 
   /* Count the URIs */
   
-  end = 0;
   num_uris = 0;
   while(1)
     {
@@ -204,7 +204,6 @@
   /* Set up the array and decode URLS */
 
   num_added = 0;
-  end = 0;
   pos1 = str;
 
   ret = calloc(num_uris+1, sizeof(char*));
@@ -221,8 +220,6 @@
 
     if(!isspace(*pos2) || (pos1 == pos2))
       {
-      end = 1;
-      
       if(*pos2 != '\0')
         pos2++;
       }

gmerlin-1.2.0.tar.gz/lib/utf8.c -> gmerlin-4256.tar.gz/lib/utf8.c Changed

gmerlin-4256.tar.gz/lib/videofilters.c Added

@@ -0,0 +1,368 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/converters.h>
+
+
+#include <gmerlin/utils.h>
+
+#include <gmerlin/filters.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "videofilters"
+
+
+/* Video */
+
+typedef struct
+  {
+  bg_plugin_handle_t * handle;
+  bg_fv_plugin_t     * plugin;
+  gavl_video_source_t * out_src;
+  } video_filter_t;
+
+struct bg_video_filter_chain_s
+  {
+  gavl_video_source_t * out_src; // Last Filter element
+  gavl_video_source_t * in_src; // Legacy!!
+  
+  int num_filters;
+  video_filter_t * filters;
+  const bg_gavl_video_options_t * opt;
+  bg_plugin_registry_t * plugin_reg;
+  
+  bg_parameter_info_t * parameters;
+
+  char * filter_string;
+  
+  int need_rebuild;
+  int need_restart;
+  
+  bg_read_video_func_t in_func;
+  void * in_data;
+  int in_stream;
+
+  
+  pthread_mutex_t mutex;
+  };
+
+int bg_video_filter_chain_need_restart(bg_video_filter_chain_t * ch)
+  {
+  return ch->need_restart || ch->need_rebuild;
+  }
+
+static int
+video_filter_create(video_filter_t * f,
+                    bg_video_filter_chain_t * ch,
+                    const char * name)
+  {
+  const bg_plugin_info_t * info;
+  info = bg_plugin_find_by_name(ch->plugin_reg, name);
+  if(!info)
+    return 0;
+  f->handle = bg_plugin_load(ch->plugin_reg, info);
+  if(!f->handle)
+    return 0;
+
+  f->plugin = (bg_fv_plugin_t*)(f->handle->plugin);
+  return 1;
+  }
+
+static void video_filter_destroy(video_filter_t * f)
+  {
+  if(f->handle)
+    bg_plugin_unref_nolock(f->handle);
+  }
+
+static void destroy_video_chain(bg_video_filter_chain_t * ch)
+  {
+  int i;
+  
+  /* Destroy previous filters */
+  for(i = 0; i < ch->num_filters; i++)
+    video_filter_destroy(&ch->filters[i]);
+  if(ch->filters)
+    {
+    free(ch->filters);
+    ch->filters = NULL;
+    }
+  ch->num_filters = 0;
+  }
+
+static void bg_video_filter_chain_rebuild(bg_video_filter_chain_t * ch)
+  {
+  int i;
+  char ** filter_names;
+  filter_names = bg_strbreak(ch->filter_string, ',');
+  
+  destroy_video_chain(ch);
+  
+  if(!filter_names)
+    return;
+  
+  while(filter_names[ch->num_filters])
+    ch->num_filters++;
+
+  ch->filters = calloc(ch->num_filters, sizeof(*ch->filters));
+  for(i = 0; i < ch->num_filters; i++)
+    {
+    video_filter_create(&ch->filters[i], ch,
+                        filter_names[i]);
+    }
+  bg_strbreak_free(filter_names);
+  ch->need_rebuild = 0;
+  }
+
+bg_video_filter_chain_t *
+bg_video_filter_chain_create(const bg_gavl_video_options_t * opt,
+                             bg_plugin_registry_t * plugin_reg)
+  {
+  bg_video_filter_chain_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  ret->opt = opt;
+  ret->plugin_reg = plugin_reg;
+  
+  pthread_mutex_init(&ret->mutex, NULL);
+  return ret;
+  }
+
+static const bg_parameter_info_t params[] =
+  {
+    {
+      .name      = "video_filters",
+      .opt       = "f",
+      .long_name = TRS("Video Filters"),
+      .preset_path = "videofilters",
+      .gettext_domain = PACKAGE,
+      .gettext_directory = LOCALE_DIR,
+      .type = BG_PARAMETER_MULTI_CHAIN,
+      .flags = BG_PARAMETER_SYNC,
+    },
+    { /* End */ }
+  };
+
+static void create_video_parameters(bg_video_filter_chain_t * ch)
+  {
+  ch->parameters = bg_parameter_info_copy_array(params);
+  bg_plugin_registry_set_parameter_info(ch->plugin_reg,
+                                        BG_PLUGIN_FILTER_VIDEO,
+                                        BG_PLUGIN_FILTER_1,
+                                        ch->parameters);
+  }
+
+const bg_parameter_info_t *
+bg_video_filter_chain_get_parameters(bg_video_filter_chain_t * ch)
+  {
+  if(!ch->parameters)
+    create_video_parameters(ch);
+  return ch->parameters;
+  }
+
+void
+bg_video_filter_chain_set_parameter(void * data, const char * name,
+                                    const bg_parameter_value_t * val)
+  {
+  int i;
+  char * pos;
+  video_filter_t * f;
+  
+  bg_video_filter_chain_t * ch;
+  ch = (bg_video_filter_chain_t *)data;
+    
+  if(!name)
+    {
+    for(i = 0; i < ch->num_filters; i++)
+      {
+      if(ch->filters[i].plugin->common.set_parameter)
+        ch->filters[i].plugin->common.set_parameter(ch->filters[i].handle->priv,
+                                             NULL, NULL);
+      }
+    return;
+    }
+
+  
+  if(!strcmp(name, "video_filters"))
+    {
+    if(!ch->filter_string && !val->val_str)
+      goto the_end;
+    
+    if(ch->filter_string && val->val_str &&
+       !strcmp(ch->filter_string, val->val_str))
+      {
+      goto the_end;
+      }
+    /* Rebuild chain */
+    ch->filter_string = gavl_strrep(ch->filter_string, val->val_str);
+    ch->need_rebuild = 1;
+    }
+  else if(!strncmp(name, "video_filters.", 14))
+    {
+    if(ch->need_rebuild)
+      bg_video_filter_chain_rebuild(ch);
+    
+    pos = strchr(name, '.');
+    pos++;
+    i = atoi(pos);
+    f = ch->filters + i;
+
+    pos = strchr(pos, '.');
+    if(!pos)
+      goto the_end;
+    pos++;
+    if(f->plugin->common.set_parameter)
+      {
+      f->plugin->common.set_parameter(f->handle->priv, pos, val);
+      if(f->plugin->need_restart &&
+         f->plugin->need_restart(f->handle->priv))
+        ch->need_restart = 1;
+      }
+    }
+  the_end:
+  return;
+  }
+
+/* Legacy */
+static gavl_source_status_t
+read_func_in(void * priv, gavl_video_frame_t ** frame)
+  {
+  bg_video_filter_chain_t * ch = priv;
+  if(!ch->in_func(ch->in_data, *frame, ch->in_stream))
+    return GAVL_SOURCE_EOF;
+  return GAVL_SOURCE_OK;
+  }
+
+
+int bg_video_filter_chain_init(bg_video_filter_chain_t * ch,
+                               const gavl_video_format_t * in_format,
+                               gavl_video_format_t * out_format)
+  {
+  ch->need_restart = 0;
+  
+
+  if(ch->in_src)
+    gavl_video_source_destroy(ch->in_src);
+
+  ch->in_src = gavl_video_source_create(read_func_in, ch, 0, in_format);
+
+  bg_video_filter_chain_connect(ch, ch->in_src);
+  gavl_video_format_copy(out_format, gavl_video_source_get_src_format(ch->out_src));
+  return ch->num_filters;
+  }
+
+void bg_video_filter_chain_connect_input(bg_video_filter_chain_t * ch,
+                                         bg_read_video_func_t func, void * priv,
+                                         int stream)
+  {
+  ch->in_func = func;
+  ch->in_data = priv;
+  ch->in_stream = stream;
+  }
+
+int bg_video_filter_chain_read(void * priv, gavl_video_frame_t* frame,
+                               int stream)
+  {
+  bg_video_filter_chain_t * ch = priv;
+  return (gavl_video_source_read_frame(ch->out_src, &frame) == GAVL_SOURCE_OK);
+  }
+
+int bg_video_filter_chain_set_out_format(bg_video_filter_chain_t * ch,
+                                         const gavl_video_format_t * out_format)
+  {
+  gavl_video_source_set_dst(ch->out_src, 0, out_format);
+  return 1; // Unused anyway?
+  }
+
+
+void bg_video_filter_chain_destroy(bg_video_filter_chain_t * ch)
+  {
+  if(ch->parameters)
+    bg_parameter_info_destroy_array(ch->parameters);
+  if(ch->filter_string)
+    free(ch->filter_string);
+  destroy_video_chain(ch);
+
+  if(ch->in_src)
+    gavl_video_source_destroy(ch->in_src);
+
+  pthread_mutex_destroy(&ch->mutex);
+  
+  free(ch);
+  }
+
+void bg_video_filter_chain_lock(void * priv)
+  {
+  bg_video_filter_chain_t * cnv = priv;
+  pthread_mutex_lock(&cnv->mutex);
+  }
+
+void bg_video_filter_chain_unlock(void * priv)
+  {
+  bg_video_filter_chain_t * cnv = priv;
+  pthread_mutex_unlock(&cnv->mutex);
+  }
+
+void bg_video_filter_chain_reset(bg_video_filter_chain_t * ch)
+  {
+  int i;
+  for(i = 0; i < ch->num_filters; i++)
+    {
+    if(ch->filters[i].plugin->reset)
+      ch->filters[i].plugin->reset(ch->filters[i].handle->priv);
+    gavl_video_source_reset(ch->filters[i].out_src);
+    }
+  }
+
+gavl_video_source_t *
+bg_video_filter_chain_connect(bg_video_filter_chain_t * ch,
+                              gavl_video_source_t * src)
+  {
+  int i;
+
+  if(ch->need_rebuild)
+    bg_video_filter_chain_rebuild(ch);
+  
+  for(i = 0; i < ch->num_filters; i++)
+    {
+    gavl_video_options_copy(gavl_video_source_get_options(src),
+                            ch->opt->opt);
+    
+    ch->filters[i].out_src =
+      ch->filters[i].plugin->connect(ch->filters[i].handle->priv,
+                                     src, ch->opt->opt);
+    src = ch->filters[i].out_src;
+    }
+  
+  ch->out_src = src;
+  gavl_video_source_set_lock_funcs(ch->out_src,
+                                   bg_video_filter_chain_lock,
+                                   bg_video_filter_chain_unlock,
+                                   ch);
+  
+  return ch->out_src;
+  }

gmerlin-1.2.0.tar.gz/lib/visualize.c -> gmerlin-4256.tar.gz/lib/visualize.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -40,7 +40,6 @@
 #include <gmerlin/log.h>
 
 #define LOG_DOMAIN "visualizer"
-
 /*
  * gmerlin_visualize_slave
  *   -w "window_id"
@@ -48,6 +47,12 @@
  *   -o "output_module"
  */
 
+#ifdef PKGBIN_DIR
+#define PKGBIN_PATH PKGBIN_DIR"/"
+#else
+#define PKGBIN_PATH ""
+#endif
+
 struct bg_visualizer_s
   {
   bg_msg_t * msg;
@@ -228,21 +233,21 @@
     
   if(v->vis_info->flags & BG_PLUGIN_VISUALIZE_FRAME)
     {
-    command = bg_sprintf("gmerlin_visualizer_slave  -w %s -o %s -p ",
+    command = bg_sprintf(PKGBIN_PATH "gmerlin_visualizer_slave  -w %s -o %s -p ",
                          v->display_string,
                          v->ov_info->module_filename);
     }
   else
     {
-    command = bg_sprintf("gmerlin_visualizer_slave -w %s -p ",
+    command = bg_sprintf(PKGBIN_PATH "gmerlin_visualizer_slave -w %s -p ",
                          v->display_string);
     }
 #ifdef HAVE_LV
   if(v->vis_info->api == BG_PLUGIN_API_LV)
-    command = bg_strcat(command, v->vis_info->name);
+    command = gavl_strcat(command, v->vis_info->name);
   else
 #endif  
-    command = bg_strcat(command, v->vis_info->module_filename);
+    command = gavl_strcat(command, v->vis_info->module_filename);
   
   v->proc = bg_subprocess_create(command, 1, 1, 0);
   if(!v->proc)

gmerlin-1.2.0.tar.gz/lib/visualize_slave.c -> gmerlin-4256.tar.gz/lib/visualize_slave.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -64,7 +64,7 @@
   
   gavl_volume_control_t * gain_control;
   pthread_mutex_t gain_mutex;
-  
+
   } audio_buffer_t;
 
 static audio_buffer_t * audio_buffer_create()
@@ -279,7 +279,7 @@
   bg_msg_queue_t * cb_queue; /* Pass events */
 
   bg_ov_callbacks_t   cb;
-  
+  gavl_video_sink_t * sink;
   } bg_visualizer_slave_t;
 
 static int init_plugin(bg_visualizer_slave_t * v);
@@ -482,9 +482,13 @@
   if(!strncmp(plugin_module, "vis_lv_", 7))
     {
     if(ret->ov_handle)
-      ret->vis_handle = load_plugin_lv(plugin_module, BG_PLUGIN_VISUALIZE_FRAME, ret->window_id);
+      ret->vis_handle =
+        load_plugin_lv(plugin_module,
+                       BG_PLUGIN_VISUALIZE_FRAME, ret->window_id);
     else
-      ret->vis_handle = load_plugin_lv(plugin_module, BG_PLUGIN_VISUALIZE_GL, ret->window_id);
+      ret->vis_handle =
+        load_plugin_lv(plugin_module,
+                       BG_PLUGIN_VISUALIZE_GL, ret->window_id);
     ret->vis_api = BG_PLUGIN_API_LV;
     }
   else
@@ -592,13 +596,13 @@
       v->vis_plugin->draw_frame(v->vis_handle->priv, NULL);
     else if(v->do_convert_video)
       {
-      out_frame = v->ov_plugin->get_frame(v->ov_handle->priv);
+      out_frame = gavl_video_sink_get_frame(v->sink);
       v->vis_plugin->draw_frame(v->vis_handle->priv, v->video_frame_in);
       gavl_video_convert(v->video_cnv, v->video_frame_in, out_frame);
       }
     else
       {
-      out_frame = v->ov_plugin->get_frame(v->ov_handle->priv);
+      out_frame = gavl_video_sink_get_frame(v->sink);
       v->vis_plugin->draw_frame(v->vis_handle->priv, out_frame);
       }
     pthread_mutex_unlock(&v->vis_mutex);
@@ -617,7 +621,8 @@
     if(v->do_ov)
       {
       pthread_mutex_lock(&v->ov_mutex);
-      v->ov_plugin->put_video(v->ov_handle->priv, out_frame);
+
+      gavl_video_sink_put_frame(v->sink, out_frame);
       frame_time = gavl_timer_get(v->timer);
       
       v->ov_plugin->handle_events(v->ov_handle->priv);
@@ -738,6 +743,8 @@
     /* Open OV Plugin */
     if(!v->ov_plugin->open(v->ov_handle->priv, &v->video_format_out, 0))
       return 0;
+
+    v->sink = v->ov_plugin->get_sink(v->ov_handle->priv);
     
     /* Initialize video converter */
     
@@ -774,9 +781,7 @@
 static int write_message(bg_msg_t * msg)
   {
   int result;
-//  fprintf(stderr, "Write message slave...\n");
   result = bg_msg_write(msg, msg_write_callback, NULL);
-//  fprintf(stderr, "Write message slave done %d\n", result);
   return result;
   }
 
@@ -806,8 +811,7 @@
   bg_msg_queue_t * log_queue;
   int counter = 0.0;
   bg_parameter_type_t parameter_type;
-  gavl_dsp_context_t * ctx;
-  int big_endian;
+  gavl_dsp_context_t * ctx = NULL;
   int result;
 
   ctx = gavl_dsp_context_create();
@@ -840,20 +844,21 @@
     switch(bg_msg_get_id(msg))
       {
       case BG_VIS_MSG_AUDIO_FORMAT:
-        bg_msg_get_arg_audio_format(msg, 0, &audio_format, &big_endian);
-
+        bg_msg_get_arg_audio_format(msg, 0, &audio_format);
+        
         bg_visualizer_slave_set_audio_format(s, &audio_format);
         if(audio_frame)
           gavl_audio_frame_destroy(audio_frame);
         audio_frame = gavl_audio_frame_create(&audio_format);
         break;
       case BG_VIS_MSG_AUDIO_DATA:
-        bg_msg_read_audio_frame(ctx,
+        bg_msg_read_audio_frame(&ctx,
                                 msg,
                                 &audio_format,
+                                NULL,
                                 audio_frame,
                                 msg_read_callback,
-                                NULL, big_endian);
+                                NULL);
         
         if(!pthread_mutex_trylock(&s->running_mutex))
           {

gmerlin-1.2.0.tar.gz/lib/x11/Makefile.am -> gmerlin-4256.tar.gz/lib/x11/Makefile.am Changed

gmerlin-1.2.0.tar.gz/lib/x11/glvideo.c -> gmerlin-4256.tar.gz/lib/x11/glvideo.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -36,7 +36,6 @@
   int width, height;
 
   /* For overlays only */
-  int active;
   gavl_rectangle_i_t src_rect;
   int dst_x, dst_y;
   } texture_t;
@@ -45,8 +44,8 @@
   {
   int extensions;
   
-  texture_t video;
-  texture_t * overlays;
+  //  texture_t video;
+  //  texture_t * overlays;
   } gl_priv_t;
 
 static int has_extension(const char * extensions,
@@ -111,75 +110,85 @@
   return check_gl(d->win, d->pixelformats, priv);
   }
 
-static void create_texture(gl_priv_t * priv,
-                           texture_t * ret,
-                           int width, int height, gavl_pixelformat_t pixelformat)
+static gavl_video_frame_t *
+create_texture(gl_priv_t * glp,
+               int width, int height,
+               gavl_pixelformat_t pixelformat)
   {
-  gavl_video_frame_t * dummy;
-  
+  gavl_video_frame_t * ret;
+  texture_t * priv;
   gavl_video_format_t texture_format;
+  gavl_video_format_t image_format;
+  
+  priv = calloc(1, sizeof(*priv));
+  
   switch(pixelformat)
     {
     case GAVL_GRAY_8:
-      ret->type   = GL_LUMINANCE;
-      ret->format = GL_UNSIGNED_BYTE;
+      priv->type   = GL_LUMINANCE;
+      priv->format = GL_UNSIGNED_BYTE;
       break;
     case GAVL_GRAYA_16:
-      ret->type   = GL_LUMINANCE_ALPHA;
-      ret->format = GL_UNSIGNED_BYTE;
+      priv->type   = GL_LUMINANCE_ALPHA;
+      priv->format = GL_UNSIGNED_BYTE;
       break;
     case GAVL_GRAY_16:
-      ret->type   = GL_LUMINANCE;
-      ret->format = GL_UNSIGNED_SHORT;
+      priv->type   = GL_LUMINANCE;
+      priv->format = GL_UNSIGNED_SHORT;
       break;
     case GAVL_GRAYA_32:
-      ret->type   = GL_LUMINANCE_ALPHA;
-      ret->format = GL_UNSIGNED_SHORT;
+      priv->type   = GL_LUMINANCE_ALPHA;
+      priv->format = GL_UNSIGNED_SHORT;
       break;
     case GAVL_GRAY_FLOAT:
-      ret->type   = GL_LUMINANCE;
-      ret->format = GL_FLOAT;
+      priv->type   = GL_LUMINANCE;
+      priv->format = GL_FLOAT;
       break;
     case GAVL_GRAYA_FLOAT:
-      ret->type   = GL_LUMINANCE_ALPHA;
-      ret->format = GL_FLOAT;
+      priv->type   = GL_LUMINANCE_ALPHA;
+      priv->format = GL_FLOAT;
       break;
     case GAVL_RGB_24:
-      ret->type   = GL_RGB;
-      ret->format = GL_UNSIGNED_BYTE;
+      priv->type   = GL_RGB;
+      priv->format = GL_UNSIGNED_BYTE;
       break;
     case GAVL_RGBA_32:
-      ret->type   = GL_RGBA;
-      ret->format = GL_UNSIGNED_BYTE;
+      priv->type   = GL_RGBA;
+      priv->format = GL_UNSIGNED_BYTE;
       break;
     case GAVL_RGB_48:
-      ret->type   = GL_RGB;
-      ret->format = GL_UNSIGNED_SHORT;
+      priv->type   = GL_RGB;
+      priv->format = GL_UNSIGNED_SHORT;
       break;
     case GAVL_RGBA_64:
-      ret->type   = GL_RGBA;
-      ret->format = GL_UNSIGNED_SHORT;
+      priv->type   = GL_RGBA;
+      priv->format = GL_UNSIGNED_SHORT;
       break;
     case GAVL_RGB_FLOAT:
-      ret->type   = GL_RGB;
-      ret->format = GL_FLOAT;
+      priv->type   = GL_RGB;
+      priv->format = GL_FLOAT;
       break;
     case GAVL_RGBA_FLOAT:
-      ret->type   = GL_RGBA;
-      ret->format = GL_FLOAT;
+      priv->type   = GL_RGBA;
+      priv->format = GL_FLOAT;
       break;
     default:
       break;
     }
+  memset(&image_format, 0, sizeof(image_format));
   memset(&texture_format, 0, sizeof(texture_format));
   
-  texture_format.image_width = width;
-  texture_format.image_height = height;
-  texture_format.pixelformat = pixelformat;
-  texture_format.pixel_width = 1;
-  texture_format.pixel_height = 1;
+  image_format.image_width = width;
+  image_format.image_height = height;
+  image_format.pixelformat = pixelformat;
+  image_format.pixel_width = 1;
+  image_format.pixel_height = 1;
+
+  gavl_video_format_set_frame_size(&image_format, 0, 0);
+  
+  gavl_video_format_copy(&texture_format, &image_format);
   
-  if(!(priv->extensions & texture_non_power_of_two))
+  if(!(glp->extensions & texture_non_power_of_two))
     {
     texture_format.frame_width = 1;
     texture_format.frame_height = 1;
@@ -195,13 +204,18 @@
     texture_format.frame_height = texture_format.image_height;
     }
 
-  ret->width  = texture_format.frame_width;
-  ret->height = texture_format.frame_height;
+  //  fprintf(stderr, "Create texture:\n");
+  //  gavl_video_format_dump(&image_format);
+  //  gavl_video_format_dump(&texture_format);
   
+  priv->width  = texture_format.frame_width;
+  priv->height = texture_format.frame_height;
   
-  dummy = gavl_video_frame_create_nopad(&texture_format);
-  glGenTextures(1,&ret->texture);
-  glBindTexture(GL_TEXTURE_2D,ret->texture);
+  ret = gavl_video_frame_create_nopad(&texture_format);
+  ret->user_data = priv;
+
+  glGenTextures(1,&priv->texture);
+  glBindTexture(GL_TEXTURE_2D,priv->texture);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
@@ -209,19 +223,35 @@
 
   glTexImage2D(GL_TEXTURE_2D, 0,
                GL_RGBA,
-               // ret->type,
+               // priv->type,
                texture_format.frame_width,
                texture_format.frame_height,
                0,
-               ret->type,
-               ret->format,
-               dummy->planes[0]);
-  gavl_video_frame_destroy(dummy);
+               priv->type,
+               priv->format,
+               ret->planes[0]);
+  gavl_video_frame_destroy(ret);
+
+  /* Create real frame */
+  ret = gavl_video_frame_create_nopad(&image_format);
+  ret->user_data = priv;
+
+  //  fprintf(stderr, "create_texture %p\n", ret);
+  
+  return ret;
   }
 
-static void delete_texture(texture_t * ret)
+static void destroy_frame_gl(driver_data_t * d, gavl_video_frame_t * f)
   {
-  glDeleteTextures(1, &ret->texture);
+  texture_t * t = f->user_data;
+
+  //  fprintf(stderr, "destroy_frame_gl %p\n", f);
+  
+  bg_x11_window_set_gl(d->win);
+  glDeleteTextures(1, &t->texture);
+  gavl_video_frame_destroy(f);
+  bg_x11_window_unset_gl(d->win);
+  free(t);
   }
 
 static int open_gl(driver_data_t * d)
@@ -230,7 +260,7 @@
   gl_priv_t * priv;
   const char * extensions;
   
-  priv = (gl_priv_t *)(d->priv);
+  priv = d->priv;
   w = d->win;
   
   bg_x11_window_start_gl(w);
@@ -242,11 +272,10 @@
   if(has_extension(extensions, "GL_ARB_texture_non_power_of_two"))
     priv->extensions |= texture_non_power_of_two;
   
-  create_texture(priv,
-                 &priv->video,
-                 w->video_format.image_width,
-                 w->video_format.image_height,
-                 d->pixelformat);
+  w->frame = create_texture(priv,
+                            w->video_format.image_width,
+                            w->video_format.image_height,
+                            d->pixelformat);
   
   glDisable(GL_DEPTH_TEST);
   
@@ -268,18 +297,23 @@
   gavl_video_frame_t * ret;
   bg_x11_window_t * w;
   w = d->win;
-  ret = gavl_video_frame_create_nopad(&w->video_format);
+  
+  ret = create_texture(d->priv,
+                       w->video_format.image_width,
+                       w->video_format.image_height,
+                       w->video_format.pixelformat);
+  gavl_video_frame_clear(ret, &w->video_format);
   return ret;
   }
 
 static void put_frame_gl(driver_data_t * d, gavl_video_frame_t * f)
   {
   int i;
-  gl_priv_t * priv;
   bg_x11_window_t * w;
   float tex_x1, tex_x2, tex_y1, tex_y2;
   float v_x1, v_x2, v_y1, v_y2;
-  priv = (gl_priv_t *)(d->priv);
+  texture_t * t = f->user_data;
+  
   w = d->win;
 
   bg_x11_window_set_gl(w);
@@ -301,23 +335,23 @@
   /* Put image into texture */
   glEnable(GL_TEXTURE_2D);
   
-  glBindTexture(GL_TEXTURE_2D,priv->video.texture);
+  glBindTexture(GL_TEXTURE_2D, t->texture);
   
   glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
                   w->video_format.image_width,
                   w->video_format.image_height,
-                  priv->video.type,
-                  priv->video.format,
+                  t->type,
+                  t->format,
                   f->planes[0]);
   
   /* Draw this */
   
-  tex_x1 = (w->src_rect.x+2.0) / priv->video.width;
-  tex_y1 = (w->src_rect.y+2.0) / priv->video.height;
+  tex_x1 = (w->src_rect.x+2.0) / t->width;
+  tex_y1 = (w->src_rect.y+2.0) / t->height;
+  
+  tex_x2 = (w->src_rect.x + w->src_rect.w) / t->width;
+  tex_y2 = (w->src_rect.y + w->src_rect.h) / t->height;
   
-  tex_x2 = (w->src_rect.x + w->src_rect.w) / priv->video.width;
-  tex_y2 = (w->src_rect.y + w->src_rect.h) / priv->video.height;
-
   glColor4f(w->background_color[0], 
             w->background_color[1], 
             w->background_color[2],
@@ -341,28 +375,30 @@
     
     for(i = 0; i < w->num_overlay_streams; i++)
       {
-      if(!priv->overlays[i].active)
+      if(!w->overlay_streams[i].active)
         continue;
+
+      t = w->overlay_streams[i].ovl->user_data;
       
-      glBindTexture(GL_TEXTURE_2D,priv->overlays[i].texture);
+      glBindTexture(GL_TEXTURE_2D,t->texture);
       
-      tex_x1 = (float)(priv->overlays[i].src_rect.x) /
-        priv->overlays[i].width;
+      tex_x1 = (float)(t->src_rect.x) /
+        t->width;
       
-      tex_y1 = (float)(priv->overlays[i].src_rect.y) /
-        priv->overlays[i].height;
+      tex_y1 = (float)(t->src_rect.y) /
+        t->height;
     
-      tex_x2 = (float)(priv->overlays[i].src_rect.x + priv->overlays[i].src_rect.w) /
-        priv->overlays[i].width;
+      tex_x2 = (float)(t->src_rect.x + t->src_rect.w) /
+        t->width;
 
-      tex_y2 = (float)(priv->overlays[i].src_rect.y + priv->overlays[i].src_rect.h) /
-        priv->overlays[i].height;
+      tex_y2 = (float)(t->src_rect.y + t->src_rect.h) /
+        t->height;
       
-      v_x1 = priv->overlays[i].dst_x - w->src_rect.x;
-      v_y1 = priv->overlays[i].dst_y - w->src_rect.y;
+      v_x1 = t->dst_x - w->src_rect.x;
+      v_y1 = t->dst_y - w->src_rect.y;
 
-      v_x2 = v_x1 + priv->overlays[i].src_rect.w;
-      v_y2 = v_y1 + priv->overlays[i].src_rect.h;
+      v_x2 = v_x1 + t->src_rect.w;
+      v_y2 = v_y1 + t->src_rect.h;
       
       v_x1 = (v_x1 * w->dst_rect.w) / w->src_rect.w;
       v_x2 = (v_x2 * w->dst_rect.w) / w->src_rect.w;
@@ -384,112 +420,80 @@
   bg_x11_window_unset_gl(w);
   }
 
-static void destroy_frame_gl(driver_data_t * d, gavl_video_frame_t * f)
+/* Overlay support */
+
+static gavl_video_frame_t *
+create_overlay_gl(driver_data_t* d, overlay_stream_t * str)
   {
-  gavl_video_frame_destroy(f);
+  gavl_video_frame_t * ret;
+  bg_x11_window_set_gl(d->win);
+
+  ret = create_texture(d->priv,
+                       str->format.image_width,
+                       str->format.image_height,
+                       str->format.pixelformat);
+
+  bg_x11_window_unset_gl(d->win);
+  return ret;
+  }
+
+static void
+destroy_overlay_gl(driver_data_t* d, overlay_stream_t * str,
+                  gavl_video_frame_t * frame)
+  {
+  destroy_frame_gl(d, frame);
   }
 
-/* Overlay support */
 
-static void add_overlay_stream_gl(driver_data_t* d)
+static void init_overlay_stream_gl(driver_data_t* d, overlay_stream_t * str)
   {
-  gl_priv_t * priv;
   bg_x11_window_t * w;
   
-  priv = (gl_priv_t *)(d->priv);
   w = d->win;
-
-  priv->overlays =
-    realloc(priv->overlays,
-            (w->num_overlay_streams+1) * sizeof(*(priv->overlays)));
-  memset(&priv->overlays[w->num_overlay_streams], 0,
-         sizeof(priv->overlays[w->num_overlay_streams]));
   
   if(!gavl_pixelformat_is_rgb(w->overlay_streams[w->num_overlay_streams].format.pixelformat))
     w->overlay_streams[w->num_overlay_streams].format.pixelformat = GAVL_RGBA_32;
   
-  bg_x11_window_set_gl(w);
 
-  create_texture(priv,
-                 &priv->overlays[w->num_overlay_streams],
-                 w->overlay_streams[w->num_overlay_streams].format.image_width,
-                 w->overlay_streams[w->num_overlay_streams].format.image_height,
-                 w->overlay_streams[w->num_overlay_streams].format.pixelformat);
-  
-  bg_x11_window_unset_gl(w);
-  
+  w->num_overlay_streams++;
   }
 
-static void set_overlay_gl(driver_data_t* d, int stream, gavl_overlay_t * ovl)
+static void set_overlay_gl(driver_data_t* d, overlay_stream_t * str)
   {
-  gl_priv_t * priv;
   bg_x11_window_t * w;
   
-  priv = (gl_priv_t *)(d->priv);
   w = d->win;
 
-  if(ovl)
+  if(str->active)
     {
+    texture_t * t = str->ovl->user_data;
+    
     bg_x11_window_set_gl(w);
-    glBindTexture(GL_TEXTURE_2D,priv->overlays[stream].texture);
+    glBindTexture(GL_TEXTURE_2D, t->texture);
     
     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
-                    w->overlay_streams[stream].format.image_width,
-                    w->overlay_streams[stream].format.image_height,
-                    priv->overlays[stream].type,
-                    priv->overlays[stream].format,
-                    ovl->frame->planes[0]);
-    priv->overlays[stream].active = 1;
+                    str->format.image_width,
+                    str->format.image_height,
+                    t->type,
+                    t->format,
+                    str->ovl->planes[0]);
     bg_x11_window_unset_gl(w);
-
-    gavl_rectangle_i_copy(&priv->overlays[stream].src_rect, &ovl->ovl_rect);
-    priv->overlays[stream].dst_x = ovl->dst_x;
-    priv->overlays[stream].dst_y = ovl->dst_y;
     }
-  else
-    priv->overlays[stream].active = 0;
-  
   }
 
-
-static gavl_video_frame_t * create_overlay_gl(driver_data_t* d, int stream)
-  {
-  return gavl_video_frame_create_nopad(&d->win->overlay_streams[stream].format);
-  }
-
-static void destroy_overlay_gl(driver_data_t* d, int stream, gavl_video_frame_t* ovl)
-  {
-  gavl_video_frame_destroy(ovl);
-  }
-
-
 static void close_gl(driver_data_t * d)
   {
-  int i;
-  gl_priv_t * priv;
   bg_x11_window_t * w;
   
-  priv = (gl_priv_t *)(d->priv);
   w = d->win;
   
-  bg_x11_window_set_gl(w);
-  delete_texture(&priv->video);
-  
-  for(i = 0; i < w->num_overlay_streams; i++)
-    delete_texture(&priv->overlays[i]);
-  if(priv->overlays)
-    {
-    free(priv->overlays);
-    priv->overlays = NULL; 
-    }
-  bg_x11_window_unset_gl(w);
   bg_x11_window_stop_gl(w);
   }
 
 static void cleanup_gl(driver_data_t * d)
   {
   gl_priv_t * priv;
-  priv = (gl_priv_t *)(d->priv);
+  priv = d->priv;
   free(priv);
   }
 
@@ -504,7 +508,7 @@
     .destroy_frame      = destroy_frame_gl,
     .close              = close_gl,
     .cleanup            = cleanup_gl,
-    .add_overlay_stream = add_overlay_stream_gl,
+    .init_overlay_stream = init_overlay_stream_gl,
     .set_overlay        = set_overlay_gl,
     .create_overlay     = create_overlay_gl,
     .destroy_overlay    = destroy_overlay_gl,

gmerlin-1.2.0.tar.gz/lib/x11/grab.c -> gmerlin-4256.tar.gz/lib/x11/grab.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -48,6 +48,8 @@
 #define LOG_DOMAIN "x11grab"
 #include <gmerlin/log.h>
 
+#include <gmerlin/frametimer.h>
+
 #define MAX_CURSOR_SIZE 32
 
 static const bg_parameter_info_t parameters[] = 
@@ -83,6 +85,16 @@
       .help_string = TRS("Disable screensaver and energy saving mode"),
     },
     {
+      .name =      "fps",
+      .long_name = TRS("Capture rate"),
+      .type        = BG_PARAMETER_FLOAT,
+      .val_min     = { .val_f = 1.0 },
+      .val_max     = { .val_f = 100.0 },
+      .val_default = { .val_f = 25.0 },
+      .num_digits  = 2,
+      .help_string = TRS("Specify the capture rate (in frames per second)"),
+    },
+    {
       .name = "x",
       .long_name = "X",
       .type  = BG_PARAMETER_INT,
@@ -140,7 +152,7 @@
 
   gavl_pixelformat_t pixelformat;
 
-  gavl_timer_t * timer;
+  bg_frame_timer_t * ft;
 
   XImage * image;
   gavl_video_frame_t * frame;
@@ -164,7 +176,7 @@
   int cursor_changed;
 #endif
 
-  gavl_overlay_t      cursor;
+  gavl_overlay_t      * cursor;
   gavl_video_format_t cursor_format;
   
   int cursor_off_x;
@@ -179,6 +191,8 @@
   gavl_overlay_blend_context_t * blend;
 
   bg_x11_screensaver_t scr;
+
+  float fps;
   
   };
 
@@ -255,6 +269,10 @@
     else
       win->cfg_flags &= ~DISABLE_SCREENSAVER;
     }
+  else if(!strcmp(name, "fps"))
+    {
+    win->fps = val->val_f;
+    }
   }
 
 int bg_x11_grab_window_get_parameter(void * data, const char * name,
@@ -332,7 +350,7 @@
   uint16_t white;
   uint8_t * ptr;
   
-  gavl_video_frame_fill(win->cursor.frame,
+  gavl_video_frame_fill(win->cursor,
                         &win->cursor_format,
                         cursor_transparent);
   
@@ -340,8 +358,8 @@
     {
     black = cursor_black[i];
     white = cursor_white[i];
-    ptr = win->cursor.frame->planes[0] +
-      i * win->cursor.frame->strides[0];
+    ptr = win->cursor->planes[0] +
+      i * win->cursor->strides[0];
     
     for(j = 0; j < CURSOR_WIDTH; j++)
       {
@@ -364,8 +382,8 @@
       white >>= 1;
       }
     }
-  win->cursor.ovl_rect.w = CURSOR_WIDTH;
-  win->cursor.ovl_rect.h = CURSOR_HEIGHT;
+  win->cursor->src_rect.w = CURSOR_WIDTH;
+  win->cursor->src_rect.h = CURSOR_HEIGHT;
   }
 
 static void create_window(bg_x11_grab_window_t * ret)
@@ -495,7 +513,6 @@
   /* Initialize members */  
   ret->win = None;
 
-  ret->timer = gavl_timer_create();
   ret->blend = gavl_overlay_blend_context_create();
 
   ret->cursor_format.image_width  = MAX_CURSOR_SIZE;
@@ -508,8 +525,8 @@
   // Fixme: This will break for > 8 bit/channel RGB visuals
   //        and other 8bit / channel RGBA formats
   ret->cursor_format.pixelformat = GAVL_RGBA_32; 
-
-  ret->cursor.frame = gavl_video_frame_create(&ret->cursor_format);
+  
+  ret->cursor = gavl_video_frame_create(&ret->cursor_format);
   
   return ret;
   }
@@ -523,10 +540,11 @@
   
   if(win->dpy)
     XCloseDisplay(win->dpy);
-  
-  gavl_timer_destroy(win->timer);
+
+  if(win->ft)
+    bg_frame_timer_destroy(win->ft);
   gavl_overlay_blend_context_destroy(win->blend);
-  gavl_video_frame_destroy(win->cursor.frame);
+  gavl_video_frame_destroy(win->cursor);
   free(win);
   }
 
@@ -640,12 +658,13 @@
     gavl_rectangle_i_copy(&win->grab_rect, &win->win_rect);
     }
   
+  win->ft = bg_frame_timer_create(win->fps, &format->timescale);
+  
   /* Common format parameters */
   format->pixel_width = 1;
   format->pixel_height = 1;
   format->pixelformat = win->pixelformat;
   format->framerate_mode = GAVL_FRAMERATE_VARIABLE;
-  format->timescale = 1000;
   format->frame_duration = 0;
 
   format->frame_width = format->image_width;
@@ -715,9 +734,6 @@
   create_window(win);
   handle_events(win);
   
-  gavl_timer_set(win->timer, 0);
-  gavl_timer_start(win->timer);
-
   if(win->flags & DISABLE_SCREENSAVER)
     bg_x11_screensaver_disable(&win->scr);
   
@@ -726,14 +742,19 @@
 
 void bg_x11_grab_window_close(bg_x11_grab_window_t * win)
   {
-  gavl_timer_stop(win->timer);
+  if(win->ft)
+    {
+    bg_frame_timer_destroy(win->ft);
+    win->ft = NULL;
+    }
+  
   bg_x11_screensaver_enable(&win->scr);
   
   if(win->use_shm)
     {
     gavl_video_frame_null(win->frame);
     gavl_video_frame_destroy(win->frame);
-
+    
     XShmDetach(win->dpy, &win->shminfo);
     shmdt(win->shminfo.shmaddr);
     shmctl(win->shminfo.shmid, IPC_RMID, NULL);
@@ -742,10 +763,12 @@
   else
     {
     gavl_video_frame_destroy(win->frame);
-    win->image->data = NULL;
     XDestroyImage(win->image);
     }
 
+  win->frame = NULL;
+  win->image = NULL;
+  
   if(!(win->flags & GRAB_ROOT))
     {
     XUnmapWindow(win->dpy, win->win);
@@ -767,33 +790,33 @@
   XFixesCursorImage *im;
   im = XFixesGetCursorImage(win->dpy);
 
-  win->cursor.ovl_rect.w = im->width;
-  win->cursor.ovl_rect.h = im->height;
+  win->cursor->src_rect.w = im->width;
+  win->cursor->src_rect.h = im->height;
 
-  if(win->cursor.ovl_rect.w > MAX_CURSOR_SIZE)
+  if(win->cursor->src_rect.w > MAX_CURSOR_SIZE)
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN,
            "Cursor too wide, increase MAX_CURSOR_SIZE in grab.c to %d",
-           win->cursor.ovl_rect.w);
-    win->cursor.ovl_rect.w = MAX_CURSOR_SIZE;
+           win->cursor->src_rect.w);
+    win->cursor->src_rect.w = MAX_CURSOR_SIZE;
     }
-  if(win->cursor.ovl_rect.h > MAX_CURSOR_SIZE)
+  if(win->cursor->src_rect.h > MAX_CURSOR_SIZE)
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN,
            "Cursor too high, increase MAX_CURSOR_SIZE in grab.c to %d",
-           win->cursor.ovl_rect.h);
-    win->cursor.ovl_rect.h = MAX_CURSOR_SIZE;
+           win->cursor->src_rect.h);
+    win->cursor->src_rect.h = MAX_CURSOR_SIZE;
     }
   
   win->cursor_off_x = im->xhot;
   win->cursor_off_y = im->yhot;
 
-  for(i = 0; i < win->cursor.ovl_rect.h; i++)
+  for(i = 0; i < win->cursor->src_rect.h; i++)
     {
     src = (im->pixels) + i * im->width;
-    dst = win->cursor.frame->planes[0] + i * win->cursor.frame->strides[0];
+    dst = win->cursor->planes[0] + i * win->cursor->strides[0];
 
-    for(j = 0; j < win->cursor.ovl_rect.w; j++)
+    for(j = 0; j < win->cursor->src_rect.w; j++)
       {
       dst[3] = *src >> 24;          // A
       dst[0] = (*src >> 16) & 0xff; // R
@@ -840,11 +863,11 @@
   if(root_y + MAX_CURSOR_SIZE < rect->y)
     return;
 
-  win->cursor.dst_x = root_x - rect->x - win->cursor_off_x;
-  win->cursor.dst_y = root_y - rect->y - win->cursor_off_y;
+  win->cursor->dst_x = root_x - rect->x - win->cursor_off_x;
+  win->cursor->dst_y = root_y - rect->y - win->cursor_off_y;
 
-  if((win->cursor.dst_x != win->cursor_x) ||
-     (win->cursor.dst_y != win->cursor_y))
+  if((win->cursor->dst_x != win->cursor_x) ||
+     (win->cursor->dst_y != win->cursor_y))
     init_blend = 1;
 
 #ifdef HAVE_XFIXES
@@ -858,28 +881,30 @@
   if(init_blend)
     {
     gavl_overlay_blend_context_set_overlay(win->blend,
-                                           &win->cursor);
+                                           win->cursor);
     }
   
   gavl_overlay_blend(win->blend, frame);
-  // fprintf(stderr, "Cursor 2: %d %d\n", win->cursor.dst_x, win->cursor.dst_y);
+  // fprintf(stderr, "Cursor 2: %d %d\n", win->cursor->dst_x, win->cursor->dst_y);
 
-  win->cursor_x = win->cursor.dst_x;
-  win->cursor_x = win->cursor.dst_y;
+  win->cursor_x = win->cursor->dst_x;
+  win->cursor_x = win->cursor->dst_y;
   }
 
-int bg_x11_grab_window_grab(bg_x11_grab_window_t * win,
-                            gavl_video_frame_t  * frame)
+gavl_source_status_t bg_x11_grab_window_grab(void * win_p,
+                                             gavl_video_frame_t ** frame)
   {
   int crop_left = 0;
   int crop_right = 0;
   int crop_top = 0;
   int crop_bottom = 0;
-  
   gavl_rectangle_i_t rect;
+  bg_x11_grab_window_t * win = win_p;
   
   handle_events(win);
 
+  bg_frame_timer_wait(win->ft);
+  
   /* Crop */
   
   if(win->use_shm)
@@ -901,6 +926,7 @@
     if(!XShmGetImage(win->dpy, win->root, win->image, rect.x, rect.y, AllPlanes))
       {
       bg_log(BG_LOG_ERROR, LOG_DOMAIN, "XShmGetImage failed");
+      return GAVL_SOURCE_EOF;
       }
     }
   else
@@ -933,12 +959,11 @@
                  AllPlanes, ZPixmap, win->image,
                  crop_left, crop_top);
     }
-    
-  gavl_video_frame_copy(&win->format, frame, win->frame);
 
   if(win->flags & DRAW_CURSOR)
-    draw_cursor(win, &rect, frame);
-  
-  frame->timestamp = gavl_time_scale(win->format.timescale, gavl_timer_get(win->timer));
-  return 1;
+    draw_cursor(win, &rect, win->frame);
+
+  bg_frame_timer_update(win->ft, win->frame);
+  *frame = win->frame;
+  return GAVL_SOURCE_OK;
   }

gmerlin-1.2.0.tar.gz/lib/x11/icon.c -> gmerlin-4256.tar.gz/lib/x11/icon.c Changed

gmerlin-1.2.0.tar.gz/lib/x11/overlay.c -> gmerlin-4256.tar.gz/lib/x11/overlay.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -23,67 +23,95 @@
 #include <x11/x11.h>
 #include <x11/x11_window_private.h>
 
-int bg_x11_window_add_overlay_stream(bg_x11_window_t * w,
-                                     gavl_video_format_t * format)
-  {
-  if(!w->current_driver->driver->add_overlay_stream)
-    return -1;
-  
-  w->overlay_streams =
-    realloc(w->overlay_streams,
-            (w->num_overlay_streams+1) * sizeof(*(w->overlay_streams)));
-  memset(&w->overlay_streams[w->num_overlay_streams], 0,
-         sizeof(w->overlay_streams[w->num_overlay_streams]));
-  
-  /* Initialize */
-  gavl_video_format_copy(&w->overlay_streams[w->num_overlay_streams].format,
-                         format); 
-  w->current_driver->driver->add_overlay_stream(w->current_driver);
-  
-  gavl_video_format_copy(format,
-                         &w->overlay_streams[w->num_overlay_streams].format); 
-  
-  w->num_overlay_streams++;
-  return w->num_overlay_streams - 1;
-  }
-
+#if 0
 void bg_x11_window_set_overlay(bg_x11_window_t * w, int stream,
                                gavl_overlay_t * ovl)
   {
-  int i;
-  w->overlay_streams[stream].ovl = ovl;
-  w->current_driver->driver->set_overlay(w->current_driver, stream, ovl);
-  w->has_overlay = 0;
-  for(i = 0; i < w->num_overlay_streams; i++)
-    {
-    if(w->overlay_streams[i].ovl)
-      {
-      w->has_overlay = 1;
-      break;
-      }
-    }
   }
+#endif
 
-gavl_overlay_t *
+#if 0
+static gavl_overlay_t *
 bg_x11_window_create_overlay(bg_x11_window_t * w, int stream)
   {
   gavl_overlay_t * ret;
-  ret = calloc(1, sizeof(*ret));
   if(w->current_driver->driver->create_overlay)
-    ret->frame = w->current_driver->driver->create_overlay(w->current_driver,
-                                                           stream);
+    ret = w->current_driver->driver->create_overlay(w->current_driver, stream);
   else
-    ret->frame = gavl_video_frame_create(&w->overlay_streams[stream].format);
+    ret = gavl_video_frame_create(&w->overlay_streams[stream].format);
   return ret;
   }
 
-void bg_x11_window_destroy_overlay(bg_x11_window_t * w, int stream,
-                                   gavl_overlay_t * ovl)
+static void
+bg_x11_window_destroy_overlay(bg_x11_window_t * w, int stream,
+                              gavl_overlay_t * ovl)
   {
   if(w->current_driver->driver->destroy_overlay)
     w->current_driver->driver->destroy_overlay(w->current_driver,
-                                               stream, ovl->frame);
+                                               stream, ovl);
   else
-    gavl_video_frame_destroy(ovl->frame);
-  free(ovl);
+    gavl_video_frame_destroy(ovl);
   }
+#endif
+
+static gavl_video_frame_t * get_frame(void * priv)
+  {
+  overlay_stream_t * str = priv;
+  if(!str->ovl)
+    {
+    str->ovl =
+      str->win->current_driver->driver->create_overlay(str->win->current_driver, str);
+    }
+  return str->ovl;
+  }
+
+static gavl_sink_status_t put_frame(void * priv, gavl_video_frame_t * frame)
+  {
+  bg_x11_window_t * w;
+  overlay_stream_t * str = priv;
+  
+  w = str->win;
+
+  if(frame && frame->src_rect.w && frame->src_rect.h)
+    str->active = 1;
+  else
+    str->active = 0;
+  
+  SET_FLAG(w, FLAG_OVERLAY_CHANGED);
+  return GAVL_SINK_OK;
+  }
+
+gavl_video_sink_t *
+bg_x11_window_add_overlay_stream(bg_x11_window_t * w,
+                                 gavl_video_format_t * format)
+  {
+  overlay_stream_t * str;
+  
+  if(!w->current_driver->driver->init_overlay_stream)
+    return NULL;
+  
+  w->overlay_streams =
+    realloc(w->overlay_streams,
+            (w->num_overlay_streams+1) * sizeof(*(w->overlay_streams)));
+
+  str = w->overlay_streams + w->num_overlay_streams;
+  
+  memset(str, 0, sizeof(*str));
+  
+  /* Initialize */
+  gavl_video_format_copy(&str->format, format); 
+  
+  w->current_driver->driver->init_overlay_stream(w->current_driver,
+                                                 str);
+  
+  gavl_video_format_copy(format, &str->format); 
+  str->win = w;
+  
+  w->num_overlay_streams++;
+
+  str->sink = gavl_video_sink_create(w->current_driver->driver->create_overlay ? get_frame : NULL,
+                                     put_frame, str, &str->format);
+  
+  return str->sink;
+  }
+

gmerlin-1.2.0.tar.gz/lib/x11/screensaver.c -> gmerlin-4256.tar.gz/lib/x11/screensaver.c Changed

gmerlin-1.2.0.tar.gz/lib/x11/shm.c -> gmerlin-4256.tar.gz/lib/x11/shm.c Changed

gmerlin-1.2.0.tar.gz/lib/x11/x11_event.c -> gmerlin-4256.tar.gz/lib/x11/x11_event.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -342,7 +342,7 @@
                              int * x_ret, int * y_ret)
   {
   double coord_norm;
-  if(!w->video_open)
+  if(!TEST_FLAG(w, FLAG_VIDEO_OPEN))
     {
     *x_ret = x_raw;
     *y_ret = y_raw;
@@ -367,19 +367,28 @@
   int  button_number = 0;
   window_t * cur;
   int x_src, y_src;
-  w->do_delete = 0;
+  int still_shown = 0;
+
+  if(TEST_FLAG(w, FLAG_OVERLAY_CHANGED) &&
+     TEST_FLAG(w, FLAG_STILL_MODE))
+    {
+    bg_x11_window_put_frame_internal(w, w->still_frame);
+    still_shown = 1;
+    }
+  
+  CLEAR_FLAG(w, FLAG_DO_DELETE);
   
   if(!evt || (evt->type != MotionNotify))
     {
     w->idle_counter++;
     if(w->idle_counter >= IDLE_MAX)
       {
-      if(!w->pointer_hidden)
+      if(!TEST_FLAG(w, FLAG_POINTER_HIDDEN))
         {
         if(w->current->child == None)
           XDefineCursor(w->dpy, w->current->win, w->fullscreen_cursor);
         XFlush(w->dpy);
-        w->pointer_hidden = 1;
+        SET_FLAG(w, FLAG_POINTER_HIDDEN);
         }
       w->idle_counter = 0;
       }
@@ -387,19 +396,20 @@
 
   bg_x11_screensaver_ping(&w->scr);
   
-  if(w->need_focus && window_is_viewable(w->dpy, w->current->focus_child))
+  if(TEST_FLAG(w, FLAG_NEED_FOCUS) &&
+     window_is_viewable(w->dpy, w->current->focus_child))
     {
     XSetInputFocus(w->dpy, w->current->focus_child,
                    RevertToParent, w->focus_time);
-    w->need_focus = 0;
+    CLEAR_FLAG(w, FLAG_NEED_FOCUS);
     }
 
-  if(w->need_fullscreen &&
+  if(TEST_FLAG(w, FLAG_NEED_FULLSCREEN) &&
      window_is_viewable(w->dpy, w->fullscreen.win))
     {
     bg_x11_window_set_fullscreen_mapped(w, &w->fullscreen);
 
-    w->need_fullscreen = 0;
+    CLEAR_FLAG(w, FLAG_NEED_FULLSCREEN);
     }
   
   if(!evt)
@@ -407,7 +417,7 @@
 
   if(evt->type == w->shm_completion_type)
     {
-    w->wait_for_completion = 0;
+    CLEAR_FLAG(w, FLAG_WAIT_FOR_COMPLETION);
     return;
     }
 
@@ -415,8 +425,11 @@
   switch(evt->type)
     {
     case Expose:
-      if(w->still_mode && w->still_frame)
+      if(TEST_FLAG(w, FLAG_STILL_MODE) && !still_shown && w->still_frame)
+        {
         bg_x11_window_put_frame_internal(w, w->still_frame);
+        still_shown = 1;
+        }
       break;
     case PropertyNotify:
       if(evt->xproperty.atom == w->_XEMBED_INFO)
@@ -439,20 +452,18 @@
         {
         if(evt->xclient.data.l[0] == w->WM_DELETE_WINDOW)
           {
-          w->do_delete = 1;
+          SET_FLAG(w, FLAG_DO_DELETE);
           return;
           }
         else if(evt->xclient.data.l[0] == w->WM_TAKE_FOCUS)
           {
-          int result;
           if(window_is_viewable(w->dpy, w->current->focus_child))
-            result = XSetInputFocus(w->dpy, w->current->focus_child,
-                                    RevertToParent, evt->xclient.data.l[1]);
+            XSetInputFocus(w->dpy, w->current->focus_child,
+                           RevertToParent, evt->xclient.data.l[1]);
           else
             {
-            w->need_focus = 1;
+            SET_FLAG(w, FLAG_NEED_FOCUS);
             w->focus_time = evt->xclient.data.l[1];
-            result = 0;
             }
           }
         }
@@ -664,10 +675,10 @@
          (evt->xcreatewindow.window != cur->subwin))
         {
         cur->child = evt->xcreatewindow.window;
-        fprintf(stderr, "Embed child %ld\n",
-                evt->xcreatewindow.window);
+        //        fprintf(stderr, "Embed child %ld\n",
+        //        evt->xcreatewindow.window);
         bg_x11_window_embed_child(w, cur);
-        fprintf(stderr, "Embed child done\n");
+        //        fprintf(stderr, "Embed child done\n");
         }
       break;
     case DestroyNotify:
@@ -680,12 +691,12 @@
 
       if(evt->xdestroywindow.window == cur->child)
         {
-        fprintf(stderr, "UnEmbed child\n");
+        //        fprintf(stderr, "UnEmbed child\n");
         cur->child = None;
         cur->child_xembed = 0;
         if(cur->child_accel_map)
           bg_accelerator_map_clear(cur->child_accel_map);
-        fprintf(stderr, "Unembed child done\n");
+        //        fprintf(stderr, "Unembed child done\n");
         }
       break;
 #if 0
@@ -763,12 +774,12 @@
         }
       
       w->idle_counter = 0;
-      if(w->pointer_hidden)
+      if(TEST_FLAG(w, FLAG_POINTER_HIDDEN))
         {
         XDefineCursor(w->dpy, w->normal.win, None);
         XDefineCursor(w->dpy, w->fullscreen.win, None);
         XFlush(w->dpy);
-        w->pointer_hidden = 0;
+        CLEAR_FLAG(w, FLAG_POINTER_HIDDEN);
         }
 
       if((evt->xmotion.window == w->normal.win) ||
@@ -815,8 +826,7 @@
 
         XDefineCursor(w->dpy, w->normal.win, None);
         w->idle_counter = 0;
-        w->pointer_hidden = 0;
-        
+        CLEAR_FLAG(w, FLAG_POINTER_HIDDEN);
         }
       else if(evt->xmap.window == w->fullscreen.win)
         {
@@ -830,8 +840,7 @@
 
         XDefineCursor(w->dpy, w->fullscreen.win, None);
         w->idle_counter = 0;
-        w->pointer_hidden = 0;
-
+        CLEAR_FLAG(w, FLAG_POINTER_HIDDEN);
         
         //        bg_x11_window_set_fullscreen_mapped(w, &w->fullscreen);
         }
@@ -1014,15 +1023,16 @@
         }
 
     }
+
   }
 
 void bg_x11_window_handle_events(bg_x11_window_t * win, int milliseconds)
   {
   XEvent evt;
   
-  if(win->wait_for_completion)
+  if(TEST_FLAG(win, FLAG_WAIT_FOR_COMPLETION))
     {
-    while(win->wait_for_completion)
+    while(TEST_FLAG(win, FLAG_WAIT_FOR_COMPLETION))
       {
       x11_window_next_event(win, &evt, -1);
       bg_x11_window_handle_event(win, &evt);

gmerlin-1.2.0.tar.gz/lib/x11/x11_gl.c -> gmerlin-4256.tar.gz/lib/x11/x11_gl.c Changed

gmerlin-1.2.0.tar.gz/lib/x11/x11_video.c -> gmerlin-4256.tar.gz/lib/x11/x11_video.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -37,9 +37,34 @@
 #endif
   };
 
+static gavl_video_frame_t * create_frame(bg_x11_window_t * w)
+  {
+  gavl_video_frame_t * ret;
+  if(!TEST_FLAG(w, FLAG_DO_SW_SCALE) &&
+     w->current_driver->driver->create_frame)
+    {
+    ret = w->current_driver->driver->create_frame(w->current_driver);
+    }
+  else
+    {
+    ret = gavl_video_frame_create(&w->video_format);
+    gavl_video_frame_clear(ret, &w->video_format);
+    }
+  return ret;
+  }
+
+static void destroy_frame(bg_x11_window_t * w, gavl_video_frame_t * f)
+  {
+  if(!TEST_FLAG(w, FLAG_DO_SW_SCALE) &&
+     w->current_driver->driver->destroy_frame)
+    w->current_driver->driver->destroy_frame(w->current_driver, f);
+  else
+    gavl_video_frame_destroy(f);
+  }
+
 static int set_brightness(bg_x11_window_t * w)
   {
-  if(w->video_open &&
+  if(TEST_FLAG(w, FLAG_VIDEO_OPEN) &&
      w->current_driver->driver->set_brightness &&
      (w->current_driver->flags & DRIVER_FLAG_BRIGHTNESS))
     {
@@ -57,7 +82,7 @@
 
 static int set_saturation(bg_x11_window_t * w)
   {
-  if(w->video_open &&
+  if(TEST_FLAG(w, FLAG_VIDEO_OPEN) &&
      w->current_driver->driver->set_saturation &&
      (w->current_driver->flags & DRIVER_FLAG_SATURATION))
     {
@@ -75,7 +100,7 @@
 
 static int set_contrast(bg_x11_window_t * w)
   {
-  if(w->video_open &&
+  if(TEST_FLAG(w, FLAG_VIDEO_OPEN) &&
      w->current_driver->driver->set_contrast &&
      (w->current_driver->flags & DRIVER_FLAG_CONTRAST))
     {
@@ -135,6 +160,55 @@
 
 /* For Video output */
 
+
+static gavl_video_frame_t * get_frame(void * priv)
+  {
+  bg_x11_window_t * w = priv;
+  if(!w->frame)
+    w->frame = create_frame(w);
+  return w->frame;
+  }
+
+#if 0
+void bg_x11_window_put_frame(bg_x11_window_t * w, gavl_video_frame_t * f)
+  {
+  CLEAR_FLAG(w, FLAG_STILL_MODE);
+  bg_x11_window_put_frame_internal(w, f);
+  }
+
+void bg_x11_window_put_still(bg_x11_window_t * w, gavl_video_frame_t * f)
+  {
+  SET_FLAG(w, FLAG_STILL_MODE);
+  if(!w->still_frame)
+    {
+    w->still_frame = bg_x11_window_create_frame(w);
+    }
+  gavl_video_frame_copy(&w->video_format, w->still_frame, f);
+  bg_x11_window_put_frame_internal(w, w->still_frame);
+  }
+#endif
+
+static gavl_sink_status_t put_frame(void * priv, gavl_video_frame_t * f)
+  {
+  bg_x11_window_t * w = priv;
+  if(f->duration >= 0)
+    {
+    CLEAR_FLAG(w, FLAG_STILL_MODE);
+    bg_x11_window_put_frame_internal(w, f);
+    }
+  else
+    {
+    SET_FLAG(w, FLAG_STILL_MODE);
+
+    if(!w->still_frame)
+      w->still_frame = create_frame(w);
+    gavl_video_frame_copy(&w->video_format, w->still_frame, f);
+    bg_x11_window_put_frame_internal(w, w->still_frame);
+    }
+  
+  return GAVL_SINK_OK;
+  }
+
 #define PAD_SIZE 16
 #define PAD(sz) (((sz+PAD_SIZE-1) / PAD_SIZE) * PAD_SIZE)
 
@@ -144,18 +218,16 @@
   int num_drivers;
   int i;
   int force_hw_scale;
-  
   int min_penalty, min_index;
-
-  w->do_sw_scale = 0;
+  
+  CLEAR_FLAG(w, FLAG_DO_SW_SCALE);
   w->current_driver = NULL;  
-  if(!w->drivers_initialized)
+  if(!TEST_FLAG(w, FLAG_DRIVERS_INITIALIZED))
     {
     init(w);
-    w->drivers_initialized = 1;
+    SET_FLAG(w, FLAG_DRIVERS_INITIALIZED);
     }
   
-  
   gavl_video_format_copy(&w->video_format, format);
 
   /* Pad sizes, which might screw up some drivers */
@@ -163,7 +235,7 @@
   w->video_format.frame_width = PAD(w->video_format.frame_width);
   w->video_format.frame_height = PAD(w->video_format.frame_height);
   
-  if(w->auto_resize)
+  if(TEST_FLAG(w, FLAG_AUTO_RESIZE))
     {
     bg_x11_window_resize(w,
                          (w->video_format.image_width *
@@ -188,7 +260,7 @@
    *  Now, get the driver with the lowest penalty.
    *  Scaling would be nice as well
    */
-  force_hw_scale = w->force_hw_scale;
+  force_hw_scale = !!TEST_FLAG(w, FLAG_FORCE_HW_SCALE);
   
   while(1)
     {
@@ -229,7 +301,6 @@
       w->current_driver = &w->drivers[min_index];
       break;
       }
-    /* Flag as unusable */
     bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Trying %s driver",
            w->drivers[min_index].driver->name);
     if(!w->drivers[min_index].driver->open(&w->drivers[min_index]))
@@ -237,6 +308,7 @@
       bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Opening %s driver failed",
              w->drivers[min_index].driver->name);
       
+      /* Flag as unusable */
       w->drivers[min_index].pixelformat = GAVL_PIXELFORMAT_NONE;
       }
     else
@@ -249,7 +321,6 @@
     }
   if(!w->current_driver)
     return 0;
-
   
   w->video_format.pixelformat = w->current_driver->pixelformat;
   
@@ -259,49 +330,38 @@
   w->window_format.pixelformat = format->pixelformat;
   
   if(!w->current_driver->driver->can_scale)
-    {
-    w->do_sw_scale = 1;
-    
-    }
-
+    SET_FLAG(w, FLAG_DO_SW_SCALE);
+  
   set_contrast(w);
   set_saturation(w);
   set_brightness(w);
 
   XSync(w->dpy, False);
   bg_x11_window_handle_events(w, 0);
+
+#if 0  
+  if(TEST_FLAG(w, FLAG_DO_SW_SCALE) ||
+     !w->current_driver->driver->create_frame)
+    get_func = NULL;
+  else
+    get_func = get_frame;
+#endif
+  
+  w->sink =
+    gavl_video_sink_create(TEST_FLAG(w, FLAG_DO_SW_SCALE) ? NULL : get_frame,
+                           put_frame, w, &w->video_format);
   
   return 1;
   }
 
-gavl_video_frame_t * bg_x11_window_create_frame(bg_x11_window_t * w)
+gavl_video_sink_t * bg_x11_window_get_sink(bg_x11_window_t * w)
   {
-  if(!w->do_sw_scale)
-    {
-    if(w->current_driver->driver->create_frame)
-      return w->current_driver->driver->create_frame(w->current_driver);
-    else
-      return gavl_video_frame_create(&w->video_format);
-    }
-  else
-    return gavl_video_frame_create(&w->video_format);
+  return w->sink;
   }
 
-void bg_x11_window_destroy_frame(bg_x11_window_t * w, gavl_video_frame_t * f)
-  {
-  if(!w->do_sw_scale)
-    {
-    if(w->current_driver->driver->destroy_frame)
-      w->current_driver->driver->destroy_frame(w->current_driver, f);
-    else
-      gavl_video_frame_destroy(f);
-    }
-  else
-    gavl_video_frame_destroy(f);
-  }
 
 #define PADD_SIZE 128
-#define PADD_IMAGE_SIZE(s) \
+#define PAD_IMAGE_SIZE(s) \
 s = ((s + PADD_SIZE - 1) / PADD_SIZE) * PADD_SIZE
 
 void bg_x11_window_set_rectangles(bg_x11_window_t * w,
@@ -311,11 +371,17 @@
   gavl_video_options_t * opt;
   gavl_rectangle_f_copy(&w->src_rect, src_rect);
   gavl_rectangle_i_copy(&w->dst_rect, dst_rect);
+#if 0
+  fprintf(stderr, "bg_x11_window_set_rectangles\nSrc: ");
+  gavl_rectangle_f_dump(&w->src_rect);
+  fprintf(stderr, "\nDst: ");
+  gavl_rectangle_i_dump(&w->dst_rect);
+  fprintf(stderr, "\n");
+#endif
+  if(!TEST_FLAG(w, FLAG_VIDEO_OPEN))
+    SET_FLAG(w, FLAG_VIDEO_OPEN);
   
-  if(!w->video_open)
-    w->video_open = 1;
-  
-  if(w->current_driver && w->do_sw_scale)
+  if(w->current_driver && TEST_FLAG(w, FLAG_DO_SW_SCALE))
     {
 
     if((w->window_format.image_width > w->window_format.frame_width) ||
@@ -324,8 +390,8 @@
       w->window_format.frame_width = w->window_format.image_width;
       w->window_format.frame_height = w->window_format.image_height;
       
-      PADD_IMAGE_SIZE(w->window_format.frame_width);
-      PADD_IMAGE_SIZE(w->window_format.frame_height);
+      PAD_IMAGE_SIZE(w->window_format.frame_width);
+      PAD_IMAGE_SIZE(w->window_format.frame_height);
       
       if(w->window_frame)
         {
@@ -362,13 +428,12 @@
   bg_x11_window_clear(w);
   }
 
-#undef PADD_IMAGE_SIZE
+#undef PAD_IMAGE_SIZE
 
 void bg_x11_window_put_frame_internal(bg_x11_window_t * w,
                                       gavl_video_frame_t * f)
   {
-  
-  if(w->do_sw_scale)
+  if(TEST_FLAG(w, FLAG_DO_SW_SCALE))
     {
     gavl_video_scaler_scale(w->scaler, f, w->window_frame);
     w->current_driver->driver->put_frame(w->current_driver,
@@ -376,28 +441,15 @@
     }
   else
     w->current_driver->driver->put_frame(w->current_driver, f);
-  }
 
-void bg_x11_window_put_frame(bg_x11_window_t * w, gavl_video_frame_t * f)
-  {
-  w->still_mode = 0;
-  bg_x11_window_put_frame_internal(w, f);
+  CLEAR_FLAG(w, FLAG_OVERLAY_CHANGED);
   }
 
-void bg_x11_window_put_still(bg_x11_window_t * w, gavl_video_frame_t * f)
-  {
-  w->still_mode = 1;
-  if(!w->still_frame)
-    {
-    w->still_frame = bg_x11_window_create_frame(w);
-    }
-  gavl_video_frame_copy(&w->video_format, w->still_frame, f);
-  bg_x11_window_put_frame_internal(w, w->still_frame);
-  }
 
 
 void bg_x11_window_close_video(bg_x11_window_t * w)
   {
+  int i;
   if(w->window_frame)
     {
     if(w->current_driver->driver->destroy_frame)
@@ -406,11 +458,40 @@
       gavl_video_frame_destroy(w->window_frame);
     w->window_frame = NULL;
     }
+
   if(w->still_frame)
     {
-    bg_x11_window_destroy_frame(w, w->still_frame);
+    destroy_frame(w, w->still_frame);
     w->still_frame = NULL;
     }
+
+  if(w->frame)
+    {
+    destroy_frame(w, w->frame);
+    w->frame = NULL;
+    }
+
+  for(i = 0; i < w->num_overlay_streams; i++)
+    {
+    overlay_stream_t * str = w->overlay_streams + i;
+    if(str->ovl)
+      {
+      if(w->current_driver->driver->destroy_overlay)
+        w->current_driver->driver->destroy_overlay(w->current_driver, str, str->ovl);
+      else
+        gavl_video_frame_destroy(str->ovl);
+      }
+    if(str->sink)
+      gavl_video_sink_destroy(str->sink);
+    }
+
+  if(w->sink)
+    {
+    gavl_video_sink_destroy(w->sink);
+    w->sink = NULL;
+    }
+  if(w->current_driver->driver->close)
+    w->current_driver->driver->close(w->current_driver);
   
   if(w->overlay_streams)
     {
@@ -419,11 +500,8 @@
     w->overlay_streams = NULL;
     }
   
-  if(w->current_driver->driver->close)
-    w->current_driver->driver->close(w->current_driver);
+  CLEAR_FLAG(w, FLAG_VIDEO_OPEN);
   
-  w->video_open = 0;
-
   XSync(w->dpy, False);
   bg_x11_window_handle_events(w, 0);
   }

gmerlin-1.2.0.tar.gz/lib/x11/x11_window.c -> gmerlin-4256.tar.gz/lib/x11/x11_window.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -70,10 +70,10 @@
   if(w->current->parent != w->root)
     return 0;
   
-  if(!w->is_fullscreen)
-    return w->disable_screensaver_normal;
+  if(!TEST_FLAG(w, FLAG_IS_FULLSCREEN))
+    return !!TEST_FLAG(w, FLAG_DISABLE_SCREENSAVER_NORMAL);
   else
-    return w->disable_screensaver_fullscreen;
+    return !!TEST_FLAG(w, FLAG_DISABLE_SCREENSAVER_FULLSCREEN);
   }
 
 void bg_x11_window_ping_screensaver(bg_x11_window_t * w)
@@ -444,7 +444,8 @@
 #endif
 
   /* Check for XShm */
-  w->have_shm = bg_x11_window_check_shm(w->dpy, &w->shm_completion_type);
+  if(bg_x11_window_check_shm(w->dpy, &w->shm_completion_type))
+    SET_FLAG(w, FLAG_HAVE_SHM); 
   
   return 1;
   }
@@ -533,17 +534,17 @@
     {
     //    fprintf(stderr, "Is fullscreen\n");
     
-    if(!w->is_fullscreen)
+    if(!TEST_FLAG(w, FLAG_IS_FULLSCREEN))
       send_event = 1;
     w->current = &w->fullscreen;
-    w->is_fullscreen = 1;
+    SET_FLAG(w, FLAG_IS_FULLSCREEN);
     }
   else
     {
-    if(w->is_fullscreen)
+    if(TEST_FLAG(w, FLAG_IS_FULLSCREEN))
       send_event = 0;
     w->current = &w->normal;
-    w->is_fullscreen = 0;
+    CLEAR_FLAG(w, FLAG_IS_FULLSCREEN);
     }
 
 #if 1
@@ -610,7 +611,7 @@
   
   /* Define back the cursor */
   XDefineCursor(win->dpy, w->win, None);
-  win->pointer_hidden = 0;
+  CLEAR_FLAG(win, FLAG_POINTER_HIDDEN);
   
   bg_x11_window_check_embed_property(win, w);
   }
@@ -678,7 +679,6 @@
 static int create_window(bg_x11_window_t * w,
                          int width, int height)
   {
-  const char * display_name;
   unsigned long event_mask;
   XColor black;
   Atom wm_protocols[2];
@@ -787,19 +787,6 @@
     set_fullscreen(w, w->fullscreen.win);
     XSetWMProtocols(w->dpy, w->fullscreen.win, wm_protocols, 2);
     w->fullscreen.toplevel = w->fullscreen.win;
-
-#if 0
-    w->fullscreen.focus_child =
-      XCreateWindow(w->dpy, w->fullscreen.win,
-                    0, 0,
-                    width, height,
-                    0,
-                    0,
-                    InputOnly,
-                    vi->visual,
-                    attr_flags_input_only,
-                    &attr);
-#endif
     w->fullscreen.focus_child = XCreateSimpleWindow(w->dpy,
                                                     w->fullscreen.win,
                                                     -1, -1, 1, 1, 0,
@@ -847,9 +834,6 @@
   
   w->black = BlackPixel(w->dpy, w->screen);
   
-  
-  display_name = XDisplayName(DisplayString(w->dpy));
-
   XFree(wmhints);
   
   /* Determine if we are in fullscreen mode */
@@ -915,7 +899,7 @@
   int y;
   
   /* Return early if there is nothing to do */
-  if(!!fullscreen == !!w->is_fullscreen)
+  if(!!fullscreen == !!TEST_FLAG(w, FLAG_IS_FULLSCREEN))
     return 0;
   
   /* Normal->fullscreen */
@@ -933,8 +917,9 @@
     w->window_height = height;
     
     w->current = &w->fullscreen;
-    w->is_fullscreen = 1;
-    w->need_fullscreen = 1;
+
+    SET_FLAG(w, FLAG_IS_FULLSCREEN);
+    SET_FLAG(w, FLAG_NEED_FULLSCREEN);
     bg_x11_window_show(w, 1);
     
     if(w->callbacks && w->callbacks->set_fullscreen)
@@ -966,7 +951,7 @@
     
     /* Map normal window */
     w->current = &w->normal;
-    w->is_fullscreen = 0;
+    CLEAR_FLAG(w, FLAG_IS_FULLSCREEN);
     
     w->window_width  = w->normal_width;
     w->window_height = w->normal_height;
@@ -996,7 +981,8 @@
   {
   win->normal_width = width;
   win->normal_height = height;
-  if(!win->is_fullscreen && (win->normal.parent == win->root))
+  if(!TEST_FLAG(win, FLAG_IS_FULLSCREEN) &&
+     (win->normal.parent == win->root))
     {
     win->window_width = width;
     win->window_height = height;
@@ -1016,7 +1002,7 @@
   {
   bg_x11_window_t * ret;
   ret = calloc(1, sizeof(*ret));
-  ret->display_string_parent = bg_strdup(ret->display_string_parent, display_string);
+  ret->display_string_parent = gavl_strrep(ret->display_string_parent, display_string);
   ret->scaler = gavl_video_scaler_create();
   
   /* Set default OpenGL attributes */
@@ -1244,7 +1230,10 @@
 
   if(!strcmp(name, "auto_resize"))
     {
-    win->auto_resize = val->val_i;
+    if(val->val_i)
+      SET_FLAG(win, FLAG_AUTO_RESIZE);
+    else
+      CLEAR_FLAG(win, FLAG_AUTO_RESIZE);
     }
   else if(!strcmp(name, "window_x"))
     {
@@ -1268,11 +1257,17 @@
     }
   else if(!strcmp(name, "disable_xscreensaver_normal"))
     {
-    win->disable_screensaver_normal = val->val_i;
+    if(val->val_i)
+      SET_FLAG(win, FLAG_DISABLE_SCREENSAVER_NORMAL);
+    else
+      CLEAR_FLAG(win, FLAG_DISABLE_SCREENSAVER_NORMAL);
     }
   else if(!strcmp(name, "disable_xscreensaver_fullscreen"))
     {
-    win->disable_screensaver_fullscreen = val->val_i;
+    if(val->val_i)
+      SET_FLAG(win, FLAG_DISABLE_SCREENSAVER_FULLSCREEN);
+    else
+      CLEAR_FLAG(win, FLAG_DISABLE_SCREENSAVER_FULLSCREEN);
     }
 #ifdef HAVE_GLX
   else if(!strcmp(name, "background_color"))
@@ -1283,7 +1278,10 @@
   
   else if(!strcmp(name, "force_hw_scale"))
     {
-    win->force_hw_scale = val->val_i;
+    if(val->val_i)
+      SET_FLAG(win, FLAG_FORCE_HW_SCALE);
+    else
+      CLEAR_FLAG(win, FLAG_FORCE_HW_SCALE);
     }
   else if(!strcmp(name, "scale_mode"))
     {
@@ -1307,7 +1305,6 @@
     opt = gavl_video_scaler_get_options(win->scaler);
     if(scale_mode != gavl_video_options_get_scale_mode(opt))
       {
-      win->scaler_options_changed = 1;
       gavl_video_options_set_scale_mode(opt, scale_mode);
       }
     }
@@ -1316,7 +1313,6 @@
     opt = gavl_video_scaler_get_options(win->scaler);
     if(val->val_i != gavl_video_options_get_scale_order(opt))
       {
-      win->scaler_options_changed = 1;
       gavl_video_options_set_scale_order(opt, val->val_i);
       }
     }
@@ -1325,7 +1321,6 @@
     opt = gavl_video_scaler_get_options(win->scaler);
     if(val->val_i != gavl_video_options_get_quality(opt))
       {
-      win->scaler_options_changed = 1;
       gavl_video_options_set_quality(opt, val->val_i);
       }
     }
@@ -1438,8 +1433,8 @@
     XClassHint xclasshint;
 
     /* const madness */
-    xclasshint.res_name = bg_strdup(NULL, name);
-    xclasshint.res_class = bg_strdup(NULL, klass);
+    xclasshint.res_name = gavl_strdup(name);
+    xclasshint.res_class = gavl_strdup(klass);
 
     if(w->normal.parent == w->root)
       XSetClassHint(w->dpy, w->normal.win, &xclasshint);

gmerlin-1.2.0.tar.gz/lib/x11/ximage.c -> gmerlin-4256.tar.gz/lib/x11/ximage.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -41,12 +41,12 @@
 static gavl_video_frame_t * create_frame_ximage(driver_data_t * d)
   {
   ximage_frame_t * frame;
-  gavl_video_frame_t * ret;
+  gavl_video_frame_t * ret = NULL;
   bg_x11_window_t * w = d->win;
   
   frame = calloc(1, sizeof(*frame));
 
-  if(w->have_shm)
+  if(TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     /* Create Shm Image */
     frame->x11_image = XShmCreateImage(w->dpy, w->visual,
@@ -55,7 +55,11 @@
                                        w->window_format.frame_width,
                                        w->window_format.frame_height);
     if(!frame->x11_image)
-      w->have_shm = 0;
+      {
+      CLEAR_FLAG(w, FLAG_HAVE_SHM);
+      free(frame);
+      frame = NULL;
+      }
     else
       {
       if(!bg_x11_window_create_shm(w, &frame->shminfo,
@@ -63,18 +67,17 @@
                                 frame->x11_image->bytes_per_line))
         {
         XDestroyImage(frame->x11_image);
-
-        w->have_shm = 0;
+        CLEAR_FLAG(w, FLAG_HAVE_SHM);
         }
       frame->x11_image->data = frame->shminfo.shmaddr;
 
-      ret = calloc(1, sizeof(*ret));
-
+      ret = gavl_video_frame_create(NULL);
       ret->planes[0] = (uint8_t*)(frame->x11_image->data);
       ret->strides[0] = frame->x11_image->bytes_per_line;
       }
     }
-  if(!w->have_shm)
+  
+  if(!ret)
     {
     /* Use gavl to allocate memory aligned scanlines */
     ret = gavl_video_frame_create(&w->window_format);
@@ -87,6 +90,9 @@
                                     ret->strides[0]);
     }
   ret->user_data = frame;
+
+  gavl_video_frame_clear(ret, &w->window_format);
+  
   return ret;
   }
 
@@ -95,7 +101,7 @@
   ximage_frame_t * frame = (ximage_frame_t*)f->user_data;
   bg_x11_window_t * w = d->win;
   
-  if(w->have_shm)
+  if(TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     XShmPutImage(w->dpy,            /* dpy        */
                  w->current->win, /* d          */
@@ -108,7 +114,7 @@
                  w->dst_rect.w,    /* src_width  */
                  w->dst_rect.h,   /* src_height */
                  True                  /* send_event */);
-    w->wait_for_completion = 1;
+    SET_FLAG(w, FLAG_WAIT_FOR_COMPLETION);
     }
   else
     {
@@ -131,7 +137,7 @@
   bg_x11_window_t * w = d->win;
   if(frame->x11_image)
     XFree(frame->x11_image);
-  if(w->have_shm)
+  if(TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     bg_x11_window_destroy_shm(w, &frame->shminfo);
     gavl_video_frame_null(f);

gmerlin-1.2.0.tar.gz/lib/x11/xvideo.c -> gmerlin-4256.tar.gz/lib/x11/xvideo.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -355,14 +355,14 @@
 
   frame = calloc(1, sizeof(*frame));
 
-  if(w->have_shm)
+  if(TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     frame->xv_image =
       XvShmCreateImage(w->dpy, priv->current_port, priv->format, NULL,
                        w->video_format.frame_width,
                        w->video_format.frame_height, &frame->shminfo);
     if(!frame->xv_image)
-      w->have_shm = 0;
+      CLEAR_FLAG(w, FLAG_HAVE_SHM);
     else
       {
       if(!bg_x11_window_create_shm(w, &frame->shminfo,
@@ -370,14 +370,14 @@
         {
         XFree(frame->xv_image);
         frame->xv_image = NULL;
-        w->have_shm = 0;
+        CLEAR_FLAG(w, FLAG_HAVE_SHM);
         }
       else
         frame->xv_image->data = frame->shminfo.shmaddr;
       }
     }
 
-  if(!w->have_shm)
+  if(!TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     ret = gavl_video_frame_create(&w->video_format);
     frame->xv_image =
@@ -423,7 +423,7 @@
       break;
     }
 
-  
+  gavl_video_frame_clear(ret, &w->video_format);
   ret->user_data = frame;
   return ret;
   }
@@ -438,7 +438,7 @@
   priv = (xv_priv_t *)(d->priv);
   w = d->win;
 
-  if(w->have_shm)
+  if(TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     XvShmPutImage(w->dpy,
                   priv->current_port,
@@ -454,7 +454,7 @@
                   w->dst_rect.w,  /* dest_w */
                   w->dst_rect.h,  /* dest_h */
                   True);
-    w->wait_for_completion = 1;
+    SET_FLAG(w, FLAG_WAIT_FOR_COMPLETION);
     }
   else
     {
@@ -481,8 +481,8 @@
 
   if(frame->xv_image)
     XFree(frame->xv_image);
-
-  if(w->have_shm)
+     
+  if(TEST_FLAG(w, FLAG_HAVE_SHM))
     {
     bg_x11_window_destroy_shm(w, &frame->shminfo);
     gavl_video_frame_null(f);

gmerlin-1.2.0.tar.gz/m4/check_funcs.m4 -> gmerlin-4256.tar.gz/m4/check_funcs.m4 Changed

@@ -1,4 +1,36 @@
 dnl
+dnl Standardized linker flags:
+dnl We use --as-needed for executables and
+dnl --no-undefined for libraries
+dnl
+
+AC_DEFUN([GMERLIN_CHECK_LDFLAGS],[
+
+GMERLIN_LIB_LDFLAGS=""
+GMERLIN_EXE_LDFLAGS=""
+
+AC_MSG_CHECKING(if linker supports --no-undefined)
+OLD_LDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+AC_TRY_LINK([],[],
+            [GMERLIN_LIB_LDFLAGS="-Wl,--no-undefined $GMERLIN_LIB_LDFLAGS"; AC_MSG_RESULT(Supported)],
+            [AC_MSG_RESULT(Unsupported)])
+LDFLAGS=$OLD_LDFLAGS
+
+AC_MSG_CHECKING(if linker supports --as-needed)
+OLD_LDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS -Wl,--as-needed"
+AC_TRY_LINK([],[],
+            [GMERLIN_EXE_LDFLAGS="-Wl,--as-needed $GMERLIN_EXE_LDFLAGS"; AC_MSG_RESULT(Supported)],
+            [AC_MSG_RESULT(Unsupported)])
+LDFLAGS=$OLD_LDFLAGS
+
+AC_SUBST(GMERLIN_LIB_LDFLAGS)
+AC_SUBST(GMERLIN_EXE_LDFLAGS)
+
+])
+
+dnl
 dnl AVCodec
 dnl
 
@@ -9,7 +41,8 @@
 
 have_avcodec=false
 
-AVCODEC_BUILD="3412992"
+dnl 54.1.0
+AVCODEC_BUILD="3539200"
 
 AC_ARG_ENABLE(libavcodec,
 [AC_HELP_STRING([--disable-libavcodec],[Disable libavcodec (default: autodetect)])],
@@ -328,6 +361,11 @@
 
 AM_CONDITIONAL(HAVE_SCHROEDINGER, test x$have_schroedinger = xtrue)
 
+OLD_CFLAGS=$CFLAGS
+CFLAGS=$SCHROEDINGER_CFLAGS
+AC_CHECK_HEADERS(schroedinger/schroversion.h)
+CFLAGS=$OLD_CFLAGS
+
 if test "x$have_schroedinger" = "xtrue"; then
 AC_DEFINE([HAVE_SCHROEDINGER])
 fi
@@ -1277,7 +1315,7 @@
 AH_TEMPLATE([HAVE_CDIO], [ libcdio found ])
 
 have_cdio="false"
-CDIO_REQUIRED="0.76"
+CDIO_REQUIRED="0.79"
 
 AC_ARG_ENABLE(libcdio,
 [AC_HELP_STRING([--disable-libcdio],[Disable libcdio (default: autodetect)])],
@@ -1300,6 +1338,45 @@
 ])
 
 dnl
+dnl libudf
+dnl
+
+AC_DEFUN([GMERLIN_CHECK_LIBUDF],[
+
+AH_TEMPLATE([HAVE_LIBUDF], [ libudf found ])
+
+AC_MSG_CHECKING([for libudf])
+if test "x$have_cdio" = "xtrue"; then
+
+OLD_CFLAGS=$CFLAGS
+OLD_LIBS=$LIBS
+
+CFLAGS=$CDIO_CFLAGS
+LIBS=$CDIO_LIBS
+
+AC_CHECK_LIB(udf, udf_open, have_libudf=true, have_libudf=false)
+
+if test "x$have_libudf" = "xtrue"; then
+AC_DEFINE([HAVE_LIBUDF])
+LIBUDF_LIBS="-ludf"
+AC_MSG_RESULT([Found])
+else
+LIBUDF_LIBS=""
+AC_MSG_RESULT([Not found])
+fi
+
+CFLAGS=$OLD_CFLAGS
+LIBS=$OLD_LIBS
+
+else
+AC_MSG_RESULT([Not found (libcdio missing)])
+fi
+
+AC_SUBST(LIBUDF_LIBS)
+
+])
+
+dnl
 dnl libdca
 dnl
 
@@ -1879,3 +1956,40 @@
 fi
 
 ])
+
+dnl
+dnl Check for opus codec
+dnl
+
+AC_DEFUN([GMERLIN_CHECK_OPUS],[
+
+AH_TEMPLATE([HAVE_OPUS],
+            [Do we have libopus installed?])
+
+have_theora="false"
+
+OPUS_REQUIRED="1.0.0"
+
+AC_ARG_ENABLE(opus,
+[AC_HELP_STRING([--disable-opus],[Disable opus (default: autodetect)])],
+[case "${enableval}" in
+   yes) test_opus=true ;;
+   no)  test_opus=false ;;
+esac],[test_opus=true])
+
+if test x$test_opus = xtrue; then
+
+PKG_CHECK_MODULES(OPUS, opus, have_opus="true", have_opus="false")
+fi
+
+AC_SUBST(OPUS_REQUIRED)
+AC_SUBST(OPUS_LIBS)
+AC_SUBST(OPUS_CFLAGS)
+
+AM_CONDITIONAL(HAVE_OPUS, test x$have_opus = xtrue)
+
+if test "x$have_opus" = "xtrue"; then
+AC_DEFINE([HAVE_OPUS])
+fi
+
+])

gmerlin-1.2.0.tar.gz/m4/gettext.m4 -> gmerlin-4256.tar.gz/m4/gettext.m4 Changed

@@ -1,5 +1,5 @@
-# gettext.m4 serial 53 (gettext-0.15)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2005.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
 
 dnl Macro to add for using GNU gettext.
 
@@ -35,7 +35,7 @@
 dnl    'need-formatstring-macros', then GNU gettext implementations that don't
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
+dnl    the value '$(top_builddir)/intl/' is used.
 dnl
 dnl The result of the configuration is one of three cases:
 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -60,11 +60,18 @@
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
-  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
   define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl
   ifelse(gt_included_intl, yes, [
@@ -78,7 +85,7 @@
   dnl Sometimes libintl requires libiconv, so first search for libiconv.
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
   dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
@@ -90,7 +97,7 @@
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX
 
   dnl Set USE_NLS.
@@ -104,16 +111,25 @@
   LTLIBINTL=
   POSUB=
 
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
     ifelse(gt_included_intl, yes, [
       AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
+      AC_ARG_WITH([included-gettext],
         [  --with-included-gettext use the GNU gettext library included here],
         nls_cv_force_use_gnu_gettext=$withval,
         nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -122,26 +138,41 @@
         dnl to use.  If GNU gettext is available we use this.  Else we have
         dnl to fall back to GNU NLS library.
 
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
+changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-]], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+               ]])],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
           ifelse(gt_included_intl, yes, , [
             AM_ICONV_LINK
@@ -152,49 +183,53 @@
           dnl even if libiconv doesn't exist.
           AC_LIB_LINKFLAGS_BODY([intl])
           AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
+            [$gt_func_gnugettext_libintl],
            [gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-]], [])[extern int _nl_msg_cat_cntr;
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
-              [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
+const char *_nl_expand_alias (const char *);
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                 ]])],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-]], [])[extern int _nl_msg_cat_cntr;
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
-                [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
+const char *_nl_expand_alias (const char *);
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"])
@@ -204,8 +239,8 @@
         dnl use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -252,7 +287,7 @@
 
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
+      AC_DEFINE([ENABLE_NLS], [1],
         [Define to 1 if translation of program messages to the user's native language
    is requested.])
     else
@@ -265,7 +300,7 @@
   if test "$USE_NLS" = "yes"; then
     AC_MSG_CHECKING([where the gettext function comes from])
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -279,16 +314,16 @@
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         AC_MSG_CHECKING([how to link with libintl])
         AC_MSG_RESULT([$LIBINTL])
         AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
       fi
 
       dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
+      AC_DEFINE([HAVE_GETTEXT], [1],
        [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
        [Define if the GNU dcgettext() function is already present or preinstalled.])
     fi
 
@@ -304,9 +339,9 @@
     fi
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
 
     dnl For backward compatibility. Some configure.ins may be using this.
     nls_cv_header_intl=
@@ -314,316 +349,51 @@
 
     dnl For backward compatibility. Some Makefiles may be using this.
     DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
+    AC_SUBST([DATADIRNAME])
 
     dnl For backward compatibility. Some Makefiles may be using this.
     INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
+    AC_SUBST([INSTOBJEXT])
 
     dnl For backward compatibility. Some Makefiles may be using this.
     GENCAT=gencat
-    AC_SUBST(GENCAT)
+    AC_SUBST([GENCAT])
 
     dnl For backward compatibility. Some Makefiles may be using this.
     INTLOBJS=
     if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"
     fi
-    AC_SUBST(INTLOBJS)
+    AC_SUBST([INTLOBJS])
 
     dnl Enable libtool support if the surrounding package wishes it.
     INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
   ])
 
   dnl For backward compatibility. Some Makefiles may be using this.
   INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
+  AC_SUBST([INTLLIBS])
 
   dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
 ])
 
 
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
 [
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([gt_GLIBC2])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([gl_VISIBILITY])dnl
-  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
-  AC_REQUIRE([bh_C_SIGNED])dnl
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([gl_GLIBC21])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-  AC_REQUIRE([gt_INTL_MACOSX])dnl
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
-  AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_LANGINFO_CODESET
-  gt_LC_MESSAGES
-
-  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
-  dnl 1. when we install a shared library, we must arrange to export
-  dnl    auxiliary pointer variables for every exported variable,
-  dnl 2. when we install a shared library and a static library simultaneously,
-  dnl    the include file specifies __declspec(dllimport) and therefore we
-  dnl    must arrange to define the auxiliary pointer variables for the
-  dnl    exported variables _also_ in the static library.
-  if test "$enable_shared" = yes; then
-    case "$host_os" in
-      cygwin*) is_woe32dll=yes ;;
-      *) is_woe32dll=no ;;
-    esac
-  else
-    is_woe32dll=no
-  fi
-  WOE32DLL=$is_woe32dll
-  AC_SUBST([WOE32DLL])
-
-  dnl Rename some macros and functions used for locking.
-  AH_BOTTOM([
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init     libintl_lock_init
-#define glthread_lock_lock     libintl_lock_lock
-#define glthread_lock_unlock   libintl_lock_unlock
-#define glthread_lock_destroy  libintl_lock_destroy
-#define glthread_rwlock_init     libintl_rwlock_init
-#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
-#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
-#define glthread_rwlock_unlock   libintl_rwlock_unlock
-#define glthread_rwlock_destroy  libintl_rwlock_destroy
-#define glthread_recursive_lock_init     libintl_recursive_lock_init
-#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
-#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
-#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
-#define glthread_once                 libintl_once
-#define glthread_once_call            libintl_once_call
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-])
-])
-
-
-dnl Checks for the core files of the intl subdirectory:
-dnl   dcigettext.c
-dnl   eval-plural.h
-dnl   explodename.c
-dnl   finddomain.c
-dnl   gettextP.h
-dnl   gmo.h
-dnl   hash-string.h hash-string.c
-dnl   l10nflist.c
-dnl   libgnuintl.h.in (except the *printf stuff)
-dnl   loadinfo.h
-dnl   loadmsgcat.c
-dnl   localealias.c
-dnl   log.c
-dnl   plural-exp.h plural-exp.c
-dnl   plural.y
-dnl Used by libglocale.
-AC_DEFUN([gt_INTL_SUBDIR_CORE],
-[
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_LOCK])dnl
-
-  AC_TRY_LINK(
-    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
-    [],
-    [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
-       [Define to 1 if the compiler understands __builtin_expect.])])
-
-  AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
-    stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
-    argz_next __fsetlocking])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-
-  AM_ICONV
-
-  dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
-  dnl and a _NL_LOCALE_NAME macro always.
-  AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
-    [AC_TRY_LINK([#include <langinfo.h>
-#include <locale.h>],
-      [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
-      gt_cv_nl_locale_name=yes,
-      gt_cv_nl_locale_name=no)
-    ])
-  if test $gt_cv_nl_locale_name = yes; then
-    AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
-      [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* $[0-9]*\.[0-9.]*$.*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
 ])
 
 
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
 [
-  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-    [AC_TRY_COMPILE([$2], [
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
 ])

gmerlin-1.2.0.tar.gz/m4/iconv.m4 -> gmerlin-4256.tar.gz/m4/iconv.m4 Changed

@@ -1,5 +1,5 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# iconv.m4 serial 18 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -21,6 +21,7 @@
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
@@ -29,34 +30,170 @@
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <iconv.h>
+         ]],
+         [[iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);]])],
+      [am_cv_func_iconv=yes])
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+           ]],
+           [[iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);]])],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
       LIBS="$am_save_LIBS"
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+}]])],
+        [am_cv_func_iconv_works=yes],
+        [am_cv_func_iconv_works=no],
+        [
+changequote(,)dnl
+         case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+changequote([,])dnl
+        ])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
   fi
   if test "$am_cv_lib_iconv" = yes; then
     AC_MSG_CHECKING([how to link with libiconv])
@@ -68,34 +205,64 @@
     LIBICONV=
     LTLIBICONV=
   fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
 ])
 
-AC_DEFUN([AM_ICONV],
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [m4_ifdef([gl_00GNULIB],
+       [[AC_DEFUN_ONCE(
+           [$1], [$2])]],
+       [[AC_DEFUN(
+           [$1], [$2])]])]))
+gl_iconv_AC_DEFUN([AM_ICONV],
 [
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+           ]],
+           [[]])],
+        [am_cv_proto_iconv_arg1=""],
+        [am_cv_proto_iconv_arg1="const"])
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
       [Define as const if the declaration of iconv() needs const.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
   fi
 ])

gmerlin-1.2.0.tar.gz/m4/lib-ld.m4 -> gmerlin-4256.tar.gz/m4/lib-ld.m4 Changed

@@ -1,50 +1,56 @@
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
 
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -54,12 +60,12 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -77,33 +83,36 @@
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(acl_cv_path_LD,
+AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-	test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
+  AC_MSG_RESULT([$LD])
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT([no])
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_LIB_PROG_LD_GNU

gmerlin-1.2.0.tar.gz/m4/lib-link.m4 -> gmerlin-4256.tar.gz/m4/lib-link.m4 Changed

@@ -1,58 +1,66 @@
-# lib-link.m4 serial 8 (gettext-0.15)
-dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.54])
 
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
 dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
     AC_LIB_LINKFLAGS_BODY([$1], [$2])
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
   ])
   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
   LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
   INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
   dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
   dnl results of this search when this library appears as a dependency.
   HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
+  popdef([NAME])
+  popdef([Name])
 ])
 
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
 dnl searches for libname and the libraries corresponding to explicit and
 dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 
   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
   dnl accordingly.
@@ -66,13 +74,26 @@
 
   AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
     ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$3]], [[$4]])],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
     LIBS="$ac_save_LIBS"
   ])
   if test "$ac_cv_lib[]Name" = yes; then
     HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
     AC_MSG_CHECKING([how to link with lib[]$1])
     AC_MSG_RESULT([$LIB[]NAME])
   else
@@ -82,17 +103,25 @@
     CPPFLAGS="$ac_save_CPPFLAGS"
     LIB[]NAME=
     LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
   fi
   AC_SUBST([HAVE_LIB]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
 ])
 
 dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
   dnl Tell automake >= 1.10 to complain if config.rpath is missing.
@@ -101,7 +130,7 @@
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
   AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
@@ -109,35 +138,66 @@
     acl_cv_rpath=done
   ])
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
+  AC_ARG_ENABLE([rpath],
     [  --disable-rpath         do not hardcode runtime library paths],
     :, enable_rpath=yes)
 ])
 
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -150,6 +210,10 @@
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 ])
@@ -158,6 +222,10 @@
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -177,7 +245,7 @@
         names_already_handled="$names_already_handled $name"
         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
         dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -197,22 +265,55 @@
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIB[]NAME; do
@@ -220,21 +321,46 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -249,7 +375,9 @@
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -268,12 +396,12 @@
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
                 dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
+                if test "$acl_hardcode_direct" = yes; then
                   dnl Using DIR/libNAME.so during linking hardcodes DIR into the
                   dnl resulting binary.
                   LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                     dnl Use an explicit option to hardcode DIR into the resulting
                     dnl binary.
                     LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
@@ -304,13 +432,13 @@
                     if test -z "$haveit"; then
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                       dnl FIXME: Not sure whether we should use
                       dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
                       dnl here.
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
                     else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
                       dnl here, because this doesn't fit in flags passed to the
                       dnl compiler. So give up. No hardcoding. This affects only
                       dnl very old systems.
@@ -337,6 +465,16 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -397,9 +535,11 @@
                     dnl   3. if it's already present in $LDFLAGS or the already
                     dnl      constructed $LIBNAME,
                     dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -498,18 +638,18 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
       dnl Weird platform: only the last -rpath option counts, the user must
       dnl pass all path elements in one option. We can arrange that for a
       dnl single library, but not when more than one $LIBNAMEs are used.
       alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
       acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
     else
@@ -517,7 +657,7 @@
       for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
       done
@@ -530,6 +670,11 @@
       LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
     done
   fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
 ])
 
 dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
@@ -566,7 +711,7 @@
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   $1=
   if test "$enable_rpath" != no; then
-    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
       dnl Use an explicit option to hardcode directories into the resulting
       dnl binary.
       rpathdirs=
@@ -575,7 +720,8 @@
         if test -n "$next"; then
           dir="$next"
           dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
             rpathdirs="$rpathdirs $dir"
           fi
           next=
@@ -584,7 +730,8 @@
             -L) next=yes ;;
             -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
                  dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
                    rpathdirs="$rpathdirs $dir"
                  fi
                  next= ;;
@@ -600,16 +747,16 @@
           done
         else
           dnl The linker is used for linking directly.
-          if test -n "$hardcode_libdir_separator"; then
+          if test -n "$acl_hardcode_libdir_separator"; then
             dnl Weird platform: only the last -rpath option counts, the user
             dnl must pass all path elements in one option.
             alldirs=
             for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
             done
             acl_save_libdir="$libdir"
             libdir="$alldirs"
-            eval flag=\"$hardcode_libdir_flag_spec\"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
             libdir="$acl_save_libdir"
             $1="$flag"
           else
@@ -617,7 +764,7 @@
             for dir in $rpathdirs; do
               acl_save_libdir="$libdir"
               libdir="$dir"
-              eval flag=\"$hardcode_libdir_flag_spec\"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
               libdir="$acl_save_libdir"
               $1="${$1}${$1:+ }$flag"
             done

gmerlin-1.2.0.tar.gz/m4/lib-prefix.m4 -> gmerlin-4256.tar.gz/m4/lib-prefix.m4 Changed

@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 5 (gettext-0.15)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -153,33 +153,72 @@
   prefix="$acl_save_prefix"
 ])
 
-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
-dnl the basename of the libdir, either "lib" or "lib64".
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
 AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
 [
-  dnl There is no formal standard regarding lib and lib64. The current
-  dnl practice is that on a system supporting 32-bit and 64-bit instruction
-  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
-  dnl libraries go under $prefix/lib. We determine the compiler's default
-  dnl mode by looking at the compiler's library search path. If at least
-  dnl of its elements ends in /lib64 or points to a directory whose absolute
-  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
-  dnl default, namely "lib".
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
   acl_libdirstem=lib
-  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-  if test -n "$searchpath"; then
-    acl_save_IFS="${IFS= 	}"; IFS=":"
-    for searchdir in $searchpath; do
-      if test -d "$searchdir"; then
-        case "$searchdir" in
-          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-          *) searchdir=`cd "$searchdir" && pwd`
-             case "$searchdir" in
-               */lib64 ) acl_libdirstem=lib64 ;;
-             esac ;;
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
         esac
       fi
-    done
-    IFS="$acl_save_IFS"
-  fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
 ])

gmerlin-1.2.0.tar.gz/m4/lqt_opt_cflags.m4 -> gmerlin-4256.tar.gz/m4/lqt_opt_cflags.m4 Changed

@@ -17,10 +17,9 @@
         ifelse([$3],[],[:],[$3])
     fi])
 
-dnl LQT_OPT_CFLAGS(CPU_TYPE [, ADDITIONAL_OPT_FLAGS])
+dnl LQT_OPT_CFLAGS([ADDITIONAL_OPT_FLAGS])
 dnl Get proper optimization flags. 
 dnl
-dnl CPU_TYPE: host_cpu variable as obtained from AC_CANONICAL_HOST
 dnl ADDITIONAL_OPT_FLAGS:  Additional optimization flags (e.g. -O3 --fast-math)
 dnl On output, the Variable LQT_OPT_CFLAGS will be set to the compiler flags
 dnl Furthermore, is debuggind was requested, the variable LQT_DEBUG will be
@@ -32,7 +31,6 @@
 dnl Debugging Support
 dnl
 
-
 LQT_DEBUG=false
 
 AC_ARG_ENABLE(debug,
@@ -56,37 +54,17 @@
 lqt_cpuflags=""
 fi
 
-dnl
-dnl Autodetect CPU specific flags
-dnl
-
-if test x$lqt_cpuflags = xauto; then
-
-lqt_cpu_family=""
-case [$1] in
-  i[[3-7]]86)
-    lqt_cpu_family=x86;;
-  x86_64*)
-    lqt_cpu_family=x86;;
-  powerpc | powerpc64)
-    lqt_cpu_family=ppc;;
-  *)
-    lqt_cpu_family="";;
-esac
-
-if test x$lqt_cpu_family = x; then
-  lqt_cpuflags=""
-else
-  lqt_cpuflags=`$srcdir/cpuinfo.sh $lqt_cpu_family`
-fi
+dnl Let gcc detect the architecture
 
+if test "x$lqt_cpuflags" = "xauto"; then
+  lqt_cpuflags="-march=native -mtune=native"
 fi
 
 dnl
 dnl Build the final flags
 dnl
 
-lqt_additional_opt_flags=ifelse([$2],[],[],[$2])
+lqt_additional_opt_flags=ifelse([$1],[],[],[$1])
 
 lqt_test_flags=$lqt_cpuflags

gmerlin-1.2.0.tar.gz/m4/nls.m4 -> gmerlin-4256.tar.gz/m4/nls.m4 Changed

gmerlin-1.2.0.tar.gz/m4/po.m4 -> gmerlin-4256.tar.gz/m4/po.m4 Changed

@@ -1,5 +1,5 @@
-# po.m4 serial 13 (gettext-0.15)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# po.m4 serial 21 (gettext-0.18.3)
+dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,16 +17,21 @@
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
   AC_REQUIRE([AM_NLS])dnl
 
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
 
@@ -37,7 +42,7 @@
     [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
     :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
 
   dnl Test whether it is GNU msgfmt >= 0.15.
 changequote(,)dnl
@@ -84,6 +89,10 @@
   test -n "$localedir" || localedir='${datadir}/locale'
   AC_SUBST([localedir])
 
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
   AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
@@ -94,7 +103,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -110,7 +119,8 @@
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -121,12 +131,12 @@
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -218,7 +228,7 @@
 changequote(,)dnl
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
@@ -246,6 +256,7 @@
   fi
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
   sed_x_variable='
 # Test if the hold space is empty.
 x
@@ -253,9 +264,9 @@
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
   # Seen the first line of the variable definition.
-  s/^[	 ]*VARIABLE[	 ]*=//
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
   ba
 }
 bd
@@ -307,7 +318,7 @@
     sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -397,14 +408,15 @@
   fi
 
   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -414,8 +426,8 @@
       frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -426,3 +438,16 @@
   fi
   mv "$ac_file.tmp" "$ac_file"
 ])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])

gmerlin-1.2.0.tar.gz/m4/progtest.m4 -> gmerlin-4256.tar.gz/m4/progtest.m4 Changed

@@ -1,5 +1,5 @@
-# progtest.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
 
 # Search path for a program which passes the given test.
 
@@ -27,15 +27,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -55,7 +54,7 @@
 # Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
+AC_CACHE_VAL([ac_cv_path_$1],
 [case "[$]$1" in
   [[\\/]]* | ?:[[\\/]]*)
     ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
@@ -84,9 +83,9 @@
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
+  AC_MSG_RESULT([$][$1])
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT([no])
 fi
-AC_SUBST($1)dnl
+AC_SUBST([$1])dnl
 ])

gmerlin-4256.tar.gz/make_manpages Added

gmerlin-4256.tar.gz/make_texis Added

gmerlin-4256.tar.gz/osd/osd.sfd Added

@@ -0,0 +1,293 @@
+SplineFontDB: 1.0
+FontName: GmerlinOSD
+FullName: GmerlinOSD
+FamilyName: GmerlinOSD
+Weight: Medium
+Copyright: Created by Burkhard Plaum with FontForge 1.0 (http://fontforge.sf.net)
+Comments: 2006-2-20: Created.
+Version: 001.000
+ItalicAngle: 0
+UnderlinePosition: -100
+UnderlineWidth: 50
+Ascent: 800
+Descent: 200
+XUID: [1021 359 2142557246 10853752]
+FSType: 0
+PfmFamily: 17
+TTFWeight: 500
+TTFWidth: 5
+LineGap: 90
+VLineGap: 0
+OS2TypoAscent: 0
+OS2TypoAOffset: 1
+OS2TypoDescent: 0
+OS2TypoDOffset: 1
+OS2TypoLinegap: 90
+OS2WinAscent: 0
+OS2WinAOffset: 1
+OS2WinDescent: 0
+OS2WinDOffset: 1
+HheadAscent: 0
+HheadAOffset: 1
+HheadDescent: 0
+HheadDOffset: 1
+OS2Vendor: 'Gmer'
+ScriptLang: 1
+ 1 latn 1 dflt 
+TtfTable: cvt  4
+!$MDh
+EndTtf
+LangName: 1033 
+Encoding: ISO8859-1
+UnicodeInterp: none
+NameList: Adobe Glyph List
+DisplaySize: -24
+AntiAlias: 1
+FitToEm: 1
+WinInfo: 32 16 7
+Grid
+400 400 m 29
+ 746.41 200 l 29
+400 400 m 25
+ 53.5898 200 l 25
+400 400 m 25
+ 400 800 l 25
+0 0 m 1
+ 0 800 l 1
+ 800 800 l 1
+ 800 0 l 1
+ 0 0 l 1
+EndSplineSet
+BeginChars: 256 12
+StartChar: exclam
+Encoding: 33 33 0
+Width: 800
+Flags: W
+TeX: 101 0 0 0
+HStem: 0 21G<0 200 600 800>
+Fore
+600 0 m 25
+ 600 800 l 17
+ 800 800 l 9
+ 800 0 l 25
+ 600 0 l 25
+0 0 m 25
+ 200 0 l 25
+ 200 800 l 17
+ 0 800 l 9
+ 0 0 l 25
+EndSplineSet
+EndChar
+StartChar: quotedbl
+Encoding: 34 34 1
+Width: 800
+Flags: W
+TeX: 113 0 0 0
+HStem: 0 21G<0 800>
+Fore
+0 0 m 25
+ 0 800 l 21
+ 800 800 l 13
+ 800 0 l 25
+ 0 0 l 25
+EndSplineSet
+EndChar
+StartChar: numbersign
+Encoding: 35 35 2
+Width: 800
+Flags: W
+TeX: 110 0 0 0
+Fore
+0 800 m 17
+ 800 400 l 13
+ 0 0 l 25
+ 0 800 l 17
+EndSplineSet
+EndChar
+StartChar: V
+Encoding: 86 86 3
+Width: 564
+Flags: W
+TeX: 86 0 0 0
+HStem: 258.8 278.4<70.7998 253.2>
+Fore
+70.7998 537.2 m 25
+ 253.2 537.2 l 25
+ 493.2 777.2 l 25
+ 493.2 18.7998 l 25
+ 253.2 258.8 l 25
+ 70.7998 258.8 l 25
+ 70.7998 537.2 l 25
+EndSplineSet
+EndChar
+StartChar: B
+Encoding: 66 66 4
+Width: 800
+Flags: W
+TeX: 66 0 0 0
+HStem: 1 21G<367 433> 196 5<343.696 456.304> 367.5 66<0.5 200.5 599.5 799.5> 600 4<343.696 456.304>
+VStem: 196 4.5<343.696 456.304> 367 66<1 201 600 800> 599.5 4.5<343.696 456.304>
+CounterMasks: 1 0e
+Fore
+196 400 m 4
+ 196 512.608 287.392 604 400 604 c 4
+ 512.608 604 604 512.608 604 400 c 4
+ 604 287.392 512.608 196 400 196 c 4
+ 287.392 196 196 287.392 196 400 c 4
+517.733 236.098 m 1
+ 564.402 282.767 l 1
+ 705.823 141.346 l 1
+ 659.154 94.6768 l 1
+ 517.733 236.098 l 1
+94.1768 659.654 m 1
+ 140.846 706.324 l 1
+ 282.267 564.902 l 1
+ 235.598 518.233 l 1
+ 94.1768 659.654 l 1
+564.402 518.233 m 1
+ 517.733 564.902 l 1
+ 659.154 706.324 l 1
+ 705.823 659.654 l 1
+ 564.402 518.233 l 1
+140.846 94.6768 m 1
+ 94.1768 141.346 l 1
+ 235.598 282.767 l 1
+ 282.267 236.098 l 1
+ 140.846 94.6768 l 1
+599.5 367.5 m 1
+ 599.5 433.5 l 1
+ 799.5 433.5 l 1
+ 799.5 367.5 l 1
+ 599.5 367.5 l 1
+0.5 367.5 m 1
+ 0.5 433.5 l 1
+ 200.5 433.5 l 1
+ 200.5 367.5 l 1
+ 0.5 367.5 l 1
+367 201 m 1
+ 433 201 l 1
+ 433 1 l 1
+ 367 1 l 1
+ 367 201 l 1
+367 800 m 1
+ 433 800 l 1
+ 433 600 l 1
+ 367 600 l 1
+ 367 800 l 1
+EndSplineSet
+EndChar
+StartChar: C
+Encoding: 67 67 5
+Width: 800
+Flags: W
+TeX: 67 0 0 0
+HStem: 0 80<289.6 510.4> 720 80<289.6 510.4>
+VStem: 0 80<289.6 510.4> 400 400<80 720>
+Fore
+0 400 m 0
+ 0 620.8 179.2 800 400 800 c 0
+ 620.8 800 800 620.8 800 400 c 0
+ 800 179.2 620.8 0 400 0 c 0
+ 179.2 0 0 179.2 0 400 c 0
+400 80 m 1
+ 400 720 l 1
+ 223.36 720 80 576.64 80 400 c 0
+ 80 223.36 223.36 80 400 80 c 1
+EndSplineSet
+EndChar
+StartChar: S
+Encoding: 83 83 6
+Width: 800
+Flags: W
+TeX: 83 0 0 0
+HStem: 0 21G<289.6 510.4> 714 86<289.6 510.4>
+Fore
+632.42 390.999 m 0
+ 580.73 420.703 514.673 402.86 484.969 351.171 c 0
+ 455.265 299.481 473.107 233.424 524.797 203.72 c 0
+ 576.485 174.016 642.543 191.858 672.247 243.548 c 0
+ 701.951 295.236 684.109 361.295 632.42 390.999 c 0
+273.964 204.514 m 0
+ 325.84 233.89 344.101 299.834 314.724 351.709 c 0
+ 285.348 403.585 219.404 421.846 167.528 392.469 c 0
+ 115.652 363.093 97.3916 297.149 126.769 245.273 c 0
+ 156.145 193.397 222.088 175.137 273.964 204.514 c 0
+292 606 m 0
+ 292 546.384 340.384 498 400 498 c 0
+ 459.616 498 508 546.384 508 606 c 0
+ 508 665.616 459.616 714 400 714 c 0
+ 340.384 714 292 665.616 292 606 c 0
+0 400 m 0
+ 0 620.8 179.2 800 400 800 c 0
+ 620.8 800 800 620.8 800 400 c 0
+ 800 179.2 620.8 0 400 0 c 0
+ 179.2 0 0 179.2 0 400 c 0
+EndSplineSet
+EndChar
+StartChar: D
+Encoding: 68 68 7
+Width: 800
+Flags: W
+TeX: 68 0 0 0
+HStem: 0 21G<289.6 510.4>
+Fore
+0 400 m 0
+ 0 620.8 179.2 800 400 800 c 0
+ 620.8 800 800 620.8 800 400 c 0
+ 800 179.2 620.8 0 400 0 c 0
+ 179.2 0 0 179.2 0 400 c 0
+EndSplineSet
+EndChar
+StartChar: bar
+Encoding: 124 124 8
+Width: 300
+Flags: W
+TeX: 98 0 0 0
+HStem: 0 21G<50 250>
+Fore
+50 0 m 1
+ 50 800 l 1
+ 250 800 l 1
+ 250 0 l 1
+ 50 0 l 1
+EndSplineSet
+EndChar
+StartChar: period
+Encoding: 46 46 9
+Width: 300
+Flags: W
+TeX: 112 0 0 0
+Fore
+50 300 m 1
+ 50 500 l 1
+ 250 500 l 1
+ 250 300 l 1
+ 50 300 l 1
+EndSplineSet
+EndChar
+StartChar: bracketleft
+Encoding: 91 91 10
+Width: 450
+Flags: W
+TeX: 98 0 0 0
+Fore
+400 0 m 1
+ 179.2 0 0 179.2 0 400 c 0
+ 0 620.8 179.2 800 400 800 c 1
+ 400 0 l 1
+EndSplineSet
+EndChar
+StartChar: bracketright
+Encoding: 93 93 11
+Width: 450
+Flags: MW
+TeX: 98 0 0 0
+Fore
+50 0 m 1
+ 270.8 0 450 179.2 450 400 c 4
+ 450 620.8 270.8 800 50 800 c 1
+ 50 0 l 1
+EndSplineSet
+EndChar
+EndChars
+EndSplineFont

gmerlin-1.2.0.tar.gz/plugins/Makefile.am -> gmerlin-4256.tar.gz/plugins/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/alsa/Makefile.am -> gmerlin-4256.tar.gz/plugins/alsa/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/alsa/alsa_common.c -> gmerlin-4256.tar.gz/plugins/alsa/alsa_common.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -377,8 +377,8 @@
 
   stream = record ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK;
   
-  ret->name      = bg_strdup(NULL, "card");
-  ret->long_name = bg_strdup(NULL, TRS("Card"));
+  ret->name      = gavl_strdup("card");
+  ret->long_name = gavl_strdup(TRS("Card"));
   ret->type = BG_PARAMETER_STRINGLIST;
 
   snd_ctl_card_info_malloc(&info);
@@ -391,9 +391,9 @@
     }
   
   /* Default is always supported */
-  ret->val_default.val_str = bg_strdup(NULL, "default");
-  append_card(ret, bg_strdup(NULL, "default"),
-              bg_strdup(NULL, TRS("Default")));
+  ret->val_default.val_str = gavl_strdup("default");
+  append_card(ret, gavl_strdup("default"),
+              gavl_strdup(TRS("Default")));
   
   while (card >= 0)
     {
@@ -444,7 +444,7 @@
         continue;
         }
       name = bg_sprintf("hw:%d,%d", card, dev);
-      label = bg_strdup(NULL, snd_pcm_info_get_name(pcminfo));
+      label = gavl_strdup(snd_pcm_info_get_name(pcminfo));
       append_card(ret, name, label);
       snd_pcm_info_free(pcminfo);
       }

gmerlin-1.2.0.tar.gz/plugins/alsa/alsa_common.h -> gmerlin-4256.tar.gz/plugins/alsa/alsa_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/alsa/i_alsa.c -> gmerlin-4256.tar.gz/plugins/alsa/i_alsa.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -40,6 +40,8 @@
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "i_alsa"
 
+#include <gavl/metatags.h>
+
 #include "alsa_common.h"
 
 static const bg_parameter_info_t static_parameters[] =
@@ -100,14 +102,13 @@
   char * card;
   
   snd_pcm_t * pcm;
-
-  gavl_audio_frame_t * f;
-  int last_frame_size;
-
+  
   gavl_time_t buffer_time;
   char * user_device;
 
   int64_t samples_read;
+
+  gavl_audio_source_t * src; 
   } alsa_t;
 
 static const bg_parameter_info_t *
@@ -164,11 +165,11 @@
     }
   else if(!strcmp(name, "card"))
     {
-    priv->card = bg_strdup(priv->card, val->val_str);
+    priv->card = gavl_strrep(priv->card, val->val_str);
     }
   else if(!strcmp(name, "user_device"))
     {
-    priv->user_device = bg_strdup(priv->user_device, val->val_str);
+    priv->user_device = gavl_strrep(priv->user_device, val->val_str);
     }
   }
 
@@ -181,18 +182,89 @@
   return ret;
   }
 
+static gavl_source_status_t read_func_alsa(void * p, gavl_audio_frame_t ** frame)
+  {
+  int result = 0;
+  alsa_t * priv = p;
+
+  gavl_audio_frame_t * f = *frame;
+  
+  while(1)
+    {
+    if(priv->format.interleave_mode == GAVL_INTERLEAVE_ALL)
+      {
+      result = snd_pcm_readi(priv->pcm,
+                             f->samples.s_8,
+                             priv->format.samples_per_frame);
+      }
+    else if(priv->format.interleave_mode == GAVL_INTERLEAVE_NONE)
+      {
+      result = snd_pcm_readn(priv->pcm,
+                             (void**)(f->channels.s_8),
+                             priv->format.samples_per_frame);
+      }
+    
+    if(result > 0)
+      {
+      f->valid_samples = result;
+      return GAVL_SOURCE_OK;
+      }
+    else if(result == -EPIPE)
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Dropping samples");
+      snd_pcm_drop(priv->pcm);
+      if(snd_pcm_prepare(priv->pcm) < 0)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "snd_pcm_prepare failed");
+        return GAVL_SOURCE_EOF;
+        }
+      snd_pcm_start(priv->pcm);
+      }
+    else
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unknown error");
+      break;
+      }
+    }
+  return GAVL_SOURCE_EOF;
+  }
+
+static char * pcm_card_name(snd_pcm_t * pcm)
+  {
+  int card;
+  snd_pcm_info_t *info;
+  char * name = NULL;
+  
+  snd_pcm_info_malloc(&info);
+  if(snd_pcm_info (pcm, info) == 0)
+    {
+    card = snd_pcm_info_get_card(info);
+    if(card >= 0)
+      {
+      if(snd_card_get_name(card, &name) &&
+         snd_card_get_longname(card, &name))
+        {
+        snd_pcm_info_free(info);
+        return NULL;
+        }
+      }
+    }
+  snd_pcm_info_free(info);
+  return name;
+  }
+
 static int open_alsa(void * data,
                      gavl_audio_format_t * format,
-                     gavl_video_format_t * video_format)
+                     gavl_video_format_t * video_format, gavl_metadata_t * m)
   {
   const char * card = NULL;
   alsa_t * priv = data;
   
   if(priv->user_device)
-  card = priv->user_device;
+    card = priv->user_device;
   else
-  card = priv->card;
-
+    card = priv->card;
+  
   priv->samples_read = 0;
   
   if(!card)
@@ -213,14 +285,18 @@
   
   if(!priv->pcm)
     return 0;
+
+  /* Get the name of the soundcard */
+  gavl_metadata_set_nocpy(m, GAVL_META_DEVICE, pcm_card_name(priv->pcm));
+  
   gavl_audio_format_copy(&priv->format, format);
 
-  priv->f = gavl_audio_frame_create(&priv->format);
-    
   if(snd_pcm_prepare(priv->pcm) < 0)
     return 0;
   snd_pcm_start(priv->pcm);
 
+  priv->src = gavl_audio_source_create(read_func_alsa, priv, 0, format);
+  
   return 1;
   }
 
@@ -232,96 +308,25 @@
     snd_pcm_close(priv->pcm);
     priv->pcm = NULL;
     }
-  if(priv->f)
+  if(priv->src)
     {
-    gavl_audio_frame_destroy(priv->f);
-    priv->f = NULL;
+    gavl_audio_source_destroy(priv->src);
+    priv->src = NULL;
     }
   }
 
-
-static int read_frame(alsa_t * priv)
-  {
-  int result = 0;
-
-  
-  while(1)
-    {
-    if(priv->format.interleave_mode == GAVL_INTERLEAVE_ALL)
-      {
-      result = snd_pcm_readi(priv->pcm,
-                             priv->f->samples.s_8,
-                             priv->format.samples_per_frame);
-      }
-    else if(priv->format.interleave_mode == GAVL_INTERLEAVE_NONE)
-      {
-      result = snd_pcm_readn(priv->pcm,
-                             (void**)(priv->f->channels.s_8),
-                             priv->format.samples_per_frame);
-      }
-    
-    if(result > 0)
-      {
-      priv->f->valid_samples = result;
-      priv->last_frame_size = result;
-      return 1;
-      }
-    else if(result == -EPIPE)
-      {
-      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Dropping samples");
-      snd_pcm_drop(priv->pcm);
-      if(snd_pcm_prepare(priv->pcm) < 0)
-        {
-        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "snd_pcm_prepare failed");
-        return 0;
-        }
-      snd_pcm_start(priv->pcm);
-      }
-    else
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unknown error");
-      break;
-      }
-    }
-  return 0;
-  }
-
-static int read_frame_alsa(void * p, gavl_audio_frame_t * f,
+static int read_samples_alsa(void * p, gavl_audio_frame_t * f,
                            int stream,
                            int num_samples)
   {
-  int samples_read;
-  int samples_copied;
-
   alsa_t * priv = p;
+  return gavl_audio_source_read_samples(priv->src, f, num_samples);
+  }
 
-  samples_read = 0;
-
-  while(samples_read < num_samples)
-    {
-    if(!priv->f->valid_samples)
-      {
-      read_frame(priv);
-      }
-    samples_copied =
-      gavl_audio_frame_copy(&priv->format,                                  /* format  */
-                            f,                                              /* dst     */
-                            priv->f,                                        /* src     */
-                            samples_read,                                   /* dst_pos */
-                            priv->last_frame_size - priv->f->valid_samples, /* src_pos */
-                            num_samples - samples_read,                     /* dst_size */
-                            priv->f->valid_samples                          /* src_size */ );
-    priv->f->valid_samples -= samples_copied;
-    samples_read += samples_copied;
-    }
-
-  if(f)
-    {
-    f->valid_samples = samples_read;
-    f->timestamp = priv->samples_read;
-    }
-  priv->samples_read += samples_read;
-  return samples_read;
+static gavl_audio_source_t * get_audio_source_alsa(void * p)
+  {
+  alsa_t * priv = p;
+  return priv->src;
   }
 
 static void destroy_alsa(void * p)
@@ -352,9 +357,10 @@
       .set_parameter =  set_parameter_alsa,
     },
 
-    .open =          open_alsa,
-    .read_audio =    read_frame_alsa,
-    .close =         close_alsa,
+    .open =             open_alsa,
+    .get_audio_source = get_audio_source_alsa,
+    .read_audio =       read_samples_alsa,
+    .close =            close_alsa,
   };
 /* Include this into all plugin modules exactly once
    to let the plugin loader obtain the API version */

gmerlin-1.2.0.tar.gz/plugins/alsa/oa_alsa.c -> gmerlin-4256.tar.gz/plugins/alsa/oa_alsa.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -128,6 +128,8 @@
   int convert_buffer_alloc;
   
   gavl_time_t buffer_time;
+  
+  gavl_audio_sink_t * sink;
   } alsa_t;
 
 static void convert_4_to_3(alsa_t * priv, gavl_audio_frame_t * frame)
@@ -194,6 +196,56 @@
 
   }
 
+static gavl_sink_status_t
+write_func_alsa(void * p, gavl_audio_frame_t * f)
+  {
+  int result = -EPIPE;
+  alsa_t * priv = p;
+
+  if(priv->convert_4_3)
+    {
+    convert_4_to_3(priv, f);
+    while(result == -EPIPE)
+      {
+      result = snd_pcm_writei(priv->pcm,
+                              priv->convert_buffer,
+                              f->valid_samples);
+
+      if(result == -EPIPE)
+        {
+        //    snd_pcm_drop(priv->pcm);
+        if(snd_pcm_prepare(priv->pcm) < 0)
+          return GAVL_SINK_ERROR;
+        }
+      }
+    }
+  else
+    {
+    while(result == -EPIPE)
+      {
+      result = snd_pcm_writei(priv->pcm,
+                              f->samples.s_8,
+                              f->valid_samples);
+
+      if(result == -EPIPE)
+        {
+        //    snd_pcm_drop(priv->pcm);
+        if(snd_pcm_prepare(priv->pcm) < 0)
+          return GAVL_SINK_ERROR;
+        }
+      }
+    }
+  
+  if(result < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "snd_pcm_write returned %s",
+           snd_strerror(result));
+    return GAVL_SINK_ERROR;
+    }
+  return GAVL_SINK_OK;
+  }
+
 static int open_alsa(void * data, gavl_audio_format_t * format)
   {
   int playback_mode;
@@ -325,10 +377,21 @@
   
   if(!priv->pcm)
     return 0;
+
   gavl_audio_format_copy(&priv->format, format);
+  priv->sink = gavl_audio_sink_create(NULL, write_func_alsa, priv,
+                                      &priv->format);
+  
   return 1;
   }
 
+static gavl_audio_sink_t *
+get_sink_alsa(void * p)
+  {
+  alsa_t * priv = p;
+  return priv->sink;
+  }
+
 static void close_alsa(void * p)
   {
   alsa_t * priv = p;
@@ -340,51 +403,10 @@
     snd_pcm_close(priv->pcm);
     priv->pcm = NULL;
     }
-  }
-
-static void write_frame_alsa(void * p, gavl_audio_frame_t * f)
-  {
-  int result = -EPIPE;
-  alsa_t * priv = p;
-
-  if(priv->convert_4_3)
-    {
-    convert_4_to_3(priv, f);
-    while(result == -EPIPE)
-      {
-      result = snd_pcm_writei(priv->pcm,
-                              priv->convert_buffer,
-                              f->valid_samples);
-
-      if(result == -EPIPE)
-        {
-        //    snd_pcm_drop(priv->pcm);
-        if(snd_pcm_prepare(priv->pcm) < 0)
-          return;
-        }
-      }
-    }
-  else
-    {
-    while(result == -EPIPE)
-      {
-      result = snd_pcm_writei(priv->pcm,
-                              f->samples.s_8,
-                              f->valid_samples);
-
-      if(result == -EPIPE)
-        {
-        //    snd_pcm_drop(priv->pcm);
-        if(snd_pcm_prepare(priv->pcm) < 0)
-          return;
-        }
-      }
-    }
-  
-  
-  if(result < 0)
+  if(priv->sink)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "snd_pcm_write returned %s", snd_strerror(result));
+    gavl_audio_sink_destroy(priv->sink);
+    priv->sink = NULL;
     }
   }
 
@@ -450,7 +472,7 @@
     }
   else if(!strcmp(name, "user_device"))
     {
-    priv->user_device = bg_strdup(priv->user_device, val->val_str);
+    priv->user_device = gavl_strrep(priv->user_device, val->val_str);
     }
   else if(!strcmp(name, "buffer_time"))
     {
@@ -459,7 +481,7 @@
     }
   else if(!strcmp(name, "card"))
     {
-    priv->card = bg_strdup(priv->card, val->val_str);
+    priv->card = gavl_strrep(priv->card, val->val_str);
     }
   }
 
@@ -482,8 +504,8 @@
     },
 
     .open =          open_alsa,
+    .get_sink =      get_sink_alsa,
     .start =         start_alsa,
-    .write_audio =   write_frame_alsa,
     .stop =          stop_alsa,
     .close =         close_alsa,
     .get_delay =     get_delay_alsa,

gmerlin-1.2.0.tar.gz/plugins/audiofilters/Makefile.am -> gmerlin-4256.tar.gz/plugins/audiofilters/Makefile.am Changed

gmerlin-4256.tar.gz/plugins/audiofilters/fa_channels.c Added

@@ -0,0 +1,245 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+
+#define LOG_DOMAIN "fa_channels"
+
+typedef struct
+  {
+  int front_channels;
+  int rear_channels;
+  int lfe;
+  
+  int need_restart;
+
+  gavl_audio_format_t format;
+
+  bg_parameter_info_t * parameters;
+
+  gavl_audio_source_t * in_src;
+  gavl_audio_source_t * out_src;
+  
+  } channels_priv_t;
+
+static void * create_channels()
+  {
+  channels_priv_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+static void destroy_channels(void * priv)
+  {
+  channels_priv_t * vp;
+  vp = priv;
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
+  free(vp);
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+    .name =        "front_channels",
+    .long_name =   TRS("Front channels"),
+    .type =        BG_PARAMETER_INT,
+    .flags =       BG_PARAMETER_SYNC,
+    .val_min =     { .val_i = 1 },
+    .val_max =     { .val_i = 5 },
+    .val_default = { .val_i = 2 },
+    },
+    {
+    .name =        "rear_channels",
+    .long_name =   TRS("Rear channels"),
+    .type =        BG_PARAMETER_INT,
+    .flags =       BG_PARAMETER_SYNC,
+    .val_min =     { .val_i = 0 },
+    .val_max =     { .val_i = 3 },
+    .val_default = { .val_i = 0 },
+    },
+    {
+    .name =        "lfe",
+    .long_name =   TRS("LFE"),
+    .type =        BG_PARAMETER_CHECKBUTTON,
+    .flags =       BG_PARAMETER_SYNC,
+    .val_default = { .val_i = 0 },
+    },
+    { /* End of parameters */ }
+  };
+
+static const bg_parameter_info_t * get_parameters_channels(void * priv)
+  {
+  return parameters;
+  }
+
+static void
+set_parameter_channels(void * priv, const char * name,
+                         const bg_parameter_value_t * val)
+  {
+  channels_priv_t * vp = priv;
+
+  if(!name)
+    return;
+
+  else if(!strcmp(name, "front_channels"))
+    {
+    if(vp->front_channels != val->val_i)
+      {
+      vp->need_restart = 1;
+      vp->front_channels = val->val_i;
+      }
+    }
+  else if(!strcmp(name, "rear_channels"))
+    {
+    if(vp->rear_channels != val->val_i)
+      {
+      vp->need_restart = 1;
+      vp->rear_channels = val->val_i;
+      }
+    }
+  else if(!strcmp(name, "lfe"))
+    {
+    if(vp->lfe != val->val_i)
+      {
+      vp->need_restart = 1;
+      vp->lfe = val->val_i;
+      }
+    }
+  }
+
+static int need_restart_channels(void * priv)
+  {
+  channels_priv_t * vp = priv;
+  return vp->need_restart;
+  }
+
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_audio_frame_t ** frame)
+  {
+  channels_priv_t * vp = priv;
+  return gavl_audio_source_read_frame(vp->in_src, frame);
+  }
+
+static void set_channel_setup(channels_priv_t * vp, gavl_audio_format_t * f)
+  {
+  f->num_channels = 0;
+
+  switch(vp->front_channels)
+    {
+    case 1:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER;
+      break;
+    case 2:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_RIGHT;
+      break;
+    case 3:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_RIGHT;
+      break;
+    case 4:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_RIGHT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER_LEFT;
+      break;
+    case 5:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_RIGHT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_FRONT_CENTER_LEFT;
+      break;
+    }
+
+  switch(vp->rear_channels)
+    {
+    case 1:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_REAR_CENTER;
+      break;
+    case 2:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_REAR_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_REAR_RIGHT;
+      break;
+    case 3:
+      f->channel_locations[f->num_channels++] = GAVL_CHID_REAR_LEFT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_REAR_RIGHT;
+      f->channel_locations[f->num_channels++] = GAVL_CHID_REAR_CENTER;
+      break;
+    }
+
+  if(vp->lfe)
+    f->channel_locations[f->num_channels++] = GAVL_CHID_LFE;
+  }
+
+static gavl_audio_source_t *
+connect_channels(void * priv,
+                     gavl_audio_source_t * src,
+                     const gavl_audio_options_t * opt)
+  {
+  gavl_audio_format_t format;
+  channels_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
+
+  gavl_audio_format_copy(&format,
+                         gavl_audio_source_get_src_format(vp->in_src));
+
+  set_channel_setup(vp, &format);
+  gavl_audio_source_set_dst(vp->in_src, 0, &format);
+  vp->out_src = gavl_audio_source_create_source(read_func, vp, 0, vp->in_src);
+  return vp->out_src;
+  }
+
+const bg_fa_plugin_t the_plugin = 
+  {
+    .common =
+    {
+      BG_LOCALE,
+      .name =      "fa_channels",
+      .long_name = TRS("Force channel setup"),
+      .description = TRS("This forces a channel setup as input for the next filter."),
+      .type =     BG_PLUGIN_FILTER_AUDIO,
+      .flags =    BG_PLUGIN_FILTER_1,
+      .create =   create_channels,
+      .destroy =   destroy_channels,
+      .get_parameters =   get_parameters_channels,
+      .set_parameter =    set_parameter_channels,
+      .priority =         1,
+    },
+    .connect = connect_channels,
+    .need_restart = need_restart_channels,
+  };
+
+/* Include this into all plugin modules exactly once
+   to let the plugin loader obtain the API version */
+BG_GET_PLUGIN_API_VERSION;

gmerlin-1.2.0.tar.gz/plugins/audiofilters/fa_sampleformat.c -> gmerlin-4256.tar.gz/plugins/audiofilters/fa_sampleformat.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -36,13 +36,13 @@
   gavl_sample_format_t sample_format;
   int need_restart;
 
-  bg_read_audio_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_audio_format_t format;
 
   bg_parameter_info_t * parameters;
+
+  gavl_audio_source_t * in_src;
+  gavl_audio_source_t * out_src;
+  
   } sampleformat_priv_t;
 
 static void * create_sampleformat()
@@ -58,6 +58,9 @@
   vp = priv;
   if(vp->parameters)
     bg_parameter_info_destroy_array(vp->parameters);
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
+
   free(vp);
   }
 
@@ -70,7 +73,7 @@
       .long_name = TRS("Sampleformat"),
       .type = BG_PARAMETER_STRINGLIST,
       .flags = BG_PARAMETER_SYNC,
-      .val_default = { .val_str = "YUV 420 Planar" },
+      .val_default = { .val_str = "Floating point" },
     },
     { /* End of parameters */ },
   };
@@ -94,10 +97,10 @@
     f = gavl_get_sample_format(i);
     if(f != GAVL_SAMPLE_NONE)
       {
-      ret->multi_names_nc[index] = bg_strdup(NULL,
-                                          gavl_sample_format_to_string(f));
-      ret->multi_labels_nc[index] = bg_strdup(NULL,
-                                           gavl_sample_format_to_string(f));
+      ret->multi_names_nc[index] =
+        gavl_strdup(gavl_sample_format_to_string(f));
+      ret->multi_labels_nc[index] =
+        gavl_strdup(gavl_sample_format_to_string(f));
       index++;
       }
     }
@@ -136,59 +139,37 @@
     }
   }
 
-static void connect_input_port_sampleformat(void * priv,
-                                    bg_read_audio_func_t func,
-                                    void * data, int stream, int port)
+static int need_restart_sampleformat(void * priv)
   {
   sampleformat_priv_t * vp;
   vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
+  return vp->need_restart;
   }
 
-static void set_input_format_sampleformat(void * priv,
-                                         gavl_audio_format_t * format,
-                                         int port)
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_audio_frame_t ** frame)
   {
-  sampleformat_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    format->sample_format = vp->sample_format;
-    gavl_audio_format_copy(&vp->format, format);
-    vp->need_restart = 0;
-    }
+  sampleformat_priv_t * vp = priv;
+  return gavl_audio_source_read_frame(vp->in_src, frame);
   }
 
-static void get_output_format_sampleformat(void * priv, gavl_audio_format_t * format)
+static gavl_audio_source_t *
+connect_sampleformat(void * priv,
+                     gavl_audio_source_t * src,
+                     const gavl_audio_options_t * opt)
   {
-  sampleformat_priv_t * vp;
-  vp = priv;
-  
-  gavl_audio_format_copy(format, &vp->format);
-  }
+  gavl_audio_format_t format;
+  sampleformat_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
 
-static int need_restart_sampleformat(void * priv)
-  {
-  sampleformat_priv_t * vp;
-  vp = priv;
-  return vp->need_restart;
-  }
+  gavl_audio_format_copy(&format, gavl_audio_source_get_src_format(vp->in_src));
+  format.sample_format = vp->sample_format;
+  gavl_audio_source_set_dst(vp->in_src, 0, &format);
+  vp->out_src = gavl_audio_source_create_source(read_func, vp, 0, vp->in_src);
+  return vp->out_src;
 
-static int read_audio_sampleformat(void * priv,
-                                  gavl_audio_frame_t * frame, int stream, int num_samples)
-  {
-  sampleformat_priv_t * vp;
-  vp = priv;
-  
-  return vp->read_func(vp->read_data, frame, vp->read_stream, num_samples);
   }
 
 const bg_fa_plugin_t the_plugin = 
@@ -198,7 +179,7 @@
       BG_LOCALE,
       .name =      "fa_sampleformat",
       .long_name = TRS("Force sampleformat"),
-      .description = TRS("This forces a sampleformat as input for the next filter. Its mainly used for testing."),
+      .description = TRS("This forces a sampleformat as input for the next filter."),
       .type =     BG_PLUGIN_FILTER_AUDIO,
       .flags =    BG_PLUGIN_FILTER_1,
       .create =   create_sampleformat,
@@ -208,12 +189,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_sampleformat,
-    
-    .set_input_format = set_input_format_sampleformat,
-    .get_output_format = get_output_format_sampleformat,
-
-    .read_audio = read_audio_sampleformat,
+    .connect = connect_sampleformat,
     .need_restart = need_restart_sampleformat,
     
   };

gmerlin-4256.tar.gz/plugins/audiofilters/fa_samplerate.c Added

@@ -0,0 +1,215 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+
+#define LOG_DOMAIN "fa_samplerate"
+
+#define RATE_SOURCE -1
+#define RATE_USER   -2
+
+typedef struct
+  {
+  int samplerate_cfg;
+  int samplerate_user;
+  int samplerate_current;
+  
+  int need_restart;
+
+  gavl_audio_format_t format;
+
+  gavl_audio_source_t * in_src;
+  gavl_audio_source_t * out_src;
+
+  } samplerate_priv_t;
+
+static void * create_samplerate()
+  {
+  samplerate_priv_t * ret;
+  ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+static void destroy_samplerate(void * priv)
+  {
+  samplerate_priv_t * vp;
+  vp = priv;
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
+  free(vp);
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .gettext_domain = PACKAGE,
+      .gettext_directory = LOCALE_DIR,
+      .name = "samplerate",
+      .long_name = TRS("Samplerate [Hz]"),
+      .type = BG_PARAMETER_STRINGLIST,
+      .flags = BG_PARAMETER_SYNC,
+      .val_default = { .val_str = "source" },
+      .multi_names = (const char*[]){ "source",
+                                "48000",
+                                "44100",
+                                "32000",
+                                "24000",
+                                "22050",
+                                "user",
+                                NULL },
+      .multi_labels = (const char*[]){ TRS("From source"),
+                                 "48000",
+                                 "44100",
+                                 "32000",
+                                 "24000",
+                                 "22050",
+                                 TRS("User defined"),
+                                 NULL },
+    },
+    {
+      .name = "user_rate",
+      .long_name = TRS("User defined samplerate [Hz]"),
+      .type = BG_PARAMETER_INT,
+      .flags = BG_PARAMETER_SYNC,
+      .val_min     = { .val_i = 8000 },
+      .val_max     = { .val_i = 192000 },
+      .val_default = { .val_i = 44100 },
+    },
+    { /* End of parameters */ },
+  };
+
+static const bg_parameter_info_t * get_parameters_samplerate(void * priv)
+  {
+  return parameters;
+  }
+
+static int get_samplerate(samplerate_priv_t * vp)
+  {
+  if(vp->samplerate_cfg == RATE_SOURCE)
+    {
+    const gavl_audio_format_t * fmt;
+    if(vp->in_src)
+      {
+      fmt = gavl_audio_source_get_src_format(vp->in_src);
+      return fmt->samplerate;
+      }
+    else
+      return 0;
+    }
+  else if(vp->samplerate_cfg == RATE_USER)
+    return vp->samplerate_user;
+  else
+    return vp->samplerate_cfg;
+  }
+
+static void
+set_parameter_samplerate(void * priv, const char * name,
+                          const bg_parameter_value_t * val)
+  {
+  samplerate_priv_t * vp;
+  vp = priv;
+  
+  if(!name)
+    {
+    int current_rate = get_samplerate(vp);
+    if(!current_rate || (current_rate != vp->samplerate_current))
+      vp->need_restart = 1;
+    return;
+    }
+  if(!strcmp(name, "samplerate"))
+    {
+    if(!strcmp(val->val_str, "source"))
+      vp->samplerate_cfg = RATE_SOURCE;
+    else if(!strcmp(val->val_str, "user"))
+      vp->samplerate_cfg = RATE_USER;
+    else
+      vp->samplerate_cfg = atoi(val->val_str);
+    }
+  else if(!strcmp(name, "user_rate"))
+    vp->samplerate_user = val->val_i;
+  }
+
+static int need_restart_samplerate(void * priv)
+  {
+  samplerate_priv_t * vp = priv;
+  return vp->need_restart;
+  }
+
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_audio_frame_t ** frame)
+  {
+  samplerate_priv_t * vp = priv;
+  return gavl_audio_source_read_frame(vp->in_src, frame);
+  }
+
+static gavl_audio_source_t *
+connect_samplerate(void * priv,
+                     gavl_audio_source_t * src,
+                     const gavl_audio_options_t * opt)
+  {
+  gavl_audio_format_t format;
+  samplerate_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
+
+  vp->samplerate_current = get_samplerate(vp);
+  
+  gavl_audio_format_copy(&format, gavl_audio_source_get_src_format(vp->in_src));
+  format.samplerate = vp->samplerate_current;
+  gavl_audio_source_set_dst(vp->in_src, 0, &format);
+  vp->out_src = gavl_audio_source_create_source(read_func, vp, 0, vp->in_src);
+  return vp->out_src;
+  }
+
+const bg_fa_plugin_t the_plugin = 
+  {
+    .common =
+    {
+      BG_LOCALE,
+      .name =      "fa_samplerate",
+      .long_name = TRS("Force samplerate"),
+      .description = TRS("This forces a samplerate as input for the next filter."),
+      .type =     BG_PLUGIN_FILTER_AUDIO,
+      .flags =    BG_PLUGIN_FILTER_1,
+      .create =   create_samplerate,
+      .destroy =   destroy_samplerate,
+      .get_parameters =   get_parameters_samplerate,
+      .set_parameter =    set_parameter_samplerate,
+      .priority =         1,
+    },
+    
+    .connect = connect_samplerate,
+    .need_restart = need_restart_samplerate,
+    
+  };
+
+/* Include this into all plugin modules exactly once
+   to let the plugin loader obtain the API version */
+BG_GET_PLUGIN_API_VERSION;

gmerlin-1.2.0.tar.gz/plugins/audiofilters/fa_volume.c -> gmerlin-4256.tar.gz/plugins/audiofilters/fa_volume.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -40,6 +40,9 @@
   int read_stream;
   
   gavl_audio_format_t format;
+
+  gavl_audio_source_t * in_src;
+  gavl_audio_source_t * out_src;
   } volume_priv_t;
 
 static void * create_volume()
@@ -55,6 +58,9 @@
   volume_priv_t * vp;
   vp = priv;
 
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
+  
   gavl_volume_control_destroy(vp->vc);
   free(vp);
   }
@@ -97,54 +103,36 @@
     }
   }
 
-static void connect_input_port_volume(void * priv,
-                                      bg_read_audio_func_t func,
-                                      void * data, int stream, int port)
+static gavl_source_status_t read_func(void * priv, gavl_audio_frame_t ** frame)
   {
+  gavl_source_status_t st;
   volume_priv_t * vp;
   vp = priv;
 
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
+  if((st = gavl_audio_source_read_frame(vp->in_src, frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
+  gavl_volume_control_apply(vp->vc, *frame);
+  return GAVL_SOURCE_OK;
   }
 
-static void set_input_format_volume(void * priv, gavl_audio_format_t * format, int port)
+static gavl_audio_source_t * connect_volume(void * priv,
+                                            gavl_audio_source_t * src,
+                                            const gavl_audio_options_t * opt)
   {
+  const gavl_audio_format_t * format;
   volume_priv_t * vp;
   vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_audio_source_destroy(vp->out_src);
 
-  if(!port)
-    {
-    gavl_audio_format_copy(&vp->format, format);
-    gavl_volume_control_set_format(vp->vc, format);
-    }
-  }
-
-static void get_output_format_volume(void * priv, gavl_audio_format_t * format)
-  {
-  volume_priv_t * vp;
-  vp = priv;
+  format = gavl_audio_source_get_src_format(vp->in_src);
   
-  gavl_audio_format_copy(format, &vp->format);
-  }
-
-static int read_audio_volume(void * priv, gavl_audio_frame_t * frame, int stream, int num_samples)
-  {
-  volume_priv_t * vp;
-  vp = priv;
-
-  if(vp->read_func(vp->read_data, frame, vp->read_stream, num_samples))
-    {
-    gavl_volume_control_apply(vp->vc, frame);
-    return frame->valid_samples;
-    }
-  else
-    return 0;
+  gavl_volume_control_set_format(vp->vc, format);
+  gavl_audio_source_set_dst(vp->in_src, 0, format);
+  vp->out_src = gavl_audio_source_create_source(read_func, vp, 0, vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fa_plugin_t the_plugin = 
@@ -164,13 +152,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_volume,
-    
-    .set_input_format = set_input_format_volume,
-    .get_output_format = get_output_format_volume,
-
-    .read_audio = read_audio_volume,
-    
+    .connect = connect_volume,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/cdaudio/Makefile.am -> gmerlin-4256.tar.gz/plugins/cdaudio/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/cdaudio/cdaudio.c -> gmerlin-4256.tar.gz/plugins/cdaudio/cdaudio.c Changed

gmerlin-1.2.0.tar.gz/plugins/cdaudio/cdaudio.h -> gmerlin-4256.tar.gz/plugins/cdaudio/cdaudio.h Changed

gmerlin-1.2.0.tar.gz/plugins/cdaudio/cdaudio_xml.c -> gmerlin-4256.tar.gz/plugins/cdaudio/cdaudio_xml.c Changed

gmerlin-1.2.0.tar.gz/plugins/cdaudio/cddb.c -> gmerlin-4256.tar.gz/plugins/cdaudio/cddb.c Changed

gmerlin-1.2.0.tar.gz/plugins/cdaudio/cdparanoia.c -> gmerlin-4256.tar.gz/plugins/cdaudio/cdparanoia.c Changed

gmerlin-1.2.0.tar.gz/plugins/cdaudio/cdtext.c -> gmerlin-4256.tar.gz/plugins/cdaudio/cdtext.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -23,10 +23,20 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gmerlin/utils.h>
-
 #include <cdio/cdio.h>
 #include <cdio/cdtext.h>
+/* Stuff defined by cdio includes */
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef VERSION
+
+
+#include <gmerlin/utils.h>
+
 
 #include <gavl/metatags.h>
 
@@ -40,9 +50,9 @@
   field = cdtext_get_const(key, cdtext);                                \
   if(field)                                                             \
     {                                                                   \
-    info[idx->tracks[i].index].metadata.dst = bg_strdup(info[idx->tracks[i].index].metadata.dst, field); \
+    info[idx->tracks[i].index].metadata.dst = gavl_strrep(info[idx->tracks[i].index].metadata.dst, field); \
     if(!info[idx->tracks[i].index].metadata.dst)                        \
-      info[idx->tracks[i].index].metadata.dst = bg_strdup(info[idx->tracks[i].index].metadata.dst, dst); \
+      info[idx->tracks[i].index].metadata.dst = gavl_strrep(info[idx->tracks[i].index].metadata.dst, dst); \
     }
 
 int bg_cdaudio_get_metadata_cdtext(CdIo_t * cdio,

gmerlin-1.2.0.tar.gz/plugins/cdaudio/i_cdaudio.c -> gmerlin-4256.tar.gz/plugins/cdaudio/i_cdaudio.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -36,6 +36,8 @@
 
 #include <gavl/metatags.h>
 
+#define FRAME_SAMPLES 588
+
 typedef struct
   {
   bg_parameter_info_t * parameters;
@@ -43,8 +45,6 @@
   bg_track_info_t * track_info;
 
   void * ripper;
-  gavl_audio_frame_t * frame;
-  int last_read_samples;
 
   char disc_id[DISCID_SIZE];
 
@@ -84,7 +84,6 @@
   int cddb_timeout;
 #endif
   
-  
   int current_track;
   int current_sector; /* For ripping only */
       
@@ -95,11 +94,12 @@
   int old_seconds;
   bg_cdaudio_status_t status;
 
-  uint32_t samples_written;
-
   int paused;
     
   const char * disc_name;
+
+  gavl_audio_source_t * src;
+  
   } cdaudio_t;
 
 static void destroy_cd_data(cdaudio_t* cd)
@@ -178,7 +178,7 @@
   /* Destroy data from previous open */
   destroy_cd_data(cd);
   
-  cd->device_name = bg_strdup(cd->device_name, arg);
+  cd->device_name = gavl_strrep(cd->device_name, arg);
 
   cd->cdio = bg_cdaudio_open(cd->device_name);
   if(!cd->cdio)
@@ -208,15 +208,17 @@
       cd->track_info[j].audio_streams[0].format.num_channels = 2;
       cd->track_info[j].audio_streams[0].format.sample_format = GAVL_SAMPLE_S16;
       cd->track_info[j].audio_streams[0].format.interleave_mode = GAVL_INTERLEAVE_ALL;
+      cd->track_info[j].audio_streams[0].format.samples_per_frame = FRAME_SAMPLES;
       gavl_metadata_set(&cd->track_info[j].audio_streams[0].m, GAVL_META_FORMAT,
                         "CD Audio");
       
       gavl_set_channel_setup(&cd->track_info[j].audio_streams[0].format);
-      
-      cd->track_info[j].duration =
-        ((int64_t)(cd->index->tracks[i].last_sector -
-                   cd->index->tracks[i].first_sector + 1) *
-         GAVL_TIME_SCALE) / 75;
+
+      gavl_metadata_set_long(&cd->track_info[j].metadata,
+                             GAVL_META_APPROX_DURATION,
+                             ((int64_t)(cd->index->tracks[i].last_sector -
+                                        cd->index->tracks[i].first_sector + 1) *
+                              GAVL_TIME_SCALE) / 75);
 
       gavl_metadata_set(&cd->track_info[j].metadata, GAVL_META_FORMAT,
                         "CD Audio");
@@ -318,7 +320,9 @@
         {
         j = cd->index->tracks[i].index;
         if(cd->index->tracks[i].is_audio)
-          cd->track_info[j].name = bg_sprintf(TR("Audio CD track %02d"), j+1);
+          gavl_metadata_set_nocpy(&cd->track_info[j].metadata,
+                                  GAVL_META_LABEL,
+                                  bg_sprintf(TR("Audio CD track %02d"), j+1));
         }
       }
     }
@@ -330,9 +334,10 @@
         {
         j = cd->index->tracks[i].index;
         if(cd->index->tracks[i].is_audio)
-          cd->track_info[j].name =
-            bg_create_track_name(&cd->track_info[j].metadata,
-                                 cd->trackname_template);
+          gavl_metadata_set_nocpy(&cd->track_info[j].metadata,
+                                  GAVL_META_LABEL,
+                                  bg_create_track_name(&cd->track_info[j].metadata,
+                                                       cd->trackname_template));
         }
       }
     cd->disc_name = gavl_metadata_get(&cd->track_info[0].metadata, GAVL_META_ALBUM);
@@ -362,6 +367,12 @@
   int i;
   cdaudio_t * cd = data;
 
+  if(cd->src)
+    {
+    gavl_audio_source_destroy(cd->src);
+    cd->src = NULL;
+    }
+  
   for(i = 0; i < cd->index->num_tracks; i++)
     {
     if(cd->index->tracks[i].is_audio && (cd->index->tracks[i].index == track))
@@ -382,32 +393,55 @@
   return 1;
   }
 
-static int start_cdaudio(void * priv)
+static gavl_source_status_t read_frame(void * priv, gavl_audio_frame_t ** fp)
   {
-  int i;
+  gavl_audio_frame_t * f = *fp;
   cdaudio_t * cd = priv;
 
+  if(cd->current_sector > cd->index->tracks[cd->current_track].last_sector)
+    return GAVL_SOURCE_EOF;
+  
+  if(!cd->rip_initialized)
+    {
+    bg_cdaudio_rip_init(cd->ripper, cd->cdio,
+                        cd->first_sector);
+    cd->rip_initialized = 1;
+    }
+  bg_cdaudio_rip_rip(cd->ripper, f);
+  
+  f->valid_samples = FRAME_SAMPLES;
+  f->timestamp =
+    (cd->current_sector - cd->index->tracks[cd->current_track].first_sector) *
+    FRAME_SAMPLES;
+  
+  cd->current_sector++;
+  return GAVL_SOURCE_OK;
+  }
 
+static int start_cdaudio(void * priv)
+  {
+  cdaudio_t * cd = priv;
   if(!cd->cdio)
     {
     cd->cdio = bg_cdaudio_open(cd->device_name);
     if(!cd->cdio)
       return 0;
     }
+  cd->src = gavl_audio_source_create(read_frame, cd, 0,
+                                     /* Format is the same for all tracks */
+                                     &cd->track_info[0].audio_streams[0].format);
   
-    /* Rip */
-    
-  for(i = 0; i < cd->index->num_audio_tracks; i++)
-    {
-    cd->track_info[i].audio_streams[0].format.samples_per_frame =
-      588;
-    }
-    
   cd->current_sector = cd->first_sector;
-  cd->samples_written = 0;
   return 1;
   }
 
+static gavl_audio_source_t *
+get_audio_source_cdaudio(void * priv, int stream)
+  {
+  cdaudio_t * cd = priv;
+  return cd->src;
+  }
+
 static void stop_cdaudio(void * priv)
   {
   cdaudio_t * cd = priv;
@@ -415,73 +449,11 @@
     {
     bg_cdaudio_rip_close(cd->ripper);
     cd->rip_initialized = 0;
-    if(cd->frame)
-      {
-      gavl_audio_frame_destroy(cd->frame);
-      cd->frame = NULL;
-      }
     }
+  
   cd->cdio = NULL;
   }
 
-static void read_frame(cdaudio_t * cd)
-  {
-  if(!cd->rip_initialized)
-    {
-    gavl_audio_format_t format;
-    bg_cdaudio_rip_init(cd->ripper, cd->cdio,
-                        cd->first_sector);
-    
-    gavl_audio_format_copy(&format,
-                           &cd->track_info[0].audio_streams[0].format);
-    format.samples_per_frame = 588;
-    cd->frame = gavl_audio_frame_create(&format);
-    cd->rip_initialized = 1;
-    }
-  bg_cdaudio_rip_rip(cd->ripper, cd->frame);
-
-  cd->frame->valid_samples = 588;
-  cd->last_read_samples = cd->frame->valid_samples;
-  cd->current_sector ++;
-  }
-
-static int read_audio_cdaudio(void * priv,
-                              gavl_audio_frame_t * frame, int stream,
-                              int num_samples)
-  {
-  int samples_read = 0, samples_copied;
-  cdaudio_t * cd = priv;
-  
-  if(cd->current_sector > cd->index->tracks[cd->current_track].last_sector)
-    {
-    if(frame)
-      frame->valid_samples = 0;
-    return 0;
-    }
-  while(samples_read < num_samples)
-    {
-    if(cd->current_sector > cd->index->tracks[cd->current_track].last_sector)
-      break;
-    
-    if(!cd->frame || !cd->frame->valid_samples)
-      read_frame(cd);
-
-    samples_copied = gavl_audio_frame_copy(&cd->track_info[0].audio_streams[0].format,
-                                           frame,
-                                           cd->frame,
-                                           samples_read, /* out_pos */
-                                           cd->last_read_samples - cd->frame->valid_samples,  /* in_pos */
-                                           num_samples - samples_read, /* out_size, */
-                                           cd->frame->valid_samples /* in_size */);
-    cd->frame->valid_samples -= samples_copied;
-    samples_read += samples_copied;
-    
-    }
-  if(frame)
-    frame->valid_samples = samples_read;
-  cd->samples_written += samples_read;
-  return samples_read;
-  }
 
 static void seek_cdaudio(void * priv, int64_t * time, int scale)
   {
@@ -493,33 +465,25 @@
   
   if(!cd->rip_initialized)
     {
-    gavl_audio_format_t format;
     bg_cdaudio_rip_init(cd->ripper, cd->cdio,
                         cd->first_sector);
-    
-    gavl_audio_format_copy(&format,
-                           &cd->track_info[0].audio_streams[0].format);
-    format.samples_per_frame = 588;
-    cd->frame = gavl_audio_frame_create(&format);
     cd->rip_initialized = 1;
     }
   
   sample_position = gavl_time_rescale(scale, 44100, *time);
-        
+  
   cd->current_sector =
-    sample_position / 588 + cd->index->tracks[cd->current_track].first_sector;
-  samples_to_skip = sample_position % 588;
+    sample_position / FRAME_SAMPLES + cd->index->tracks[cd->current_track].first_sector;
+  samples_to_skip = sample_position % FRAME_SAMPLES;
   
   /* Seek to the point */
   
   bg_cdaudio_rip_seek(cd->ripper, cd->current_sector);
-  
-  /* Read one frame os samples (can be more than one sector) */
-  read_frame(cd);
-  
+
   /* Set skipped samples */
-  
-  cd->frame->valid_samples -= samples_to_skip;
+
+  gavl_audio_source_reset(cd->src);
+  gavl_audio_source_skip_src(cd->src, samples_to_skip);
   }
 
 static void close_cdaudio(void * priv)
@@ -528,8 +492,13 @@
   if(cd->cdio)
     {
     bg_cdaudio_close(cd->cdio);
+    cd->cdio = NULL;
+    }
+  if(cd->src)
+    {
+    gavl_audio_source_destroy(cd->src);
+    cd->src = NULL;
     }
-  cd->cdio = NULL;
   }
 
 /* Configuration stuff */
@@ -713,7 +682,7 @@
     return;
 
   if(!strcmp(name, "trackname_template"))
-    cd->trackname_template = bg_strdup(cd->trackname_template, val->val_str);
+    cd->trackname_template = gavl_strrep(cd->trackname_template, val->val_str);
 
   if(!strcmp(name, "use_cdtext"))
     cd->use_cdtext = val->val_i;
@@ -724,11 +693,11 @@
   if(!strcmp(name, "use_musicbrainz"))
     cd->use_musicbrainz = val->val_i;
   if(!strcmp(name, "musicbrainz_host"))
-    cd->musicbrainz_host = bg_strdup(cd->musicbrainz_host, val->val_str);
+    cd->musicbrainz_host = gavl_strrep(cd->musicbrainz_host, val->val_str);
   if(!strcmp(name, "musicbrainz_port"))
     cd->musicbrainz_port = val->val_i;
   if(!strcmp(name, "musicbrainz_proxy_host"))
-    cd->musicbrainz_proxy_host = bg_strdup(cd->musicbrainz_proxy_host, val->val_str);
+    cd->musicbrainz_proxy_host = gavl_strrep(cd->musicbrainz_proxy_host, val->val_str);
   if(!strcmp(name, "musicbrainz_proxy_port"))
     cd->musicbrainz_proxy_port = val->val_i;
 #endif
@@ -737,19 +706,19 @@
   if(!strcmp(name, "use_cddb"))
     cd->use_cddb = val->val_i;
   if(!strcmp(name, "cddb_host"))
-    cd->cddb_host = bg_strdup(cd->cddb_host, val->val_str);
+    cd->cddb_host = gavl_strrep(cd->cddb_host, val->val_str);
   if(!strcmp(name, "cddb_port"))
     cd->cddb_port = val->val_i;
   if(!strcmp(name, "cddb_path"))
-    cd->cddb_path = bg_strdup(cd->cddb_path, val->val_str);
+    cd->cddb_path = gavl_strrep(cd->cddb_path, val->val_str);
   if(!strcmp(name, "cddb_proxy_host"))
-    cd->cddb_proxy_host = bg_strdup(cd->cddb_proxy_host, val->val_str);
+    cd->cddb_proxy_host = gavl_strrep(cd->cddb_proxy_host, val->val_str);
   if(!strcmp(name, "cddb_proxy_port"))
     cd->cddb_proxy_port = val->val_i;
   if(!strcmp(name, "cddb_proxy_user"))
-    cd->cddb_proxy_user = bg_strdup(cd->cddb_proxy_user, val->val_str);
+    cd->cddb_proxy_user = gavl_strrep(cd->cddb_proxy_user, val->val_str);
   if(!strcmp(name, "cddb_proxy_pass"))
-    cd->cddb_proxy_pass = bg_strdup(cd->cddb_proxy_pass, val->val_str);
+    cd->cddb_proxy_pass = gavl_strrep(cd->cddb_proxy_pass, val->val_str);
   if(!strcmp(name, "cddb_timeout"))
     cd->cddb_timeout = val->val_i;
 #endif
@@ -820,7 +789,6 @@
     /* Set streams */
     .set_audio_stream =      set_audio_stream_cdaudio,
     .set_video_stream =      NULL,
-    .set_subtitle_stream =   NULL,
 
     /*
      *  Start decoding.
@@ -829,8 +797,8 @@
      *  in the stream infos to check out, which streams are to be decoded
      */
     .start =                 start_cdaudio,
-    /* Read one audio frame (returns FALSE on EOF) */
-    .read_audio =    read_audio_cdaudio,
+    
+    .get_audio_source = get_audio_source_cdaudio,
     
     /*
      *  Do percentage seeking (can be NULL)

gmerlin-1.2.0.tar.gz/plugins/cdaudio/musicbrainz.c -> gmerlin-4256.tar.gz/plugins/cdaudio/musicbrainz.c Changed

gmerlin-1.2.0.tar.gz/plugins/edl/Makefile.am -> gmerlin-4256.tar.gz/plugins/edl/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/edl/i_edl.c -> gmerlin-4256.tar.gz/plugins/edl/i_edl.c Changed

gmerlin-1.2.0.tar.gz/plugins/esd/Makefile.am -> gmerlin-4256.tar.gz/plugins/esd/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/esd/i_esd.c -> gmerlin-4256.tar.gz/plugins/esd/i_esd.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <config.h>
 #include <gmerlin/translation.h>
@@ -49,6 +50,8 @@
   int last_frame_size;
   
   int64_t samples_read;
+  
+  gavl_audio_source_t * src;
   } esd_t;
 
 static const bg_parameter_info_t parameters[] =
@@ -78,7 +81,7 @@
     return;
   if(!strcmp(name, "esd_host"))
     {
-    e->hostname = bg_strdup(e->hostname, val->val_str);
+    e->hostname = gavl_strrep(e->hostname, val->val_str);
     }
   else if(!strcmp(name, "input_mode"))
     {
@@ -111,9 +114,37 @@
   return parameters;
   }
 
+static int read_samples_esd(void * p, gavl_audio_frame_t * f, int stream,
+                            int num_samples)
+  {
+  esd_t * priv = p;
+  return gavl_audio_source_read_samples(priv->src, f, num_samples);
+  }
+
+static gavl_source_status_t
+read_func_esd(void * p, gavl_audio_frame_t ** f)
+  {
+  esd_t * priv = p;
+
+  (*f)->valid_samples = read(priv->esd_socket,
+                             (*f)->samples.s_8,
+                             ESD_BUF_SIZE);
+
+  if((*f)->valid_samples < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "reading samples failed: %s",
+           strerror(errno));
+    return GAVL_SOURCE_EOF;
+    }
+  (*f)->valid_samples /= priv->bytes_per_frame;
+  
+  return ((*f)->valid_samples ? GAVL_SOURCE_OK : GAVL_SOURCE_EOF);
+  }
+
 static int open_esd(void * data,
                     gavl_audio_format_t * format,
-                    gavl_video_format_t * video_format)
+                    gavl_video_format_t * video_format,
+                    gavl_metadata_t * m)
   {
   int esd_format;
   const char * esd_host;
@@ -158,14 +189,14 @@
   gethostname(hostname, 128);
     
   name = bg_sprintf("gmerlin@%s pid: %d", hostname, getpid());
-
-    
+  
   if(e->do_monitor)
     e->esd_socket = esd_monitor_stream(esd_format, format->samplerate,
                                        e->hostname, name);
   else
     e->esd_socket = esd_record_stream(esd_format, format->samplerate,
                                       e->hostname, name);
+
   free(name);
   if(e->esd_socket < 0)
     {
@@ -173,6 +204,9 @@
     return 0;
     }
   e->bytes_per_frame = 4;
+  e->src = gavl_audio_source_create(read_func_esd, e,
+                                    GAVL_SOURCE_SRC_FRAMESIZE_MAX,
+                                    format);
   return 1;
   }
 
@@ -181,49 +215,17 @@
   esd_t * e = data;
   esd_close(e->esd_socket);
   gavl_audio_frame_destroy(e->f);
+  if(e->src)
+    {
+    gavl_audio_source_destroy(e->src);
+    e->src = NULL;
+    }
   }
 
-static int read_frame_esd(void * p, gavl_audio_frame_t * f, int stream,
-                           int num_samples)
+static gavl_audio_source_t * get_audio_source_esd(void * p)
   {
-  int samples_read;
-  int samples_copied;
-  
   esd_t * priv = p;
-  
-  samples_read = 0;
-
-  while(samples_read < num_samples)
-    {
-    if(!priv->f->valid_samples)
-      {
-      priv->f->valid_samples = read(priv->esd_socket,
-                                    priv->f->samples.s_8,
-                                    ESD_BUF_SIZE);
-      priv->f->valid_samples /= priv->bytes_per_frame;
-      priv->last_frame_size = priv->f->valid_samples;
-      }
-    
-    samples_copied =
-      gavl_audio_frame_copy(&priv->format,         /* format  */
-                            f,                     /* dst     */
-                            priv->f,               /* src     */
-                            samples_read,          /* dst_pos */
-                            priv->last_frame_size - priv->f->valid_samples, /* src_pos */
-                            num_samples - samples_read, /* dst_size */
-                            priv->f->valid_samples      /* src_size */ );
-    
-    priv->f->valid_samples -= samples_copied;
-    samples_read += samples_copied;
-    }
-
-  if(f)
-    {
-    f->valid_samples = samples_read;
-    f->timestamp = priv->samples_read;
-    }
-  priv->samples_read += samples_read;
-  return samples_read;
+  return priv->src;
   }
 
 const bg_recorder_plugin_t the_plugin =
@@ -246,8 +248,9 @@
     },
 
     .open =                open_esd,
-    .read_audio =          read_frame_esd,
+    .read_audio =          read_samples_esd,
     .close =               close_esd,
+    .get_audio_source =    get_audio_source_esd,
   };
 /* Include this into all plugin modules exactly once
    to let the plugin loader obtain the API version */

gmerlin-1.2.0.tar.gz/plugins/esd/oa_esd.c -> gmerlin-4256.tar.gz/plugins/esd/oa_esd.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,9 +35,11 @@
   {
   int esd_socket;
   char * hostname;
-  int bytes_per_sample;
+  int block_align;
   int esd_format;
   int samplerate;
+
+  gavl_audio_sink_t * sink;
   } esd_t;
 
 static const bg_parameter_info_t parameters[] =
@@ -53,25 +55,25 @@
 static void set_parameter_esd(void * data, const char * name,
                               const bg_parameter_value_t * val)
   {
-  esd_t * e = data;
+  upnp_t * e = data;
 
   if(!name)
     return;
   
   if(!strcmp(name, "esd_host"))
     {
-    e->hostname = bg_strdup(e->hostname, val->val_str);
+    e->hostname = gavl_strrep(e->hostname, val->val_str);
     }
   }
 
-static void * create_esd()
+static void * create_upnp()
   {
-  esd_t * ret = calloc(1, sizeof(*ret));
+  upnp_t * ret = calloc(1, sizeof(*ret));
 
   return ret;
   }
 
-static void destroy_esd(void *data)
+static void destroy_upnp(void *data)
   {
   esd_t * e = data;
 
@@ -80,10 +82,20 @@
   free(e);
   }
 
+static gavl_sink_status_t
+write_func_esd(void * p, gavl_audio_frame_t * f)
+  {
+  esd_t * e = p;
+  if(write(e->esd_socket, f->channels.s_8[0],
+           f->valid_samples * e->block_align) < 0)
+    return GAVL_SINK_ERROR;
+  return GAVL_SINK_OK;
+  }
+
 static int open_esd(void * data, gavl_audio_format_t * format)
   {
   esd_t * e = data;
-  e->bytes_per_sample = 1;
+  e->block_align = 1;
 
   format->interleave_mode = GAVL_INTERLEAVE_ALL;
     
@@ -99,7 +111,7 @@
       format->channel_locations[0] = GAVL_CHID_FRONT_CENTER;
       break;
     default:
-      e->bytes_per_sample *= 2;
+      e->block_align *= 2;
       e->esd_format |= ESD_STEREO;
       format->num_channels = 2;
       format->channel_locations[0] = GAVL_CHID_FRONT_LEFT;
@@ -117,14 +129,21 @@
     {
     format->sample_format = GAVL_SAMPLE_S16;
     e->esd_format |= ESD_BITS16;
-    e->bytes_per_sample *= 2;
+    e->block_align *= 2;
     }
 
   e->samplerate = format->samplerate;
   
+  e->sink = gavl_audio_sink_create(NULL, write_func_esd, e, format);
   return 1;
   }
 
+static gavl_audio_sink_t * get_sink_esd(void * p)
+  {
+  esd_t * e = p;
+  return e->sink;
+  }
+
 // static int stream_count = 0;
 
 static int start_esd(void * p)
@@ -142,13 +161,17 @@
 static void write_esd(void * p, gavl_audio_frame_t * f)
   {
   esd_t * e = p;
-  write(e->esd_socket, f->channels.s_8[0], f->valid_samples *
-        e->bytes_per_sample);
+  gavl_audio_sink_put_frame(e->sink, f);
   }
 
 static void close_esd(void * p)
   {
-
+  esd_t * e = p;
+  if(e->sink)
+    {
+    gavl_audio_sink_destroy(e->sink);
+    e->sink = NULL;
+    }
   }
 
 static void stop_esd(void * p)
@@ -185,6 +208,7 @@
     .write_audio =   write_esd,
     .stop =          stop_esd,
     .close =         close_esd,
+    .get_sink =      get_sink_esd,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/gavl/Makefile.am -> gmerlin-4256.tar.gz/plugins/gavl/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/gavl/ir_gavl.c -> gmerlin-4256.tar.gz/plugins/gavl/ir_gavl.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -26,67 +26,43 @@
 
 #include <gmerlin/translation.h>
 #include <gmerlin/plugin.h>
+#include <gavl/gavf.h>
 
-#include <gavl/gavldsp.h>
-
-#include <gmerlin/serialize.h>
-#include <gmerlin/fileformat.h>
 
 typedef struct
   {
   gavl_video_format_t format;
-  bg_f_io_t io;
-  int big_endian;
-  gavl_dsp_context_t * ctx;
+  gavf_io_t * io;
+  gavl_metadata_t m;
   } gavl_t;
 
 static void * create_gavl()
   {
   gavl_t * ret;
   ret = calloc(1, sizeof(*ret));
-  ret->ctx = gavl_dsp_context_create();
   return ret;
   }
 
 static void destroy_gavl(void* priv)
   {
   gavl_t * gavl = priv;
-  gavl_dsp_context_destroy(gavl->ctx);
   free(gavl);
   }
 
 static int read_header_gavl(void * priv, const char * filename,
                             gavl_video_format_t * format)
   {
-  bg_f_chunk_t ch;
-  bg_f_signature_t sig;
-  
+  FILE * f;
   gavl_t * gavl = priv;
 
-  if(!bg_f_io_open_stdio_read(&gavl->io, filename))
-    return 0;
-
-  /* Read signature */
-  if(!bg_f_chunk_read(&gavl->io, &ch)) 
-    return 0;
-
-  if(ch.type != CHUNK_TYPE_SIGNATURE)
-    return 0;
-  
-  if(!bg_f_signature_read(&gavl->io, &ch, &sig)) 
-    return 0;
-
-  if(sig.type != SIG_TYPE_IMAGE)
-    return 0;
-  
-  /* Read format */
-  if(!bg_f_chunk_read(&gavl->io, &ch)) 
-    return 0;
-  
-  if(ch.type != CHUNK_TYPE_VIDEO_FORMAT)
+  f = fopen(filename, "r");
+  if(!f)
     return 0;
+  gavl->io = gavf_io_create_file(f, 0, 1, 1);
 
-  if(!bg_f_video_format_read(&gavl->io, &ch, format, &gavl->big_endian))
+  if(!gavl_image_read_header(gavl->io,
+                             &gavl->m,
+                             format))
     return 0;
   
   gavl_video_format_copy(&gavl->format, format);
@@ -96,23 +72,15 @@
 
 static int read_image_gavl(void * priv, gavl_video_frame_t * frame)
   {
-  bg_f_chunk_t ch;
+  int result = 1;
   gavl_t * gavl = priv;
-  
-  /* Read frame */
-  if(!bg_f_chunk_read(&gavl->io, &ch)) 
-    return 0;
 
-  if(ch.type != CHUNK_TYPE_VIDEO_FRAME)
-    return 0;
-  
-  if(!bg_f_video_frame_read(&gavl->io, &ch, &gavl->format,
-                            frame, gavl->big_endian, gavl->ctx))
-    return 0;
-  
-  bg_f_io_close(&gavl->io);
-  
-  return 1;
+  if(frame)
+    result = gavl_image_read_image(gavl->io,
+                                   &gavl->format,
+                                   frame);
+  gavf_io_destroy(gavl->io);
+  return result;
   }
 
 const bg_image_reader_plugin_t the_plugin =

gmerlin-1.2.0.tar.gz/plugins/gavl/iw_gavl.c -> gmerlin-4256.tar.gz/plugins/gavl/iw_gavl.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,17 +29,18 @@
 #include <gmerlin/utils.h>
 #include <gmerlin/pluginfuncs.h>
 
-#include <gavl/gavldsp.h>
+// #include <gavl/gavldsp.h>
+#include <gavl/gavf.h>
 
-#include <gmerlin/serialize.h>
-#include <gmerlin/fileformat.h>
+// #include <gmerlin/serialize.h>
+// #include <gmerlin/fileformat.h>
 
 
 typedef struct
   {
   gavl_video_format_t format;
-  bg_f_io_t io;
   bg_iw_callbacks_t * cb;
+  gavf_io_t * io;
   
   } gavl_t;
 
@@ -49,7 +50,6 @@
   {
   gavl_t * ret;
   ret = calloc(1, sizeof(*ret));
-
   return ret;
   }
 
@@ -62,47 +62,48 @@
 static void destroy_gavl(void* priv)
   {
   gavl_t * gavl = priv;
-
   free(gavl);
   }
 
-
 static int write_header_gavl(void * priv, const char * filename,
                              gavl_video_format_t * format,
                              const gavl_metadata_t * metadata)
   {
-  bg_f_signature_t sig;
+  FILE * f;
   char * real_filename;
   gavl_t * gavl = priv;
   
   real_filename = bg_filename_ensure_extension(filename, "gavi");
-
+  
   if(!bg_iw_cb_create_output_file(gavl->cb, real_filename))
     {
     free(real_filename);
     return 0;
     }
-  
-  if(!bg_f_io_open_stdio_write(&gavl->io, real_filename))
-    return 0;
-  free(real_filename);
-  
-  sig.type = SIG_TYPE_IMAGE;
-  if(!bg_f_signature_write(&gavl->io, &sig))
+
+  f = fopen(real_filename, "w");
+  if(!f)
     return 0;
 
-  if(!bg_f_video_format_write(&gavl->io, format))
+  gavl->io = gavf_io_create_file(f, 1, 1, 1);
+  if(!gavl->io)
     return 0;
+  free(real_filename);
+
   gavl_video_format_copy(&gavl->format, format);
-  return 1;
+  return gavl_image_write_header(gavl->io, metadata, format);
   }
 
 static int write_image_gavl(void * priv, gavl_video_frame_t * frame)
   {
   gavl_t * gavl = priv;
-  if(!bg_f_video_frame_write(&gavl->io, &gavl->format, frame))
-    return 0;
-  bg_f_io_close(&gavl->io);
+
+  gavl_image_write_image(gavl->io,
+                         &gavl->format,
+                         frame);
+  
+  gavf_io_destroy(gavl->io);
+  gavl->io = NULL;
   return 1;
   }
 
@@ -121,6 +122,7 @@
       .destroy =        destroy_gavl,
     },
     .extensions = "gavi",
+    .mimetypes = "image/x-gavi",
     .write_header =  write_header_gavl,
     .write_image =   write_image_gavl,
     .set_callbacks = set_callbacks_gavl,

gmerlin-1.2.0.tar.gz/plugins/image/Makefile.am -> gmerlin-4256.tar.gz/plugins/image/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/image/ir_bmp.c -> gmerlin-4256.tar.gz/plugins/image/ir_bmp.c Changed

gmerlin-1.2.0.tar.gz/plugins/image/ir_pnm.c -> gmerlin-4256.tar.gz/plugins/image/ir_pnm.c Changed

gmerlin-1.2.0.tar.gz/plugins/image/ir_tga.c -> gmerlin-4256.tar.gz/plugins/image/ir_tga.c Changed

gmerlin-1.2.0.tar.gz/plugins/image/iw_bmp.c -> gmerlin-4256.tar.gz/plugins/image/iw_bmp.c Changed

gmerlin-1.2.0.tar.gz/plugins/image/iw_pnm.c -> gmerlin-4256.tar.gz/plugins/image/iw_pnm.c Changed

gmerlin-1.2.0.tar.gz/plugins/image/iw_tga.c -> gmerlin-4256.tar.gz/plugins/image/iw_tga.c Changed

gmerlin-1.2.0.tar.gz/plugins/jack/Makefile.am -> gmerlin-4256.tar.gz/plugins/jack/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/jack/i_jack.c -> gmerlin-4256.tar.gz/plugins/jack/i_jack.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -44,8 +44,8 @@
 
   pthread_mutex_lock(&priv->active_mutex);
   
-  //  fprintf(stderr, "Write jack %d\n", f->valid_samples);
-
+  //  fprintf(stderr, "Jack Process %d\n", nframes);
+  
   /* Check if there is enough space */
   for(i = 0; i < priv->num_ports; i++)
     {
@@ -95,10 +95,60 @@
   return 0;
   }
 
+static void close_jack(void * p)
+  {
+  jack_t * priv = p;
+  bg_jack_close_client(priv);
+  priv->client = NULL;
+  
+  if(priv->src)
+    {
+    gavl_audio_source_destroy(priv->src);
+    priv->src = NULL;
+    }
+  }
+
+static gavl_source_status_t
+read_func_jack(void * p, gavl_audio_frame_t ** frame)
+  {
+  int i;
+  
+  int samples_read, result;
+
+  gavl_audio_frame_t * f = *frame;
+  jack_t * priv = p;
+  
+  for(i = 0; i < priv->format.num_channels; i++)
+    {
+    samples_read = 0;
+    while(samples_read < priv->format.samples_per_frame)
+      {
+      result = jack_ringbuffer_read(priv->ports[i].buffer,
+                                    (char*)(f->channels.f[i] + samples_read),
+                                    (priv->format.samples_per_frame -
+                                     samples_read) * sizeof(float));
+      samples_read += result / sizeof(float);
+      
+      if(samples_read < priv->format.num_channels)
+        {
+        gavl_time_t delay_time;
+        delay_time = gavl_time_unscale(priv->format.samplerate,
+                                       priv->format.samples_per_frame -
+                                       samples_read);
+        gavl_time_delay(&delay_time);
+        }
+      }
+    }
+
+  f->valid_samples = samples_read;
+  return GAVL_SOURCE_OK;
+  }
+
 
 static int open_jack(void * data,
                      gavl_audio_format_t * format,
-                     gavl_video_format_t * video_format)
+                     gavl_video_format_t * video_format,
+                     gavl_metadata_t * m)
   {
   int i;
   jack_t * priv = data;
@@ -112,6 +162,9 @@
   priv->format.sample_format = GAVL_SAMPLE_FLOAT;
   priv->format.interleave_mode = GAVL_INTERLEAVE_NONE;
   priv->format.samples_per_frame = priv->samples_per_frame;
+
+  /* TODO: Make this configurable */
+  priv->format.num_channels = 2;
   
   /* Clear ports */
   for(i = 0; i < priv->num_ports; i++)
@@ -127,80 +180,50 @@
     }
 
   gavl_audio_format_copy(format, &priv->format);
+
+  priv->src = gavl_audio_source_create(read_func_jack, priv, 0, format);
   
   priv->samples_read = 0;
   return 1;
   }
 
-static void close_jack(void * p)
+
+static gavl_audio_source_t * get_audio_source_jack(void * p)
   {
+  jack_t * priv = p;
+  return priv->src;
   }
 
-static int read_frame_jack(void * p, gavl_audio_frame_t * f,
-                           int stream,
-                           int num_samples)
+static int read_samples_jack(void * p, gavl_audio_frame_t * f, int stream,
+                             int num_samples)
   {
-  int i;
-  
-  int samples_read, result;
-  
   jack_t * priv = p;
-
-  for(i = 0; i < priv->format.num_channels; i++)
-    {
-    samples_read = 0;
-    while(samples_read < num_samples)
-      {
-      result = jack_ringbuffer_read(priv->ports[i].buffer,
-                                    (char*)(f->channels.f[i] + samples_read),
-                                    (num_samples - samples_read) *
-                                    sizeof(float));
-      samples_read += result / sizeof(float);
-
-      if(samples_read < num_samples)
-        {
-        gavl_time_t delay_time;
-        delay_time = gavl_time_unscale(priv->format.samplerate,
-                                       num_samples - samples_read);
-        gavl_time_delay(&delay_time);
-        }
-      
-      }
-    }
-
-  if(f)
-    {
-    f->valid_samples = samples_read;
-    //    f->valid_samples = num_samples;
-    f->timestamp = priv->samples_read;
-    }
-  priv->samples_read += samples_read;
-  
-  //  return samples_read;
-  return num_samples;
+  return gavl_audio_source_read_samples(priv->src, f, num_samples);
   }
 
+
 const bg_recorder_plugin_t the_plugin =
   {
     .common =
     {
       BG_LOCALE,
-      .name =          "i_jack",
-      .long_name =     TRS("Jack"),
-      .description =   TRS("Jack recorder"),
-      .type =          BG_PLUGIN_RECORDER_AUDIO,
-      .flags =         BG_PLUGIN_RECORDER,
-      .priority =      BG_PLUGIN_PRIORITY_MAX,
-      .create =        bg_jack_create,
-      .destroy =       bg_jack_destroy,
+      .name =           "i_jack",
+      .long_name =      TRS("Jack"),
+      .description =    TRS("Jack recorder"),
+      .type =           BG_PLUGIN_RECORDER_AUDIO,
+      .flags =          BG_PLUGIN_RECORDER,
+      .priority =       BG_PLUGIN_PRIORITY_MAX,
+      .create =         bg_jack_create,
+      .destroy =        bg_jack_destroy,
 
       .get_parameters = bg_jack_get_parameters,
       .set_parameter =  bg_jack_set_parameter,
     },
 
-    .open =          open_jack,
-    .read_audio =    read_frame_jack,
-    .close =         close_jack,
+    .open =             open_jack,
+    .get_audio_source = get_audio_source_jack,
+    .read_audio =       read_samples_jack,
+    .close =            close_jack,
   };
 /* Include this into all plugin modules exactly once
    to let the plugin loader obtain the API version */

gmerlin-1.2.0.tar.gz/plugins/jack/jack_common.c -> gmerlin-4256.tar.gz/plugins/jack/jack_common.c Changed

gmerlin-1.2.0.tar.gz/plugins/jack/jack_common.h -> gmerlin-4256.tar.gz/plugins/jack/jack_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/jack/oa_jack.c -> gmerlin-4256.tar.gz/plugins/jack/oa_jack.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -124,6 +124,67 @@
   
   }
 
+static gavl_sink_status_t
+write_func_jack(void * p, gavl_audio_frame_t * f)
+  {
+  int i;
+  int samples_written, result;
+  gavl_time_t delay_time;
+  jack_t * priv = p;
+  int write_space;
+  
+  //  fprintf(stderr, "Write jack %d\n", f->valid_samples);
+  
+  for(i = 0; i < priv->num_ports; i++)
+    {
+    if(!priv->ports[i].active)
+      continue;
+    
+    samples_written = 0;
+
+    while(1)
+      {
+      write_space = jack_ringbuffer_write_space(priv->ports[i].buffer);
+      if(write_space >= f->valid_samples * sizeof(float))
+        break;
+      
+      delay_time =
+        gavl_time_unscale(priv->format.samplerate,
+                          f->valid_samples - write_space / sizeof(float)) / 2;
+      gavl_time_delay(&delay_time);
+      }
+    
+    while(samples_written < f->valid_samples)
+      {
+      result =
+        jack_ringbuffer_write(priv->ports[i].buffer,
+                              (const char*)(f->channels.f[priv->ports[i].index] +
+                                            samples_written),
+                              (f->valid_samples - samples_written) *
+                              sizeof(float));
+#if 0
+      if(i)
+        fprintf(stderr, "Write %d %d %ld\n", samples_written,
+                f->valid_samples - samples_written, result);
+
+#endif
+      result /= sizeof(float);
+
+      samples_written += result;
+      
+      }
+    
+    }
+  return GAVL_SINK_OK;
+  }
+
+static void
+write_frame_jack(void * p, gavl_audio_frame_t * f)
+  {
+  jack_t * priv = p;
+  gavl_audio_sink_put_frame(priv->sink, f);
+  }
+
 static int open_jack(void * data, gavl_audio_format_t * format)
   {
   int i;
@@ -180,63 +241,29 @@
 
   gavl_audio_format_copy(format, &priv->format);
 
+  priv->sink =
+    gavl_audio_sink_create(NULL, write_func_jack, priv,
+                           &priv->format);
+  
   return 1;
   }
 
 static void close_jack(void * p)
   {
+  jack_t * priv;
+  priv = p;
+  if(priv->sink)
+    {
+    gavl_audio_sink_destroy(priv->sink);
+    priv->sink = NULL;
+    }
   }
 
-static void write_frame_jack(void * p, gavl_audio_frame_t * f)
+static gavl_audio_sink_t * get_sink_jack(void * p)
   {
-  int i;
-  int samples_written, result;
-  gavl_time_t delay_time;
-  jack_t * priv = p;
-  int write_space;
-  
-  //  fprintf(stderr, "Write jack %d\n", f->valid_samples);
-  
-  for(i = 0; i < priv->num_ports; i++)
-    {
-    if(!priv->ports[i].active)
-      continue;
-    
-    samples_written = 0;
-
-    while(1)
-      {
-      write_space = jack_ringbuffer_write_space(priv->ports[i].buffer);
-      if(write_space >= f->valid_samples * sizeof(float))
-        break;
-      
-      delay_time = gavl_time_unscale(priv->format.samplerate,
-                                     f->valid_samples - write_space / sizeof(float)) / 2;
-      gavl_time_delay(&delay_time);
-      }
-    
-    while(samples_written < f->valid_samples)
-      {
-      result =
-        jack_ringbuffer_write(priv->ports[i].buffer,
-                              (const char*)(f->channels.f[priv->ports[i].index] +
-                                            samples_written),
-                              (f->valid_samples - samples_written) *
-                              sizeof(float));
-#if 0
-      if(i)
-        fprintf(stderr, "Write %d %d %ld\n", samples_written,
-                f->valid_samples - samples_written, result);
-
-#endif
-      result /= sizeof(float);
-
-      samples_written += result;
-      
-      }
-    
-    }
-  
+  jack_t * priv;
+  priv = p;
+  return priv->sink;
   }
 
 static int get_delay_jack(void * p)
@@ -266,6 +293,7 @@
     },
 
     .open =          open_jack,
+    .get_sink =      get_sink_jack,
     .start =         bg_jack_start,
     .write_audio =   write_frame_jack,
     .stop =          bg_jack_stop,

gmerlin-1.2.0.tar.gz/plugins/jpeg/Makefile.am -> gmerlin-4256.tar.gz/plugins/jpeg/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/jpeg/exif.c -> gmerlin-4256.tar.gz/plugins/jpeg/exif.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -184,7 +184,7 @@
   
   if(e->format == EXIF_FORMAT_ASCII)
     gavl_metadata_set_nocpy(fd->m, key,
-                            bg_strndup(NULL, (char*)e->data, end));
+                            gavl_strndup((char*)e->data, end));
   }
                               
 
@@ -278,9 +278,8 @@
     return;
   
   gavl_metadata_set_nocpy(fd->m, key,
-                          bg_strndup(NULL,
-                                     (char*)e->data,
-                                     (char*)(e->data + e->size)));
+                          gavl_strndup((char*)e->data,
+                                       (char*)(e->data + e->size)));
   }
 
 const enum_tab_t resolution_units[] =
@@ -559,12 +558,12 @@
   ExifData * d;
   foreach_data_t fd;
   fd.m = ret;
-  fd.cnv = bg_charset_converter_create("UTF-16LE", "UTF-8");
   
   d = exif_data_new_from_file(filename);
   if(!d)
     return;
 
+  fd.cnv = bg_charset_converter_create("UTF-16LE", "UTF-8");
   fd.bo = exif_data_get_byte_order(d);
   
   exif_data_foreach_content(d, foreach1, &fd);

gmerlin-1.2.0.tar.gz/plugins/jpeg/exif.h -> gmerlin-4256.tar.gz/plugins/jpeg/exif.h Changed

gmerlin-1.2.0.tar.gz/plugins/jpeg/ir_jpeg.c -> gmerlin-4256.tar.gz/plugins/jpeg/ir_jpeg.c Changed

gmerlin-1.2.0.tar.gz/plugins/jpeg/iw_jpeg.c -> gmerlin-4256.tar.gz/plugins/jpeg/iw_jpeg.c Changed

gmerlin-1.2.0.tar.gz/plugins/lqt/Makefile.am -> gmerlin-4256.tar.gz/plugins/lqt/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/lqt/e_lqt.c -> gmerlin-4256.tar.gz/plugins/lqt/e_lqt.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -55,8 +55,59 @@
     { /* End */ }
   };
 
+typedef struct e_lqt_s e_lqt_t;
+
+typedef struct
+  {
+  gavl_audio_format_t format;
+  lqt_codec_info_t ** codec_info;
+  int64_t samples_written;
+  
+  gavl_audio_sink_t * sink;
+  gavl_packet_sink_t * psink;
+
+  int compressed;
+  int index;
+
+  e_lqt_t * e;
+  } audio_stream_t;
+
 typedef struct
   {
+  gavl_video_format_t format;
+  uint8_t ** rows;
+  lqt_codec_info_t ** codec_info;
+  bg_encoder_framerate_t fr;
+  int64_t frames_written;
+  int64_t pts_offset;
+    
+  gavl_video_sink_t * sink;
+  gavl_packet_sink_t * psink;
+
+  int compressed;
+  int index;
+
+  e_lqt_t * e;
+  } video_stream_t;
+
+typedef struct
+  {
+  char language[4];
+  int timescale;
+  int64_t last_end_time;
+
+  uint16_t text_box[4];
+
+  uint16_t fg_color[4];
+  uint16_t bg_color[4];
+  gavl_packet_sink_t * psink;
+
+  int index;
+  e_lqt_t * e;
+  } text_stream_t;
+
+struct e_lqt_s
+  {
   int max_riff_size;
   char * filename;
   char * filename_tmp;
@@ -73,46 +124,21 @@
   
   int num_video_streams;
   int num_audio_streams;
-  int num_subtitle_text_streams;
+  int num_text_streams;
   
   /* Needed for calculating the duration of the last chapter */
   gavl_time_t duration;
   
   bg_encoder_callbacks_t * cb;
-  
-  struct
-    {
-    gavl_audio_format_t format;
-    lqt_codec_info_t ** codec_info;
-    int64_t samples_written;
-    } * audio_streams;
-  
-  struct
-    {
-    gavl_video_format_t format;
-    uint8_t ** rows;
-    lqt_codec_info_t ** codec_info;
-    bg_encoder_framerate_t fr;
-    int64_t frames_written;
-    int64_t pts_offset;
-    } * video_streams;
-  
-  struct
-    {
-    char language[4];
-    int timescale;
-    int64_t last_end_time;
 
-    uint16_t text_box[4];
-
-    uint16_t fg_color[4];
-    uint16_t bg_color[4];
-    } * subtitle_text_streams;
+  audio_stream_t         * audio_streams;
+  video_stream_t         * video_streams;
+  text_stream_t * text_streams;
   
-  const bg_chapter_list_t * chapter_list;
+  const gavl_chapter_list_t * chapter_list;
   
   int chapter_track_id;
-  } e_lqt_t;
+  };
 
 static void * create_lqt()
   {
@@ -156,11 +182,12 @@
 
 static int open_lqt(void * data, const char * filename,
                     const gavl_metadata_t * m,
-                    const bg_chapter_list_t * chapter_list)
+                    const gavl_chapter_list_t * chapter_list)
   {
   e_lqt_t * e = data;
 
-  e->filename = bg_filename_ensure_extension(filename, get_extension(e->file_type));
+  e->filename =
+    bg_filename_ensure_extension(filename, get_extension(e->file_type));
 
   if(!bg_encoder_cb_create_output_file(e->cb, e->filename))
     return 0;
@@ -195,56 +222,56 @@
 
     /* TODO: Make the arguments in lqt const friendly */
     
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_COPYRIGHT));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_COPYRIGHT));
     if(tag)
       {
       quicktime_set_copyright(e->file, tag);
       free(tag);
       }
 
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_TITLE));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_TITLE));
     if(tag)
       {
       quicktime_set_name(e->file, tag);
       free(tag);
       }
     
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_COMMENT));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_COMMENT));
     if(tag)
       {
       lqt_set_comment(e->file, tag);
       free(tag);
       }
     
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_ARTIST));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_ARTIST));
     if(tag)
       {
       lqt_set_artist(e->file, tag);
       free(tag);
       }
     
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_GENRE));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_GENRE));
     if(tag)
       {
       lqt_set_genre(e->file, tag);
       free(tag);
       }
     
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_TRACKNUMBER));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_TRACKNUMBER));
     if(tag)
       {
       lqt_set_track(e->file, tag);
       free(tag);
       }
 
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_ALBUM));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_ALBUM));
     if(tag)
       {
       lqt_set_album(e->file, tag);
       free(tag);
       }
 
-    tag = bg_strdup(NULL, gavl_metadata_get(m, GAVL_META_AUTHOR));
+    tag = gavl_strdup(gavl_metadata_get(m, GAVL_META_AUTHOR));
     if(tag)
       {
       lqt_set_author(e->file, tag);
@@ -273,32 +300,57 @@
   return lqt_gavl_writes_compressed_video(e->file_type, format, ci);
   }
 
+static audio_stream_t * append_audio_stream(e_lqt_t * e)
+  {
+  audio_stream_t * ret;
+  e->audio_streams =
+    realloc(e->audio_streams,
+            (e->num_audio_streams+1)*sizeof(*(e->audio_streams)));
+
+  ret = &e->audio_streams[e->num_audio_streams];
+  ret->index = e->num_audio_streams;
+  
+  memset(ret, 0, sizeof(*ret));
+  ret->e = e;
+  e->num_audio_streams++;
+  return ret;
+  }
+
+static video_stream_t * append_video_stream(e_lqt_t * e)
+  {
+  video_stream_t * ret;
+  e->video_streams =
+    realloc(e->video_streams,
+            (e->num_video_streams+1)*sizeof(*(e->video_streams)));
 
+  ret = &e->video_streams[e->num_video_streams];
+  ret->index = e->num_video_streams;
+  
+  memset(ret, 0, sizeof(*ret));
+  ret->e = e;
+  e->num_video_streams++;
+  return ret;
+  }
 
 static int add_audio_stream_lqt(void * data,
                                 const gavl_metadata_t * m,
                                 const gavl_audio_format_t * format)
   {
   const char * tag;
+  audio_stream_t * as;
   e_lqt_t * e = data;
+  
+  as = append_audio_stream(e);
 
-  e->audio_streams =
-    realloc(e->audio_streams,
-            (e->num_audio_streams+1)*sizeof(*(e->audio_streams)));
-  memset(&e->audio_streams[e->num_audio_streams], 0,
-         sizeof(*(e->audio_streams)));
-  gavl_audio_format_copy(&e->audio_streams[e->num_audio_streams].format,
-                         format);
+  gavl_audio_format_copy(&as->format, format);
   
-  lqt_gavl_add_audio_track(e->file, &e->audio_streams[e->num_audio_streams].format,
+  lqt_gavl_add_audio_track(e->file, &as->format,
                            NULL);
 
   tag = gavl_metadata_get(m, GAVL_META_LANGUAGE);
   if(tag)
-    lqt_set_audio_language(e->file, e->num_audio_streams, tag);
-  
-  e->num_audio_streams++;
-  return e->num_audio_streams-1;
+    lqt_set_audio_language(e->file, as->index, tag);
+  return as->index;
   }
 
 static int
@@ -308,70 +360,60 @@
                                 const gavl_compression_info_t * ci)
   {
   const char * tag;
+  audio_stream_t * as;
   e_lqt_t * e = data;
 
-  e->audio_streams =
-    realloc(e->audio_streams,
-            (e->num_audio_streams+1)*sizeof(*(e->audio_streams)));
-  memset(&e->audio_streams[e->num_audio_streams], 0,
-         sizeof(*(e->audio_streams)));
+  as = append_audio_stream(e);
+  as->compressed = 1;
   lqt_gavl_add_audio_track_compressed(e->file, format, ci);
 
   tag = gavl_metadata_get(m, GAVL_META_LANGUAGE);
   if(tag)
-    lqt_set_audio_language(e->file, e->num_audio_streams, tag);
-  
-  e->num_audio_streams++;
-  return e->num_audio_streams-1;
+    lqt_set_audio_language(e->file, as->index, tag);
+  return as->index;
   }
 
-static int add_subtitle_text_stream_lqt(void * data,
+static int add_text_stream_lqt(void * data,
                                         const gavl_metadata_t * m,
-                                        int * timescale)
+                                        uint32_t * timescale)
   {
   const char * tag;
+  text_stream_t * s;
   e_lqt_t * e = data;
 
-  e->subtitle_text_streams =
-    realloc(e->subtitle_text_streams,
-            (e->num_subtitle_text_streams+1)*
-            sizeof(*(e->subtitle_text_streams)));
+  e->text_streams =
+    realloc(e->text_streams,
+            (e->num_text_streams+1)*
+            sizeof(*(e->text_streams)));
 
-  memset(&e->subtitle_text_streams[e->num_subtitle_text_streams], 0,
-         sizeof(*(e->subtitle_text_streams)));
+  s = e->text_streams + e->num_text_streams;
+  
+  memset(s, 0, sizeof(*s));
 
   tag = gavl_metadata_get(m, GAVL_META_LANGUAGE);
   if(tag)
-    strncpy(e->subtitle_text_streams[e->num_subtitle_text_streams].language,
-            tag, 3);
+    strncpy(s->language, tag, 3);
   
-  e->subtitle_text_streams[e->num_subtitle_text_streams].timescale = *timescale;
+  s->timescale = *timescale;
+  s->index = e->num_text_streams;
+  s->e = e;
   
-  e->num_subtitle_text_streams++;
-  return e->num_subtitle_text_streams-1;
+  e->num_text_streams++;
+  return s->index;
   }
 
 
+
 static int add_video_stream_lqt(void * data,
                                 const gavl_metadata_t* m,
                                 const gavl_video_format_t* format)
   {
+  video_stream_t * vs;
   e_lqt_t * e = data;
-
-  e->video_streams =
-    realloc(e->video_streams,
-            (e->num_video_streams+1)*sizeof(*(e->video_streams)));
-  memset(&e->video_streams[e->num_video_streams], 0,
-         sizeof(*(e->video_streams)));
-  
-  gavl_video_format_copy(&e->video_streams[e->num_video_streams].format,
-                         format);
-
-  lqt_gavl_add_video_track(e->file, &e->video_streams[e->num_video_streams].format,
-                           NULL);
-
-  e->num_video_streams++;
-  return e->num_video_streams-1;
+  vs = append_video_stream(e);
+  gavl_video_format_copy(&vs->format, format);
+  lqt_gavl_add_video_track(e->file, &vs->format, NULL);
+  return vs->index;
   }
 
 static int
@@ -380,36 +422,168 @@
                                 const gavl_video_format_t* format,
                                 const gavl_compression_info_t * ci)
   {
+  video_stream_t * vs;
   e_lqt_t * e = data;
+  vs = append_video_stream(e);
+  lqt_gavl_add_video_track_compressed(e->file, format, ci);
+  vs->compressed = 1;
+  return vs->index;
+  }
 
-  e->video_streams =
-    realloc(e->video_streams,
-            (e->num_video_streams+1)*sizeof(*(e->video_streams)));
-  memset(&e->video_streams[e->num_video_streams], 0,
-         sizeof(*(e->video_streams)));
+static gavl_video_sink_t * get_video_sink_lqt(void * data, int stream)
+  {
+  e_lqt_t * e = data;
+  return e->video_streams[stream].sink;
+  }
+
+static gavl_audio_sink_t * get_audio_sink_lqt(void * data, int stream)
+  {
+  e_lqt_t * e = data;
+  return e->audio_streams[stream].sink;
+  }
+
+static gavl_packet_sink_t * get_video_packet_sink_lqt(void * data, int stream)
+  {
+  e_lqt_t * e = data;
+  return e->video_streams[stream].psink;
+  }
+
+static gavl_packet_sink_t * get_text_sink_lqt(void * data, int stream)
+  {
+  e_lqt_t * e = data;
+  return e->text_streams[stream].psink;
+  }
+
+static gavl_packet_sink_t * get_audio_packet_sink_lqt(void * data, int stream)
+  {
+  e_lqt_t * e = data;
+  return e->audio_streams[stream].psink;
+  }
+
+static gavl_sink_status_t
+write_audio_func_lqt(void * data, gavl_audio_frame_t* frame)
+  {
+  gavl_time_t test_time;
+  audio_stream_t * as = data;
   
-  lqt_gavl_add_video_track_compressed(e->file, format, ci);
+  if(!as->samples_written && frame->timestamp)
+    lqt_set_audio_pts_offset(as->e->file, as->index, frame->timestamp);
   
-  e->num_video_streams++;
-  return e->num_video_streams-1;
+  as->samples_written += frame->valid_samples;
+  
+  test_time = gavl_time_unscale(as->format.samplerate,
+                                as->samples_written);
+  if(as->e->duration < test_time)
+    as->e->duration = test_time;
+  
+  return lqt_encode_audio_raw(as->e->file, frame->samples.s_8,
+                              frame->valid_samples, as->index) ?
+    GAVL_SINK_OK : GAVL_SINK_ERROR;
   }
 
-static void get_audio_format_lqt(void * data, int stream,
-                                 gavl_audio_format_t * ret)
+
+
+static gavl_sink_status_t
+write_video_func_lqt(void * data, gavl_video_frame_t* frame)
   {
-  e_lqt_t * e = data;
+  gavl_time_t test_time;
+  video_stream_t * vs = data;
+  
+  test_time = gavl_time_unscale(vs->format.timescale,
+                                frame->timestamp);
+  if(vs->e->duration < test_time)
+    vs->e->duration = test_time;
+
+  if(!vs->frames_written)
+    {
+    vs->pts_offset = frame->timestamp;
+    if(vs->pts_offset)
+      lqt_set_video_pts_offset(vs->e->file, vs->index,
+                               vs->pts_offset);
+    }
+  vs->frames_written++;
+  
+  return lqt_gavl_encode_video(vs->e->file, vs->index, frame,
+                               vs->rows,
+                               vs->pts_offset) ?
+    GAVL_SINK_ERROR : GAVL_SINK_OK;
+  }
 
-  gavl_audio_format_copy(ret, &e->audio_streams[stream].format);
+static gavl_sink_status_t
+write_video_packet_func(void * data, gavl_packet_t * p)
+  {
+  gavl_time_t test_time;
+  video_stream_t * s = data;
+  
+  test_time = gavl_time_unscale(s->format.timescale,
+                                p->pts);
+  if(s->e->duration < test_time)
+    s->e->duration = test_time;
+  
+  if(!s->frames_written)
+    {
+    s->pts_offset = p->pts;
+    if(s->pts_offset)
+      lqt_set_video_pts_offset(s->e->file, s->index,
+                               s->pts_offset);
+    }
+  s->frames_written++;
   
+  return lqt_gavl_write_video_packet(s->e->file, s->index, p) ?
+    GAVL_SINK_OK : GAVL_SINK_ERROR;
   }
+
+static gavl_sink_status_t
+write_audio_packet_func(void * data, gavl_packet_t * p)
+  {
+  gavl_time_t test_time;
+  audio_stream_t * s = data;
+  
+  if(!s->samples_written && p->pts)
+    lqt_set_audio_pts_offset(s->e->file, s->index, p->pts);
+  s->samples_written += p->duration;
+
+  test_time = gavl_time_unscale(s->format.samplerate,
+                                s->samples_written);
+  if(s->e->duration < test_time)
+    s->e->duration = test_time;
   
-static void get_video_format_lqt(void * data, int stream,
-                                 gavl_video_format_t * ret)
+  return lqt_gavl_write_audio_packet(s->e->file, s->index, p) ?
+    GAVL_SINK_OK : GAVL_SINK_ERROR;
+  }
+
+static gavl_sink_status_t
+write_text_func(void * data,
+                         gavl_packet_t * p)
   {
-  e_lqt_t * e = data;
-  gavl_video_format_copy(ret, &e->video_streams[stream].format);
+  text_stream_t * s = data;
+  
+  if(s->e->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "AVI subtitles not supported");
+    return GAVL_SINK_ERROR;
+    }
+
+  //  fprintf(stderr, "write subtitle %"PRId64", %"PRId64", \"%s\"\n",
+  //        start, duration, text);
+  
+
+  /* Put empty subtitle if the last end time is not equal to
+     this start time */
+  if(s->last_end_time < p->pts)
+    {
+    if(lqt_write_text(s->e->file, s->index, "",
+                      p->pts - s->last_end_time))
+      return GAVL_SINK_ERROR;
+    }
+  
+  if(lqt_write_text(s->e->file, s->index, (char*)p->data, p->duration))
+    return 0;
+  s->last_end_time = p->pts + p->duration;
+  return GAVL_SINK_OK;
   }
 
+
 static int start_lqt(void * data)
   {
   int i, tmp;
@@ -417,53 +591,73 @@
 
   for(i = 0; i < e->num_audio_streams; i++)
     {
-     /* Ugly hack */
-    tmp = e->audio_streams[i].format.samples_per_frame;
+    audio_stream_t * as = &e->audio_streams[i];
+    /* Ugly hack */
+    tmp = as->format.samples_per_frame;
     lqt_gavl_get_audio_format(e->file,
                               i,
-                              &e->audio_streams[i].format);
-    e->audio_streams[i].format.samples_per_frame = tmp;
+                              &as->format);
+    as->format.samples_per_frame = tmp;
+
+    if(!as->compressed)
+      as->sink = gavl_audio_sink_create(NULL, write_audio_func_lqt,
+                                        as, &as->format);
+    else
+      as->psink = gavl_packet_sink_create(NULL, write_audio_packet_func,
+                                          as);
     }
   for(i = 0; i < e->num_video_streams; i++)
     {
-    lqt_gavl_get_video_format(e->file,
-                              i,
-                              &e->video_streams[i].format, 1);
+    video_stream_t * vs = &e->video_streams[i];
+    lqt_gavl_get_video_format(e->file, i, &vs->format, 1);
+    if(!vs->compressed)
+      vs->sink = gavl_video_sink_create(NULL,
+                                        write_video_func_lqt,
+                                        vs, &vs->format);
+    else
+      vs->psink = gavl_packet_sink_create(NULL, write_video_packet_func,
+                                          vs);
     }
 
   if(!(e->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
     {
     /* Add the subtitle tracks */
-    for(i = 0; i < e->num_subtitle_text_streams; i++)
+    for(i = 0; i < e->num_text_streams; i++)
       {
-      lqt_add_text_track(e->file, e->subtitle_text_streams[i].timescale);
-      lqt_set_text_language(e->file, i, e->subtitle_text_streams[i].language);
+      text_stream_t * ts;
+      ts = &e->text_streams[i];
+
+      lqt_add_text_track(e->file, ts->timescale);
+      lqt_set_text_language(e->file, i, ts->language);
     
       lqt_set_text_box(e->file, i,
-                       e->subtitle_text_streams[i].text_box[0],
-                       e->subtitle_text_streams[i].text_box[1],
-                       e->subtitle_text_streams[i].text_box[2],
-                       e->subtitle_text_streams[i].text_box[3]);
+                       ts->text_box[0],
+                       ts->text_box[1],
+                       ts->text_box[2],
+                       ts->text_box[3]);
 
       lqt_set_text_fg_color(e->file, i,
-                            e->subtitle_text_streams[i].fg_color[0],
-                            e->subtitle_text_streams[i].fg_color[1],
-                            e->subtitle_text_streams[i].fg_color[2],
-                            e->subtitle_text_streams[i].fg_color[3]);
+                            ts->fg_color[0],
+                            ts->fg_color[1],
+                            ts->fg_color[2],
+                            ts->fg_color[3]);
 
       lqt_set_text_bg_color(e->file, i,
-                            e->subtitle_text_streams[i].bg_color[0],
-                            e->subtitle_text_streams[i].bg_color[1],
-                            e->subtitle_text_streams[i].bg_color[2],
-                            e->subtitle_text_streams[i].bg_color[3]);
-    
+                            ts->bg_color[0],
+                            ts->bg_color[1],
+                            ts->bg_color[2],
+                            ts->bg_color[3]);
+
+      ts->psink = gavl_packet_sink_create(NULL, write_text_func,
+                                          ts);
+      
       }
   
     /* Add the chapter track */
     if(e->chapter_list)
       {
       lqt_add_text_track(e->file, e->chapter_list->timescale);
-      e->chapter_track_id = e->num_subtitle_text_streams;
+      e->chapter_track_id = e->num_text_streams;
       lqt_set_chapter_track(e->file, e->chapter_track_id);
       }
     }
@@ -475,7 +669,8 @@
          // TODO: Make LQT_WAV_ID_NONE part of the public lqt API
          (e->audio_streams[i].codec_info[0]->wav_ids[0] == -1)) 
         {
-        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Audio codec %s cannot be written to AVI files",
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+               "Audio codec %s cannot be written to AVI files",
                e->audio_streams[i].codec_info[0]->name);
         return 0;
         }
@@ -486,82 +681,6 @@
   }
 
 
-static int write_audio_frame_lqt(void * data, gavl_audio_frame_t* frame,
-                                 int stream)
-  {
-  gavl_time_t test_time;
-  e_lqt_t * e = data;
-
-  if(!e->audio_streams[stream].samples_written && frame->timestamp)
-    lqt_set_audio_pts_offset(e->file, stream, frame->timestamp);
-  
-  e->audio_streams[stream].samples_written += frame->valid_samples;
-  
-  test_time = gavl_time_unscale(e->audio_streams[stream].format.samplerate,
-                                e->audio_streams[stream].samples_written);
-  if(e->duration < test_time)
-    e->duration = test_time;
-  
-  return !!lqt_encode_audio_raw(e->file, frame->samples.s_8,
-                                frame->valid_samples, stream);
-  }
-
-static int write_video_frame_lqt(void * data, gavl_video_frame_t* frame,
-                                 int stream)
-  {
-  gavl_time_t test_time;
-  e_lqt_t * e = data;
-  
-  test_time = gavl_time_unscale(e->video_streams[stream].format.timescale,
-                                frame->timestamp);
-  if(e->duration < test_time)
-    e->duration = test_time;
-
-  if(!e->video_streams[stream].frames_written)
-    {
-    e->video_streams[stream].pts_offset = frame->timestamp;
-    if(e->video_streams[stream].pts_offset)
-      lqt_set_video_pts_offset(e->file, stream,
-                               e->video_streams[stream].pts_offset);
-    }
-  e->video_streams[stream].frames_written++;
-  
-  return !lqt_gavl_encode_video(e->file, stream, frame,
-                                e->video_streams[stream].rows,
-                                e->video_streams[stream].pts_offset);
-  }
-
-static int write_subtitle_text_lqt(void * data,const char * text,
-                                   int64_t start,
-                                   int64_t duration, int stream)
-  {
-  e_lqt_t * e = data;
-
-  if(e->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "AVI subtitles not supported");
-    return 0;
-    }
-
-  //  fprintf(stderr, "write subtitle %"PRId64", %"PRId64", \"%s\"\n",
-  //        start, duration, text);
-          
-
-  /* Put empty subtitle if the last end time is not equal to
-     this start time */
-  if(e->subtitle_text_streams[stream].last_end_time < start)
-    {
-    if(lqt_write_text(e->file, stream, "",
-                      start - e->subtitle_text_streams[stream].last_end_time))
-      return 0;
-    }
-  
-  if(lqt_write_text(e->file, stream, text, duration))
-    return 0;
-  e->subtitle_text_streams[stream].last_end_time = start + duration;
-  return 1;
-  }
-
 
 static int close_lqt(void * data, int do_delete)
   {
@@ -646,8 +765,13 @@
     {
     for(i = 0; i < e->num_audio_streams; i++)
       {
-      if(e->audio_streams[i].codec_info)
-        lqt_destroy_codec_info(e->audio_streams[i].codec_info);
+      audio_stream_t * as = &e->audio_streams[i];
+      if(as->codec_info)
+        lqt_destroy_codec_info(as->codec_info);
+      if(as->sink)
+        gavl_audio_sink_destroy(as->sink);
+      if(as->psink)
+        gavl_packet_sink_destroy(as->psink);
       }
 
     free(e->audio_streams);
@@ -657,16 +781,33 @@
     {
     for(i = 0; i < e->num_video_streams; i++)
       {
-      if(e->video_streams[i].codec_info)
-        lqt_destroy_codec_info(e->video_streams[i].codec_info);
-      lqt_gavl_rows_destroy(e->video_streams[i].rows);
+      video_stream_t * vs = &e->video_streams[i];
+      
+      if(vs->codec_info)
+        lqt_destroy_codec_info(vs->codec_info);
+      lqt_gavl_rows_destroy(vs->rows);
+
+      if(vs->sink)
+        gavl_video_sink_destroy(vs->sink);
       }
-    
     free(e->video_streams);
     e->video_streams = NULL;
     }
+  if(e->text_streams)
+    {
+    for(i = 0; i < e->num_text_streams; i++)
+      {
+      text_stream_t * ts = &e->text_streams[i];
+      if(ts->psink)
+        gavl_packet_sink_destroy(ts->psink);
+      }
+    free(e->text_streams);
+    e->text_streams = NULL;
+    }
+  
   e->num_audio_streams = 0;
   e->num_video_streams = 0;
+  e->num_text_streams = 0;
   return 1;
   }
 
@@ -864,50 +1005,11 @@
     }
   }
 
-static int write_video_packet_lqt(void * data, gavl_packet_t * p, int stream)
-  {
-  gavl_time_t test_time;
-  e_lqt_t * e = data;
-  
-  test_time = gavl_time_unscale(e->video_streams[stream].format.timescale,
-                                p->pts);
-  if(e->duration < test_time)
-    e->duration = test_time;
-
-  
-  if(!e->video_streams[stream].frames_written)
-    {
-    e->video_streams[stream].pts_offset = p->pts;
-    if(e->video_streams[stream].pts_offset)
-      lqt_set_video_pts_offset(e->file, stream,
-                               e->video_streams[stream].pts_offset);
-    }
-  e->video_streams[stream].frames_written++;
-  
-  return lqt_gavl_write_video_packet(e->file, stream, p);
-  }
-
-static int write_audio_packet_lqt(void * data, gavl_packet_t * p, int stream)
-  {
-  gavl_time_t test_time;
-  e_lqt_t * e = data;
-
-  if(!e->audio_streams[stream].samples_written && p->pts)
-    lqt_set_audio_pts_offset(e->file, stream, p->pts);
-  e->audio_streams[stream].samples_written += p->duration;
-
-  test_time = gavl_time_unscale(e->audio_streams[stream].format.samplerate,
-                                e->audio_streams[stream].samples_written);
-  if(e->duration < test_time)
-    e->duration = test_time;
-  
-  return lqt_gavl_write_audio_packet(e->file, stream, p);
-  }
 
 
 /* Subtitle parameters */
 
-static const bg_parameter_info_t subtitle_text_parameters[] =
+static const bg_parameter_info_t text_parameters[] =
   {
     {
       .name =      "box_top",
@@ -952,41 +1054,48 @@
     { /* End of parameters */ },
   };
 
-static const bg_parameter_info_t * get_subtitle_text_parameters_lqt(void * priv)
+static const bg_parameter_info_t *
+get_text_parameters_lqt(void * priv)
   {
-  return subtitle_text_parameters;
+  return text_parameters;
   }
 
-static void set_subtitle_text_parameter_lqt(void * priv, int stream,
-                                            const char * name,
-                                            const bg_parameter_value_t * val)
+#define CNV_COLOR(c) (int)(c * 65535.0 + 0.5)
+
+static void
+set_text_parameter_lqt(void * priv, int stream,
+                                const char * name,
+                                const bg_parameter_value_t * val)
   {
   e_lqt_t * e = priv;
+  text_stream_t * ts;
   
   if(!name)
     return;
+
+  ts = &e->text_streams[stream];
   
   if(!strcmp(name, "box_top"))
-    e->subtitle_text_streams[stream].text_box[0] = val->val_i;
+    ts->text_box[0] = val->val_i;
   else if(!strcmp(name, "box_left"))
-    e->subtitle_text_streams[stream].text_box[1] = val->val_i;
+    ts->text_box[1] = val->val_i;
   else if(!strcmp(name, "box_bottom"))
-    e->subtitle_text_streams[stream].text_box[2] = val->val_i;
+    ts->text_box[2] = val->val_i;
   else if(!strcmp(name, "box_right"))
-    e->subtitle_text_streams[stream].text_box[3] = val->val_i;
+    ts->text_box[3] = val->val_i;
   else if(!strcmp(name, "fg_color"))
     {
-    e->subtitle_text_streams[stream].fg_color[0] = (int)(val->val_color[0] * 65535.0 + 0.5);
-    e->subtitle_text_streams[stream].fg_color[1] = (int)(val->val_color[1] * 65535.0 + 0.5);
-    e->subtitle_text_streams[stream].fg_color[2] = (int)(val->val_color[2] * 65535.0 + 0.5);
-    e->subtitle_text_streams[stream].fg_color[3] = (int)(val->val_color[3] * 65535.0 + 0.5);
+    ts->fg_color[0] = CNV_COLOR(val->val_color[0]);
+    ts->fg_color[1] = CNV_COLOR(val->val_color[1]);
+    ts->fg_color[2] = CNV_COLOR(val->val_color[2]);
+    ts->fg_color[3] = CNV_COLOR(val->val_color[3]);
     }
   else if(!strcmp(name, "bg_color"))
     {
-    e->subtitle_text_streams[stream].bg_color[0] = (int)(val->val_color[0] * 65535.0 + 0.5);
-    e->subtitle_text_streams[stream].bg_color[1] = (int)(val->val_color[1] * 65535.0 + 0.5);
-    e->subtitle_text_streams[stream].bg_color[2] = (int)(val->val_color[2] * 65535.0 + 0.5);
-    e->subtitle_text_streams[stream].bg_color[3] = (int)(val->val_color[3] * 65535.0 + 0.5);
+    ts->bg_color[0] = CNV_COLOR(val->val_color[0]);
+    ts->bg_color[1] = CNV_COLOR(val->val_color[1]);
+    ts->bg_color[2] = CNV_COLOR(val->val_color[2]);
+    ts->bg_color[3] = CNV_COLOR(val->val_color[3]);
     }
   }
 
@@ -1012,13 +1121,13 @@
     
     .max_audio_streams =         -1,
     .max_video_streams =         -1,
-    .max_subtitle_text_streams = -1,
+    .max_text_streams = -1,
 
     .set_callbacks =         set_callbacks_lqt,
     
     .get_audio_parameters =         get_audio_parameters_lqt,
     .get_video_parameters =         get_video_parameters_lqt,
-    .get_subtitle_text_parameters = get_subtitle_text_parameters_lqt,
+    .get_text_parameters = get_text_parameters_lqt,
 
     .open =                 open_lqt,
 
@@ -1028,7 +1137,7 @@
     .add_audio_stream =     add_audio_stream_lqt,
     .add_audio_stream_compressed =     add_audio_stream_compressed_lqt,
     
-    .add_subtitle_text_stream = add_subtitle_text_stream_lqt,
+    .add_text_stream = add_text_stream_lqt,
 
     .add_video_stream =     add_video_stream_lqt,
     .add_video_stream_compressed =     add_video_stream_compressed_lqt,
@@ -1036,20 +1145,15 @@
     
     .set_audio_parameter =          set_audio_parameter_lqt,
     .set_video_parameter =          set_video_parameter_lqt,
-    .set_subtitle_text_parameter =  set_subtitle_text_parameter_lqt,
+    .set_text_parameter =  set_text_parameter_lqt,
     
-    .get_audio_format =     get_audio_format_lqt,
-    .get_video_format =     get_video_format_lqt,
+    .get_audio_sink =     get_audio_sink_lqt,
+    .get_video_sink =     get_video_sink_lqt,
 
+    .get_audio_packet_sink =     get_audio_packet_sink_lqt,
+    .get_video_packet_sink =     get_video_packet_sink_lqt,
+    .get_text_sink =     get_text_sink_lqt,
     .start =                start_lqt,
-    
-    .write_audio_frame =    write_audio_frame_lqt,
-    .write_video_frame =    write_video_frame_lqt,
-
-    .write_audio_packet = write_audio_packet_lqt,
-    .write_video_packet = write_video_packet_lqt,
-    
-    .write_subtitle_text =  write_subtitle_text_lqt,
     .close =                close_lqt,
   };

gmerlin-1.2.0.tar.gz/plugins/lqt/i_lqt.c -> gmerlin-4256.tar.gz/plugins/lqt/i_lqt.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -68,6 +68,46 @@
 
 typedef struct
   {
+  int quicktime_index;
+  int64_t pts_offset;
+    
+  quicktime_t * file; // Points to global struct
+  gavl_audio_source_t * src;
+  gavl_packet_source_t * psrc;
+
+  gavl_audio_format_t * fmt;
+
+  gavl_compression_info_t ci;
+  } audio_stream_t;
+  
+typedef struct
+  {
+  int quicktime_index;
+  unsigned char ** rows;
+  int has_timecodes;
+  int64_t pts_offset;
+  
+  quicktime_t * file; // Points to global struct
+  gavl_video_source_t * src;
+  gavl_packet_source_t * psrc;
+  
+  gavl_video_format_t * fmt;
+  gavl_compression_info_t ci;
+  } video_stream_t;
+
+typedef struct
+  {
+  int quicktime_index;
+  int64_t pts_offset;
+  quicktime_t * file; // Points to global struct
+  
+  char * text;
+  int text_alloc;
+  gavl_packet_source_t * src;
+  } text_stream_t;
+
+typedef struct
+  {
   quicktime_t * file;
   bg_parameter_info_t * parameters;
 
@@ -76,25 +116,10 @@
 
   bg_track_info_t track_info;
 
-  struct
-    {
-    int quicktime_index;
-    int64_t pts_offset;
-    } * audio_streams;
+  audio_stream_t * audio_streams;
+  video_stream_t * video_streams;
+  text_stream_t * text_streams;
   
-  struct
-    {
-    int quicktime_index;
-    unsigned char ** rows;
-    int has_timecodes;
-    int64_t pts_offset;
-    } * video_streams;
-  struct
-    {
-    int quicktime_index;
-    int timescale;
-    int64_t pts_offset;
-    } * subtitle_streams;
   } i_lqt_t;
 
 static void * create_lqt()
@@ -113,7 +138,7 @@
   char * text = NULL;
   int text_alloc = 0;
   
-  e->track_info.chapter_list = bg_chapter_list_create(0);
+  e->track_info.chapter_list = gavl_chapter_list_create(0);
   e->track_info.chapter_list->timescale = lqt_text_time_scale(e->file, track);
 
   num = lqt_text_samples(e->file, track);
@@ -122,7 +147,7 @@
     {
     if(lqt_read_text(e->file, track, &text, &text_alloc, &timestamp, &duration))
       {
-      bg_chapter_list_insert(e->track_info.chapter_list, i, timestamp, text);
+      gavl_chapter_list_insert(e->track_info.chapter_list, i, timestamp, text);
       }
     else
       break;
@@ -147,7 +172,7 @@
   lang[3] = '\0';
   
   /* We want to keep the thing const-clean */
-  filename = bg_strdup(NULL, arg);
+  filename = gavl_strdup(arg);
   e->file = quicktime_open(filename, 1, 0);
   free(filename);
 
@@ -204,7 +229,6 @@
   num_video_streams = quicktime_video_tracks(e->file);
   num_text_streams  = lqt_text_tracks(e->file);
 
-  e->track_info.duration = 0;
   e->track_info.flags = BG_TRACK_SEEKABLE | BG_TRACK_PAUSABLE;
   if(num_audio_streams)
     {
@@ -219,7 +243,6 @@
         m = &e->track_info.audio_streams[e->track_info.num_audio_streams].m;
         
         e->audio_streams[e->track_info.num_audio_streams].quicktime_index = i;
-
         e->audio_streams[e->track_info.num_audio_streams].pts_offset =
           lqt_get_audio_pts_offset(e->file, i);
         
@@ -267,9 +290,9 @@
     }
   if(num_text_streams)
     {
-    e->subtitle_streams = calloc(num_text_streams, sizeof(*e->subtitle_streams));
-    e->track_info.subtitle_streams =
-      calloc(num_text_streams, sizeof(*e->track_info.subtitle_streams));
+    e->text_streams = calloc(num_text_streams, sizeof(*e->text_streams));
+    e->track_info.text_streams =
+      calloc(num_text_streams, sizeof(*e->track_info.text_streams));
     
     for(i = 0; i < num_text_streams; i++)
       {
@@ -285,29 +308,30 @@
         }
       else
         {
-        m = &e->track_info.subtitle_streams[e->track_info.num_subtitle_streams].m;
+        m = &e->track_info.text_streams[e->track_info.num_text_streams].m;
         
-        e->subtitle_streams[e->track_info.num_subtitle_streams].quicktime_index = i;
-        e->subtitle_streams[e->track_info.num_subtitle_streams].timescale =
-          lqt_text_time_scale(e->file, i);
+        e->text_streams[e->track_info.num_text_streams].file = e->file;
+        e->text_streams[e->track_info.num_text_streams].quicktime_index = i;
 
-        e->subtitle_streams[e->track_info.num_subtitle_streams].pts_offset =
+        e->track_info.text_streams[e->track_info.num_text_streams].timescale =
+          lqt_text_time_scale(e->file, i);
+        
+        e->text_streams[e->track_info.num_text_streams].pts_offset =
           lqt_get_text_pts_offset(e->file, i);
         
         lqt_get_text_language(e->file, i, lang);
         gavl_metadata_set(m, GAVL_META_LANGUAGE, lang);
         
-        e->track_info.subtitle_streams[e->track_info.num_subtitle_streams].is_text = 1;
-        
-        e->track_info.num_subtitle_streams++;
+        e->track_info.num_text_streams++;
         }
       }
-
+    
     
     }
 
-  e->track_info.duration = lqt_gavl_duration(e->file);
-
+  gavl_metadata_set_long(&e->track_info.metadata, GAVL_META_APPROX_DURATION,
+                         lqt_gavl_duration(e->file));
+  
   if(lqt_is_avi(e->file))
     gavl_metadata_set(&e->track_info.metadata, GAVL_META_FORMAT, "AVI (lqt)");
   else
@@ -331,50 +355,38 @@
 
 /* Read one audio frame (returns FALSE on EOF) */
 static  
-int read_audio_samples_lqt(void * data, gavl_audio_frame_t * f, int stream,
-                          int num_samples)
+gavl_source_status_t read_audio_func(void * data, gavl_audio_frame_t ** fp)
   {
-  i_lqt_t * e = data;
+  gavl_audio_frame_t * f;
+  audio_stream_t * as = data;
   
-  lqt_gavl_decode_audio(e->file, e->audio_streams[stream].quicktime_index,
-                        f, num_samples);
-  if(f->valid_samples)
-    f->timestamp += e->audio_streams[stream].pts_offset;
-  return f->valid_samples;
-  }
-
+  f = *fp;
+  
+  if(!lqt_gavl_decode_audio(as->file, as->quicktime_index,
+                            f, as->fmt->samples_per_frame))
+    {
+    return GAVL_SOURCE_EOF;
+    }
+  f->timestamp += as->pts_offset;
 
-static int has_subtitle_lqt(void * data, int stream)
-  {
-  return 1;
+  //  fprintf(stderr, "Decode %d\n", f->valid_samples);
+  
+  return f->valid_samples ? GAVL_SOURCE_OK : GAVL_SOURCE_EOF;
   }
 
-static int read_subtitle_text_lqt(void * priv,
-                                  char ** text, int * text_alloc,
-                                  int64_t * start_time,
-                                  int64_t * duration, int stream)
-  {
-  i_lqt_t * e = priv;
-  int ret =  lqt_read_text(e->file,
-                           e->subtitle_streams[stream].quicktime_index,
-                           text, text_alloc,
-                           start_time, duration);
-  if(ret)
-    *start_time += e->subtitle_streams[stream].pts_offset;
-  return ret;
-  }
 
 /* Read one video frame (returns FALSE on EOF) */
-static
-int read_video_frame_lqt(void * data, gavl_video_frame_t * f, int stream)
+
+static gavl_source_status_t
+read_video_func(void * data, gavl_video_frame_t ** fp)
   {
-  i_lqt_t * e = data;
-  int ret = lqt_gavl_decode_video(e->file,
-                                  e->video_streams[stream].quicktime_index,
-                                  f, e->video_streams[stream].rows);
-  if(ret)
-    f->timestamp += e->video_streams[stream].pts_offset;
-  return ret;
+  gavl_video_frame_t * f;
+  video_stream_t * vs = data;
+  f = *fp;
+  if(!lqt_gavl_decode_video(vs->file, vs->quicktime_index, f, vs->rows))
+    return GAVL_SOURCE_EOF;
+  f->timestamp += vs->pts_offset;
+  return GAVL_SOURCE_OK;
   }
 
 
@@ -390,6 +402,15 @@
     }
   if(e->audio_streams)
     {
+    for(i = 0; i < e->track_info.num_audio_streams; i++)
+      {
+      if(e->audio_streams[i].src)
+        gavl_audio_source_destroy(e->audio_streams[i].src);
+
+      if(e->audio_streams[i].psrc)
+        gavl_packet_source_destroy(e->audio_streams[i].psrc);
+      gavl_compression_info_free(&e->audio_streams[i].ci);
+      }
     free(e->audio_streams);
     e->audio_streams = NULL;
     }
@@ -399,19 +420,50 @@
       {
       if(e->video_streams[i].rows)
         free(e->video_streams[i].rows);
+      if(e->video_streams[i].src)
+        gavl_video_source_destroy(e->video_streams[i].src);
+      if(e->video_streams[i].psrc)
+        gavl_packet_source_destroy(e->video_streams[i].psrc);
+      gavl_compression_info_free(&e->video_streams[i].ci);
       }
     free(e->video_streams);
     e->video_streams = NULL;
     }
+  if(e->text_streams)
+    {
+    for(i = 0; i < e->track_info.num_text_streams; i++)
+      {
+      if(e->text_streams[i].src)
+        gavl_packet_source_destroy(e->text_streams[i].src);
+      }
+    free(e->text_streams);
+    e->text_streams = NULL;
+    }
   bg_track_info_free(&e->track_info);  
   }
 
 static void seek_lqt(void * data, gavl_time_t * time, int scale)
   {
+  int i;
   i_lqt_t * e = data;
+
+  //  fprintf(stderr, "Seek lqt\n");
+  
   lqt_gavl_seek_scaled(e->file, time, scale);
+
+  for(i = 0; i < e->track_info.num_audio_streams; i++)
+    {
+    if(e->audio_streams[i].src)
+      gavl_audio_source_reset(e->audio_streams[i].src);
+    }
+  for(i = 0; i < e->track_info.num_video_streams; i++)
+    {
+    if(e->video_streams[i].src)
+      gavl_video_source_reset(e->video_streams[i].src);
+    }
   }
 
+
 static void destroy_lqt(void * data)
   {
   i_lqt_t * e = data;
@@ -472,15 +524,15 @@
 #endif
   if(!strcmp(name, "audio_codecs"))
     {
-    e->audio_codec_string = bg_strdup(e->audio_codec_string, val->val_str);
+    e->audio_codec_string = gavl_strrep(e->audio_codec_string, val->val_str);
     }
   else if(!strcmp(name, "video_codecs"))
     {
-    e->video_codec_string = bg_strdup(e->video_codec_string, val->val_str);
+    e->video_codec_string = gavl_strrep(e->video_codec_string, val->val_str);
     }
   else if(!strncmp(name, "audio_codecs.", 13))
     {
-    tmp_string = bg_strdup(NULL, name+13);
+    tmp_string = gavl_strdup(name+13);
     pos = strchr(tmp_string, '.');
     *pos = '\0';
     pos++;
@@ -491,7 +543,7 @@
     }
   else if(!strncmp(name, "video_codecs.", 13))
     {
-    tmp_string = bg_strdup(NULL, name+13);
+    tmp_string = gavl_strdup(name+13);
     pos = strchr(tmp_string, '.');
     *pos = '\0';
     pos++;
@@ -506,34 +558,72 @@
                                           int stream, gavl_compression_info_t * ci)
   {
   i_lqt_t * e = data;
-  return lqt_gavl_get_audio_compression_info(e->file, stream, ci);
+  if((e->audio_streams[stream].ci.id == GAVL_CODEC_ID_NONE) &&
+     !lqt_gavl_get_audio_compression_info(e->file, stream, &e->audio_streams[stream].ci))
+    return 0;
+
+  gavl_compression_info_copy(ci, &e->audio_streams[stream].ci);
+  return 1;
   }
 
 static int get_video_compression_info_lqt(void * data,
                                           int stream, gavl_compression_info_t * ci)
   {
   i_lqt_t * e = data;
-  return lqt_gavl_get_video_compression_info(e->file, stream, ci);
+  if((e->video_streams[stream].ci.id == GAVL_CODEC_ID_NONE) &&
+     !lqt_gavl_get_video_compression_info(e->file, stream, &e->video_streams[stream].ci))
+    return 0;
+
+  gavl_compression_info_copy(ci, &e->video_streams[stream].ci);
+  return 1;
   }
 
-static int read_audio_packet_lqt(void * data, int stream, gavl_packet_t * p)
+static gavl_source_status_t read_audio_packet_lqt(void * data, gavl_packet_t ** p)
   {
-  int ret;
-  i_lqt_t * e = data;
-  ret = lqt_gavl_read_audio_packet(e->file, stream, p);
-  if(ret)
-    p->pts += e->audio_streams[stream].pts_offset;
-  return ret;
+  audio_stream_t * s = data;
+  if(!lqt_gavl_read_audio_packet(s->file, s->quicktime_index, *p))
+    return GAVL_SOURCE_EOF;
+
+  (*p)->pts += s->pts_offset;
+  return GAVL_SOURCE_OK;
   }
 
-static int read_video_packet_lqt(void * data, int stream, gavl_packet_t * p)
+static gavl_source_status_t read_video_packet_lqt(void * data, gavl_packet_t ** p)
   {
-  int ret;
-  i_lqt_t * e = data;
-  ret = lqt_gavl_read_video_packet(e->file, stream, p);
-  if(ret)
-    p->pts += e->video_streams[stream].pts_offset;
-  return ret;
+  video_stream_t * s = data;
+  if(!lqt_gavl_read_video_packet(s->file, s->quicktime_index, *p))
+    return GAVL_SOURCE_EOF;
+
+  (*p)->pts += s->pts_offset;
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_source_status_t read_text_func(void * priv,
+                                           gavl_packet_t ** ret)
+  {
+  int len;
+  int64_t start_time;
+  int64_t duration;
+
+  text_stream_t * ts = priv;
+  
+  int result =  lqt_read_text(ts->file,
+                              ts->quicktime_index,
+                              &ts->text, &ts->text_alloc,
+                              &start_time, &duration);
+  if(!result)
+    return GAVL_SOURCE_EOF;
+  start_time += ts->pts_offset;
+
+  len = strlen(ts->text);
+  
+  gavl_packet_alloc(*ret, len);
+  memcpy((*ret)->data, ts->text, len);
+  (*ret)->data_len = len;
+  (*ret)->pts = start_time;
+  (*ret)->duration = duration;
+  
+  return GAVL_SOURCE_OK;
   }
 
 static int start_lqt(void * data)
@@ -543,19 +633,83 @@
 
   for(i = 0; i < e->track_info.num_audio_streams; i++)
     {
-    lqt_gavl_get_audio_format(e->file,
-                              e->audio_streams[i].quicktime_index,
-                              &e->track_info.audio_streams[i].format);
+    audio_stream_t * as = &e->audio_streams[i];
+    as->fmt = &e->track_info.audio_streams[i].format;
+
+    lqt_gavl_get_audio_format(e->file, as->quicktime_index, as->fmt);
+
+    as->src =
+      gavl_audio_source_create(read_audio_func, as, 0, as->fmt);
+
+    as->psrc =
+      gavl_packet_source_create_audio(read_audio_packet_lqt,
+                                      as, 0, &as->ci, as->fmt);
+    
+    as->file = e->file;
     }
   for(i = 0; i < e->track_info.num_video_streams; i++)
     {
-    lqt_gavl_get_video_format(e->file,
-                              e->video_streams[i].quicktime_index,
-                              &e->track_info.video_streams[i].format, 0);
+    video_stream_t * vs = &e->video_streams[i];
+    vs->fmt = &e->track_info.video_streams[i].format;
+    
+    lqt_gavl_get_video_format(e->file, vs->quicktime_index, vs->fmt, 0);
+
+    vs->src =
+      gavl_video_source_create(read_video_func, vs, 0, vs->fmt);
+
+    vs->psrc =
+      gavl_packet_source_create_video(read_video_packet_lqt,
+                                      vs, 0, &vs->ci, vs->fmt);
+    
+    vs->file = e->file;
+    }
+  for(i = 0; i < e->track_info.num_text_streams; i++)
+    {
+    text_stream_t * ts = &e->text_streams[i];
+
+    ts->src =
+      gavl_packet_source_create_text(read_text_func, ts, 0, e->track_info.text_streams[i].timescale);
+    ts->file = e->file;
     }
+  
   return 1;
   }
 
+static gavl_audio_source_t *
+get_audio_source_lqt(void * data, int stream)
+  {
+  i_lqt_t * e = data;
+  return e->audio_streams[stream].src;
+  }
+
+static gavl_video_source_t *
+get_video_source_lqt(void * data, int stream)
+  {
+  i_lqt_t * e = data;
+  return e->video_streams[stream].src;
+  }
+
+static gavl_packet_source_t *
+get_audio_packet_source_lqt(void * data, int stream)
+  {
+  i_lqt_t * e = data;
+  return e->audio_streams[stream].psrc;
+  }
+
+static gavl_packet_source_t *
+get_video_packet_source_lqt(void * data, int stream)
+  {
+  i_lqt_t * e = data;
+  return e->video_streams[stream].psrc;
+  }
+
+static gavl_packet_source_t *
+get_text_source_lqt(void * data, int stream)
+  {
+  i_lqt_t * e = data;
+  return e->text_streams[stream].src;
+  }
+
 char const * const extensions = "mov";
 
 static const char * get_extensions(void * priv)
@@ -587,19 +741,24 @@
     //    .set_audio_stream =  set_audio_stream_lqt,
     //    .set_video_stream =  set_audio_stream_lqt,
 
+    .get_audio_source = get_audio_source_lqt,
+    .get_video_source = get_video_source_lqt,
+
+    .get_audio_packet_source = get_audio_packet_source_lqt,
+    .get_video_packet_source = get_video_packet_source_lqt,
+    
     .get_audio_compression_info = get_audio_compression_info_lqt,
     .get_video_compression_info = get_video_compression_info_lqt,
 
     .start =             start_lqt,
+    
+    //    .has_subtitle =       has_subtitle_lqt,
+    //    .read_subtitle_text = read_subtitle_text_lqt,
 
-    .read_audio = read_audio_samples_lqt,
-    .read_video =   read_video_frame_lqt,
-
-    .has_subtitle =       has_subtitle_lqt,
-    .read_subtitle_text = read_subtitle_text_lqt,
-
-    .read_audio_packet = read_audio_packet_lqt,
-    .read_video_packet = read_video_packet_lqt,
+    .get_text_source = get_text_source_lqt,
+    
+    //    .read_audio_packet = read_audio_packet_lqt,
+    //    .read_video_packet = read_video_packet_lqt,
     
     .seek =               seek_lqt,
     //    .stop =               stop_lqt,

gmerlin-1.2.0.tar.gz/plugins/lqt/lqt_common.c -> gmerlin-4256.tar.gz/plugins/lqt/lqt_common.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -67,10 +67,10 @@
     if(!info->gettext_domain)
       {
       info->gettext_domain =
-        bg_strdup(info->gettext_domain,
+        gavl_strrep(info->gettext_domain,
                   codec_info[i]->gettext_domain);
       info->gettext_directory =
-        bg_strdup(info->gettext_directory,
+        gavl_strrep(info->gettext_directory,
                   codec_info[i]->gettext_directory);
       }
 
@@ -83,11 +83,10 @@
       codec_info[i]->num_decoding_parameters;
     
     if(!info->val_default.val_str)
-      info->val_default.val_str = bg_strdup(NULL,
-                                            codec_info[i]->name);
+      info->val_default.val_str = gavl_strdup(codec_info[i]->name);
     
-    info->multi_names_nc[index] = bg_strdup(NULL, codec_info[i]->name);
-    info->multi_labels_nc[index] = bg_strdup(NULL, codec_info[i]->long_name);
+    info->multi_names_nc[index] = gavl_strdup(codec_info[i]->name);
+    info->multi_labels_nc[index] = gavl_strdup(codec_info[i]->long_name);
 
     if(encode)
       {
@@ -95,15 +94,15 @@
                                                codec_info[i]->description);
       
       if(codec_info[i]->compatibility_flags & (LQT_FILE_QT | LQT_FILE_QT_OLD))
-        info->multi_descriptions_nc[index] = bg_strcat(info->multi_descriptions_nc[index], " QT");
+        info->multi_descriptions_nc[index] = gavl_strcat(info->multi_descriptions_nc[index], " QT");
       if(codec_info[i]->compatibility_flags & ( LQT_FILE_MP4))
-        info->multi_descriptions_nc[index] = bg_strcat(info->multi_descriptions_nc[index], " MP4");
+        info->multi_descriptions_nc[index] = gavl_strcat(info->multi_descriptions_nc[index], " MP4");
       if(codec_info[i]->compatibility_flags & ( LQT_FILE_M4A))
-        info->multi_descriptions_nc[index] = bg_strcat(info->multi_descriptions_nc[index], " M4A");
+        info->multi_descriptions_nc[index] = gavl_strcat(info->multi_descriptions_nc[index], " M4A");
       if(codec_info[i]->compatibility_flags & ( LQT_FILE_AVI))
-        info->multi_descriptions_nc[index] = bg_strcat(info->multi_descriptions_nc[index], " AVI");
+        info->multi_descriptions_nc[index] = gavl_strcat(info->multi_descriptions_nc[index], " AVI");
       if(codec_info[i]->compatibility_flags & ( LQT_FILE_3GP))
-        info->multi_descriptions_nc[index] = bg_strcat(info->multi_descriptions_nc[index], " 3GP");
+        info->multi_descriptions_nc[index] = gavl_strcat(info->multi_descriptions_nc[index], " 3GP");
       }
     else
       info->multi_descriptions_nc[index] = bg_sprintf("%s",
@@ -118,28 +117,28 @@
       if(!j)
         {
         info->multi_parameters_nc[index][j].gettext_domain =
-          bg_strdup(info->multi_parameters_nc[index][j].gettext_domain,
+          gavl_strrep(info->multi_parameters_nc[index][j].gettext_domain,
                     codec_info[i]->gettext_domain);
         info->multi_parameters_nc[index][j].gettext_directory =
-          bg_strdup(info->multi_parameters_nc[index][j].gettext_directory,
+          gavl_strrep(info->multi_parameters_nc[index][j].gettext_directory,
                     codec_info[i]->gettext_directory);
         }
       
       //      if(encode)
         info->multi_parameters_nc[index][j].name =
-          bg_strdup(info->multi_parameters_nc[index][j].name,
+          gavl_strrep(info->multi_parameters_nc[index][j].name,
                     lqt_parameter_info[j].name);
         //      else
         //        info->multi_parameters[i][j].name =
         //          bg_sprintf("%s.%s", info->multi_names[i], lqt_parameter_info[j].name);
 
       info->multi_parameters_nc[index][j].long_name = 
-        bg_strdup(NULL, lqt_parameter_info[j].real_name);
+        gavl_strdup(lqt_parameter_info[j].real_name);
 
       if(lqt_parameter_info[j].help_string)
         {
         info->multi_parameters_nc[index][j].help_string = 
-          bg_strdup(NULL, lqt_parameter_info[j].help_string);
+          gavl_strdup(lqt_parameter_info[j].help_string);
         
         }
       
@@ -193,15 +192,13 @@
         case LQT_PARAMETER_STRING:
           info->multi_parameters_nc[index][j].type = BG_PARAMETER_STRING;
           info->multi_parameters_nc[index][j].val_default.val_str =
-            bg_strdup(NULL,
-                      lqt_parameter_info[j].val_default.val_string);
+            gavl_strdup(lqt_parameter_info[j].val_default.val_string);
           
           break;
         case LQT_PARAMETER_STRINGLIST:
           info->multi_parameters_nc[index][j].type = BG_PARAMETER_STRINGLIST;
           info->multi_parameters_nc[index][j].val_default.val_str =
-            bg_strdup(NULL,
-                      lqt_parameter_info[j].val_default.val_string);
+            gavl_strdup(lqt_parameter_info[j].val_default.val_string);
 
           info->multi_parameters_nc[index][j].multi_names_nc =
             calloc(lqt_parameter_info[j].num_stringlist_options+1,
@@ -210,7 +207,7 @@
           for(k = 0; k < lqt_parameter_info[j].num_stringlist_options; k++)
             {
             info->multi_parameters_nc[index][j].multi_names_nc[k] =
-              bg_strdup(NULL, lqt_parameter_info[j].stringlist_options[k]);
+              gavl_strdup(lqt_parameter_info[j].stringlist_options[k]);
             }
           bg_parameter_info_set_const_ptrs(&info->multi_parameters_nc[index][j]);
           break;

gmerlin-1.2.0.tar.gz/plugins/lqt/lqt_common.h -> gmerlin-4256.tar.gz/plugins/lqt/lqt_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/lqt/lqtgavl.c -> gmerlin-4256.tar.gz/plugins/lqt/lqtgavl.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * lqtgavl - gavl Bindings for libquicktime
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <lqtgavl.h>
 #include <colormodels.h>
@@ -476,6 +477,7 @@
   int constant_framerate;
   int tc_framerate;
   uint32_t tc_flags;
+  int pixel_width, pixel_height;
   if(track >= quicktime_video_tracks(file) ||
      track < 0)
     return 0;
@@ -486,9 +488,12 @@
   format->frame_width = format->image_width;
   format->frame_height = format->image_height;
 
-  lqt_get_pixel_aspect(file, track, &format->pixel_width,
-                       &format->pixel_height);
+  lqt_get_pixel_aspect(file, track, &pixel_width,
+                       &pixel_height);
 
+  format->pixel_width = pixel_width;
+  format->pixel_height = pixel_height;
+  
   format->timescale = lqt_video_time_scale(file, track);
   format->frame_duration = lqt_frame_duration(file, track,
                                               &constant_framerate);
@@ -536,7 +541,11 @@
     return 0;
   
   frame->timestamp = lqt_frame_time(file, track);
+  frame->duration = lqt_frame_duration(file, track, NULL);
 
+  //  fprintf(stderr, "Duration: %ld, PTS: %ld\n", 
+  //          frame->duration, frame->timestamp);
+          
   if(lqt_has_timecode_track(file, track, &tc_flags,
                             &tc_framerate) &&
      lqt_read_timecode(file, track, &tc))
@@ -720,6 +729,8 @@
       break;
     case GAVL_CODEC_ID_VORBIS:    //!< Vorbis (segmented extradata and packets)
     case GAVL_CODEC_ID_FLAC:      //!< FLAC
+    case GAVL_CODEC_ID_OPUS:      //!< Opus
+    case GAVL_CODEC_ID_SPEEX:      //!< Opus
       break;
     
     /* Video */
@@ -770,6 +781,11 @@
     case GAVL_CODEC_ID_DIRAC:     //!< Complete DIRAC frames, sequence end code 
       lci->id = LQT_COMPRESSION_DIRAC;
       break;
+    case GAVL_CODEC_ID_DTS:
+    case GAVL_CODEC_ID_VP8:
+    case GAVL_CODEC_ID_DVDSUB:
+    case GAVL_CODEC_ID_DIV3:
+      break;
     }
 
   if(lci->id == LQT_COMPRESSION_NONE)
@@ -928,6 +944,22 @@
   if(lp->flags & LQT_PACKET_KEYFRAME)
     gp->flags |= GAVL_PACKET_KEYFRAME;
 
+  if(lp->flags & LQT_PACKET_REF_FRAME)
+    gp->flags |= GAVL_PACKET_REF;
+
+  switch(lp->flags & LQT_PACKET_TYPE_MASK)
+    {
+    case LQT_PACKET_TYPE_I:
+      gp->flags |= GAVL_PACKET_TYPE_I;
+      break;
+    case LQT_PACKET_TYPE_P:
+      gp->flags |= GAVL_PACKET_TYPE_P;
+      break;
+    case LQT_PACKET_TYPE_B:
+      gp->flags |= GAVL_PACKET_TYPE_B;
+      break;
+    }
+  
   }
 
 int lqt_gavl_read_audio_packet(quicktime_t * file, int track, gavl_packet_t * p)

gmerlin-1.2.0.tar.gz/plugins/lqt/lqtgavl.h -> gmerlin-4256.tar.gz/plugins/lqt/lqtgavl.h Changed

gmerlin-1.2.0.tar.gz/plugins/mikmod/Makefile.am -> gmerlin-4256.tar.gz/plugins/mikmod/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/mikmod/i_mikmod.c -> gmerlin-4256.tar.gz/plugins/mikmod/i_mikmod.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -53,6 +53,8 @@
 
   int block_align;
   int eof;
+  
+  gavl_audio_source_t * src;
   } i_mikmod_t;
 
 #ifdef dump
@@ -92,25 +94,31 @@
 
   
 /* Read one audio frame (returns FALSE on EOF) */
-static int read_audio_samples_mikmod(void * data, gavl_audio_frame_t * f, int stream,
-                                     int num_samples)
+static gavl_source_status_t
+read_func_mikmod(void * data,
+                 gavl_audio_frame_t ** fp)
   {
   int result;
   i_mikmod_t * e = data;
+  gavl_audio_frame_t * f = *fp;
 
+  int num_samples =
+    e->track_info.audio_streams[0].format.samples_per_frame;
+  
   result = bg_subprocess_read_data(e->proc->stdout_fd,
-                                   f->samples.u_8, num_samples * e->block_align);
-
+                                   f->samples.u_8,
+                                   num_samples * e->block_align);
+  
   if(result < 0)
-    return 0;
-
+    return GAVL_SOURCE_EOF;
+  
   if(result < num_samples * e->block_align)
     e->eof = 1;
   
   f->valid_samples = result / e->block_align;
-  return f->valid_samples;
+  return f->valid_samples ? GAVL_SOURCE_OK : GAVL_SOURCE_EOF;
   }
-
+  
 // arg = path of mod
 static int open_mikmod(void * data, const char * arg)
   {
@@ -118,6 +126,7 @@
   char *command;
   i_mikmod_t * mik = data;
   gavl_audio_frame_t * test_frame;
+  gavl_audio_format_t * fmt;
   
   // if no mikmod installed 
   if(!bg_search_file_exec("mikmod", NULL))
@@ -127,24 +136,27 @@
     }
 
   /* Create track infos */
-  mik->track_info.duration = GAVL_TIME_UNDEFINED;
   mik->track_info.num_audio_streams = 1;
   mik->track_info.audio_streams = calloc(1, sizeof(*(mik->track_info.audio_streams)));
+
+  fmt = &mik->track_info.audio_streams[0].format;
   
-  mik->track_info.audio_streams[0].format.samplerate = mik->frequency;
+  fmt->samplerate = mik->frequency;
 
   if(mik->output == MONO8 || mik->output == MONO16)
-    mik->track_info.audio_streams[0].format.num_channels = 1;
+    fmt->num_channels = 1;
   else if(mik->output == STEREO8 || mik->output == STEREO16)
-    mik->track_info.audio_streams[0].format.num_channels = 2;
+    fmt->num_channels = 2;
 
+  gavl_set_channel_setup(fmt);
+  
   if(mik->output == MONO8 || mik->output == STEREO8)
-    mik->track_info.audio_streams[0].format.sample_format = GAVL_SAMPLE_U8;
+    fmt->sample_format = GAVL_SAMPLE_U8;
   else if(mik->output == MONO16 || mik->output == STEREO16)
-    mik->track_info.audio_streams[0].format.sample_format = GAVL_SAMPLE_S16;
+    fmt->sample_format = GAVL_SAMPLE_S16;
 
-  mik->track_info.audio_streams[0].format.interleave_mode = GAVL_INTERLEAVE_ALL;
-  mik->track_info.audio_streams[0].format.samples_per_frame = 1024;
+  fmt->interleave_mode = GAVL_INTERLEAVE_ALL;
+  fmt->samples_per_frame = 1024;
 
   gavl_metadata_set(&mik->track_info.audio_streams[0].m,
                     GAVL_META_FORMAT, "mikmod audio");
@@ -155,43 +167,43 @@
     
   if(mik->output == MONO8)
     {
-    command = bg_strcat(command, " -o 8m");
+    command = gavl_strcat(command, " -o 8m");
     mik->block_align = 1;
     }
   else if(mik->output == MONO16)
     {
-    command = bg_strcat(command, " -o 16m");
+    command = gavl_strcat(command, " -o 16m");
     mik->block_align = 2;
     }
   else if(mik->output == STEREO8)
     {
-    command = bg_strcat(command, " -o 8s");
+    command = gavl_strcat(command, " -o 8s");
     mik->block_align = 2;
     }
   else if(mik->output == STEREO16)
     {
-    command = bg_strcat(command, " -o 16s");
+    command = gavl_strcat(command, " -o 16s");
     mik->block_align = 4;
     }
   if(mik->use_surround)
-    command = bg_strcat(command, " -s");
+    command = gavl_strcat(command, " -s");
   if(mik->use_interpolate)
-    command = bg_strcat(command, " -i");
+    command = gavl_strcat(command, " -i");
   if(mik->force_volume)
-    command = bg_strcat(command, " -fa");
+    command = gavl_strcat(command, " -fa");
   if(mik->hidden_patterns)
-    command = bg_strcat(command, " -c");
-
-  command = bg_strcat(command, " ");
-  command = bg_strcat(command, arg);
+    command = gavl_strcat(command, " -c");
 
+  command = gavl_strcat(command, " ");
+  command = gavl_strcat(command, arg);
+  
   /* Test file compatibility */
   mik->proc = bg_subprocess_create(command, 0, 1, 0);
   test_frame = gavl_audio_frame_create(&mik->track_info.audio_streams[0].format);
 
-  result = read_audio_samples_mikmod(data, test_frame, 0, 1);
-
-  if(result)
+  result = read_func_mikmod(mik, &test_frame);
+  
+  if(result == GAVL_SOURCE_OK)
     {
     bg_subprocess_kill(mik->proc, SIGKILL);
     bg_subprocess_close(mik->proc);
@@ -205,6 +217,9 @@
     }
 
   gavl_audio_frame_destroy(test_frame);
+
+  mik->src = gavl_audio_source_create(read_func_mikmod,
+                                      mik, 0, fmt);
   
   free(command);
 #ifdef dump
@@ -225,6 +240,13 @@
   }
 
 
+static gavl_audio_source_t *
+get_audio_source_mikmod(void * p, int stream)
+  {
+  i_mikmod_t * priv = p;
+  return priv->src;
+  }
+
 static void close_mikmod(void * data)
   {
   i_mikmod_t * e = data;
@@ -235,6 +257,9 @@
     bg_subprocess_close(e->proc);
     e->proc = NULL;
     }
+  if(e->src)
+    gavl_audio_source_destroy(e->src);
+  
   bg_track_info_free(&e->track_info);
   }
 
@@ -253,8 +278,15 @@
       .name =        "output",
       .long_name =   TRS("Output format"),
       .type =        BG_PARAMETER_STRINGLIST,
-      .multi_names = (char const *[]){ "mono8", "stereo8", "mono16", "stereo16", NULL },
-      .multi_labels =  (char const *[]){ TRS("Mono 8bit"), TRS("Stereo 8bit"), TRS("Mono 16bit"), TRS("Stereo 16bit"), NULL },
+      .multi_names = (char const *[]){ "mono8",
+                                       "stereo8",
+                                       "mono16",
+                                       "stereo16",
+                                       NULL },
+      .multi_labels =  (char const *[]){ TRS("Mono 8bit"),
+                                         TRS("Stereo 8bit"),
+                                         TRS("Mono 16bit"),
+                                         TRS("Stereo 16bit"), NULL },
       
       .val_default = { .val_str = "stereo16" },
     },
@@ -329,7 +361,8 @@
     mikmod->use_surround = val->val_i;
   }
 
-static char const * const extensions = "it xm mod mtm  s3m stm ult far med dsm amf imf 669";
+static char const * const extensions =
+  "it xm mod mtm  s3m stm ult far med dsm amf imf 669";
 
 static const char * get_extensions(void * priv)
   {
@@ -356,8 +389,9 @@
     .open =              open_mikmod,
     .get_num_tracks =    get_num_tracks_mikmod,
     .get_track_info =    get_track_info_mikmod,
+
+    .get_audio_source =  get_audio_source_mikmod,
     
-    .read_audio          = read_audio_samples_mikmod,
     .close =              close_mikmod
     
   };

gmerlin-1.2.0.tar.gz/plugins/oss/Makefile.am -> gmerlin-4256.tar.gz/plugins/oss/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/oss/i_oss.c -> gmerlin-4256.tar.gz/plugins/oss/i_oss.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -84,6 +84,8 @@
   char * device;
   int fd;
 
+  gavl_audio_format_t format;
+  
   /* Configuration vairables */
   
   int num_channels;
@@ -92,9 +94,8 @@
 
   /* Runtime variables */
     
-  int bytes_per_frame;
-
-  int64_t samples_read;
+  int block_align;
+  gavl_audio_source_t * src;
   } oss_t;
 
 static const bg_parameter_info_t *
@@ -112,7 +113,7 @@
     return;
   if(!strcmp(name, "device"))
     {
-    priv->device = bg_strdup(priv->device, val->val_str);
+    priv->device = gavl_strrep(priv->device, val->val_str);
     pos = strchr(priv->device, ' '); if(pos) *pos = '\0';
     }
   else if(!strcmp(name, "channel_mode"))
@@ -144,16 +145,37 @@
   return ret;
   }
 
+static int read_samples_oss(void * p, gavl_audio_frame_t * f, int stream, int num_samples)
+  {
+  oss_t * priv = p;
+  return gavl_audio_source_read_samples(priv->src, f, num_samples);
+  }
+
+static gavl_source_status_t read_func_oss(void * p, gavl_audio_frame_t ** frame)
+  {
+  oss_t * priv = p;
+  gavl_audio_frame_t * f = *frame;
+  
+  f->valid_samples = read(priv->fd,
+                          f->samples.s_8,
+                          priv->format.samples_per_frame * priv->block_align);
+
+  if(f->valid_samples <= 0)
+    return GAVL_SOURCE_EOF;
+  f->valid_samples /= priv->block_align;
+  return GAVL_SOURCE_OK;
+  }
+
 static int open_oss(void * data,
                     gavl_audio_format_t * format,
-                    gavl_video_format_t * video_format)
+                    gavl_video_format_t * video_format,
+                    gavl_metadata_t * m)
   {
   gavl_sample_format_t sample_format;
   int test_value;
   oss_t * priv = data;
 
   priv->fd = -1;
-  priv->samples_read = 0;
   
   memset(format, 0, sizeof(*format));
   
@@ -232,7 +254,12 @@
     goto fail;
     }
 
-  priv->bytes_per_frame = priv->bytes_per_sample * priv->num_channels;
+  priv->block_align = priv->bytes_per_sample * priv->num_channels;
+
+  gavl_audio_format_copy(&priv->format, format);
+
+  priv->src = gavl_audio_source_create(read_func_oss, priv, 0, format);
+  
   return 1;
   fail:
   if(priv->fd != -1)
@@ -249,19 +276,18 @@
     close(priv->fd);
     priv->fd = -1;
     }
+  if(priv->src)
+    {
+    gavl_audio_source_destroy(priv->src);
+    priv->src = NULL;
+    }
   }
 
-static int read_frame_oss(void * p, gavl_audio_frame_t * f, int stream, int num_samples)
+
+static gavl_audio_source_t * get_audio_source_oss(void * p)
   {
   oss_t * priv = p;
-  
-  f->valid_samples = read(priv->fd,
-                          f->samples.s_8,
-                          num_samples * priv->bytes_per_frame);
-  f->valid_samples /= priv->bytes_per_frame;
-  f->timestamp = priv->samples_read;
-  priv->samples_read += f->valid_samples;
-  return priv->samples_read;
+  return priv->src;
   }
 
 static void destroy_oss(void * p)
@@ -291,9 +317,10 @@
       .set_parameter =  set_parameter_oss
     },
 
-    .open =          open_oss,
-    .read_audio =    read_frame_oss,
-    .close =         close_oss,
+    .open =             open_oss,
+    .read_audio =       read_samples_oss,
+    .close  =           close_oss,
+    .get_audio_source = get_audio_source_oss,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/oss/oa_oss.c -> gmerlin-4256.tar.gz/plugins/oss/oa_oss.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -116,7 +116,7 @@
 
   int bytes_per_sample;
   gavl_audio_format_t format;
-
+  gavl_audio_sink_t * sink;
   } oss_t;
 
 static void * create_oss()
@@ -133,7 +133,6 @@
   gavl_sample_format_t sample_format;
   gavl_sample_format_t test_format;
   int test_value;
-
   
   /* Open the devices */
   
@@ -302,6 +301,42 @@
   return 0;
   }
 
+static gavl_sink_status_t
+write_func_oss(void * p, gavl_audio_frame_t * f)
+  {
+  oss_t * priv = p;
+  
+  if(write(priv->fd_front, f->channels.s_8[0], f->valid_samples *
+           priv->num_channels_front * priv->bytes_per_sample) < 0)
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write failed: %s",
+           strerror(errno));
+    return GAVL_SINK_ERROR;
+    }
+  if(priv->num_channels_rear)
+    {
+    if(write(priv->fd_rear, f->channels.s_8[2], f->valid_samples *
+             priv->num_channels_rear * priv->bytes_per_sample) < 0)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write failed: %s",
+             strerror(errno));
+      return GAVL_SINK_ERROR;
+      }
+    }
+
+  if(priv->num_channels_center_lfe)
+    {
+    if(write(priv->fd_center_lfe, f->channels.s_8[4], f->valid_samples *
+             priv->num_channels_center_lfe * priv->bytes_per_sample) < 0)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write failed: %s",
+             strerror(errno));
+      return GAVL_SINK_ERROR;
+      }
+    }
+  return GAVL_SINK_OK;
+  }
+
 static int open_oss(void * data, gavl_audio_format_t * format)
   {
   int front_channels = 0;
@@ -412,6 +447,11 @@
       gavl_bytes_per_sample(format->sample_format);
     gavl_audio_format_copy(&priv->format, format);
     }
+
+  priv->sink =
+    gavl_audio_sink_create(NULL, write_func_oss, priv,
+                           format);
+  
   return ret;
   }
 
@@ -438,7 +478,18 @@
 
 static void close_oss(void * p)
   {
-  
+  oss_t * priv = p;
+  if(priv->sink)
+    {
+    gavl_audio_sink_destroy(priv->sink);
+    priv->sink = NULL;
+    }
+  }
+
+static gavl_audio_sink_t * get_sink_oss(void * p)
+  {
+  oss_t * priv = p;
+  return priv->sink;
   }
 
 static int start_oss(void * data)
@@ -452,33 +503,6 @@
     return 1;
   }
 
-static void write_frame_oss(void * p, gavl_audio_frame_t * f)
-  {
-  oss_t * priv = p;
-
-  
-  if(write(priv->fd_front, f->channels.s_8[0], f->valid_samples *
-           priv->num_channels_front * priv->bytes_per_sample) < 0)
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write failed: %s",
-           strerror(errno));
-     
-  if(priv->num_channels_rear)
-    {
-    if(write(priv->fd_rear, f->channels.s_8[2], f->valid_samples *
-             priv->num_channels_rear * priv->bytes_per_sample) < 0)
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write failed: %s",
-             strerror(errno));
-    }
-
-  if(priv->num_channels_center_lfe)
-    {
-    if(write(priv->fd_center_lfe, f->channels.s_8[4], f->valid_samples *
-             priv->num_channels_center_lfe * priv->bytes_per_sample) < 0)
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Write failed: %s",
-             strerror(errno));
-    }
-  }
-
 static void destroy_oss(void * p)
   {
   oss_t * priv = p;
@@ -534,7 +558,7 @@
     }
   else if(!strcmp(name, "device"))
     {
-    priv->device_front = bg_strdup(priv->device_front, val->val_str);
+    priv->device_front = gavl_strrep(priv->device_front, val->val_str);
 
     pos = strchr(priv->device_front, ' '); if(pos) *pos = '\0';
 
@@ -545,7 +569,7 @@
     }
   else if(!strcmp(name, "rear_device"))
     {
-    priv->device_rear = bg_strdup(priv->device_rear, val->val_str);
+    priv->device_rear = gavl_strrep(priv->device_rear, val->val_str);
     pos = strchr(priv->device_rear, ' '); if(pos) *pos = '\0';
     }
   else if(!strcmp(name, "use_center_lfe_device"))
@@ -555,7 +579,7 @@
   else if(!strcmp(name, "center_lfe_device"))
     {
     priv->device_center_lfe =
-      bg_strdup(priv->device_center_lfe, val->val_str);
+      gavl_strrep(priv->device_center_lfe, val->val_str);
     pos = strchr(priv->device_center_lfe, ' '); if(pos) *pos = '\0';
     }
   }
@@ -578,8 +602,8 @@
     },
 
     .open =          open_oss,
+    .get_sink =      get_sink_oss,
     .start =         start_oss,
-    .write_audio =   write_frame_oss,
     .stop =          stop_oss,
     .close =         close_oss,
     .get_delay =     get_delay_oss,

gmerlin-1.2.0.tar.gz/plugins/oss/oss_common.c -> gmerlin-4256.tar.gz/plugins/oss/oss_common.c Changed

gmerlin-1.2.0.tar.gz/plugins/oss/oss_common.h -> gmerlin-4256.tar.gz/plugins/oss/oss_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/png/Makefile.am -> gmerlin-4256.tar.gz/plugins/png/Makefile.am Changed

gmerlin-4256.tar.gz/plugins/png/c_pngenc.c Added

@@ -0,0 +1,230 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "pngwriter"
+
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gavl/metatags.h>
+#include <gavl/gavf.h>
+
+#include "pngwriter.h"
+
+typedef struct
+  {
+  bg_pngwriter_t png;
+  gavl_packet_sink_t * psink;
+  gavl_video_sink_t * vsink;
+  gavl_video_format_t fmt;
+  int have_header;
+  gavl_packet_t p;
+
+  int overlay;
+  
+  gavl_video_frame_t * frame;
+  
+  } stream_codec_t;
+
+static void * create_codec()
+  {
+  stream_codec_t * ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+static void destroy_codec(void * priv)
+  {
+  stream_codec_t * c = priv;
+  if(c->frame)
+    {
+    gavl_video_frame_null(c->frame);
+    gavl_video_frame_destroy(c->frame);
+    }
+  free(c);
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name =        "compression",
+      .long_name =   TRS("Compression level"),
+      .type =        BG_PARAMETER_SLIDER_INT,
+      .val_min =     { .val_i = 0 },
+      .val_max =     { .val_i = 9 },
+      .val_default = { .val_i = 9 },
+    },
+    {
+      .name =        "bit_mode",
+      .long_name =   TRS("Bits per channel"),
+      .type =        BG_PARAMETER_STRINGLIST,
+      .multi_names = (char const *[]){ "Auto", "8", "16" },
+      .val_default = { .val_str = "8" },
+      .help_string = TRS("If you select auto, the depth will be chosen according to the input format")
+    },
+    { /* End of parameters */ }
+  };
+
+static const bg_parameter_info_t * get_parameters(void * priv)
+  {
+  return parameters;
+  }
+
+static void set_parameter(void * priv, const char * name,
+                          const bg_parameter_value_t * val)
+  {
+  stream_codec_t * c = priv;
+  bg_pngwriter_set_parameter(&c->png, name, val);
+  }
+
+static gavl_sink_status_t put_frame(void * priv,
+                                    gavl_video_frame_t * f)
+  {
+  gavl_video_frame_t * write_frame;
+  gavl_video_format_t fmt;
+  stream_codec_t * c = priv;
+  
+  gavl_packet_reset(&c->p);
+
+  gavl_video_format_copy(&fmt, &c->fmt);
+  
+  if(c->overlay)
+    {
+    /* Take a subframe */
+    gavl_video_frame_get_subframe(fmt.pixelformat,
+                                  f, c->frame,
+                                  &f->src_rect);
+    fmt.image_width = f->src_rect.w;
+    fmt.image_height = f->src_rect.h;
+    write_frame = c->frame;
+    }
+  else
+    {
+    /* Take the whole frame */
+    write_frame = f;
+    }
+  
+  if(!bg_pngwriter_write_header(&c->png, NULL,
+                                &c->p,
+                                &fmt,
+                                NULL))
+    return GAVL_SINK_ERROR;
+  
+  bg_pngwriter_write_image(&c->png, write_frame);
+  gavf_video_frame_to_packet_metadata(f, &c->p);
+
+  if(c->overlay)
+    {
+    memset(&c->p.src_rect, 0, sizeof(c->p.src_rect));
+    c->p.dst_x = f->dst_x;
+    c->p.dst_y = f->dst_y;
+    }
+  
+  c->have_header = 0;
+  c->p.flags |= GAVL_PACKET_KEYFRAME;
+  return gavl_packet_sink_put_packet(c->psink, &c->p);
+  }
+
+static gavl_video_sink_t * open_video(void * priv,
+                                      gavl_compression_info_t * ci,
+                                      gavl_video_format_t * fmt,
+                                      gavl_metadata_t * m)
+  {
+  stream_codec_t * c = priv;
+  gavl_packet_reset(&c->p);
+  
+  bg_pngwriter_adjust_format(&c->png, fmt);
+  gavl_video_format_copy(&c->fmt, fmt);
+  
+  gavl_metadata_set(m, GAVL_META_SOFTWARE, "libpng-" PNG_LIBPNG_VER_STRING);
+  c->vsink = gavl_video_sink_create(NULL, put_frame, c, &c->fmt);
+
+  ci->id = GAVL_CODEC_ID_PNG;
+
+  return c->vsink;
+  }
+
+static gavl_video_sink_t * open_overlay(void * priv,
+                                        gavl_compression_info_t * ci,
+                                        gavl_video_format_t * fmt,
+                                        gavl_metadata_t * m)
+  {
+  stream_codec_t * c = priv;
+  gavl_video_sink_t * ret;
+
+  if(fmt->pixelformat == GAVL_PIXELFORMAT_NONE)
+    fmt->pixelformat = GAVL_RGBA_32;
+  
+  ret = open_video(priv, ci, fmt, m);
+  c->overlay = 1;
+  c->frame = gavl_video_frame_create(NULL);
+  return ret;
+  }
+
+static void set_packet_sink(void * priv, gavl_packet_sink_t * s)
+  {
+  stream_codec_t * c = priv;
+  c->psink = s;
+  }
+
+gavl_codec_id_t compressions[] =
+  {
+    GAVL_CODEC_ID_PNG,
+    GAVL_CODEC_ID_NONE
+  };
+
+static const gavl_codec_id_t * get_compressions(void * priv)
+  {
+  return compressions;
+  }
+
+
+const bg_codec_plugin_t the_plugin =
+  {
+    .common =
+    {
+      BG_LOCALE,
+      .name =            "c_pngenc",       /* Unique short name */
+      .long_name =       "PNG",
+      .description =     "libpng based encoder",
+      .type =            BG_PLUGIN_CODEC,
+      .flags =           BG_PLUGIN_VIDEO_COMPRESSOR | BG_PLUGIN_OVERLAY_COMPRESSOR,
+      .priority =        5,
+      .create =          create_codec,
+      .destroy =         destroy_codec,
+      .get_parameters =    get_parameters,
+      .set_parameter =     set_parameter,
+    },
+    .open_encode_video = open_video,
+    .open_encode_overlay = open_overlay,
+    .set_packet_sink = set_packet_sink,
+    .get_compressions = get_compressions,
+  };
+/* Include this into all plugin modules exactly once
+   to let the plugin loader obtain the API version */
+BG_GET_PLUGIN_API_VERSION;

gmerlin-1.2.0.tar.gz/plugins/png/e_spumux.c -> gmerlin-4256.tar.gz/plugins/png/e_spumux.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,7 +29,6 @@
 #include <gmerlin/pluginfuncs.h>
 #include <gmerlin/utils.h>
 
-#include <png.h>
 
 #include "pngwriter.h"
 
@@ -49,7 +48,8 @@
   gavl_metadata_t metadata;
 
   bg_encoder_callbacks_t * cb;
-  
+
+  gavl_video_sink_t * sink;
   } spumux_t;
 
 static void * create_spumux()
@@ -69,7 +69,7 @@
 
 static int open_spumux(void * priv, const char * filename,
                        const gavl_metadata_t * metadata,
-                       const bg_chapter_list_t * chapter_list)
+                       const gavl_chapter_list_t * chapter_list)
   {
   char * pos;
   spumux_t * spumux = priv;
@@ -82,12 +82,12 @@
   if(!bg_encoder_cb_create_output_file(spumux->cb, spumux->filename))
     return 0;
   
-  spumux->filename_template = bg_strdup(spumux->filename_template, filename);
+  spumux->filename_template = gavl_strrep(spumux->filename_template, filename);
 
   pos = strrchr(spumux->filename_template, '.');
   if(pos) *pos = '\0';
 
-  spumux->filename_template = bg_strcat(spumux->filename_template, "_%05d.png");
+  spumux->filename_template = gavl_strcat(spumux->filename_template, "_%05d.png");
   
   spumux->xml_file = fopen(spumux->filename, "w");
 
@@ -108,18 +108,6 @@
   return 1;
   }
 
-static int start_spumux(void * priv)
-  {
-  return 1;
-  }
-
-static void get_subtitle_overlay_format_spumux(void * priv, int stream,
-                                               gavl_video_format_t*ret)
-  {
-  spumux_t * spumux = priv;
-  gavl_video_format_copy(ret, (&spumux->format));
-  }
-
 static void print_time(FILE * out, gavl_time_t time, gavl_video_format_t * format)
   {
   int h, m, s, f;
@@ -134,49 +122,63 @@
   fprintf(out, "%02d:%02d:%02d.%02d", h, m, s, f);
   }
 
-static int write_subtitle_overlay_spumux(void * priv, gavl_overlay_t * ovl, int stream)
+static gavl_sink_status_t
+write_subtitle_overlay_spumux(void * priv, gavl_overlay_t * ovl)
   {
   char * image_filename;
   spumux_t * spumux = priv;
   gavl_video_format_t tmp_format;
   gavl_video_format_copy(&tmp_format, (&spumux->format));
 
-  tmp_format.image_width  = ovl->ovl_rect.w;
-  tmp_format.image_height = ovl->ovl_rect.h;
+  tmp_format.image_width  = ovl->src_rect.w;
+  tmp_format.image_height = ovl->src_rect.h;
   tmp_format.frame_width  = tmp_format.image_width;
   tmp_format.frame_height = tmp_format.image_height;
   
-  gavl_video_frame_get_subframe(spumux->format.pixelformat, ovl->frame, spumux->subframe, &ovl->ovl_rect);
+  gavl_video_frame_get_subframe(spumux->format.pixelformat, ovl, spumux->subframe, &ovl->src_rect);
 
   image_filename = bg_sprintf(spumux->filename_template, spumux->subtitles_written);
 
   if(!bg_encoder_cb_create_output_file(spumux->cb, image_filename))
     {
     free(image_filename);
-    return 0;
+    return GAVL_SINK_ERROR;
     }
   
-  if(!bg_pngwriter_write_header(priv, image_filename,
+  if(!bg_pngwriter_write_header(priv, image_filename, NULL,
                                 &tmp_format, &spumux->metadata))
-    return 0;
+    return GAVL_SINK_ERROR;
   
   if(!bg_pngwriter_write_image(priv, spumux->subframe))
-    return 0;
+    return GAVL_SINK_ERROR;
   
   fprintf(spumux->xml_file, "    <spu start=\"");
-  print_time(spumux->xml_file, ovl->frame->timestamp, &spumux->format);
+  print_time(spumux->xml_file, ovl->timestamp, &spumux->format);
 
   fprintf(spumux->xml_file, "\" end=\"");
-  print_time(spumux->xml_file, ovl->frame->timestamp+ovl->frame->duration, &spumux->format);
+  print_time(spumux->xml_file, ovl->timestamp+ovl->duration, &spumux->format);
   fprintf(spumux->xml_file, "\" xoffset=\"%d\" yoffset=\"%d\" image=\"%s\"/>\n", ovl->dst_x, ovl->dst_y,
           image_filename);
   
   free(image_filename);
     
   spumux->subtitles_written++;
+  return GAVL_SINK_OK;
+  }
+
+static int start_spumux(void * priv)
+  {
+  spumux_t * spumux = priv;
+  spumux->sink = gavl_video_sink_create(NULL, write_subtitle_overlay_spumux, spumux, &spumux->format);
   return 1;
   }
 
+static gavl_video_sink_t * get_sink_spumux(void * priv, int stream)
+  {
+  spumux_t * spumux = priv;
+  return spumux->sink;
+  }
+
 static int close_spumux(void * priv, int do_delete)
   {
   int i;
@@ -197,6 +199,12 @@
       }
     remove(spumux->filename);
     }
+
+  if(spumux->sink)
+    {
+    gavl_video_sink_destroy(spumux->sink);
+    spumux->sink = NULL;
+    }
   return 1;
   }
 
@@ -246,7 +254,7 @@
       .long_name =      TRS("spumux overlay exporter"),
       .description =    TRS("Exports overlay subtitles into the format used by spumux\
  (http://dvdauthor.sourceforge.net)"),
-      .type =           BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY,
+      .type =           BG_PLUGIN_ENCODER_OVERLAY,
       .flags =          BG_PLUGIN_FILE,
       .priority =       BG_PLUGIN_PRIORITY_MAX,
       .create =         create_spumux,
@@ -256,19 +264,21 @@
       //   get_error:      get_error_spumux,
     },
 
-    .max_subtitle_overlay_streams = 1,
+    .max_overlay_streams = 1,
     
     .set_callbacks =        set_callbacks_spumux,
     
     .open =                 open_spumux,
 
-    .add_subtitle_overlay_stream =     add_subtitle_overlay_stream_spumux,
+    .add_overlay_stream =     add_subtitle_overlay_stream_spumux,
     
     .start =                start_spumux,
 
-    .get_subtitle_overlay_format = get_subtitle_overlay_format_spumux,
+    .get_overlay_sink = get_sink_spumux,
+    
+    // .get_subtitle_overlay_format = get_subtitle_overlay_format_spumux,
     
-    .write_subtitle_overlay = write_subtitle_overlay_spumux,
+    // .write_subtitle_overlay = write_subtitle_overlay_spumux,
     .close =             close_spumux,
   };

gmerlin-1.2.0.tar.gz/plugins/png/ir_png.c -> gmerlin-4256.tar.gz/plugins/png/ir_png.c Changed

gmerlin-1.2.0.tar.gz/plugins/png/iw_png.c -> gmerlin-4256.tar.gz/plugins/png/iw_png.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,7 +29,6 @@
 #include <gmerlin/pluginfuncs.h>
 #include <gmerlin/utils.h>
 
-#include <png.h>
 
 #include "pngwriter.h"
 
@@ -71,7 +70,7 @@
   png_t * png = priv;
   
   if(png->writer.dont_force_extension)
-    real_filename = bg_strdup(NULL, filename);
+    real_filename = gavl_strdup(filename);
   else
     real_filename = bg_filename_ensure_extension(filename, "png");
   
@@ -81,6 +80,7 @@
     return 0;
     }
   ret = bg_pngwriter_write_header(&png->writer, real_filename,
+                                  NULL,
                                   format, metadata);
   
   free(real_filename);
@@ -139,6 +139,7 @@
       .set_parameter =  bg_pngwriter_set_parameter
     },
     .extensions = "png",
+    .mimetypes = "image/png",
     .set_callbacks = set_callbacks_png,
     .write_header =  write_header_png,
     .write_image =   bg_pngwriter_write_image,

gmerlin-1.2.0.tar.gz/plugins/png/pngwriter.c -> gmerlin-4256.tar.gz/plugins/png/pngwriter.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,36 +34,29 @@
 #include <gmerlin/utils.h>
 #include <gavl/metatags.h>
 
-#include <png.h>
-
 
 #include "pngwriter.h"
 
-int bg_pngwriter_write_header(void * priv, const char * filename,
-                              gavl_video_format_t * format,
-                              const gavl_metadata_t * metadata)
+static void
+write_function(png_structp png_ptr, png_bytep data, png_size_t length)
   {
-  int color_type;
-  int bits = 8;
-  int j;
-  bg_pngwriter_t * png = priv;
+  bg_pngwriter_t * png = png_get_io_ptr(png_ptr);
 
-  png->transform_flags = PNG_TRANSFORM_IDENTITY;
-  
-  png->output = fopen(filename, "wb");
-  if(!png->output)
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s: %s",
-           filename, strerror(errno));
-    return 0;
-    }
-  png->png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
-                                         NULL, NULL);
+  gavl_packet_alloc(png->p, png->p->data_len + length);
+  memcpy(png->p->data + png->p->data_len, data, length);
+  png->p->data_len += length;
+  }
 
-  png->info_ptr = png_create_info_struct(png->png_ptr);
-  setjmp(png_jmpbuf(png->png_ptr));
-  png_init_io(png->png_ptr, png->output);
+static void
+flush_function(png_structp png_ptr)
+  {
+  
+  }
 
+void bg_pngwriter_adjust_format(bg_pngwriter_t * png,
+                                gavl_video_format_t * format)
+  {
+  png->bits = 8;
   switch(png->bit_mode)
     {
     case BITS_AUTO:
@@ -71,21 +64,21 @@
       if(gavl_pixelformat_is_planar(format->pixelformat))
         {
         if(gavl_pixelformat_bytes_per_component(format->pixelformat) > 1)
-          bits = 16;
+          png->bits = 16;
         }
-      else if(gavl_pixelformat_bytes_per_pixel(format->pixelformat) > 4)
-        bits = 16;
+      else if(gavl_pixelformat_bytes_per_pixel(format->pixelformat) >
+              gavl_pixelformat_num_channels(format->pixelformat))
+        png->bits = 16;
       break;
     case BITS_8:
-      bits = 8;
+      png->bits = 8;
       break;
     case BITS_16:
-      bits = 16;
+      png->bits = 16;
       break;
-      
     }
 #ifndef WORDS_BIGENDIAN
-  if(bits > 8)
+  if(png->bits > 8)
     png->transform_flags |= PNG_TRANSFORM_SWAP_ENDIAN;
 #endif
 
@@ -93,16 +86,16 @@
     {
     if(gavl_pixelformat_has_alpha(format->pixelformat))
       {
-      color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-      if(bits == 8)
+      png->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+      if(png->bits == 8)
         format->pixelformat = GAVL_GRAYA_16;
       else
         format->pixelformat = GAVL_GRAYA_32;
       }
     else
       {
-      color_type = PNG_COLOR_TYPE_GRAY;
-      if(bits == 8)
+      png->color_type = PNG_COLOR_TYPE_GRAY;
+      if(png->bits == 8)
         format->pixelformat = GAVL_GRAY_8;
       else
         format->pixelformat = GAVL_GRAY_16;
@@ -112,27 +105,76 @@
     {
     if(gavl_pixelformat_has_alpha(format->pixelformat))
       {
-      color_type = PNG_COLOR_TYPE_RGBA;
-      if(bits == 8)
+      png->color_type = PNG_COLOR_TYPE_RGBA;
+      if(png->bits == 8)
         format->pixelformat = GAVL_RGBA_32;
       else
         format->pixelformat = GAVL_RGBA_64;
       }
     else
       {
-      color_type = PNG_COLOR_TYPE_RGB;
-      if(bits == 8)
+      png->color_type = PNG_COLOR_TYPE_RGB;
+      if(png->bits == 8)
         format->pixelformat = GAVL_RGB_24;
       else
         format->pixelformat = GAVL_RGB_48;
       }
     }
+  png->have_format = 1;
+  }
+
+int bg_pngwriter_write_header(void * priv,
+                              const char * filename,
+                              gavl_packet_t * p,
+                              gavl_video_format_t * format,
+                              const gavl_metadata_t * metadata)
+  {
+  int j;
+  bg_pngwriter_t * png = priv;
+  
+  png->transform_flags = PNG_TRANSFORM_IDENTITY;
+
+  if(filename)
+    {
+    png->output = fopen(filename, "wb");
+    if(!png->output)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s: %s",
+             filename, strerror(errno));
+      return 0;
+      }
+    }
+  else if(p)
+    png->p = p;
+  else
+    return 0; // Should never happen
+  
+  png->png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+                                         NULL, NULL);
+
+  png->info_ptr = png_create_info_struct(png->png_ptr);
+  setjmp(png_jmpbuf(png->png_ptr));
+
+  if(filename)
+    png_init_io(png->png_ptr, png->output);
+  else
+    {
+    png_set_write_fn(png->png_ptr,
+                     png, 
+                     write_function,
+                     flush_function);
+    }
+
+  /* */
+
+  if(!png->have_format)
+    bg_pngwriter_adjust_format(png, format);
   
   png_set_compression_level(png->png_ptr, png->compression_level);
   png_set_IHDR(png->png_ptr, png->info_ptr,
                format->image_width,
                format->image_height,
-               bits, color_type, PNG_INTERLACE_NONE,
+               png->bits, png->color_type, PNG_INTERLACE_NONE,
                PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
   
   gavl_video_format_copy(&png->format, format);
@@ -150,15 +192,15 @@
     png->text[j].compression = PNG_TEXT_COMPRESSION_NONE;
 
     if(!strcmp(metadata->tags[j].key, GAVL_META_AUTHOR))
-      png->text[j].key         = bg_strdup(png->text[j].key, "Author");
+      png->text[j].key         = gavl_strrep(png->text[j].key, "Author");
     else if(!strcmp(metadata->tags[j].key, GAVL_META_TITLE))
-      png->text[j].key         = bg_strdup(png->text[j].key, "Title");
+      png->text[j].key         = gavl_strrep(png->text[j].key, "Title");
     else if(!strcmp(metadata->tags[j].key, GAVL_META_COPYRIGHT))
-      png->text[j].key         = bg_strdup(png->text[j].key, "Copyright");
+      png->text[j].key         = gavl_strrep(png->text[j].key, "Copyright");
     else
-      png->text[j].key         = bg_strdup(png->text[j].key, metadata->tags[j].key);
+      png->text[j].key = gavl_strrep(png->text[j].key, metadata->tags[j].key);
     
-    png->text[j].text        = bg_strdup(png->text[j].text, metadata->tags[j].val);
+    png->text[j].text = gavl_strrep(png->text[j].text, metadata->tags[j].val);
     }
   
   png_set_text(png->png_ptr, png->info_ptr, png->text, png->num_text);
@@ -180,7 +222,9 @@
   png_write_png(png->png_ptr, png->info_ptr, png->transform_flags, NULL);
  
   png_destroy_write_struct(&png->png_ptr, &png->info_ptr);
-  fclose(png->output);
+
+  if(png->output)
+    fclose(png->output);
   free(rows);
 
   if(png->num_text)

gmerlin-1.2.0.tar.gz/plugins/png/pngwriter.h -> gmerlin-4256.tar.gz/plugins/png/pngwriter.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -19,6 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * *****************************************************************/
 
+#include <png.h>
+
 #define BITS_AUTO  0
 #define BITS_8     8
 #define BITS_16   16
@@ -36,10 +38,21 @@
   png_text * text;
   int num_text;
   int dont_force_extension;
+
+  int color_type;
+  int have_format;
+  int bits;
+  
+  gavl_packet_t * p;
   
   } bg_pngwriter_t;
 
+void bg_pngwriter_adjust_format(bg_pngwriter_t * png,
+                               gavl_video_format_t * format);
+
+
 int bg_pngwriter_write_header(void * priv, const char * filename,
+                              gavl_packet_t * p,
                               gavl_video_format_t * format,
                               const gavl_metadata_t * metadata);

gmerlin-1.2.0.tar.gz/plugins/postprocessors/Makefile.am -> gmerlin-4256.tar.gz/plugins/postprocessors/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/postprocessors/cdrdao_common.c -> gmerlin-4256.tar.gz/plugins/postprocessors/cdrdao_common.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -72,9 +72,9 @@
   if(!strcmp(name, "cdrdao_run"))
     c->run = val->val_i;
   else if(!strcmp(name, "cdrdao_device"))
-    c->device = bg_strdup(c->device, val->val_str);
+    c->device = gavl_strrep(c->device, val->val_str);
   else if(!strcmp(name, "cdrdao_driver"))
-    c->driver = bg_strdup(c->driver, val->val_str);
+    c->driver = gavl_strrep(c->driver, val->val_str);
   else if(!strcmp(name, "cdrdao_eject"))
     c->eject = val->val_i;
   else if(!strcmp(name, "cdrdao_simulate"))
@@ -116,44 +116,44 @@
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "cdrdao executable not found");
     return 0;
     }
-  commandline = bg_strcat(commandline, " write");
+  commandline = gavl_strcat(commandline, " write");
   
   /* Device */
   if(c->device)
     {
     str = bg_sprintf(" --device %s", c->device);
-    commandline = bg_strcat(commandline, str);
+    commandline = gavl_strcat(commandline, str);
     free(str);
     }
   /* Driver */
   if(c->driver)
     {
     str = bg_sprintf(" --driver %s", c->driver);
-    commandline = bg_strcat(commandline, str);
+    commandline = gavl_strcat(commandline, str);
     free(str);
     }
   /* Eject */
   if(c->eject)
-    commandline = bg_strcat(commandline, " --eject");
+    commandline = gavl_strcat(commandline, " --eject");
   /* Skip pause */
   if(c->nopause)
-    commandline = bg_strcat(commandline, " -n");
+    commandline = gavl_strcat(commandline, " -n");
 
   /* Simulate */
   if(c->simulate)
-    commandline = bg_strcat(commandline, " --simulate");
+    commandline = gavl_strcat(commandline, " --simulate");
 
   /* Speed */
   if(c->speed > 0)
     {
     str = bg_sprintf(" --speed %d", c->speed);
-    commandline = bg_strcat(commandline, str);
+    commandline = gavl_strcat(commandline, str);
     free(str);
     }
   
   /* TOC-File and stderr redirection */
   str = bg_sprintf(" \"%s\"", toc_file);
-  commandline = bg_strcat(commandline, str);
+  commandline = gavl_strcat(commandline, str);
   free(str);
   
   if(check_stop(c))

gmerlin-1.2.0.tar.gz/plugins/postprocessors/cdrdao_common.h -> gmerlin-4256.tar.gz/plugins/postprocessors/cdrdao_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/postprocessors/e_pp_cdrdao.c -> gmerlin-4256.tar.gz/plugins/postprocessors/e_pp_cdrdao.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -135,7 +135,7 @@
   else if(!strcmp(name, "pre_gap"))
     cdrdao->pregap = v->val_i;
   else if(!strcmp(name, "toc_file"))
-    cdrdao->toc_file = bg_strdup(cdrdao->toc_file, v->val_str);
+    cdrdao->toc_file = gavl_strrep(cdrdao->toc_file, v->val_str);
   else
     bg_cdrdao_set_parameter(cdrdao->cdr, name, v);
   }
@@ -252,7 +252,7 @@
 
   gavl_metadata_copy(&cdrdao->tracks[cdrdao->num_tracks].metadata,
                    metadata);
-  cdrdao->tracks[cdrdao->num_tracks].filename = bg_strdup(NULL, filename);
+  cdrdao->tracks[cdrdao->num_tracks].filename = gavl_strdup(filename);
   cdrdao->tracks[cdrdao->num_tracks].pp_only = pp_only;
   
   if(cdrdao->pregap > 0)

gmerlin-1.2.0.tar.gz/plugins/postprocessors/e_pp_vcdimager.c -> gmerlin-4256.tar.gz/plugins/postprocessors/e_pp_vcdimager.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -146,7 +146,7 @@
   return parameters;
   }
 
-#define SET_STR(key) if(!strcmp(name, # key)) { vcd->key = bg_strdup(vcd->key, v->val_str); return; }
+#define SET_STR(key) if(!strcmp(name, # key)) { vcd->key = gavl_strrep(vcd->key, v->val_str); return; }
 
 static void set_parameter_vcdimager(void * data, const char * name, const bg_parameter_value_t * v)
   {
@@ -193,7 +193,7 @@
   vcdimager = data;
   vcdimager->files = realloc(vcdimager->files,
                              sizeof(*(vcdimager->files)) * (vcdimager->num_files+1));
-  vcdimager->files[vcdimager->num_files].name = bg_strdup(NULL, filename);
+  vcdimager->files[vcdimager->num_files].name = gavl_strdup(filename);
   vcdimager->files[vcdimager->num_files].pp_only = pp_only;
   vcdimager->num_files++;
   }
@@ -293,20 +293,20 @@
     
   str = bg_sprintf("vcdxgen -o %s -t %s --iso-application-id=%s-%s",
                    xml_file, vcdimager->vcd_version, PACKAGE, VERSION);
-  commandline = bg_strcat(commandline, str);
+  commandline = gavl_strcat(commandline, str);
   free(str);
 
   if(vcdimager->volume_label)
     {
     str = bg_sprintf(" -l \"%s\"", vcdimager->volume_label);
-    commandline = bg_strcat(commandline, str);
+    commandline = gavl_strcat(commandline, str);
     free(str);
     }
 
   for(i = 0; i < vcdimager->num_files; i++)
     {
     str = bg_sprintf(" \"%s\"", vcdimager->files[i].name);
-    commandline = bg_strcat(commandline, str);
+    commandline = gavl_strcat(commandline, str);
     free(str);
     }
   
@@ -342,7 +342,7 @@
                    cue_file,
                    bin_file,
                    directory, vcdimager->xml_file);
-  commandline = bg_strcat(commandline, str);
+  commandline = gavl_strcat(commandline, str);
   free(str);
 
   proc = bg_subprocess_create(commandline, 0, 1, 0);

gmerlin-1.2.0.tar.gz/plugins/pulseaudio/Makefile.am -> gmerlin-4256.tar.gz/plugins/pulseaudio/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/pulseaudio/i_pulse.c -> gmerlin-4256.tar.gz/plugins/pulseaudio/i_pulse.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -24,9 +24,35 @@
 
 #include <gmerlin/utils.h>
 
+static gavl_source_status_t read_func_pulse(void * p, gavl_audio_frame_t ** frame)
+  {
+  bg_pa_t * priv;
+  int error = 0;
+
+  gavl_audio_frame_t * f = *frame;
+  
+  priv = p;
+  if(pa_simple_read(priv->pa, f->samples.u_8,
+                    priv->block_align * priv->format.samples_per_frame,
+                    &error) < 0)
+    {
+    return GAVL_SOURCE_EOF;
+    }
+  f->valid_samples = priv->format.samples_per_frame;
+  return GAVL_SOURCE_OK;
+  }
+
+static int read_samples_pulse(void * p, gavl_audio_frame_t * f, int stream,
+                              int num_samples)
+  {
+  bg_pa_t * priv = p;
+  return gavl_audio_source_read_samples(priv->src, f, num_samples);
+  }
+
 static int open_pulse(void * data,
                       gavl_audio_format_t * format,
-                      gavl_video_format_t * video_format)
+                      gavl_video_format_t * video_format,
+                      gavl_metadata_t * m)
   {
   bg_pa_t * priv;
   priv = data;
@@ -34,33 +60,26 @@
   // gavl_audio_format_copy(&priv->format, format);
   
   if(!bg_pa_open(priv, 1))
-    {
     return 0;
-    }
+  
   gavl_audio_format_copy(format, &priv->format);
-  priv->sample_count = 0;
+  priv->src = gavl_audio_source_create(read_func_pulse, priv, 0, format);
   return 1;
   }
 
 static void close_pulse(void * p)
   {
-  bg_pa_close(p);
+  bg_pa_t * priv = p;
+  gavl_audio_source_destroy(priv->src);
+  priv->src = NULL;
+  
+  bg_pa_close(priv);
   }
 
-static int read_frame_pulse(void * p, gavl_audio_frame_t * f,
-                            int stream,
-                            int num_samples)
+static gavl_audio_source_t * get_audio_source_pulse(void * p)
   {
-  bg_pa_t * priv;
-  int error = 0;
-  priv = p;
-  pa_simple_read(priv->pa, f->samples.u_8,
-                 priv->block_align * num_samples,
-                 &error);
-  f->valid_samples = num_samples;
-  f->timestamp = priv->sample_count;
-  priv->sample_count += num_samples;
-  return num_samples;
+  bg_pa_t * priv = p;
+  return priv->src;
   }
 
 static const bg_parameter_info_t parameters[] =
@@ -137,11 +156,11 @@
     }
   else if(!strcmp(name, "dev"))
     {
-    priv->dev = bg_strdup(priv->dev, val->val_str);
+    priv->dev = gavl_strrep(priv->dev, val->val_str);
     }
   else if(!strcmp(name, "server"))
     {
-    priv->server = bg_strdup(priv->server, val->val_str);
+    priv->server = gavl_strrep(priv->server, val->val_str);
     }
   }
 
@@ -165,7 +184,9 @@
     },
     
     .open =          open_pulse,
-    .read_audio =    read_frame_pulse,
+    .read_audio =    read_samples_pulse,
+    .get_audio_source = get_audio_source_pulse,
+
     .close =         close_pulse,
   };
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/pulseaudio/oa_pulse.c -> gmerlin-4256.tar.gz/plugins/pulseaudio/oa_pulse.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -23,6 +23,20 @@
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "oa_pulse"
 
+static gavl_sink_status_t
+write_func_pulse(void * p, gavl_audio_frame_t * f)
+  {
+  bg_pa_t * priv;
+  int error;
+  priv = p;
+  pa_simple_write(priv->pa,
+                  f->samples.u_8,
+                  priv->block_align * f->valid_samples,
+                  &error);
+  return GAVL_SINK_OK;
+  }
+
+
 static int open_pulse(void * data,
                       gavl_audio_format_t * format)
   {
@@ -32,11 +46,13 @@
   gavl_audio_format_copy(&priv->format, format);
   
   if(!bg_pa_open(priv, 0))
-    {
     return 0;
-    }
+  
   gavl_audio_format_copy(format, &priv->format);
-  priv->sample_count = 0;
+
+  priv->sink = gavl_audio_sink_create(NULL, write_func_pulse, priv,
+                                      &priv->format);
+  
   return 1;
   }
 
@@ -55,15 +71,10 @@
   bg_pa_close(p);
   }
 
-static void write_frame_pulse(void * p, gavl_audio_frame_t * f)
+static gavl_audio_sink_t * get_sink_pulse(void * p)
   {
-  bg_pa_t * priv;
-  int error;
-  priv = p;
-  pa_simple_write(priv->pa,
-                  f->samples.u_8,
-                  priv->block_align * f->valid_samples,
-                  &error);
+  bg_pa_t * priv = p;
+  return priv->sink;
   }
 
 static int get_delay_pulse(void * p)
@@ -96,8 +107,8 @@
     },
 
     .open =          open_pulse,
+    .get_sink =      get_sink_pulse,
     .start =         start_pulse,
-    .write_audio =   write_frame_pulse,
     .stop =          stop_pulse,
     .close =         close_pulse,
     .get_delay =     get_delay_pulse,

gmerlin-1.2.0.tar.gz/plugins/pulseaudio/pulseaudio_common.c -> gmerlin-4256.tar.gz/plugins/pulseaudio/pulseaudio_common.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -88,6 +88,8 @@
   {
   struct pa_sample_spec ss;
   pa_channel_map map;
+  //  pa_buffer_attr attr;
+  
   int error;
   char * app_name, *stream_name;
 
@@ -158,6 +160,10 @@
   
   init_channel_map(&p->format, &map);
 
+  //  memset(&attr, 0, sizeof(attr));
+  //  attr.fragsize  = -1; // Let server choose
+  //  attr.maxlength = -1; // Let server choose
+  
   app_name = bg_sprintf("Gmerlin [%d]", getpid());
 
   if(record)
@@ -174,12 +180,13 @@
                         stream_name,
                         &ss,
                         &map,
-                        NULL,
+                        NULL, // &attr,
                         &error);
 
   free(app_name);
   free(stream_name);
-  
+
+  // fprintf(stderr, "Fragement size: %d, maxlength: %d\n", attr.fragsize, attr.maxlength);  
 
   if(!p->pa)
     {
@@ -202,6 +209,16 @@
     pa_simple_free(priv->pa);
     priv->pa = NULL;
     }
+  if(priv->src)
+    {
+    gavl_audio_source_destroy(priv->src);
+    priv->src = NULL;
+    }
+  if(priv->sink)
+    {
+    gavl_audio_sink_destroy(priv->sink);
+    priv->sink = NULL;
+    }
   }
 
 
@@ -216,7 +233,12 @@
   {
   bg_pa_t * priv;
   priv = p;
-  if(priv->server) free(priv->server);
-  if(priv->dev) free(priv->dev);
+
+  bg_pa_close(p);
+  
+  if(priv->server)
+    free(priv->server);
+  if(priv->dev)
+    free(priv->dev);
   free(priv);
   }

gmerlin-1.2.0.tar.gz/plugins/pulseaudio/pulseaudio_common.h -> gmerlin-4256.tar.gz/plugins/pulseaudio/pulseaudio_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/subwriters/Makefile.am -> gmerlin-4256.tar.gz/plugins/subwriters/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/subwriters/e_subtext.c -> gmerlin-4256.tar.gz/plugins/subwriters/e_subtext.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -47,6 +47,8 @@
   
   bg_encoder_callbacks_t * cb;
 
+  gavl_packet_sink_t * sink;
+  
   } subtext_t;
 
 static void write_time_srt(FILE * output, gavl_time_t time)
@@ -64,13 +66,12 @@
   fprintf(output, "%02d:%02d:%02d,%03d", h, m, sec, msec);
   }
 
-static void write_subtitle_srt(subtext_t * s, const char * text,
-                               gavl_time_t time, gavl_time_t duration)
+static void write_subtitle_srt(subtext_t * s, gavl_packet_t * p)
   {
   int i;
   char ** lines;
 
-  if(!text || (*text == '\0'))
+  if(!p->data_len)
     {
     bg_log(BG_LOG_WARNING, LOG_DOMAIN, "Ignoring empty subtitle");
     return;
@@ -81,12 +82,12 @@
   fprintf(s->output, "%d\r\n", s->titles_written + 1);
   
   /* Time */
-  write_time_srt(s->output, time);
+  write_time_srt(s->output, p->pts);
   fprintf(s->output, " --> ");
-  write_time_srt(s->output, time+duration);
+  write_time_srt(s->output, p->pts+p->duration);
   fprintf(s->output, "\r\n");
   
-  lines = bg_strbreak(text, '\n');
+  lines = bg_strbreak((char*)p->data, '\n');
   i = 0;
   while(lines[i])
     {
@@ -122,29 +123,27 @@
   fprintf(s->output, "FORMAT=TIME\n\n");
   }
 
-static void write_subtitle_mpsub(subtext_t * s, const char * text,
-                                 gavl_time_t time, gavl_time_t duration)
+static void write_subtitle_mpsub(subtext_t * s, gavl_packet_t * p)
   {
   if(s->last_time != GAVL_TIME_UNDEFINED)
     {
     fprintf(s->output, "%.3f %.3f\n",
-            gavl_time_to_seconds(time - (s->last_time + s->last_duration)),
-            gavl_time_to_seconds(duration));
+            gavl_time_to_seconds(p->pts - (s->last_time + s->last_duration)),
+            gavl_time_to_seconds(p->duration));
     }
   else
     fprintf(s->output, "%.3f %.3f\n",
-            gavl_time_to_seconds(time),
-            gavl_time_to_seconds(duration));
+            gavl_time_to_seconds(p->pts),
+            gavl_time_to_seconds(p->duration));
   
-  fprintf(s->output, "%s\n\n", text);
+  fprintf(s->output, "%s\n\n", (char*)p->data);
   }
 
 static const struct
   {
   const char * extension;
   const char * name;
-  void (*write_subtitle)(subtext_t * s, const char * text,
-                         gavl_time_t time, gavl_time_t duration);
+  void (*write_subtitle)(subtext_t * s, gavl_packet_t * p);
   void (*write_header)(subtext_t * s);
   }
 formats[] =
@@ -178,7 +177,7 @@
 
 static int open_subtext(void * data, const char * filename,
                         const gavl_metadata_t * metadata,
-                        const bg_chapter_list_t * chapter_list)
+                        const gavl_chapter_list_t * chapter_list)
   {
   subtext_t * e;
   e = data;
@@ -198,15 +197,26 @@
   return 1;
   }
 
-static int add_subtitle_text_stream_subtext(void * data, const gavl_metadata_t * m,
-                                            int * timescale)
+static int add_text_stream_subtext(void * data,
+                                   const gavl_metadata_t * m,
+                                   uint32_t * timescale)
   {
-  subtext_t * e;
-  e = data;
   *timescale = GAVL_TIME_SCALE;
   return 0;
   }
 
+static gavl_sink_status_t write_subtitle_text_subtext(void * data, gavl_packet_t * p)
+  {
+  subtext_t * e;
+  e = data;
+  formats[e->format_index].write_subtitle(e, p);
+  e->titles_written++;
+  e->last_time     = p->pts;
+  e->last_duration = p->duration;
+  
+  return 1;
+  }
+
 static int start_subtext(void * data)
   {
   subtext_t * e;
@@ -214,23 +224,15 @@
   
   if(formats[e->format_index].write_header)
     formats[e->format_index].write_header(e);
-  
+  e->sink = gavl_packet_sink_create(NULL, write_subtitle_text_subtext, e);
   return 1;
   }
 
-static int write_subtitle_text_subtext(void * data, const char * text,
-                                       gavl_time_t start,
-                                       gavl_time_t duration, int stream)
+static gavl_packet_sink_t * get_sink_subtext(void * data, int stream)
   {
   subtext_t * e;
   e = data;
-  formats[e->format_index].write_subtitle(e, text, start, duration);
-  e->titles_written++;
-
-  e->last_time     = start;
-  e->last_duration = duration;
-  
-  return 1;
+  return e->sink;
   }
 
 static int close_subtext(void * data, int do_delete)
@@ -307,7 +309,7 @@
       .name =           "e_subtext",       /* Unique short name */
       .long_name =      TRS("Text subtitle exporter"),
       .description =    TRS("Plugin for exporting text subtitles. Supported formats are MPSub and SRT"),
-      .type =           BG_PLUGIN_ENCODER_SUBTITLE_TEXT,
+      .type =           BG_PLUGIN_ENCODER_TEXT,
       .flags =          BG_PLUGIN_FILE,
       .priority =       BG_PLUGIN_PRIORITY_MAX,
       .create =         create_subtext,
@@ -316,17 +318,17 @@
       .set_parameter =  set_parameter_subtext,
     },
 
-    .max_subtitle_text_streams = 1,
+    .max_text_streams = 1,
     
     .set_callbacks =        set_callbacks_subtext,
     
     .open =                 open_subtext,
 
-    .add_subtitle_text_stream =     add_subtitle_text_stream_subtext,
+    .add_text_stream =     add_text_stream_subtext,
     
     .start =                start_subtext,
+    .get_text_sink = get_sink_subtext,
     
-    .write_subtitle_text = write_subtitle_text_subtext,
     .close =             close_subtext,
     
   };

gmerlin-1.2.0.tar.gz/plugins/tiff/Makefile.am -> gmerlin-4256.tar.gz/plugins/tiff/Makefile.am Changed

gmerlin-4256.tar.gz/plugins/tiff/c_tiffenc.c Added

@@ -0,0 +1,165 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <tiffio.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "tiffenc"
+
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gavl/metatags.h>
+#include <gavl/gavf.h>
+
+
+
+#include "tiffwriter.h"
+
+typedef struct
+  {
+  bg_tiff_writer_t * tiff;
+  
+  gavl_packet_sink_t * psink;
+  gavl_video_sink_t * vsink;
+  gavl_video_format_t fmt;
+  int have_header;
+  gavl_packet_t p;
+  } stream_codec_t;
+
+static void * create_codec()
+  {
+  stream_codec_t * ret = calloc(1, sizeof(*ret));
+  ret->tiff = bg_tiff_writer_create();
+  return ret;
+  }
+
+static void destroy_codec(void * priv)
+  {
+  stream_codec_t * c = priv;
+  bg_tiff_writer_destroy(c->tiff);
+  free(c);
+  }
+
+static const bg_parameter_info_t * get_parameters(void * priv)
+  {
+  return bg_tiff_writer_get_parameters();
+  }
+
+static void set_parameter(void * priv, const char * name,
+                          const bg_parameter_value_t * val)
+  {
+  stream_codec_t * c = priv;
+  bg_tiff_writer_set_parameter(c->tiff, name, val);
+  }
+
+static gavl_sink_status_t put_frame(void * priv,
+                                    gavl_video_frame_t * f)
+  {
+  stream_codec_t * c = priv;
+  
+  if(!c->have_header)
+    {
+    gavl_packet_reset(&c->p);
+    if(!bg_tiff_writer_write_header(c->tiff, NULL,
+                                    &c->p,
+                                    &c->fmt,
+                                    NULL))
+      return GAVL_SINK_ERROR;
+    }
+  bg_tiff_writer_write_image(c->tiff, f);
+  gavf_video_frame_to_packet_metadata(f, &c->p);
+  c->have_header = 0;
+  c->p.flags |= GAVL_PACKET_KEYFRAME;
+  return gavl_packet_sink_put_packet(c->psink, &c->p);
+  }
+
+static gavl_video_sink_t * open_video(void * priv,
+                                      gavl_compression_info_t * ci,
+                                      gavl_video_format_t * fmt,
+                                      gavl_metadata_t * m)
+  {
+  stream_codec_t * c = priv;
+  gavl_packet_reset(&c->p);
+  if(!bg_tiff_writer_write_header(c->tiff, NULL,
+                                  &c->p,
+                                  fmt,
+                                  NULL))
+    return NULL;
+  
+  gavl_metadata_set(m, GAVL_META_SOFTWARE, TIFFGetVersion());
+  gavl_video_format_copy(&c->fmt, fmt);
+  c->have_header = 1;
+  c->vsink = gavl_video_sink_create(NULL, put_frame, c, &c->fmt);
+
+  ci->id = GAVL_CODEC_ID_TIFF;
+
+  return c->vsink;
+  }
+
+static void set_packet_sink(void * priv, gavl_packet_sink_t * s)
+  {
+  stream_codec_t * c = priv;
+  c->psink = s;
+  }
+
+gavl_codec_id_t compressions[] =
+  {
+    GAVL_CODEC_ID_TIFF,
+    GAVL_CODEC_ID_NONE
+  };
+
+static const gavl_codec_id_t * get_compressions(void * priv)
+  {
+  return compressions;
+  }
+
+
+const bg_codec_plugin_t the_plugin =
+  {
+    .common =
+    {
+      BG_LOCALE,
+      .name =            "c_tiffenc",       /* Unique short name */
+      .long_name =       "TIFF",
+      .description =     "libtiff based encoder",
+      .type =            BG_PLUGIN_CODEC,
+      .flags =           BG_PLUGIN_VIDEO_COMPRESSOR,
+      .priority =        5,
+      .create =          create_codec,
+      .destroy =         destroy_codec,
+      .get_parameters =    get_parameters,
+      .set_parameter =     set_parameter,
+    },
+    .open_encode_video = open_video,
+    .set_packet_sink = set_packet_sink,
+    .get_compressions = get_compressions,
+  };
+/* Include this into all plugin modules exactly once
+   to let the plugin loader obtain the API version */
+BG_GET_PLUGIN_API_VERSION;

gmerlin-1.2.0.tar.gz/plugins/tiff/ir_tiff.c -> gmerlin-4256.tar.gz/plugins/tiff/ir_tiff.c Changed

gmerlin-1.2.0.tar.gz/plugins/tiff/iw_tiff.c -> gmerlin-4256.tar.gz/plugins/tiff/iw_tiff.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,17 +35,11 @@
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "iw_tiff"
 
+#include "tiffwriter.h"
+
 typedef struct
   {
-  TIFF *output;
-  uint32_t Width;
-  uint32_t Height;
-  uint16 SamplesPerPixel;
-  uint16 Orientation;
-  gavl_video_format_t format;
-  uint16_t compression;
-  int jpeg_quality;
-  int zip_quality;  /* Compression level, actually */
+  bg_tiff_writer_t * tiff;
   bg_iw_callbacks_t * cb;
   } tiff_t;
 
@@ -55,17 +49,18 @@
   e->cb = cb;
   }
 
-
 static void * create_tiff()
   {
   tiff_t * ret;
   ret = calloc(1, sizeof(*ret));
+  ret->tiff = bg_tiff_writer_create();
   return ret;
   }
 
 static void destroy_tiff(void* priv)
   {
   tiff_t * tiff = priv;
+  bg_tiff_writer_destroy(tiff->tiff);
   free(tiff);
   }
 
@@ -73,175 +68,41 @@
                              gavl_video_format_t * format,
                              const gavl_metadata_t * m)
   {
-  tiff_t * p = priv;
-  uint16_t v[1];
-  int photometric;
+  int ret;
   char * real_filename;
-  int has_alpha;
+  tiff_t * tiff = priv;
   
   real_filename = bg_filename_ensure_extension(filename, "tif");
   
-  if(!bg_iw_cb_create_output_file(p->cb, real_filename))
+  if(!bg_iw_cb_create_output_file(tiff->cb, real_filename))
     {
     free(real_filename);
     return 0;
     }
-  
-  errno = 0;
-  p->output = TIFFOpen(real_filename,"w");
-  free(real_filename);
-  
-  if(!p->output)
-    {
-    if(errno)
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
-             "Cannot open %s: %s",
-             filename, strerror(errno));
-    else
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s",  filename);
-    return 0;
-    }
 
-  p->Width =  format->image_width;
-  p->Height =  format->image_height;
-  
-  if(gavl_pixelformat_has_alpha(format->pixelformat))
-    {
-    if(gavl_pixelformat_is_gray(format->pixelformat))
-      {
-      format->pixelformat = GAVL_GRAYA_16;
-      p->SamplesPerPixel = 2;
-      photometric = PHOTOMETRIC_MINISBLACK;
-      }
-    else
-      {
-      format->pixelformat = GAVL_RGBA_32;
-      p->SamplesPerPixel = 4;
-      photometric = PHOTOMETRIC_RGB;
-      }
-    has_alpha = 1;
-    }
-  else
-    {
-    if(gavl_pixelformat_is_gray(format->pixelformat))
-      {
-      format->pixelformat = GAVL_GRAY_8;
-      p->SamplesPerPixel = 1;
-      photometric = PHOTOMETRIC_MINISBLACK;
-      }
-    else
-      {
-      format->pixelformat = GAVL_RGB_24;
-      p->SamplesPerPixel = 3;
-      photometric = PHOTOMETRIC_RGB;
-      }
-    has_alpha = 0;
-    }
-  
-  TIFFSetField(p->output, TIFFTAG_IMAGEWIDTH, p->Width);
-  TIFFSetField(p->output, TIFFTAG_IMAGELENGTH, p->Height);
-  TIFFSetField(p->output, TIFFTAG_BITSPERSAMPLE, 8);
-  TIFFSetField(p->output, TIFFTAG_SAMPLESPERPIXEL, p->SamplesPerPixel);
-  TIFFSetField(p->output, TIFFTAG_COMPRESSION, p->compression);
-  if(p->compression == COMPRESSION_JPEG)
-    TIFFSetField(p->output, TIFFTAG_JPEGQUALITY, p->jpeg_quality);
-  if(p->compression == COMPRESSION_DEFLATE)
-    TIFFSetField(p->output, TIFFTAG_ZIPQUALITY, p->zip_quality);
-  TIFFSetField(p->output, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
-  TIFFSetField(p->output, TIFFTAG_PHOTOMETRIC, photometric);
-  TIFFSetField(p->output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-  TIFFSetField(p->output, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-  
-  if(has_alpha)
-    {
-    v[0] = EXTRASAMPLE_ASSOCALPHA;
-    TIFFSetField(p->output, TIFFTAG_EXTRASAMPLES, 1, v);
-    }
-  return 1;
+  ret = bg_tiff_writer_write_header(tiff->tiff, real_filename,
+                                    NULL,
+                                    format, m);
+  free(real_filename);
+  return ret;
   }
 
 static int write_image_tiff(void *priv, gavl_video_frame_t *frame)
   {
-  int i;
-  tiff_t *p = priv;
-  uint8_t * frame_ptr_start;
-  
-  frame_ptr_start = frame->planes[0];
-
-  for(i = 0; i < p->Height; i++)
-    {
-    TIFFWriteScanline(p->output, frame_ptr_start, i, 0);
-    frame_ptr_start += frame->strides[0];
-    }
-
-  TIFFClose(p->output);
-  return 1;
+  tiff_t * tiff = priv;
+  return bg_tiff_writer_write_image(tiff->tiff, frame);
   }
 
-
-/* Configuration stuff */
-
-static const bg_parameter_info_t parameters[] =
-  {
-    {
-      .name =        "compression",
-      .long_name =   TRS("Compression"),
-      .type =        BG_PARAMETER_STRINGLIST,
-      .multi_names = (char const *[]){ "none", "packbits", "deflate", "jpeg", NULL },
-      .multi_labels =  (char const *[]){ TRS("None"), TRS("Packbits"), TRS("Deflate"), TRS("JPEG"),
-                                NULL },
-
-      .val_default = { .val_str = "none" },
-    },
-    {
-      .name =        "jpeg_quality",
-      .long_name =   TRS("JPEG quality"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 100 },
-      .val_default = { .val_i = 75 }      
-    },
-    {
-      .name =        "zip_quality",
-      .long_name =   TRS("Deflate compression level"),
-      .type =        BG_PARAMETER_SLIDER_INT,
-      .val_min =     { .val_i = 0 },
-      .val_max =     { .val_i = 9 },
-      .val_default = { .val_i = 6 }      
-    },
-    { /* End of parameters */ }
-  };
-
 static const bg_parameter_info_t * get_parameters_tiff(void * p)
   {
-  return parameters;
+  return bg_tiff_writer_get_parameters();
   }
 
 static void set_parameter_tiff(void * p, const char * name,
                                const bg_parameter_value_t * val)
   {
-  tiff_t * tiff;
-  tiff = p;
-
-  if(!name)
-    return;
-
-  else if(!strcmp(name, "compression"))
-    {
-    if(!strcmp(val->val_str, "none"))
-      tiff->compression = COMPRESSION_NONE;
-    else if(!strcmp(val->val_str, "packbits"))
-      tiff->compression = COMPRESSION_PACKBITS;
-    else if(!strcmp(val->val_str, "deflate"))
-      tiff->compression = COMPRESSION_DEFLATE;
-    else if(!strcmp(val->val_str, "jpeg"))
-      tiff->compression = COMPRESSION_JPEG;
-    }
-  else if(!strcmp(name, "jpeg_quality"))
-    tiff->jpeg_quality = val->val_i;
-  else if(!strcmp(name, "zip_quality"))
-    tiff->zip_quality = val->val_i;
-  
+  tiff_t * tiff = p;
+  bg_tiff_writer_set_parameter(tiff->tiff, name, val);
   }
 
 const bg_image_writer_plugin_t the_plugin =

gmerlin-4256.tar.gz/plugins/tiff/tiffwriter.c Added

@@ -0,0 +1,332 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <tiffio.h>
+#include <inttypes.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+#include <gmerlin/plugin.h>
+#include <gmerlin/pluginfuncs.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/log.h>
+#define LOG_DOMAIN "tiffwriter"
+
+#include "tiffwriter.h"
+
+struct bg_tiff_writer_s
+  {
+  TIFF *output;
+  gavl_video_format_t format;
+  uint16_t compression;
+  int jpeg_quality;
+  int zip_level;  /* Compression level, actually */
+
+  int packet_pos;
+  gavl_packet_t * p;
+  };
+
+bg_tiff_writer_t * bg_tiff_writer_create()
+  {
+  bg_tiff_writer_t * ret = calloc(1, sizeof(*ret));
+  return ret;
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name =        "compression",
+      .long_name =   TRS("Compression"),
+      .type =        BG_PARAMETER_STRINGLIST,
+      .multi_names = (char const *[]){ "none",
+                                       "packbits",
+                                       "deflate",
+                                       "jpeg", NULL },
+      
+      .multi_labels =  (char const *[]){ TRS("None"),
+                                         TRS("Packbits"),
+                                         TRS("Deflate"),
+                                         TRS("JPEG"),
+                                         NULL },
+      
+      .val_default = { .val_str = "none" },
+    },
+    {
+      .name =        "jpeg_quality",
+      .long_name =   TRS("JPEG quality"),
+      .type =        BG_PARAMETER_SLIDER_INT,
+      .val_min =     { .val_i = 0 },
+      .val_max =     { .val_i = 100 },
+      .val_default = { .val_i = 75 }      
+    },
+    {
+      .name =        "zip_level",
+      .long_name =   TRS("Deflate compression level"),
+      .type =        BG_PARAMETER_SLIDER_INT,
+      .val_min =     { .val_i = 0 },
+      .val_max =     { .val_i = 9 },
+      .val_default = { .val_i = 9 }      
+    },
+    { /* End of parameters */ }
+  };
+
+
+const bg_parameter_info_t * bg_tiff_writer_get_parameters(void)
+  {
+  return parameters;
+  }
+
+void bg_tiff_writer_destroy(bg_tiff_writer_t * t)
+  {
+  free(t);
+  }
+
+void bg_tiff_writer_set_parameter(bg_tiff_writer_t * tiff, const char * name,
+                                  const bg_parameter_value_t * val)
+  {
+  if(!name)
+    return;
+
+  else if(!strcmp(name, "compression"))
+    {
+    if(!strcmp(val->val_str, "none"))
+      tiff->compression = COMPRESSION_NONE;
+    else if(!strcmp(val->val_str, "packbits"))
+      tiff->compression = COMPRESSION_PACKBITS;
+    else if(!strcmp(val->val_str, "deflate"))
+      tiff->compression = COMPRESSION_DEFLATE;
+    else if(!strcmp(val->val_str, "jpeg"))
+      tiff->compression = COMPRESSION_JPEG;
+    }
+  else if(!strcmp(name, "jpeg_quality"))
+    tiff->jpeg_quality = val->val_i;
+  else if(!strcmp(name, "zip_level"))
+    tiff->zip_level = val->val_i;
+  
+  }
+
+static tsize_t read_function(thandle_t fd, tdata_t data, tsize_t length)
+  {
+  uint32_t bytes_read;
+
+  bg_tiff_writer_t * tiff = (bg_tiff_writer_t *)fd;
+
+  //  fprintf(stderr, "read_function %d [%d %d]\n", length,
+  //          tiff->p->data_len, tiff->packet_pos);
+  
+  bytes_read = length;
+  if(bytes_read > tiff->p->data_len - tiff->packet_pos)
+    bytes_read = tiff->p->data_len - tiff->packet_pos;
+
+  memcpy(data, tiff->p->data + tiff->packet_pos, bytes_read);
+  tiff->packet_pos += bytes_read;
+  return bytes_read;
+  }
+
+static toff_t seek_function(thandle_t fd, toff_t off, int whence)
+  {
+  bg_tiff_writer_t * tiff = (bg_tiff_writer_t *)fd;
+  
+  //  fprintf(stderr, "seek_function %d %d  [%d %d]\n", off, whence,
+  //          tiff->p->data_len, tiff->packet_pos);
+  
+  if (whence == SEEK_SET)
+    tiff->packet_pos = off;
+  else if (whence == SEEK_CUR)
+    tiff->packet_pos += off;
+  else if (whence == SEEK_END)
+    tiff->packet_pos = tiff->p->data_len + off;
+  
+  if(tiff->packet_pos > tiff->p->data_len)
+    {
+    /* Realloc */
+    gavl_packet_alloc(tiff->p, tiff->packet_pos);
+    memset(tiff->p->data + tiff->p->data_len, 0, tiff->packet_pos - tiff->p->data_len);
+    tiff->p->data_len = tiff->packet_pos;
+    }
+  return tiff->packet_pos;
+  }
+
+static toff_t size_function(thandle_t fd)
+  {
+  bg_tiff_writer_t * tiff = (bg_tiff_writer_t *)fd;
+  return tiff->p->data_len;
+  }
+
+static int close_function(thandle_t fd)
+  {
+  return 0;
+  }
+
+static tsize_t write_function(thandle_t fd, tdata_t data, tsize_t length)
+  {
+  bg_tiff_writer_t * tiff = (bg_tiff_writer_t *)fd;
+
+  //  fprintf(stderr, "write_function %d [%d %d]\n", length,
+  //          tiff->p->data_len, tiff->packet_pos);
+  
+  /* Realloc */
+  if(tiff->packet_pos + length > tiff->p->data_len)
+    gavl_packet_alloc(tiff->p, tiff->packet_pos + length);
+
+  /* Copy + advance */
+  memcpy(tiff->p->data + tiff->packet_pos, data, length);
+  tiff->packet_pos += length;
+
+  /* Adjust length */
+  if(tiff->p->data_len < tiff->packet_pos)
+    tiff->p->data_len = tiff->packet_pos;
+  
+  return length;
+  }
+
+static int map_file_proc(thandle_t a, tdata_t* b, toff_t* c)
+  {
+  return 0;
+  }
+
+static void unmap_file_proc(thandle_t a, tdata_t b, toff_t c)
+  {
+  }
+
+
+
+int bg_tiff_writer_write_header(bg_tiff_writer_t * tiff, const char * filename,
+                         gavl_packet_t * p,
+                         gavl_video_format_t * format,
+                         const gavl_metadata_t * metadata)
+  {
+  uint16_t v[1];
+  int photometric;
+  int has_alpha;
+  uint16_t samples_per_pixel;
+
+  
+  /* Open I/O */
+  if(filename)
+    {
+    tiff->output = TIFFOpen(filename,"w");
+    
+    if(!tiff->output)
+      {
+      if(errno)
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+               "Cannot open %s: %s",
+               filename, strerror(errno));
+      else
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s",  filename);
+      return 0;
+      }
+    }
+  else /* Packet */
+    {
+    tiff->p = p;
+    gavl_packet_reset(tiff->p);
+    tiff->output = TIFFClientOpen("gmerlin", "w", (thandle_t)tiff,
+                                  read_function,write_function ,
+                                  seek_function, close_function,
+                                  size_function, map_file_proc,
+                                  unmap_file_proc);
+    }
+  
+  /* Adjust format */
+  
+  if(gavl_pixelformat_has_alpha(format->pixelformat))
+    {
+    if(gavl_pixelformat_is_gray(format->pixelformat))
+      {
+      format->pixelformat = GAVL_GRAYA_16;
+      samples_per_pixel = 2;
+      photometric = PHOTOMETRIC_MINISBLACK;
+      }
+    else
+      {
+      format->pixelformat = GAVL_RGBA_32;
+      samples_per_pixel = 4;
+      photometric = PHOTOMETRIC_RGB;
+      }
+    has_alpha = 1;
+    }
+  else
+    {
+    if(gavl_pixelformat_is_gray(format->pixelformat))
+      {
+      format->pixelformat = GAVL_GRAY_8;
+      samples_per_pixel = 1;
+      photometric = PHOTOMETRIC_MINISBLACK;
+      }
+    else
+      {
+      format->pixelformat = GAVL_RGB_24;
+      samples_per_pixel = 3;
+      photometric = PHOTOMETRIC_RGB;
+      }
+    has_alpha = 0;
+    }
+  
+  TIFFSetField(tiff->output, TIFFTAG_IMAGEWIDTH, format->image_width);
+  TIFFSetField(tiff->output, TIFFTAG_IMAGELENGTH, format->image_height);
+  TIFFSetField(tiff->output, TIFFTAG_BITSPERSAMPLE, 8);
+  TIFFSetField(tiff->output, TIFFTAG_SAMPLESPERPIXEL, samples_per_pixel);
+  TIFFSetField(tiff->output, TIFFTAG_COMPRESSION, tiff->compression);
+  if(tiff->compression == COMPRESSION_JPEG)
+    TIFFSetField(tiff->output, TIFFTAG_JPEGQUALITY, tiff->jpeg_quality);
+  if(tiff->compression == COMPRESSION_DEFLATE)
+    TIFFSetField(tiff->output, TIFFTAG_ZIPQUALITY, tiff->zip_level);
+  TIFFSetField(tiff->output, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
+  TIFFSetField(tiff->output, TIFFTAG_PHOTOMETRIC, photometric);
+  TIFFSetField(tiff->output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+  TIFFSetField(tiff->output, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+  
+  if(has_alpha)
+    {
+    v[0] = EXTRASAMPLE_ASSOCALPHA;
+    TIFFSetField(tiff->output, TIFFTAG_EXTRASAMPLES, 1, v);
+    }
+
+  gavl_video_format_copy(&tiff->format, format);
+  return 1;
+  }
+
+int bg_tiff_writer_write_image(bg_tiff_writer_t * tiff, gavl_video_frame_t * frame)
+  {
+  int i;
+  uint8_t * frame_ptr_start;
+  
+  frame_ptr_start = frame->planes[0];
+
+  for(i = 0; i < tiff->format.image_height; i++)
+    {
+    TIFFWriteScanline(tiff->output, frame_ptr_start, i, 0);
+    frame_ptr_start += frame->strides[0];
+    }
+
+  TIFFClose(tiff->output);
+  tiff->output = NULL;
+  tiff->packet_pos = 0;
+  return 1;
+  }
+

gmerlin-4256.tar.gz/plugins/tiff/tiffwriter.h Added

@@ -0,0 +1,40 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+typedef struct bg_tiff_writer_s bg_tiff_writer_t;
+
+bg_tiff_writer_t * bg_tiff_writer_create();
+
+const bg_parameter_info_t * bg_tiff_writer_get_parameters(void);
+
+void bg_tiff_writer_destroy(bg_tiff_writer_t*);
+
+void bg_tiff_writer_set_parameter(bg_tiff_writer_t*, const char * name,
+                                  const bg_parameter_value_t * val);
+
+int bg_tiff_writer_write_header(bg_tiff_writer_t * tiff, const char * filename,
+                                gavl_packet_t * p,
+                                gavl_video_format_t * format,
+                                const gavl_metadata_t * metadata);
+
+int bg_tiff_writer_write_image(bg_tiff_writer_t * tiff,
+                               gavl_video_frame_t * frame);
+

gmerlin-4256.tar.gz/plugins/upnp Added

gmerlin-4256.tar.gz/plugins/upnp/Makefile.am Added

gmerlin-4256.tar.gz/plugins/upnp/oa_upnp.c Added

@@ -0,0 +1,531 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <pthread.h>
+
+#include <config.h>
+#include <gmerlin/translation.h>
+
+#include <gmerlin/plugin.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/http.h>
+
+#include <gmerlin/xmlutils.h>
+#include <gmerlin/upnp/devicedesc.h>
+#include <gmerlin/upnp/soap.h>
+
+// #define WORDS_BIGENDIAN
+
+
+typedef struct
+  {
+  char * dev_url;
+  int stream_fd;
+  int server_fd;
+
+  char * stream_url;
+  char * stream_mimetype;
+  
+  char * avt_url;
+  char * cm_url;
+
+  char * instance_id;
+  
+  gavl_audio_sink_t * sink;
+
+  pthread_t listen_thread;
+
+  gavl_audio_format_t format;
+  gavl_audio_frame_t * frame;
+
+#ifndef WORDS_BIGENDIAN
+  gavl_dsp_context_t * dsp;
+#endif
+  } upnp_t;
+
+static void set_http_header(upnp_t * e, gavl_metadata_t * res)
+  {
+  /* TODO: Set DLNA Spefific stuff */  
+  bg_http_response_init(res, "HTTP/1.1", 200, "OK"); 
+  gavl_metadata_set(res, "Content-Type", e->stream_mimetype);
+  gavl_metadata_set(res, "transferMode.dlna.org", "Streaming");
+  // gavl_metadata_set(res, "Connection", "Close");
+  //  gavl_metadata_set(res, "contentFeatures.dlna.org",
+  //                    "DLNA.ORG_PN=LPCM;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=01700000000000000000000000000000");
+  }
+
+static const bg_parameter_info_t parameters[] =
+  {
+    {
+      .name =      "device_url",
+      .long_name = TRS("Device URL"),
+      .type =      BG_PARAMETER_STRING,
+    },
+    { /* End of parameters */ }
+  };
+
+static void set_parameter_upnp(void * data, const char * name,
+                              const bg_parameter_value_t * val)
+  {
+  upnp_t * e = data;
+
+  if(!name)
+    return;
+  
+  if(!strcmp(name, "device_url"))
+    e->dev_url = gavl_strrep(e->dev_url, val->val_str);
+  }
+
+static void * create_upnp()
+  {
+  upnp_t * ret = calloc(1, sizeof(*ret));
+
+#ifndef WORDS_BIGENDIAN
+  ret->dsp = gavl_dsp_context_create();
+#endif
+
+  return ret;
+  }
+
+static void destroy_upnp(void *data)
+  {
+  upnp_t * e = data;
+
+#ifndef WORDS_BIGENDIAN
+  gavl_dsp_context_destroy(e->dsp);
+#endif
+  
+  if(e->dev_url)
+    free(e->dev_url);
+  free(e);
+  }
+
+static gavl_audio_frame_t * get_frame_func(void * p)
+  {
+  upnp_t * e = p;
+  e->frame->valid_samples = 0;
+  return e->frame;
+  }
+
+static gavl_sink_status_t
+write_func_upnp(void * p, gavl_audio_frame_t * f)
+  {
+  upnp_t * e = p;
+  int bytes, result;
+  
+#ifndef WORDS_BIGENDIAN
+  gavl_dsp_audio_frame_swap_endian(e->dsp, e->frame, &e->format);
+#endif
+
+  bytes = e->frame->valid_samples * 2 * e->format.num_channels;
+  
+  result = bg_socket_write_data(e->stream_fd, e->frame->samples.u_8, bytes);
+
+  //  fprintf(stderr, "write: %d %d %d\n", e->frame->valid_samples, bytes, result);
+  
+  if(bytes < result)
+    return GAVL_SINK_ERROR;
+  
+  // if(write(e->fd, f->channels.s_8[0], f->valid_samples * e->block_align) < 0)
+  // return GAVL_SINK_ERROR;
+  return GAVL_SINK_OK;
+  }
+
+static void * listen_func(void * data)
+  {
+  upnp_t * e = data;
+
+  gavl_metadata_t req;
+  gavl_metadata_t res;
+
+  gavl_metadata_init(&req);
+  gavl_metadata_init(&res);
+
+  fprintf(stderr, "Listen thread started\n");
+  
+  while(1)
+    {
+    e->stream_fd = bg_listen_socket_accept(e->server_fd, 5000, NULL);
+    if(e->stream_fd < 0)
+      return NULL;
+    
+    fprintf(stderr, "Got connection\n");
+    
+    /* Read request */
+    if(!bg_http_request_read(e->stream_fd, &req, 2000))
+      return NULL;
+    
+    /* Write response */
+    set_http_header(e, &res);
+    
+    if(!bg_http_response_write(e->stream_fd, &res))
+      {
+      close(e->stream_fd);
+      e->stream_fd = -1;
+      }
+    break;
+    }
+  
+  return NULL;
+  }
+
+static const int samplerates[] =
+  {
+    44100,
+    48000,
+    /* End */
+    0
+  };
+  
+static int open_upnp(void * data, gavl_audio_format_t * format)
+  {
+  xmlDocPtr desc;
+  
+  char * tmp_string;
+  xmlDocPtr service_desc;
+  
+  upnp_t * e = data;
+  xmlNodePtr dev_node;
+  xmlNodePtr service_node;
+  char * url_base = NULL;
+  int ret = 0;
+  bg_soap_t soap;
+  char ** protocol_info = NULL;
+  int i;
+  bg_socket_address_t * addr;
+  int supported = 0;
+  
+  char addr_str[BG_SOCKET_ADDR_STR_LEN];
+  
+  memset(&soap, 0, sizeof(soap));
+  
+  /* Get device description */
+
+  desc = bg_xml_from_url(e->dev_url);
+  
+  if(!desc)
+    goto fail;
+  
+  fprintf(stderr, "Got description\n");
+
+  url_base =
+    bg_upnp_device_description_get_url_base(e->dev_url, desc);
+  
+  dev_node =
+    bg_upnp_device_description_get_device_node(desc, "MediaRenderer", 1);
+  
+  if(!dev_node)
+    goto fail;
+
+  service_node =
+    bg_upnp_device_description_get_service_node(dev_node,
+                                                "ConnectionManager",
+                                                1);
+  
+  if(!service_node)
+    goto fail;
+
+  tmp_string = bg_upnp_device_description_get_service_description(service_node,
+                                                                  url_base);
+
+  service_desc = bg_xml_from_url(tmp_string);
+  free(tmp_string);
+
+  if(!service_desc)
+    goto fail;
+  
+  e->cm_url = bg_upnp_device_description_get_control_url(service_node,
+                                                         url_base);
+  if(!e->cm_url)
+    goto fail;
+
+  service_node =
+    bg_upnp_device_description_get_service_node(dev_node,
+                                                "AVTransport",
+                                                1);
+
+  if(!service_node)
+    goto fail;
+
+  e->avt_url = bg_upnp_device_description_get_control_url(service_node,
+                                                         url_base);
+  if(!e->avt_url)
+    goto fail;
+  
+  fprintf(stderr, "Got Connection manager: %s\n", e->cm_url);
+  fprintf(stderr, "Got AVTransport:        %s\n", e->avt_url);
+  
+  /* Get protocol info */
+
+  if(!bg_upnp_service_description_has_action(service_desc, "GetProtocolInfo"))
+    {
+    fprintf(stderr, "No action GetProtocolInfo\n");
+    goto fail;
+    }
+  
+  if(!bg_soap_init(&soap, e->cm_url, "ConnectionManager", 1, "GetProtocolInfo") ||
+     !bg_soap_request(&soap))
+    {
+    bg_soap_free( &soap);
+    goto fail;
+    }
+  
+  protocol_info = bg_strbreak(bg_soap_response_get_argument(soap.res, "Sink"),
+                              ',');
+
+  bg_soap_free( &soap);
+  
+  fprintf(stderr,
+          "Sink protocol info:\n");
+
+  i = 0;
+
+  while(protocol_info[i])
+    {
+    /* We assume, that if the Renderer supports one DLNA LPCM format,
+       it supports all 4 formats, which are demanded by the DLNA spec:
+       1/2 channels and 44100/48000 Hz samplerate.
+    */
+    
+    if(strstr(protocol_info[i], "http-get:*:audio/L16;"))
+      supported = 1;
+    
+#if 0    
+    if(strstr(protocol_info[i], "http-get:*:audio/L16;") &&
+       strstr(protocol_info[i], "DLNA.ORG_PN=LPCM"))
+      supported = 1;
+#endif
+    
+    fprintf(stderr, "  %s\n", protocol_info[i]);
+    i++;
+    }
+
+  if(!supported)
+    {
+    fprintf(stderr, "No supported format\n");
+    goto fail;
+    }
+  
+  /* Open server fd */
+
+  addr = bg_socket_address_create();
+  
+  if(!bg_socket_address_set_local(addr, 0))
+    goto fail;
+
+  e->server_fd = bg_listen_socket_create_inet(addr, 0, 2, 0);
+
+  if(!bg_socket_get_address(e->server_fd, addr, NULL))
+    goto fail;
+
+  e->stream_url = bg_sprintf("http://%s/stream.lpcm",
+                             bg_socket_address_to_string(addr, addr_str));
+
+  fprintf(stderr, "Stream URL: %s\n", e->stream_url);
+
+  /* Decide format */
+
+  switch(format->num_channels)
+    {
+    case 1:
+      format->num_channels = 1;
+      format->channel_locations[0] = GAVL_CHID_FRONT_CENTER;
+      break;
+    default:
+      format->num_channels = 2;
+      format->channel_locations[0] = GAVL_CHID_FRONT_LEFT;
+      format->channel_locations[1] = GAVL_CHID_FRONT_RIGHT;
+      break;
+    }
+  
+  format->samplerate = gavl_nearest_samplerate(format->samplerate,
+                                               samplerates);
+  format->sample_format = GAVL_SAMPLE_S16;
+  format->interleave_mode = GAVL_INTERLEAVE_ALL;
+  format->samples_per_frame = 1024;
+  gavl_audio_format_copy(&e->format, format);
+  
+  e->stream_mimetype = bg_sprintf("audio/L16;rate=%d;channels=%d",
+                                  e->format.samplerate,
+                                  e->format.num_channels);
+  
+  e->frame = gavl_audio_frame_create(&e->format);
+  
+  /* From this point on, we need to expect client connections */
+
+  pthread_create(&e->listen_thread, NULL, listen_func, e); 
+  
+  /* Check, if there is a PrepareForConnection action implemented */
+
+  if(bg_upnp_service_description_has_action(service_desc, "PrepareForConnection"))
+    fprintf(stderr, "Need to call PrepareForConnection!!!\n");
+  else
+    e->instance_id = gavl_strdup("0");
+
+  /* Call SetAVTransportURI */
+
+  if(!bg_soap_init(&soap, e->avt_url, "AVTransport", 1, "SetAVTransportURI"))
+    goto fail;
+
+  bg_soap_request_add_argument(soap.req, "InstanceID", e->instance_id);
+  bg_soap_request_add_argument(soap.req, "CurrentURI", e->stream_url);
+  
+  tmp_string =
+    bg_sprintf("<DIDL-Lite xmlns:dc=\"http://purl.org/dc/elements/1.1/\" "
+               "xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\" "
+               "xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\">"
+               "<item id=\"1\" parentID=\"0\" restricted=\"false\">"
+               "<dc:title>Gmerlin output</dc:title>"
+               "<upnp:class>object.item.audioItem.audioBroadcast</upnp:class>"
+               "<res protocolInfo=\"http-get:*:%s:DLNA.ORG_PN=LPCM\">%s</res>"
+               "</item>"
+               "</DIDL-Lite>", e->stream_mimetype, e->stream_url);
+
+  fprintf(stderr, "DIDL:\n%s\n", tmp_string);
+  
+  bg_soap_request_add_argument(soap.req, "CurrentURIMetaData", tmp_string);
+  free(tmp_string);
+  
+  if(!bg_soap_request(&soap))
+    {
+    bg_soap_free( &soap);
+    goto fail;
+    }
+  bg_soap_free(&soap);
+  
+  /* */
+  
+  e->sink = gavl_audio_sink_create(get_frame_func, write_func_upnp, e, format);
+
+  ret = 1;
+  fail:
+
+  if(url_base)
+    free(url_base);
+
+  if(desc)
+    xmlFreeDoc(desc);
+  if(service_desc)
+    xmlFreeDoc(service_desc);
+  
+  return ret;
+  }
+
+static gavl_audio_sink_t * get_sink_upnp(void * p)
+  {
+  upnp_t * e = p;
+  return e->sink;
+  }
+
+// static int stream_count = 0;
+
+static int start_upnp(void * p)
+  {
+  upnp_t * e = p;
+  bg_soap_t soap;
+  
+  /* Send "play" method and wait for connection */
+
+  if(!bg_soap_init(&soap, e->avt_url, "AVTransport", 1, "Play"))
+    return 0;
+    
+  bg_soap_request_add_argument(soap.req, "InstanceID", e->instance_id);
+  bg_soap_request_add_argument(soap.req, "Speed", "1");
+  
+  if(!bg_soap_request(&soap))
+    {
+    bg_soap_free( &soap);
+    return 0;
+    }
+  bg_soap_free(&soap);
+
+  /* Join the connect thread */
+  if(pthread_join(e->listen_thread, NULL) ||
+     (e->stream_fd <= 0))
+    {
+    fprintf(stderr, "Got no connection\n");
+    return 0;
+    }
+  return 1;
+  }
+
+static void close_upnp(void * p)
+  {
+  upnp_t * e = p;
+  if(e->sink)
+    {
+    gavl_audio_sink_destroy(e->sink);
+    e->sink = NULL;
+    }
+  }
+
+static void stop_upnp(void * p)
+  {
+  bg_soap_t soap;
+
+  upnp_t * e = p;
+
+  if(!bg_soap_init(&soap, e->avt_url, "AVTransport", 1, "Stop"))
+    return;
+  
+  bg_soap_request_add_argument(soap.req, "InstanceID", e->instance_id);
+  
+  bg_soap_request(&soap);
+  bg_soap_free( &soap);
+  }
+
+static const bg_parameter_info_t *
+get_parameters_upnp(void * priv)
+  {
+  return parameters;
+  }
+
+const bg_oa_plugin_t the_plugin =
+  {
+    .common =
+    {
+      BG_LOCALE,
+      .name =          "oa_upnp",
+      .long_name =     TRS("Upnp audio output driver"),
+      .description =   TRS("Stream audio to upnp capable devices"),
+      .type =          BG_PLUGIN_OUTPUT_AUDIO,
+      .flags =         BG_PLUGIN_PLAYBACK,
+      .priority =      BG_PLUGIN_PRIORITY_MIN,
+      .create =        create_upnp,
+      .destroy =       destroy_upnp,
+
+      .get_parameters = get_parameters_upnp,
+      .set_parameter =  set_parameter_upnp
+    },
+    .open =          open_upnp,
+    .start =         start_upnp,
+    .stop =          stop_upnp,
+    .close =         close_upnp,
+    .get_sink =      get_sink_upnp,
+  };
+
+/* Include this into all plugin modules exactly once
+   to let the plugin loader obtain the API version */
+BG_GET_PLUGIN_API_VERSION;

gmerlin-1.2.0.tar.gz/plugins/v4l2/Makefile.am -> gmerlin-4256.tar.gz/plugins/v4l2/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/v4l2/convert.c -> gmerlin-4256.tar.gz/plugins/v4l2/convert.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -121,30 +121,20 @@
   }
 
 void bg_v4l2_convert_convert(bg_v4l2_convert_t * cnv, uint8_t * data, int size,
-                             gavl_video_frame_t * frame)
+                             gavl_video_frame_t ** frame)
   {
-  int result;
   //  fprintf(stderr, "bg_v4l2_convert_convert %d\n", size);
-
-  if(bgv4l2_strides_match(frame, cnv->strides, cnv->num_strides))
-    {
-    result = v4lconvert_convert(cnv->cnv,
-                                &cnv->src_format,  /* in */
-                                &cnv->dst_format, /* in */
-                                data, size, frame->planes[0], cnv->dst_size);
-    return;
-    }
   
   if(!cnv->frame)
     cnv->frame = bgv4l2_create_frame(NULL, // Can be NULL
                                      &cnv->fmt, &cnv->dst_format);
   
-  result = v4lconvert_convert(cnv->cnv,
-                              &cnv->src_format,  /* in */
-                              &cnv->dst_format, /* in */
-                              data, size, cnv->frame->planes[0], cnv->dst_size);
+  v4lconvert_convert(cnv->cnv,
+                     &cnv->src_format,  /* in */
+                     &cnv->dst_format, /* in */
+                     data, size, cnv->frame->planes[0], cnv->dst_size);
   
-  gavl_video_frame_copy(&cnv->fmt, frame, cnv->frame);
+  *frame = cnv->frame;
   }
 
 void bg_v4l2_convert_destroy(bg_v4l2_convert_t * cnv)

gmerlin-1.2.0.tar.gz/plugins/v4l2/convert.h -> gmerlin-4256.tar.gz/plugins/v4l2/convert.h Changed

gmerlin-1.2.0.tar.gz/plugins/v4l2/i_v4l2.c -> gmerlin-4256.tar.gz/plugins/v4l2/i_v4l2.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,17 +34,14 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 
-
-
 #include <config.h>
 #include <gmerlin/translation.h>
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
+#include <gmerlin/frametimer.h>
 
 #include "v4l2_common.h"
 
-#define TIME_DIV 1000
-
 #include <gmerlin/log.h>
 #define LOG_DOMAIN "i_v4l2"
 
@@ -52,6 +49,9 @@
 #include "convert.h"
 #endif
 
+#include <gavl/metatags.h>
+
+
 /* Input module */
 
 typedef struct
@@ -84,7 +84,6 @@
 
   struct v4l2_queryctrl * controls;
   int num_controls;
-  gavl_timer_t * timer;
 
   int force_rw;
 #ifdef HAVE_V4LCONVERT
@@ -92,6 +91,10 @@
 #endif
   int strides[GAVL_MAX_PLANES];
   int num_strides;
+  
+  gavl_video_source_t * src;
+  bg_frame_timer_t * ft;
+  
   } v4l2_t;
 
 
@@ -134,15 +137,17 @@
       }
     else
       {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_REQBUFS failed: %s", strerror(errno));
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "VIDIOC_REQBUFS failed: %s", strerror(errno));
       return 0;
       }
     }
   
   if (req.count < 2)
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Insufficient buffer memory on %s",
-             v4l->device);
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "Insufficient buffer memory on %s",
+           v4l->device);
     return 0;
     }
   
@@ -157,8 +162,7 @@
   for (v4l->n_buffers = 0; v4l->n_buffers < req.count; ++v4l->n_buffers)
     {
     struct v4l2_buffer buf;
-    
-    CLEAR (buf);
+    CLEAR(buf);
     
     buf.type        = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     buf.memory      = V4L2_MEMORY_MMAP;
@@ -166,7 +170,8 @@
     
     if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_QUERYBUF, &buf))
       {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_QUERYBUF failed: %s", strerror(errno));
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+             "VIDIOC_QUERYBUF failed: %s", strerror(errno));
       return 0;
       }
     v4l->buffers[v4l->n_buffers].length = buf.length;
@@ -184,7 +189,7 @@
   for (i = 0; i < v4l->n_buffers; ++i)
     {
     struct v4l2_buffer buf;
-    CLEAR (buf);
+    CLEAR(buf);
     
     buf.type        = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     buf.memory      = V4L2_MEMORY_MMAP;
@@ -214,7 +219,8 @@
   {
   int index = 0;
   struct v4l2_fmtdesc desc;
-
+  int result = 0;
+  
   CLEAR(desc);
   
   desc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 
@@ -229,13 +235,12 @@
                "VIDIOC_ENUM_FMT failed: %s", strerror(errno));
       break;
       }
-#if 0
-    fprintf(stderr, "Cam pixelformat %c%c%c%c\n",
+    bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+           "Cam pixelformat %c%c%c%c",
             desc.pixelformat & 0xff,
             (desc.pixelformat >> 8) & 0xff,
             (desc.pixelformat >> 16) & 0xff,
             (desc.pixelformat >> 24) & 0xff);
-#endif
 
     /* Return first pixelformat even if we don't support that */
     if(!desc.index)
@@ -245,187 +250,11 @@
        GAVL_PIXELFORMAT_NONE)
       {
       *ret = desc.pixelformat;
-      return 1;
+      result = 1;
       }
     index++;
     }
-
-#if 0  
-  if(!index)
-    {
-    struct v4l2_format fmt;
-    CLEAR (fmt);
-    fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    if (-1 == bgv4l2_ioctl (fd, VIDIOC_G_FMT, &fmt))
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_G_FMT failed: %s", strerror(errno));
-      return 0;
-      }
-    *ret = fmt.fmt.pix.pixelformat;
-    }
-#endif
-  return 0;
-  }
-
-
-static int open_v4l(void * priv,
-                    gavl_audio_format_t * audio_format,
-                    gavl_video_format_t * format)
-  {
-  v4l2_t * v4l;
-  struct v4l2_capability cap;
-  //  struct v4l2_cropcap cropcap;
-  //  struct v4l2_crop crop;
-  //  unsigned int min;
-  
-  v4l = priv;
-  gavl_timer_set(v4l->timer, 0);
-  gavl_timer_start(v4l->timer);
-
-  v4l->fd = bgv4l2_open_device(v4l->device, V4L2_CAP_VIDEO_CAPTURE,
-                               &cap);
-  
-  //  create_card_parameters(v4l->fd);
-
-  if(v4l->controls)
-    {
-    free(v4l->controls);
-    v4l->controls = NULL;
-    }
-  if(v4l->fd < 0)
-    return 0;
-  
-  v4l->controls =
-    bgv4l2_create_device_controls(v4l->fd, &v4l->num_controls);
-  
-  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Device name: %s", cap.card);
-
-  if ((cap.capabilities & V4L2_CAP_STREAMING) && !v4l->force_rw)
-    {
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Trying mmap i/o");
-    v4l->io = BGV4L2_IO_METHOD_MMAP;
-    }
-  else if(cap.capabilities & V4L2_CAP_READWRITE)
-    {
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Trying read i/o");
-    v4l->io = BGV4L2_IO_METHOD_RW;
-    }
-  
-  /* Select video input, video standard and tune here. */
-
-#if 0
-  CLEAR (cropcap);
-
-  cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-  if (0 == bgv4l2_ioctl (v4l->fd, VIDIOC_CROPCAP, &cropcap))
-    {
-    crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    crop.c = cropcap.defrect; /* reset to default */
-    
-    if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_S_CROP, &crop))
-      {
-      switch (errno)
-        {
-        case EINVAL:
-          /* Cropping not supported. */
-          break;
-        default:
-          /* Errors ignored. */
-          break;
-        }
-      }
-    }
-  else
-    {	
-    /* Errors ignored. */
-    }
-#endif
-  
-  if(!get_pixelformat(v4l->fd, &v4l->v4l2_pixelformat))
-    {
-#ifdef HAVE_V4LCONVERT
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Trying v4lconvert");
-    v4l->converter = bg_v4l2_convert_create(v4l->fd,
-                                            &v4l->v4l2_pixelformat,
-                                            &format->pixelformat, v4l->width,
-                                            v4l->height);
-    if(!v4l->converter)
-      return 0;
-#else
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got no supported pixelformat");
-    return 0;
-#endif
-    }
-  else
-    {
-    format->pixelformat =
-      bgv4l2_pixelformat_v4l2_2_gavl(v4l->v4l2_pixelformat);
-    }
-  
-  v4l->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-  
-  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_G_FMT, &v4l->fmt))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_G_FMT failed: %s", strerror(errno));
-    return 0;
-    }
-  
-  // CLEAR (fmt);
-
-  v4l->fmt.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-  v4l->fmt.fmt.pix.width       = v4l->width; 
-  v4l->fmt.fmt.pix.height      = v4l->height;
-  v4l->fmt.fmt.pix.pixelformat = v4l->v4l2_pixelformat;
-  
-  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_S_FMT, &v4l->fmt))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_S_FMT failed: %s", strerror(errno));
-    return 0;
-    }
-  /* Note VIDIOC_S_FMT may change width and height. */
-
-#if 0  
-  /* Buggy driver paranoia. */
-  min = fmt.fmt.pix.width * 2;
-  if (fmt.fmt.pix.bytesperline < min)
-    fmt.fmt.pix.bytesperline = min;
-  min = fmt.fmt.pix.bytesperline * fmt.fmt.pix.height;
-  if (fmt.fmt.pix.sizeimage < min)
-    fmt.fmt.pix.sizeimage = min;
-#endif
-
-  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_G_FMT, &v4l->fmt))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_G_FMT failed: %s", strerror(errno));
-    return 0;
-    }
- 
-  format->pixel_width  = 1;
-  format->pixel_height = 1;
-  format->image_width  = v4l->fmt.fmt.pix.width;
-  format->image_height = v4l->fmt.fmt.pix.height;
-  format->frame_width  = v4l->fmt.fmt.pix.width;
-  format->frame_height = v4l->fmt.fmt.pix.height;
-  format->timescale = GAVL_TIME_SCALE / TIME_DIV;
-  format->frame_duration = 0;
-  format->framerate_mode = GAVL_FRAMERATE_VARIABLE;
-
-  gavl_video_format_copy(&v4l->format, format);
-  
-  switch (v4l->io)
-    {
-    case BGV4L2_IO_METHOD_RW:
-      if(!init_read (v4l))
-        return 0;
-      break;
-      
-    case BGV4L2_IO_METHOD_MMAP:
-      if(!init_mmap (v4l))
-        return 0;
-      break;
-    }
-  return 1;
+  return result;
   }
 
 static void close_v4l(void * priv)
@@ -438,8 +267,6 @@
   if(v4l->fd < 0)
     return;
   
-  gavl_timer_stop(v4l->timer);
-
   switch (v4l->io)
     {
     case BGV4L2_IO_METHOD_RW:
@@ -454,7 +281,8 @@
       type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
       if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_STREAMOFF, &type))
         {
-        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_STREAMOFF failed: %s", strerror(errno));
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+               "VIDIOC_STREAMOFF failed: %s", strerror(errno));
         return;
         }
       for (i = 0; i < v4l->n_buffers; ++i)
@@ -494,10 +322,16 @@
     v4l->converter = NULL;
     }
 #endif
+
+  if(v4l->ft)
+    {
+    bg_frame_timer_destroy(v4l->ft);
+    v4l->ft = NULL;
+    }
   }
 
 static void process_image(v4l2_t * v4l, void * data,
-                          gavl_video_frame_t * frame)
+                          gavl_video_frame_t ** frame)
   {
 #ifdef HAVE_V4LCONVERT
   if(v4l->converter)
@@ -516,31 +350,14 @@
                        &v4l->fmt, v4l->frame->strides);
     }
   gavl_video_frame_set_planes(v4l->frame, &v4l->format, data);
-  gavl_video_frame_copy(&v4l->format, frame, v4l->frame);
+  *frame = v4l->frame;
 #ifdef HAVE_V4LCONVERT
     }
 #endif
-  frame->timestamp = gavl_timer_get(v4l->timer) / TIME_DIV;
   }
 
-static int read_frame_read(v4l2_t * v4l, gavl_video_frame_t * frame)
+static int read_frame_read(v4l2_t * v4l, gavl_video_frame_t ** frame)
   {
-  /* If strides match we can read directly into the frame buffer */
-  if(
-#ifdef HAVE_V4LCONVERT
-     !v4l->converter &&
-#endif
-     bgv4l2_strides_match(frame, v4l->strides, v4l->num_strides))
-    {
-    if (read (v4l->fd, frame->planes[0], v4l->fmt.fmt.pix.sizeimage) < v4l->fmt.fmt.pix.sizeimage)
-      {
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "read failed: %s", strerror(errno));
-      return 0;
-      }
-    frame->timestamp = gavl_timer_get(v4l->timer) / TIME_DIV;
-    return 1;
-    }
-
   if(!v4l->buffers[0].start)
     v4l->buffers[0].start = malloc(v4l->fmt.fmt.pix.sizeimage);
   
@@ -565,7 +382,7 @@
   return 1;
   }
 
-static int read_frame_mmap(v4l2_t * v4l, gavl_video_frame_t * frame)
+static int read_frame_mmap(v4l2_t * v4l, gavl_video_frame_t ** frame)
   {
   struct v4l2_buffer buf;
   
@@ -576,7 +393,8 @@
       
   if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_DQBUF, &buf))
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_DQBUF failed: %s", strerror(errno));
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN,
+           "VIDIOC_DQBUF failed: %s", strerror(errno));
     switch (errno)
       {
       case EAGAIN:
@@ -621,11 +439,13 @@
   return 1;
   }
 
-static int read_frame_v4l(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_source_status_t
+read_frame_v4l(void * priv, gavl_video_frame_t ** frame)
   {
+  int ret = 0;
   v4l2_t * v4l;
+  
   v4l = priv;
-
   
   for (;;)
     {
@@ -648,7 +468,8 @@
       {
       if (EINTR == errno)
         continue;
-      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Select failed: %s", strerror(errno));
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Select failed: %s",
+             strerror(errno));
       return 0;
       }
     
@@ -658,21 +479,35 @@
       return 0;
       }
 
+    ret = 0;
+    
     switch (v4l->io)
       {
       case BGV4L2_IO_METHOD_RW:
-        return read_frame_read(v4l, frame);
+        ret = read_frame_read(v4l, frame);
         break;
         
       case BGV4L2_IO_METHOD_MMAP:
-        return read_frame_mmap(v4l, frame);
+        ret = read_frame_mmap(v4l, frame);
         break;
       }
+
+    if(ret)
+      bg_frame_timer_update(v4l->ft, *frame);
+    
+    return ret;
     }
   
   return 0;
   }
 
+static gavl_video_source_t *
+get_video_source_v4l(void * priv)
+  {
+  v4l2_t * v4l = priv;
+  return v4l->src;
+  }
+
 static void * create_v4l()
   {
   v4l2_t * v4l;
@@ -680,8 +515,7 @@
   v4l = calloc(1, sizeof(*v4l));
   
   v4l->fd = -1;
-  //  v4l->device = bg_strdup(v4l->device, "/dev/video4");
-  v4l->timer = gavl_timer_create();
+  //  v4l->device = gavl_strrep(v4l->device, "/dev/video4");
   return v4l;
   }
 
@@ -690,7 +524,6 @@
   v4l2_t * v4l;
   v4l = priv;
   close_v4l(priv);
-  gavl_timer_destroy(v4l->timer);
   
   if(v4l->parameters)
     bg_parameter_info_destroy_array(v4l->parameters);
@@ -733,14 +566,14 @@
       .name =      "resolution",
       .long_name = TRS("Resolution"),
       .type =      BG_PARAMETER_STRINGLIST,
-      .val_default = { .val_str = "QVGA (320x240)" },
-      .multi_names =     (char const *[]){ "QSIF (160x112)",
-                              "QCIF (176x144)", 
-                              "QVGA (320x240)", 
-                              "SIF(352x240)", 
-                              "CIF (352x288)", 
-                              "VGA (640x480)", 
-                              "User defined",
+      .val_default = { .val_str = "qvga" },
+      .multi_names =     (char const *[]){ "qsif",
+                              "qcif", 
+                              "qvga", 
+                              "sif", 
+                              "cif", 
+                              "vga", 
+                              "user",
                               NULL },
       .multi_labels =     (char const *[]){ TRS("QSIF (160x112)"),
                                    TRS("QCIF (176x144)"), 
@@ -819,48 +652,48 @@
     return;
     }
   else if(!strcmp(name, "device"))
-    v4l->device = bg_strdup(v4l->device, val->val_str);
+    v4l->device = gavl_strrep(v4l->device, val->val_str);
   else if(!strcmp(name, "force_rw"))
     v4l->force_rw = val->val_i;
   else if(!strcmp(name, "resolution"))
     {
-    if(!strcmp(val->val_str, "QSIF (160x112)"))
+    if(!strcmp(val->val_str, "qsif"))
       {
       v4l->width  = 160;
       v4l->height = 112;
       v4l->user_resolution = 0;
       }
-    else if(!strcmp(val->val_str, "QCIF (176x144)"))
+    else if(!strcmp(val->val_str, "qcif"))
       {
       v4l->width  = 176;
       v4l->height = 144;
       v4l->user_resolution = 0;
       }
-    else if(!strcmp(val->val_str, "QVGA (320x240)"))
+    else if(!strcmp(val->val_str, "qvga"))
       {
       v4l->width  = 320;
       v4l->height = 240;
       v4l->user_resolution = 0;
       }
-    else if(!strcmp(val->val_str, "SIF(352x240)"))
+    else if(!strcmp(val->val_str, "sif"))
       {
       v4l->width  = 352;
       v4l->height = 240;
       v4l->user_resolution = 0;
       }
-    else if(!strcmp(val->val_str, "CIF (352x288)"))
+    else if(!strcmp(val->val_str, "cif"))
       {
       v4l->width  = 352;
       v4l->height = 288;
       v4l->user_resolution = 0;
       }
-    else if(!strcmp(val->val_str, "VGA (640x480)"))
+    else if(!strcmp(val->val_str, "vga"))
       {
       v4l->width  = 640;
       v4l->height = 480;
       v4l->user_resolution = 0;
       }
-    else if(!strcmp(val->val_str, "User defined"))
+    else if(!strcmp(val->val_str, "user"))
       {
       v4l->user_resolution = 1;
       }
@@ -883,6 +716,241 @@
     }
   }
 
+static int open_v4l(void * priv,
+                    gavl_audio_format_t * audio_format,
+                    gavl_video_format_t * format, gavl_metadata_t * m)
+  {
+  v4l2_t * v4l;
+  struct v4l2_capability cap;
+  struct v4l2_streamparm param;
+  float default_fps;
+  
+  //  struct v4l2_cropcap cropcap;
+  //  struct v4l2_crop crop;
+  //  unsigned int min;
+
+  v4l = priv;
+  
+  v4l->fd = bgv4l2_open_device(v4l->device, V4L2_CAP_VIDEO_CAPTURE,
+                               &cap);
+  
+  //  create_card_parameters(v4l->fd);
+
+  if(v4l->controls)
+    {
+    free(v4l->controls);
+    v4l->controls = NULL;
+    }
+  if(v4l->fd < 0)
+    return 0;
+  
+  v4l->controls =
+    bgv4l2_create_device_controls(v4l->fd, &v4l->num_controls);
+  
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Device name: %s", cap.card);
+
+  gavl_metadata_set(m, GAVL_META_DEVICE, (char*)cap.card);
+  
+  if((cap.capabilities & V4L2_CAP_STREAMING) &&
+     (!v4l->force_rw || !(cap.capabilities & V4L2_CAP_READWRITE)))
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Trying mmap i/o");
+    v4l->io = BGV4L2_IO_METHOD_MMAP;
+    }
+  else if(cap.capabilities & V4L2_CAP_READWRITE)
+    {
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Trying read i/o");
+    v4l->io = BGV4L2_IO_METHOD_RW;
+    }
+  
+  /* Select video input, video standard and tune here. */
+
+#if 0
+  CLEAR (cropcap);
+
+  cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+  if (0 == bgv4l2_ioctl (v4l->fd, VIDIOC_CROPCAP, &cropcap))
+    {
+    crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+    crop.c = cropcap.defrect; /* reset to default */
+    
+    if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_S_CROP, &crop))
+      {
+      switch (errno)
+        {
+        case EINVAL:
+          /* Cropping not supported. */
+          break;
+        default:
+          /* Errors ignored. */
+          break;
+        }
+      }
+    }
+  else
+    {	
+    /* Errors ignored. */
+    }
+#endif
+  
+  if(!get_pixelformat(v4l->fd, &v4l->v4l2_pixelformat))
+    {
+#ifdef HAVE_V4LCONVERT
+    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Trying v4lconvert");
+    v4l->converter = bg_v4l2_convert_create(v4l->fd,
+                                            &v4l->v4l2_pixelformat,
+                                            &format->pixelformat, v4l->width,
+                                            v4l->height);
+    if(!v4l->converter)
+      {
+#endif
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Got no supported pixelformat");
+    return 0;
+#ifdef HAVE_V4LCONVERT
+      }
+#endif
+      }
+  else
+    {
+    format->pixelformat =
+      bgv4l2_pixelformat_v4l2_2_gavl(v4l->v4l2_pixelformat);
+    }
+  
+  v4l->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  
+  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_G_FMT, &v4l->fmt))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_G_FMT failed: %s",
+           strerror(errno));
+    return 0;
+    }
+  
+  // CLEAR (fmt);
+
+  v4l->fmt.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  v4l->fmt.fmt.pix.width       = v4l->width; 
+  v4l->fmt.fmt.pix.height      = v4l->height;
+  v4l->fmt.fmt.pix.pixelformat = v4l->v4l2_pixelformat;
+  
+  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_S_FMT, &v4l->fmt))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_S_FMT failed: %s",
+           strerror(errno));
+    return 0;
+    }
+  /* Note VIDIOC_S_FMT may change width and height. */
+
+#if 0  
+  /* Buggy driver paranoia. */
+  min = fmt.fmt.pix.width * 2;
+  if (fmt.fmt.pix.bytesperline < min)
+    fmt.fmt.pix.bytesperline = min;
+  min = fmt.fmt.pix.bytesperline * fmt.fmt.pix.height;
+  if (fmt.fmt.pix.sizeimage < min)
+    fmt.fmt.pix.sizeimage = min;
+#endif
+
+  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_G_FMT, &v4l->fmt))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_G_FMT failed: %s",
+           strerror(errno));
+    return 0;
+    }
+ 
+  format->pixel_width  = 1;
+  format->pixel_height = 1;
+  format->image_width  = v4l->fmt.fmt.pix.width;
+  format->image_height = v4l->fmt.fmt.pix.height;
+  format->frame_width  = v4l->fmt.fmt.pix.width;
+  format->frame_height = v4l->fmt.fmt.pix.height;
+  format->frame_duration = 0;
+  format->framerate_mode = GAVL_FRAMERATE_VARIABLE;
+  
+  /* Check framerate */
+  CLEAR(param);
+
+  default_fps = -1.0;
+  
+  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_G_PARM, &param))
+    {
+    if (EINVAL == errno)
+      {
+      bg_log(BG_LOG_WARNING, LOG_DOMAIN, "%s does not support "
+             "VIDIOC_G_PARAM", v4l->device);
+      }
+    }
+  else
+    {
+    default_fps = (float)param.parm.capture.timeperframe.denominator /
+      (float)param.parm.capture.timeperframe.numerator;
+    }
+
+  if(default_fps < 0.0)
+    {
+    param.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+    param.parm.capture.timeperframe.numerator   = 1;
+    param.parm.capture.timeperframe.denominator = 25;
+
+    if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_S_PARM, &param))
+      {
+      if (EINVAL == errno)
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "%s does not support "
+               "VIDIOC_S_PARAM", v4l->device);
+        }
+      else
+        {
+        bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_S_PARAM failed: %s",
+               strerror(errno));
+        }
+      }
+    else
+      {
+      default_fps = (float)param.parm.capture.timeperframe.denominator /
+        (float)param.parm.capture.timeperframe.numerator;
+      }
+    }
+  
+  if(default_fps < 0.0)
+    default_fps = 10.0;
+  
+  /* Initialize capture mode */
+
+  switch (v4l->io)
+    {
+    case BGV4L2_IO_METHOD_RW:
+      if(!init_read (v4l))
+        return 0;
+      break;
+      
+    case BGV4L2_IO_METHOD_MMAP:
+      if(!init_mmap (v4l))
+        return 0;
+      break;
+    }
+
+  v4l->ft = bg_frame_timer_create(default_fps,
+                                  &format->timescale);
+
+  v4l->src =
+    gavl_video_source_create(read_frame_v4l, v4l,
+                             GAVL_SOURCE_SRC_ALLOC, format);
+
+  
+  gavl_video_format_copy(&v4l->format, format);
+  
+  
+  return 1;
+  }
+
+
+static int read_v4l(void * priv, gavl_video_frame_t * frame, int stream)
+  {
+  v4l2_t * v4l = priv;
+  return (gavl_video_source_read_frame(v4l->src, &frame) == GAVL_SOURCE_OK);
+  }
+
 const bg_recorder_plugin_t the_plugin =
   {
     .common =
@@ -904,8 +972,8 @@
     
     .open =       open_v4l,
     .close =      close_v4l,
-    .read_video = read_frame_v4l,
-    
+    .read_video = read_v4l,
+    .get_video_source = get_video_source_v4l,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/v4l2/ov_v4l2.c -> gmerlin-4256.tar.gz/plugins/v4l2/ov_v4l2.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -68,6 +68,8 @@
   int buffer_index;
   
   int force_rw;
+
+  gavl_video_sink_t * sink;
   
   } ov_v4l2_t;
 
@@ -145,7 +147,7 @@
     return;
     }
   else if(!strcmp(name, "device"))
-    v4l->device = bg_strdup(v4l->device, val->val_str);
+    v4l->device = gavl_strrep(v4l->device, val->val_str);
   else if(!strcmp(name, "force_rw"))
     v4l->force_rw = val->val_i;
   else if(v4l->controls && (v4l->fd >= 0))
@@ -232,6 +234,7 @@
   {
   if(v4l->buffers[0].f)
     gavl_video_frame_destroy(v4l->buffers[0].f);
+  
   }
 
 static int init_mmap(ov_v4l2_t * v4l)
@@ -335,13 +338,17 @@
     }
   }
 
-static void put_frame_write(ov_v4l2_t * v4l, gavl_video_frame_t * frame)
+static gavl_sink_status_t put_frame_write(ov_v4l2_t * v4l, gavl_video_frame_t * frame)
   {
   if(-1 == write(v4l->fd, frame->planes[0], v4l->fmt.fmt.pix.sizeimage))
+    {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "write failed: %s", strerror(errno));
+    return GAVL_SINK_ERROR;
+    }
+  return GAVL_SINK_OK;
   }
 
-static void put_frame_mmap(ov_v4l2_t * v4l, gavl_video_frame_t * frame)
+static gavl_sink_status_t put_frame_mmap(ov_v4l2_t * v4l, gavl_video_frame_t * frame)
   {
   struct v4l2_buffer buf;
   buffer_t * b = frame->user_data;
@@ -357,7 +364,7 @@
   if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_QBUF, &buf))
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_QBUF failed: %s", strerror(errno));
-    return;
+    return GAVL_SINK_ERROR;
     }
   //  fprintf(stderr, "VIDIOC_QBUF %d\n", buf.index);
 
@@ -370,12 +377,13 @@
     if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_STREAMON, &type))
       {
       bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_STREAMON failed: %s", strerror(errno));
-      return;
+      return GAVL_SINK_ERROR;
       }
     //    fprintf(stderr, "STREAMON\n");
     }
 
   b->queued = 1;
+  return GAVL_SINK_OK;
   }
 
 static void cleanup_v4l(ov_v4l2_t * v4l)
@@ -403,17 +411,117 @@
   v4l->num_queued = 0;
   close(v4l->fd);
   v4l->fd = -1;
+
+  if(v4l->sink)
+    {
+    gavl_video_sink_destroy(v4l->sink);
+    v4l->sink = NULL;
+    }
+  
   return;
   }
 
+
+static gavl_video_frame_t * get_frame_dqbuf(ov_v4l2_t * v4l, int mode)
+  {
+  int i;
+  struct v4l2_buffer buf;
+
+  for(i = 0; i < v4l->num_buffers; i++)
+    {
+    if(!v4l->buffers[i].queued)
+      return v4l->buffers[i].f;
+    }
+
+#if 0
+
+  CLEAR(buf);
+  buf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+  buf.index = v4l->buffer_index;
+  buf.memory = mode;
+  
+  if (0 == bgv4l2_ioctl (v4l->fd, VIDIOC_QUERYBUF, &buf))
+    {
+    fprintf(stderr, "VIDIOC_QUERY_BUF %d done: %d, queued: %d\n",
+            buf.index,
+            !!(buf.flags & V4L2_BUF_FLAG_DONE),
+            !!(buf.flags & V4L2_BUF_FLAG_QUEUED));
+        
+    }
+#endif
+  
+  CLEAR(buf);
+  buf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+  buf.memory = mode;
+  
+  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_DQBUF, &buf))
+    {
+    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_DQBUF failed: %s",
+           strerror(errno));
+    return NULL;
+    }
+
+  v4l->buffer_index++;
+  if(v4l->buffer_index >= v4l->num_buffers)
+    v4l->buffer_index = 0;
+  
+  //  fprintf(stderr, "VIDIOC_DQBUF %d done: %d, queued: %d\n",
+  //          buf.index,
+  //          !!(buf.flags & V4L2_BUF_FLAG_DONE),
+  //          !!(buf.flags & V4L2_BUF_FLAG_QUEUED));
+
+  return v4l->buffers[buf.index].f;
+  }
+
+static gavl_video_frame_t * get_frame_v4l2(void * data)
+  {
+
+  ov_v4l2_t * v4l = data;
+  
+  switch(v4l->io)
+    {
+    case BGV4L2_IO_METHOD_RW:
+      return v4l->buffers[0].f;
+      break;
+    case BGV4L2_IO_METHOD_MMAP:
+      return get_frame_dqbuf(v4l, V4L2_MEMORY_MMAP);
+      break;
+    default:
+      return NULL;
+    }
+  }
+
+
+static gavl_sink_status_t put_func_v4l2(void * data, gavl_video_frame_t * frame)
+  {
+  ov_v4l2_t * v4l = data;
+
+  //  fprintf(stderr, "Put video v4l2\n");
+  
+  switch(v4l->io)
+    {
+    case BGV4L2_IO_METHOD_RW:
+      put_frame_write(v4l, frame);
+      break;
+    case BGV4L2_IO_METHOD_MMAP:
+      put_frame_mmap(v4l, frame);
+      break;
+    default:
+      break;
+    }
+  //  fprintf(stderr, "Put video v4l2 done\n");
+  return GAVL_SINK_ERROR;
+  }
+
 static int open_v4l2(void * priv,
                     gavl_video_format_t * format, int keep_aspect)
   {
+  int ret = 0;
   struct v4l2_capability cap;
   gavl_pixelformat_t * pixelformats;
-  
   ov_v4l2_t * v4l = priv;
   
+  
   if(v4l->fd >= 0)
     {
     /* We accept the framerate settings but nothing else */
@@ -492,104 +600,25 @@
   switch(v4l->io)
     {
     case BGV4L2_IO_METHOD_RW:
-      return init_write(v4l);
+      ret = init_write(v4l);
       break;
     case BGV4L2_IO_METHOD_MMAP:
-      return init_mmap(v4l);
+      ret = init_mmap(v4l);
     default:
       return 0;
     }
-  return 0;
-  }
-
-static gavl_video_frame_t * get_frame_dqbuf(ov_v4l2_t * v4l, int mode)
-  {
-  int i;
-  struct v4l2_buffer buf;
-
-  for(i = 0; i < v4l->num_buffers; i++)
-    {
-    if(!v4l->buffers[i].queued)
-      return v4l->buffers[i].f;
-    }
-
-#if 0
-
-  CLEAR(buf);
-  buf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-  buf.index = v4l->buffer_index;
-  buf.memory = mode;
-  
-  if (0 == bgv4l2_ioctl (v4l->fd, VIDIOC_QUERYBUF, &buf))
-    {
-    fprintf(stderr, "VIDIOC_QUERY_BUF %d done: %d, queued: %d\n",
-            buf.index,
-            !!(buf.flags & V4L2_BUF_FLAG_DONE),
-            !!(buf.flags & V4L2_BUF_FLAG_QUEUED));
-        
-    }
-#endif
-  
-  CLEAR(buf);
-  buf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-  buf.memory = mode;
-  
-  if (-1 == bgv4l2_ioctl (v4l->fd, VIDIOC_DQBUF, &buf))
-    {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "VIDIOC_DQBUF failed: %s",
-           strerror(errno));
-    return NULL;
-    }
-
-  v4l->buffer_index++;
-  if(v4l->buffer_index >= v4l->num_buffers)
-    v4l->buffer_index = 0;
-  
-  //  fprintf(stderr, "VIDIOC_DQBUF %d done: %d, queued: %d\n",
-  //          buf.index,
-  //          !!(buf.flags & V4L2_BUF_FLAG_DONE),
-  //          !!(buf.flags & V4L2_BUF_FLAG_QUEUED));
-
-  return v4l->buffers[buf.index].f;
-  }
-
-static gavl_video_frame_t * get_frame_v4l2(void * data)
-  {
 
-  ov_v4l2_t * v4l = data;
-  
-  switch(v4l->io)
-    {
-    case BGV4L2_IO_METHOD_RW:
-      return v4l->buffers[0].f;
-      break;
-    case BGV4L2_IO_METHOD_MMAP:
-      return get_frame_dqbuf(v4l, V4L2_MEMORY_MMAP);
-      break;
-    default:
-      return NULL;
-    }
+  if(ret)
+    v4l->sink = gavl_video_sink_create(get_frame_v4l2,
+                                       put_func_v4l2,
+                                       v4l, format);
+  return ret;
   }
 
-
-static void put_video_v4l2(void * data, gavl_video_frame_t * frame)
+static gavl_video_sink_t * get_sink_v4l2(void * data)
   {
   ov_v4l2_t * v4l = data;
-
-  //  fprintf(stderr, "Put video v4l2\n");
-  
-  switch(v4l->io)
-    {
-    case BGV4L2_IO_METHOD_RW:
-      put_frame_write(v4l, frame);
-      break;
-    case BGV4L2_IO_METHOD_MMAP:
-      put_frame_mmap(v4l, frame);
-      break;
-    default:
-      return;
-    }
-  //  fprintf(stderr, "Put video v4l2 done\n");
+  return v4l->sink;
   }
 
 static void show_window_v4l2(void * data, int show)
@@ -629,14 +658,13 @@
     //    .set_window_options =   set_window_options_v4l2,
     //    .set_window_title =   set_window_title_v4l2,
     .open =               open_v4l2,
-    .get_frame =    get_frame_v4l2,
-
+    .get_sink = get_sink_v4l2,
+    
     //    .add_overlay_stream = add_overlay_stream_v4l2,
     //    .create_overlay =    create_overlay_v4l2,
     //    .set_overlay =        set_overlay_v4l2,
 
-    .put_video =          put_video_v4l2,
-
+    
     //    .handle_events =  handle_events_v4l2,
     
     //    .destroy_overlay =   destroy_overlay_v4l2,

gmerlin-1.2.0.tar.gz/plugins/v4l2/v4l2_common.c -> gmerlin-4256.tar.gz/plugins/v4l2/v4l2_common.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -184,8 +184,8 @@
 
   info = &(*ret)[*num];
 
-  info->name = bg_strdup(info->name, (char*)ctrl->name);
-  info->long_name = bg_strdup(info->long_name, (char*)ctrl->name);
+  info->name = gavl_strrep(info->name, (char*)ctrl->name);
+  info->long_name = gavl_strrep(info->long_name, (char*)ctrl->name);
   info->flags = BG_PARAMETER_SYNC;
   
   switch(ctrl->type)
@@ -292,10 +292,10 @@
     info->multi_parameters_nc = realloc(info->multi_parameters_nc, (num_cards + 2)*
                                      sizeof(*info->multi_parameters));
     
-    info->multi_names_nc[num_cards] = bg_strdup(NULL, tmp_string);
+    info->multi_names_nc[num_cards] = gavl_strdup(tmp_string);
     info->multi_names_nc[num_cards+1] = NULL;
 
-    info->multi_labels_nc[num_cards] = bg_strdup(NULL, (char*)cap.card);
+    info->multi_labels_nc[num_cards] = gavl_strdup((char*)cap.card);
     info->multi_labels_nc[num_cards+1] = NULL;
 
     info->multi_parameters_nc[num_cards] = create_card_parameters(fd);

gmerlin-1.2.0.tar.gz/plugins/v4l2/v4l2_common.h -> gmerlin-4256.tar.gz/plugins/v4l2/v4l2_common.h Changed

gmerlin-1.2.0.tar.gz/plugins/videofilters/Makefile.am -> gmerlin-4256.tar.gz/plugins/videofilters/Makefile.am Changed

@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 plugindir=$(pkglibdir)/plugins
 AM_LDFLAGS = @GMERLIN_PLUGIN_LDFLAGS@ -avoid-version -module
@@ -9,8 +9,6 @@
 -DDOC_DIR=\"$(docdir)\" \
 -DDATA_DIR=\"$(pkgdatadir)\"
 
-
-
 plugin_LTLIBRARIES = \
 fv_bitshift.la \
 fv_blur.la \
@@ -36,21 +34,21 @@
 fv_zoom.la
 
 fv_blur_la_SOURCES  = fv_blur.c
-fv_blur_la_LIBADD = @MODULE_LIBADD@
+fv_blur_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 
-fv_colormatrix_rgb_la_SOURCES  = fv_colormatrix_rgb.c colormatrix.c
+fv_colormatrix_rgb_la_SOURCES  = fv_colormatrix_rgb.c
 fv_colormatrix_rgb_la_LIBADD = @MODULE_LIBADD@
 
-fv_colormatrix_yuv_la_SOURCES  = fv_colormatrix_yuv.c colormatrix.c
+fv_colormatrix_yuv_la_SOURCES  = fv_colormatrix_yuv.c
 fv_colormatrix_yuv_la_LIBADD = @MODULE_LIBADD@
 
-fv_invert_rgb_la_SOURCES  = fv_invert_rgb.c colormatrix.c
+fv_invert_rgb_la_SOURCES  = fv_invert_rgb.c
 fv_invert_rgb_la_LIBADD = @MODULE_LIBADD@
 
-fv_colorbalance_la_SOURCES  = fv_colorbalance.c colormatrix.c
+fv_colorbalance_la_SOURCES  = fv_colorbalance.c
 fv_colorbalance_la_LIBADD = @MODULE_LIBADD@
 
-fv_oldcolor_la_SOURCES  = fv_oldcolor.c colormatrix.c
+fv_oldcolor_la_SOURCES  = fv_oldcolor.c
 fv_oldcolor_la_LIBADD = @MODULE_LIBADD@
 
 fv_pixelformat_la_SOURCES  = fv_pixelformat.c
@@ -71,7 +69,7 @@
 fv_tctweak_la_LIBADD = @MODULE_LIBADD@
 
 fv_transform_la_SOURCES  = fv_transform.c
-fv_transform_la_LIBADD = @MODULE_LIBADD@
+fv_transform_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 
 fv_cropscale_la_SOURCES  = fv_cropscale.c
 fv_cropscale_la_LIBADD = @MODULE_LIBADD@
@@ -90,10 +88,12 @@
 fv_deinterlace_la_LIBADD   = @MODULE_LIBADD@
 fv_deinterlace_la_SOURCES  = fv_deinterlace.c bgyadif.c
 
-fv_equalizer_la_SOURCES  = fv_equalizer.c colormatrix.c
-fv_equalizer_la_LIBADD = @MODULE_LIBADD@
+fv_equalizer_la_SOURCES  = fv_equalizer.c 
+fv_equalizer_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 
 fv_zoom_la_SOURCES  = fv_zoom.c
 fv_zoom_la_LIBADD = @MODULE_LIBADD@
 
-noinst_HEADERS = bgyadif.h colormatrix.h deinterlace.h
+fv_swapfields_la_LIBADD = @MODULE_LIBADD@
+
+noinst_HEADERS = bgyadif.h deinterlace.h

gmerlin-1.2.0.tar.gz/plugins/videofilters/bgyadif.c -> gmerlin-4256.tar.gz/plugins/videofilters/bgyadif.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -56,11 +56,6 @@
   int parity;
   int accel_flags;
   
-  /* Where to get data */
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-
   gavl_video_format_t in_format;
   gavl_video_format_t out_format;
   
@@ -174,6 +169,7 @@
 
 void bg_yadif_init(bg_yadif_t * di,
                    gavl_video_format_t * format,
+                   gavl_video_format_t * out_format,
                    gavl_video_options_t * opt, int mode)
   {
   int sub_h = 1, sub_v = 1;
@@ -198,8 +194,7 @@
 #ifdef HAVE_MMX
   di->mmx = 0;
 #endif
-  
-  
+ 
   switch(format->pixelformat)
     {
     case GAVL_YUV_420_P:
@@ -279,24 +274,9 @@
     (di->in_format.interlace_mode == GAVL_INTERLACE_BOTTOM_FIRST) ? 1 : 0;
   
   di->mode = mode;
+  gavl_video_format_copy(out_format, &di->out_format);
   }
 
-void bg_yadif_get_output_format(bg_yadif_t * di,
-                                gavl_video_format_t * format)
-  {
-  gavl_video_format_copy(format, &di->out_format);
-
-  }
-
-void bg_yadif_connect_input(void * priv,
-                            bg_read_video_func_t func,
-                            void * data, int stream)
-  {
-  bg_yadif_t * di = priv;
-  di->read_func = func;
-  di->read_data = data;
-  di->read_stream = stream;
-  }
 
 static void filter_plane(void * priv, int start, int end)
   {
@@ -328,7 +308,8 @@
       const uint8_t *cur = cur0 + y*src_stride;
       const uint8_t *next= next0 + y*src_stride;
       uint8_t *dst2= dst + y*dst_stride;
-      di->filter_line(di->mode, dst2, prev, cur, next, w, src_stride, (di->current_parity ^ di->tff),
+      di->filter_line(di->mode, dst2, prev, cur, next, w,
+                      src_stride, (di->current_parity ^ di->tff),
                       di->comp->advance);
       }
     else
@@ -423,64 +404,81 @@
     }
   }
 
-static int read_frame(bg_yadif_t * di)
-  {
-  gavl_video_frame_t * tmp;
-  tmp = di->prev;
-
-  di->prev = di->cur;
-  di->cur = di->next;
-  di->next = tmp;
-  return di->read_func(di->read_data, di->next, di->read_stream);
-  }
-
-int bg_yadif_read(void * priv, gavl_video_frame_t * frame, int stream)
+gavl_source_status_t
+bg_yadif_read(void * priv, gavl_video_frame_t ** frame, gavl_video_source_t * src)
   {
+  gavl_source_status_t st;
   bg_yadif_t * di = priv;
   
   if(!di->field)
     {
     if(di->eof)
       return 0;
-   
-    if(!di->frame) /* Fill buffer */
+
+    /* Fill buffer */
+    if(!di->frame)
       {
-      di->read_func(di->read_data, di->cur, di->read_stream);
+      st = gavl_video_source_read_frame(src, &di->cur);
+      if(st != GAVL_SOURCE_OK)
+        return st;
       di->frame++;
-      di->read_func(di->read_data, di->next, di->read_stream);
+      }
+    if(di->frame == 1)
+      {
+      st = gavl_video_source_read_frame(src, &di->next);
+      if(st != GAVL_SOURCE_OK)
+        return st;
       gavl_video_frame_copy(&di->in_format, di->prev, di->next);
+      di->frame++;
       }
-    else if(!read_frame(di))
+    else
       {
-      di->eof = 1;
-      gavl_video_frame_copy(&di->in_format, di->next, di->prev);
+      gavl_video_frame_t * tmp;
+      tmp = di->prev;
+
+      di->prev = di->cur;
+      di->cur = di->next;
+      di->next = tmp;
+
+      st = gavl_video_source_read_frame(src, &di->next);
+      if(st != GAVL_SOURCE_OK)
+        {
+        if(st == GAVL_SOURCE_EOF)
+          {
+          di->eof = 1;
+          gavl_video_frame_copy(&di->in_format, di->next, di->prev);
+          }
+        else
+          return st;
+        }
       }
+    
     di->frame++;
     
     /* Output first field */
-    filter_frame(di, di->parity, frame);
+    filter_frame(di, di->parity, *frame);
 
     if(di->mode & 1)
       di->field++;
     else
       di->field = 0;
 
-    frame->timestamp = gavl_time_rescale(di->in_format.timescale,
+    (*frame)->timestamp = gavl_time_rescale(di->in_format.timescale,
                                          di->out_format.timescale,
                                          di->cur->timestamp);
-    frame->timecode = di->cur->timecode;
-    frame->duration = di->cur->duration;
+    (*frame)->timecode = di->cur->timecode;
+    (*frame)->duration = di->cur->duration;
     }
   else
     {
     /* Output second field */
-    filter_frame(di, 1 - di->parity, frame);
+    filter_frame(di, 1 - di->parity, *frame);
     
-    frame->timestamp = gavl_time_rescale(di->in_format.timescale,
+    (*frame)->timestamp = gavl_time_rescale(di->in_format.timescale,
                                          di->out_format.timescale,
                                          di->cur->timestamp) + di->cur->duration;
-    frame->timecode = di->cur->timecode;
-    frame->duration = di->cur->duration;
+    (*frame)->timecode = di->cur->timecode;
+    (*frame)->duration = di->cur->duration;
     
     di->field = 0;
     }
@@ -488,7 +486,7 @@
   //  fprintf(stderr, "PTS: %ld (%f)\n", frame->timestamp, gavl_time_to_seconds(gavl_time_unscale(di->out_format.timescale,
   //                                                                                          frame->timestamp)));
   
-  return 1;
+  return GAVL_SOURCE_OK;
   }
 
 void bg_yadif_reset(bg_yadif_t * di)

gmerlin-1.2.0.tar.gz/plugins/videofilters/bgyadif.h -> gmerlin-4256.tar.gz/plugins/videofilters/bgyadif.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,15 +29,10 @@
 
 void bg_yadif_init(bg_yadif_t * di,
                    gavl_video_format_t * format,
+                   gavl_video_format_t * out_format,
                    gavl_video_options_t * opt, int mode);
 
-void bg_yadif_get_output_format(bg_yadif_t * di,
-                                gavl_video_format_t * format);
-
-void bg_yadif_connect_input(void * priv,
-                            bg_read_video_func_t func,
-                            void * data, int stream);
-
-int bg_yadif_read(void * priv, gavl_video_frame_t * frame, int stream);
+gavl_source_status_t
+bg_yadif_read(void * priv, gavl_video_frame_t ** frame, gavl_video_source_t * src);
 
 void bg_yadif_reset(bg_yadif_t * di);

gmerlin-1.2.0.tar.gz/plugins/videofilters/deinterlace.h -> gmerlin-4256.tar.gz/plugins/videofilters/deinterlace.h Changed

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_bitshift.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_bitshift.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,13 +35,13 @@
   {
   int shift;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   
   int samples_per_line;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+
   } shift_priv_t;
 
 static void * create_shift()
@@ -55,6 +55,10 @@
   {
   shift_priv_t * vp;
   vp = priv;
+
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  
   free(vp);
   }
 
@@ -91,24 +95,9 @@
     vp->shift = val->val_i;
   }
 
-static void connect_input_port_shift(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  shift_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
 
 /* We support all 16 bit formats */
-static gavl_pixelformat_t pixelformats[] =
+static const gavl_pixelformat_t pixelformats[] =
   {
     GAVL_GRAY_16,
     GAVL_GRAYA_32,
@@ -117,53 +106,28 @@
     GAVL_PIXELFORMAT_NONE,
   };
 
-static void set_input_format_shift(void * priv, gavl_video_format_t * format, int port)
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_video_frame_t ** frame)
   {
+  gavl_source_status_t st;
   shift_priv_t * vp;
-  int width_mult;
-  vp = priv;
+  int i, j;
+  uint16_t * ptr;
+  gavl_video_frame_t * f;
 
   
-  if(!port)
-    {
-    width_mult = 3;
-    format->pixelformat = gavl_pixelformat_get_best(format->pixelformat,
-                                                    pixelformats,
-                                                    NULL);
-    gavl_video_format_copy(&vp->format, format);
-    
-    if(gavl_pixelformat_is_gray(format->pixelformat))
-      width_mult = 1;
-    if(gavl_pixelformat_has_alpha(format->pixelformat))
-      width_mult++;
-    vp->samples_per_line = format->image_width * width_mult;
-    }
-  }
-
-static void get_output_format_shift(void * priv, gavl_video_format_t * format)
-  {
-  shift_priv_t * vp;
   vp = priv;
   
-  gavl_video_format_copy(format, &vp->format);
-  }
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) != GAVL_SOURCE_OK)
+    return st;
 
-static int read_video_shift(void * priv, gavl_video_frame_t * frame, int stream)
-  {
-  shift_priv_t * vp;
-  int i, j;
-  uint16_t * ptr;
+  f = *frame;
   
-  vp = priv;
-
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-
   if(vp->shift)
     {
     for(i = 0; i < vp->format.image_height; i++)
       {
-      ptr = (uint16_t*)(frame->planes[0] + i * frame->strides[0]);
+      ptr = (uint16_t*)(f->planes[0] + i * f->strides[0]);
 
       for(j = 0; j < vp->samples_per_line; j++)
         {
@@ -172,7 +136,45 @@
         }
       }
     }
-  return 1;
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_video_source_t *
+connect_shift(void * priv, gavl_video_source_t * src,
+              const gavl_video_options_t * opt)
+  {
+  shift_priv_t * vp;
+  int width_mult;
+
+  vp = priv;
+
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
+
+  width_mult = 3;
+  vp->format.pixelformat =
+    gavl_pixelformat_get_best(vp->format.pixelformat,
+                              pixelformats,
+                              NULL);
+  //  gavl_video_format_copy(&vp->format, format);
+  
+  if(gavl_pixelformat_is_gray(vp->format.pixelformat))
+    width_mult = 1;
+  if(gavl_pixelformat_has_alpha(vp->format.pixelformat))
+    width_mult++;
+  vp->samples_per_line = vp->format.image_width * width_mult;
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -192,12 +194,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_shift,
-    
-    .set_input_format = set_input_format_shift,
-    .get_output_format = get_output_format_shift,
-
-    .read_video = read_video_shift,
+    .connect = connect_shift,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_blur.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_blur.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -48,13 +48,12 @@
   gavl_video_options_t * opt;
   gavl_video_scaler_t * scaler;
   gavl_video_options_t * global_opt;
+  
+  gavl_video_format_t format;
 
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
 
-  gavl_video_format_t format;
-  gavl_video_frame_t * frame;
   } blur_priv_t;
 
 static void * create_blur()
@@ -73,15 +72,8 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_blur(void * priv)
-  {
-  blur_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
-
 static void transfer_global_options(gavl_video_options_t * opt,
-                                    gavl_video_options_t * global_opt)
+                                    const gavl_video_options_t * global_opt)
   {
   void * client_data;
   gavl_video_stop_func stop_func;
@@ -103,9 +95,14 @@
   {
   blur_priv_t * vp;
   vp = priv;
-  if(vp->frame) gavl_video_frame_destroy(vp->frame);
-  if(vp->scaler) gavl_video_scaler_destroy(vp->scaler);
+  if(vp->scaler)
+    gavl_video_scaler_destroy(vp->scaler);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
   gavl_video_options_destroy(vp->global_opt);
+
+  
   free(vp);
   }
 
@@ -332,70 +329,56 @@
     }
   }
 
-static void connect_input_port_blur(void * priv,
-                                         bg_read_video_func_t func,
-                                         void * data, int stream, int port)
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_video_frame_t ** f)
   {
-  blur_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
+  gavl_source_status_t st;
 
-static void set_input_format_blur(void * priv, gavl_video_format_t * format, int port)
-  {
   blur_priv_t * vp;
+  
   vp = priv;
 
-  if(!port)
+  if((vp->radius_h != 0.0) || (vp->radius_v != 0.0))
     {
-    vp->changed = 1;
-    gavl_video_format_copy(&vp->format, format);
+    gavl_video_frame_t * in_frame = NULL;
+    if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    if(vp->changed)
+      init_scaler(vp);
+    
+    gavl_video_scaler_scale(vp->scaler, in_frame, *f);
+    gavl_video_frame_copy_metadata(*f, in_frame);
+    return GAVL_SOURCE_OK;
     }
+  else
+    return gavl_video_source_read_frame(vp->in_src, f);
   }
 
-static void get_output_format_blur(void * priv, gavl_video_format_t * format)
-  {
-  blur_priv_t * vp;
-  vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
-
-static int read_video_blur(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_video_source_t * connect_blur(void * priv,
+                                          gavl_video_source_t * src,
+                                          const gavl_video_options_t * opt)
   {
   blur_priv_t * vp;
   vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
 
-  if((vp->radius_h != 0.0) || (vp->radius_v != 0.0))
-    {
-    if(vp->changed)
-      {
-      init_scaler(vp);
-      if(vp->frame)
-        {
-        gavl_video_frame_destroy(vp->frame);
-        vp->frame = NULL;
-        }
-      }
-    if(!vp->frame)
-      vp->frame = gavl_video_frame_create(&vp->format);
-    
-    if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-      return 0;
-    gavl_video_scaler_scale(vp->scaler,
-                            vp->frame, frame);
-
-    gavl_video_frame_copy_metadata(frame, vp->frame);
-    return 1;
-    }
-  else 
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
+  
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  vp->changed = 1;
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -414,15 +397,8 @@
       .set_parameter =    set_parameter_blur,
       .priority =         1,
     },
-    
-    .get_options = get_options_blur,
-    .connect_input_port = connect_input_port_blur,
-    
-    .set_input_format = set_input_format_blur,
-    .get_output_format = get_output_format_blur,
 
-    .read_video = read_video_blur,
-    
+    .connect = connect_blur,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_colorbalance.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_colorbalance.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,12 +29,10 @@
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
-
+#include <gmerlin/colormatrix.h>
 
 #define LOG_DOMAIN "fv_colorbalance"
 
-#include "colormatrix.h"
-
 #define CLAMP_FLOAT(val) (val > 1.0) ? 1.0 : ((val < 0.0) ? 0.0 : val)
 
 typedef struct colorbalance_priv_s
@@ -44,10 +42,6 @@
   bg_colormatrix_t * mat;
   float coeffs[3][4];
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-
   int use_matrix;
   int normalize;
   
@@ -55,10 +49,10 @@
   gavl_video_options_t * global_opt;
 
   void (*process)(struct colorbalance_priv_s *, gavl_video_frame_t*);
-  
-  int (*read_video)(struct colorbalance_priv_s *,
-                    gavl_video_frame_t * frame);
-  
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+
   } colorbalance_priv_t;
 
 static void normalize_gain(colorbalance_priv_t * vp, float * gain_ret)
@@ -103,33 +97,6 @@
   vp->coeffs[2][3] = 0.0;
   }
 
-static int read_video_fast(colorbalance_priv_t * vp,
-                           gavl_video_frame_t * frame)
-  {
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-
-  /* Do the conversion */
-
-  if((vp->gain[0] != 1.0) || (vp->gain[1] != 1.0) || (vp->gain[2] != 1.0))
-    {
-    vp->process(vp, frame);
-    }
-  
-  return 1;
-  }
-
-static int read_video_matrix(colorbalance_priv_t * vp,
-                             gavl_video_frame_t * frame)
-  {
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-  
-  if((vp->gain[0] != 1.0) || (vp->gain[1] != 1.0) || (vp->gain[2] != 1.0))
-    bg_colormatrix_process(vp->mat, frame);
-  return 1;
-  }
-
 static void * create_colorbalance()
   {
   colorbalance_priv_t * ret;
@@ -140,18 +107,15 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_colorbalance(void * priv)
-  {
-  colorbalance_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
 static void destroy_colorbalance(void * priv)
   {
   colorbalance_priv_t * vp;
   vp = priv;
   bg_colormatrix_destroy(vp->mat);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
   free(vp);
   }
 
@@ -255,21 +219,6 @@
     }
   }
 
-static void connect_input_port_colorbalance(void * priv,
-                                         bg_read_video_func_t func,
-                                         void * data, int stream, int port)
-  {
-  colorbalance_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
 
 /* Processing functions */
 
@@ -288,7 +237,8 @@
    if(tmp & 0xFFFF0000) tmp= (-tmp)>>63; \
    p=tmp;
 
-static void process_rgb24(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_rgb24(colorbalance_priv_t * vp,
+                          gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -317,7 +267,8 @@
     }
   }
 
-static void process_rgb32(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_rgb32(colorbalance_priv_t * vp,
+                          gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -346,7 +297,8 @@
     }
   }
 
-static void process_bgr24(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_bgr24(colorbalance_priv_t * vp,
+                          gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -375,7 +327,8 @@
     }
   }
 
-static void process_bgr32(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_bgr32(colorbalance_priv_t * vp,
+                          gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -404,7 +357,8 @@
     }
   }
 
-static void process_rgb48(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_rgb48(colorbalance_priv_t * vp,
+                          gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -433,7 +387,8 @@
     }
   }
 
-static void process_rgb64(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_rgb64(colorbalance_priv_t * vp,
+                          gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -462,7 +417,8 @@
     }
   }
 
-static void process_rgb_float(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_rgb_float(colorbalance_priv_t * vp,
+                              gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -493,7 +449,8 @@
     }
   }
 
-static void process_rgba_float(colorbalance_priv_t * vp, gavl_video_frame_t * frame)
+static void process_rgba_float(colorbalance_priv_t * vp,
+                               gavl_video_frame_t * frame)
   {
   int i;
   float gain_norm[3];
@@ -524,17 +481,18 @@
     }
   }
 
-static void set_input_format_colorbalance(void * priv, gavl_video_format_t * format, int port)
+static void process_matrix(colorbalance_priv_t * vp,
+                           gavl_video_frame_t * frame)
   {
-  colorbalance_priv_t * vp;
-  vp = priv;
+  bg_colormatrix_process(vp->mat, frame);
+  }
 
+static void
+set_input_format(colorbalance_priv_t * vp)
+  {
   vp->use_matrix = 0;
-
-  if(port)
-    return;
   
-  switch(format->pixelformat)
+  switch(vp->format.pixelformat)
     {
     case GAVL_RGB_15:
     case GAVL_BGR_15:
@@ -597,37 +555,57 @@
     {
     set_coeffs(vp);
     
-    bg_colormatrix_init(vp->mat, format, 0, vp->global_opt);
+    bg_colormatrix_init(vp->mat, &vp->format, 0, vp->global_opt);
     bg_colormatrix_set_rgb(vp->mat, vp->coeffs);
-    vp->read_video = read_video_matrix;
-    }
-  else
-    {
-    vp->read_video = read_video_fast;
+    vp->process = process_matrix;
     }
-
-
-  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Pixelformat: %s",
-         TRD(gavl_pixelformat_to_string(format->pixelformat), NULL));
-  
-  gavl_video_format_copy(&vp->format, format);
   
+  bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Pixelformat: %s",
+         TRD(gavl_pixelformat_to_string(vp->format.pixelformat), NULL));
   }
 
-static void get_output_format_colorbalance(void * priv, gavl_video_format_t * format)
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_video_frame_t ** f)
   {
+  gavl_source_status_t st;
   colorbalance_priv_t * vp;
   vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
 
+  if((st = gavl_video_source_read_frame(vp->in_src, f)) !=
+     GAVL_SOURCE_OK)
+    return st;
+
+  if((vp->gain[0] != 1.0) || (vp->gain[1] != 1.0) || (vp->gain[2] != 1.0))
+    vp->process(vp, *f);
+  return GAVL_SOURCE_OK;
+  }
 
-static int
-read_video_colorbalance(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_video_source_t *
+connect_colorbalance(void * priv, gavl_video_source_t * src,
+                     const gavl_video_options_t * opt)
   {
   colorbalance_priv_t * vp;
   vp = priv;
-  return vp->read_video(vp, frame);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  
+  vp->in_src = src;
+
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
+
+  set_input_format(vp);
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -646,15 +624,8 @@
       .set_parameter =    set_parameter_colorbalance,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_colorbalance,
-    
-    .set_input_format = set_input_format_colorbalance,
-    .get_output_format = get_output_format_colorbalance,
 
-    .read_video = read_video_colorbalance,
-    .get_options = get_options_colorbalance,
-    
+    .connect = connect_colorbalance,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_colormatrix_rgb.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_colormatrix_rgb.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,8 +28,7 @@
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
-
-#include "colormatrix.h"
+#include <gmerlin/colormatrix.h>
 
 #define LOG_DOMAIN "fv_colormatrix_rgb"
 
@@ -37,9 +36,6 @@
   {
   bg_colormatrix_t * mat;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
   
   gavl_video_format_t format;
 
@@ -50,6 +46,9 @@
 
   gavl_video_options_t * global_opt;
 
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+
   } colormatrix_priv_t;
 
 static int need_restart_colormatrix(void * priv)
@@ -70,11 +69,6 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_colormatrix(void * priv)
-  {
-  colormatrix_priv_t * vp = priv;
-  return vp->global_opt;
-  }
 
 static void destroy_colormatrix(void * priv)
   {
@@ -82,6 +76,9 @@
   vp = priv;
   bg_colormatrix_destroy(vp->mat);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
   free(vp);
   }
 
@@ -395,22 +392,10 @@
     bg_colormatrix_set_rgba(vp->mat, vp->coeffs);
   }
 
-static void connect_input_port_colormatrix(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  colormatrix_priv_t * vp;
-  vp = priv;
-  
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  }
-
-static void set_input_format_colormatrix(void * priv, gavl_video_format_t * format, int port)
+#if 0
+static void set_input_format_colormatrix(void * priv,
+                                         gavl_video_format_t * format,
+                                         int port)
   {
   colormatrix_priv_t * vp;
   int flags = 0;
@@ -425,26 +410,56 @@
     }
   vp->need_restart = 0;
   }
+#endif
 
-static void get_output_format_colormatrix(void * priv, gavl_video_format_t * format)
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_video_frame_t ** f)
   {
-  colormatrix_priv_t * vp;
-  vp = priv;
-  gavl_video_format_copy(format, &vp->format);
+  gavl_source_status_t st;
+  colormatrix_priv_t * vp = priv;
+
+  if((st = gavl_video_source_read_frame(vp->in_src, f)) !=
+     GAVL_SOURCE_OK)
+    return st;
+
+  bg_colormatrix_process(vp->mat, *f);
+  return GAVL_SOURCE_OK;
   }
 
-static int read_video_colormatrix(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_video_source_t *
+connect_colormatrix(void * priv, gavl_video_source_t * src,
+                    const gavl_video_options_t * opt)
   {
-  colormatrix_priv_t * vp;
-  vp = priv;
+  int flags = 0;
+  colormatrix_priv_t * vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  if(vp->force_alpha)
+    flags |= BG_COLORMATRIX_FORCE_ALPHA;
+  
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
 
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
+  bg_colormatrix_init(vp->mat, &vp->format, flags, vp->global_opt);
   
-  bg_colormatrix_process(vp->mat, frame);
-  return 1;
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  
+  vp->need_restart = 0;
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
   }
 
+
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -461,15 +476,8 @@
       .set_parameter =    set_parameter_colormatrix,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_colormatrix,
-    
-    .set_input_format = set_input_format_colormatrix,
-    .get_output_format = get_output_format_colormatrix,
-
-    .read_video = read_video_colormatrix,
+    .connect = connect_colormatrix,
     .need_restart = need_restart_colormatrix,
-    .get_options = get_options_colormatrix,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_colormatrix_yuv.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_colormatrix_yuv.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,19 +28,14 @@
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
+#include <gmerlin/colormatrix.h>
 
-#include "colormatrix.h"
-
-#define LOG_DOMAIN "fv_colormatrix_rgb"
+#define LOG_DOMAIN "fv_colormatrix_yuv"
 
 typedef struct
   {
   bg_colormatrix_t * mat;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
 
   float coeffs[4][5];
@@ -48,6 +43,9 @@
   int need_restart;
   gavl_video_options_t * global_opt;
 
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+
   } colormatrix_priv_t;
 
 static int need_restart_colormatrix(void * priv)
@@ -66,18 +64,15 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_colormatrix(void * priv)
-  {
-  colormatrix_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
 static void destroy_colormatrix(void * priv)
   {
   colormatrix_priv_t * vp;
   vp = priv;
   bg_colormatrix_destroy(vp->mat);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
   free(vp);
   }
 
@@ -150,7 +145,7 @@
       .flags = BG_PARAMETER_SYNC,
     },
     {
-      .name = "r_to_u",
+      .name = "y_to_u",
       .long_name = TRS("Luminance -> Cb"),
       .type = BG_PARAMETER_SLIDER_FLOAT,
       .flags = BG_PARAMETER_SYNC,
@@ -170,7 +165,7 @@
       .num_digits =  3,
     },
     {
-      .name = "b_to_u",
+      .name = "v_to_u",
       .long_name = TRS("Cr -> Cb"),
       .type = BG_PARAMETER_SLIDER_FLOAT,
       .flags = BG_PARAMETER_SYNC,
@@ -391,66 +386,53 @@
     bg_colormatrix_set_yuva(vp->mat, vp->coeffs);
   }
 
-static void connect_input_port_colormatrix(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
+
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_video_frame_t ** f)
   {
-  colormatrix_priv_t * vp;
-  vp = priv;
-  
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
+  gavl_source_status_t st;
+  colormatrix_priv_t * vp = priv;
+
+  if((st = gavl_video_source_read_frame(vp->in_src, f)) !=
+     GAVL_SOURCE_OK)
+    return st;
+
+  bg_colormatrix_process(vp->mat, *f);
+  return GAVL_SOURCE_OK;
   }
 
-static void
-set_input_format_colormatrix(void * priv,
-                             gavl_video_format_t * format, int port)
+static gavl_video_source_t *
+connect_colormatrix(void * priv, gavl_video_source_t * src,
+                    const gavl_video_options_t * opt)
   {
-  colormatrix_priv_t * vp;
   int flags = 0;
-  vp = priv;
+  colormatrix_priv_t * vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
   if(vp->force_alpha)
     flags |= BG_COLORMATRIX_FORCE_ALPHA;
+  
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
 
-  if(!port)
-    {
-    bg_colormatrix_init(vp->mat, format, flags, vp->global_opt);
-    gavl_video_format_copy(&vp->format, format);
-    }
-  vp->need_restart = 0;
-  }
-
-static void get_output_format_colormatrix(void * priv,
-                                          gavl_video_format_t * format)
-  {
-  colormatrix_priv_t * vp;
-  vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
-
-static int read_video_colormatrix(void * priv,
-                                  gavl_video_frame_t * frame, int stream)
-  {
-  colormatrix_priv_t * vp;
-  vp = priv;
+  bg_colormatrix_init(vp->mat, &vp->format, flags, vp->global_opt);
+  
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
 
-#if 0  
-  if(!vp->colormatrix_h && !vp->colormatrix_v)
-    {
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
-    }
-#endif
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
   
-  bg_colormatrix_process(vp->mat, frame);
-  return 1;
+  vp->need_restart = 0;
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
   }
 
+
 const const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -467,15 +449,8 @@
       .set_parameter =    set_parameter_colormatrix,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_colormatrix,
-    
-    .set_input_format = set_input_format_colormatrix,
-    .get_output_format = get_output_format_colormatrix,
-
-    .read_video = read_video_colormatrix,
+    .connect = connect_colormatrix,
     .need_restart = need_restart_colormatrix,
-    .get_options = get_options_colormatrix,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_cropscale.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_cropscale.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -76,16 +76,10 @@
 
   /* */
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_scaler_t * scaler;
   gavl_video_format_t in_format;
   gavl_video_format_t out_format;
   
-  gavl_video_frame_t * frame;
-
   int need_reinit;
   int need_restart;
 
@@ -97,6 +91,9 @@
   float zoom, squeeze;
   
   chroma_out_mode_t chroma_out_mode;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } cropscale_priv_t;
 
 static void * create_cropscale()
@@ -111,20 +108,15 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_cropscale(void * priv)
-  {
-  cropscale_priv_t * vp = priv;
-  return vp->global_opt;
-  }
 
 static void destroy_cropscale(void * priv)
   {
   cropscale_priv_t * vp;
   vp = priv;
-  if(vp->frame)
-    gavl_video_frame_destroy(vp->frame);
   gavl_video_scaler_destroy(vp->scaler);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -866,24 +858,6 @@
   gavl_video_options_set_rectangles(vp->opt, &in_rect, &out_rect);
   }
 
-
-
-
-static void connect_input_port_cropscale(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  cropscale_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  }
-
 static void set_out_format(cropscale_priv_t * vp)
   {
   vp->out_format.pixelformat = vp->in_format.pixelformat;
@@ -1168,8 +1142,10 @@
   }
 
 
-
-static void set_input_format_cropscale(void * priv, gavl_video_format_t * format, int port)
+#if 0
+static void
+set_input_format_cropscale(void * priv,
+                           gavl_video_format_t * format, int port)
   {
   cropscale_priv_t * vp;
   vp = priv;
@@ -1187,21 +1163,8 @@
     vp->need_reinit = 1;
     vp->need_restart = 0;
     }
-  if(vp->frame)
-    {
-    gavl_video_frame_destroy(vp->frame);
-    vp->frame = NULL;
-    }
-  }
-
-static void get_output_format_cropscale(void * priv, gavl_video_format_t * format)
-  {
-  cropscale_priv_t * vp;
-  vp = priv;
-  
-  gavl_video_format_copy(format, &vp->out_format);
   }
-
+#endif
 static void transfer_global_options(gavl_video_options_t * opt,
                                     gavl_video_options_t * global_opt)
   {
@@ -1219,58 +1182,94 @@
   gavl_video_options_set_stop_func(opt, stop_func, client_data);
   
   }
-                                    
 
-static int read_video_cropscale(void * priv, gavl_video_frame_t * frame, int stream)
+static void init_scaler(cropscale_priv_t * vp)
   {
-  cropscale_priv_t * vp;
-  vp = priv;
-  
-  if(vp->need_reinit)
-    {
-    int conversion_flags;
-    set_rectangles(vp);
+  int conversion_flags;
+  set_rectangles(vp);
 
-    switch(vp->deinterlace)
-      {
-      case DEINTERLACE_NEVER:
-        gavl_video_options_set_deinterlace_mode(vp->opt, GAVL_DEINTERLACE_NONE);
-        break;
-      case DEINTERLACE_AUTO:
-        gavl_video_options_set_deinterlace_mode(vp->opt, GAVL_DEINTERLACE_SCALE);
-        conversion_flags = gavl_video_options_get_conversion_flags(vp->opt);
-        conversion_flags &= ~GAVL_FORCE_DEINTERLACE;
-        gavl_video_options_set_conversion_flags(vp->opt, conversion_flags);
-        break;
-      case DEINTERLACE_ALWAYS:
-        gavl_video_options_set_deinterlace_mode(vp->opt, GAVL_DEINTERLACE_SCALE);
-        conversion_flags = gavl_video_options_get_conversion_flags(vp->opt);
-        conversion_flags |= GAVL_FORCE_DEINTERLACE;
-        gavl_video_options_set_conversion_flags(vp->opt, conversion_flags);
-        break;
-      }
-    transfer_global_options(vp->opt, vp->global_opt);
-    gavl_video_scaler_init(vp->scaler, &vp->in_format, &vp->out_format);
-    vp->need_reinit = 0;
-    }
-
-  if(!vp->frame)
+  switch(vp->deinterlace)
     {
-    vp->frame = gavl_video_frame_create(&vp->in_format);
+    case DEINTERLACE_NEVER:
+      gavl_video_options_set_deinterlace_mode(vp->opt, GAVL_DEINTERLACE_NONE);
+      break;
+    case DEINTERLACE_AUTO:
+      gavl_video_options_set_deinterlace_mode(vp->opt, GAVL_DEINTERLACE_SCALE);
+      conversion_flags = gavl_video_options_get_conversion_flags(vp->opt);
+      conversion_flags &= ~GAVL_FORCE_DEINTERLACE;
+      gavl_video_options_set_conversion_flags(vp->opt, conversion_flags);
+      break;
+    case DEINTERLACE_ALWAYS:
+      gavl_video_options_set_deinterlace_mode(vp->opt, GAVL_DEINTERLACE_SCALE);
+      conversion_flags = gavl_video_options_get_conversion_flags(vp->opt);
+      conversion_flags |= GAVL_FORCE_DEINTERLACE;
+      gavl_video_options_set_conversion_flags(vp->opt, conversion_flags);
+      break;
     }
+  transfer_global_options(vp->opt, vp->global_opt);
+  gavl_video_scaler_init(vp->scaler, &vp->in_format, &vp->out_format);
+  vp->need_reinit = 0;
+  
+  }
+
+static gavl_source_status_t read_func(void * priv, gavl_video_frame_t ** f)
+  {
+  gavl_video_frame_t * in_frame = NULL;
+  cropscale_priv_t * vp;
+  gavl_source_status_t st;
   
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
+  vp = priv;
+
+  if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
+  
+  if(vp->need_reinit)
+    init_scaler(vp);
 
   if(vp->maintain_aspect)
-    gavl_video_frame_fill(frame, &vp->out_format, vp->border_color);
+    gavl_video_frame_fill(*f, &vp->out_format, vp->border_color);
   
-  gavl_video_scaler_scale(vp->scaler, vp->frame, frame);
+  gavl_video_scaler_scale(vp->scaler, in_frame, *f);
   
-  gavl_video_frame_copy_metadata(frame, vp->frame);
-  return 1;
+  gavl_video_frame_copy_metadata(*f, in_frame);
+  
+  return GAVL_SOURCE_OK;
   }
 
+static gavl_video_source_t *
+connect_cropscale(void * priv, gavl_video_source_t * src,
+                   const gavl_video_options_t * opt)
+  {
+  cropscale_priv_t * vp = priv;
+  const gavl_video_format_t * format;
+
+  format = gavl_video_source_get_src_format(src);
+  
+  gavl_video_format_copy(&vp->in_format, format);
+  gavl_video_format_copy(&vp->out_format, format);
+  set_framesize(vp);
+  set_out_format(vp);
+  
+  if(vp->deinterlace != DEINTERLACE_NEVER)
+    vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
+
+  vp->in_src = src;
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->in_format);
+
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  
+  vp->need_reinit = 1;
+  vp->need_restart = 0;
+
+  vp->out_src =
+    gavl_video_source_create(read_func,
+                             vp, 0,
+                             &vp->out_format);
+  return vp->out_src;
+  }
+  
 static int need_restart_cropscale(void * priv)
   {
   cropscale_priv_t * vp;
@@ -1295,14 +1294,8 @@
       .set_parameter =    set_parameter_cropscale,
       .priority =         1,
     },
-    .get_options = get_options_cropscale,
+    .connect = connect_cropscale,
     
-    .connect_input_port = connect_input_port_cropscale,
-    
-    .set_input_format = set_input_format_cropscale,
-    .get_output_format = get_output_format_cropscale,
-
-    .read_video = read_video_cropscale,
     .need_restart = need_restart_cropscale,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_decimate.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_decimate.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -40,15 +40,13 @@
   gavl_dsp_funcs_t   * dsp_funcs;
 
   gavl_video_frame_t * frame;
+  gavl_video_frame_t * in_frame;
+
   gavl_video_format_t format;
 
   gavl_video_frame_t * b1;
   gavl_video_frame_t * b2;
 
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-
   float threshold_block;
   float threshold_total;
   int do_log;
@@ -61,13 +59,16 @@
   int sub_v;
   float scale_factors[GAVL_MAX_PLANES];
   int width_mul;
-
+  
   float (*diff_block)(struct decimate_priv_s*, 
                       int width, int height);
 
   int (*sad_func)(const uint8_t * src_1, const uint8_t * src_2, 
                   int stride_1, int stride_2, 
                   int w, int h);
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   };
 
 static float diff_block_i(decimate_priv_t * vp, 
@@ -187,7 +188,8 @@
   return parameters;
   }
 
-static void set_parameter_decimate(void * priv, const char * name, const bg_parameter_value_t * val)
+static void set_parameter_decimate(void * priv, const char * name,
+                                   const bg_parameter_value_t * val)
   {
   decimate_priv_t * vp;
   vp = priv;
@@ -205,209 +207,178 @@
    vp->skip_max = val->val_i;
   }
 
-static void connect_input_port_decimate(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  decimate_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  }
-
 static void reset_decimate(void * priv)
   {
-  decimate_priv_t * vp;
-  vp = priv;
+  decimate_priv_t * vp = priv;
   vp->have_frame = 0;
   }
 
 static void 
-set_input_format_decimate(void * priv, 
-                          gavl_video_format_t * format, int port)
+set_format(decimate_priv_t * vp, const gavl_video_format_t * format)
   {
-  decimate_priv_t * vp;
-  vp = priv;
-
-  if(!port)
+  gavl_video_format_copy(&vp->format, format);
+  vp->format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+  if(vp->frame)
     {
-    gavl_video_format_copy(&vp->format, format);
-    vp->format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
-    if(vp->frame)
-      {
-      gavl_video_frame_destroy(vp->frame);
-      vp->frame = NULL;
-      }
-    gavl_pixelformat_chroma_sub(vp->format.pixelformat,
-                                &vp->sub_h, &vp->sub_v);
-    vp->num_planes = 
-      gavl_pixelformat_num_planes(vp->format.pixelformat);
+    gavl_video_frame_destroy(vp->frame);
+    vp->frame = NULL;
+    }
+  gavl_pixelformat_chroma_sub(vp->format.pixelformat,
+                              &vp->sub_h, &vp->sub_v);
+  vp->num_planes = 
+    gavl_pixelformat_num_planes(vp->format.pixelformat);
 
-    vp->width_mul = 1;
-    vp->diff_block = diff_block_i;
+  vp->width_mul = 1;
+  vp->diff_block = diff_block_i;
 
-    switch(vp->format.pixelformat)
-      {
-      case GAVL_GRAY_8:
-        vp->scale_factors[0] = 1.0/(1.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        break;
-      case GAVL_GRAYA_16:
-        vp->scale_factors[0] = 1.0/(2.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        vp->width_mul = 2;
-        break;
-      case GAVL_GRAY_16:
-        vp->scale_factors[0] = 1.0/(1.0*65535.0);
-        vp->sad_func = vp->dsp_funcs->sad_16;
-        break;
-      case GAVL_GRAYA_32:
-        vp->scale_factors[0] = 1.0/(2.0*65535.0);
-        vp->sad_func = vp->dsp_funcs->sad_16;
-        vp->width_mul = 2;
-        break;
-      case GAVL_GRAY_FLOAT:
-        vp->scale_factors[0] = 1.0;
-        vp->diff_block = diff_block_f;
-        break;
-      case GAVL_GRAYA_FLOAT:
-        vp->scale_factors[0] = 1.0/2.0;
-        vp->diff_block = diff_block_f;
-        vp->width_mul = 2;
-        break;
-      case GAVL_RGB_15:
-      case GAVL_BGR_15:
-        vp->scale_factors[0] = 1.0/(3.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_rgb15;
-        break;
-      case GAVL_RGB_16:
-      case GAVL_BGR_16:
-        vp->scale_factors[0] = 1.0/(3.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_rgb16;
-        break;
-      case GAVL_RGB_24:
-      case GAVL_BGR_24:
-        vp->scale_factors[0] = 1.0/(3.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        vp->width_mul = 3;
-        break;
-      case GAVL_RGB_32:
-      case GAVL_BGR_32:
-        vp->scale_factors[0] = 1.0/(3.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        vp->width_mul = 4;
-        break;
-      case GAVL_RGBA_32:
-        vp->scale_factors[0] = 1.0/(4.0*255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        vp->width_mul = 4;
-        break;
-      case GAVL_YUV_444_P:
-      case GAVL_YUV_420_P:
-      case GAVL_YUV_410_P:
-      case GAVL_YUV_411_P:
-      case GAVL_YUV_422_P:
-        vp->scale_factors[0] = 1.0/((235.0 - 16.0)*3.0);
-        vp->scale_factors[1] = 
-          (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*3.0);
-        vp->scale_factors[2] = 
-          (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*3.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        break;
-      case GAVL_YUV_444_P_16:
-      case GAVL_YUV_422_P_16:
-        vp->scale_factors[0] = 1.0/((235.0 - 16.0)*256.0*3.0);
-        vp->scale_factors[1] = 
-          (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*256.0*3.0);
-        vp->scale_factors[2] = 
-          (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*256.0*3.0);
-        vp->sad_func = vp->dsp_funcs->sad_16;
-        break;
-      case GAVL_RGB_48:
-      	vp->scale_factors[0] = 1.0/(3.0*65535.0);
-        vp->sad_func = vp->dsp_funcs->sad_16;
-        vp->width_mul = 3;
-        break;
-      case GAVL_RGBA_64:
-      	vp->scale_factors[0] = 1.0/(4.0*65535.0);
-        vp->sad_func = vp->dsp_funcs->sad_16;
-        vp->width_mul = 4;
-        break;
-      case GAVL_RGB_FLOAT:
-        vp->scale_factors[0] = 1.0/3.0;
-        vp->diff_block = diff_block_f;
-        vp->width_mul = 3;
-        break;
-      case GAVL_RGBA_FLOAT:
-        vp->scale_factors[0] = 1.0/4.0;
-        vp->diff_block = diff_block_f;
-        vp->width_mul = 4;
-        break;
-      case GAVL_YUVA_32:
-        vp->scale_factors[0] = 
-          1.0/(235.0 - 16.0 + 2.0 * (240.0 - 16.0) + 255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        vp->width_mul = 4;
-        break;
-      case GAVL_YUVA_64:
-        vp->scale_factors[0] = 
-          1.0/((235.0 - 16.0)*256.0 + 2.0 * (240.0 - 16.0)*256.0 + 255.0*256.0);
-        vp->sad_func = vp->dsp_funcs->sad_16;
-        vp->width_mul = 4;
-        break;
-      case GAVL_YUV_FLOAT:
-        vp->scale_factors[0] = 
-          1.0/3.0;
-        vp->diff_block = diff_block_f;
-        vp->width_mul = 3;
-        break;
-      case GAVL_YUVA_FLOAT:
-        vp->scale_factors[0] = 
-          1.0/4.0;
-        vp->diff_block = diff_block_f;
-        vp->width_mul = 4;
-        break;
-      case GAVL_YUY2:
-      case GAVL_UYVY:
-        vp->scale_factors[0] = 
-          1.0/(235.0 - 16.0 + 240.0 - 16.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        vp->width_mul = 2;
-        break;
-      case GAVL_YUVJ_420_P:
-      case GAVL_YUVJ_422_P:
-      case GAVL_YUVJ_444_P:
-        vp->scale_factors[0] = 1.0/(3.0 * 255.0);
-        vp->scale_factors[1] = 
-          (float)(vp->sub_h * vp->sub_v)/(3.0 * 255.0);
-        vp->scale_factors[2] = 
-          (float)(vp->sub_h * vp->sub_v)/(3.0 * 255.0);
-        vp->sad_func = vp->dsp_funcs->sad_8;
-        break;
-      case GAVL_PIXELFORMAT_NONE:
-        break;
-      }
+  switch(vp->format.pixelformat)
+    {
+    case GAVL_GRAY_8:
+      vp->scale_factors[0] = 1.0/(1.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      break;
+    case GAVL_GRAYA_16:
+      vp->scale_factors[0] = 1.0/(2.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      vp->width_mul = 2;
+      break;
+    case GAVL_GRAY_16:
+      vp->scale_factors[0] = 1.0/(1.0*65535.0);
+      vp->sad_func = vp->dsp_funcs->sad_16;
+      break;
+    case GAVL_GRAYA_32:
+      vp->scale_factors[0] = 1.0/(2.0*65535.0);
+      vp->sad_func = vp->dsp_funcs->sad_16;
+      vp->width_mul = 2;
+      break;
+    case GAVL_GRAY_FLOAT:
+      vp->scale_factors[0] = 1.0;
+      vp->diff_block = diff_block_f;
+      break;
+    case GAVL_GRAYA_FLOAT:
+      vp->scale_factors[0] = 1.0/2.0;
+      vp->diff_block = diff_block_f;
+      vp->width_mul = 2;
+      break;
+    case GAVL_RGB_15:
+    case GAVL_BGR_15:
+      vp->scale_factors[0] = 1.0/(3.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_rgb15;
+      break;
+    case GAVL_RGB_16:
+    case GAVL_BGR_16:
+      vp->scale_factors[0] = 1.0/(3.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_rgb16;
+      break;
+    case GAVL_RGB_24:
+    case GAVL_BGR_24:
+      vp->scale_factors[0] = 1.0/(3.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      vp->width_mul = 3;
+      break;
+    case GAVL_RGB_32:
+    case GAVL_BGR_32:
+      vp->scale_factors[0] = 1.0/(3.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      vp->width_mul = 4;
+      break;
+    case GAVL_RGBA_32:
+      vp->scale_factors[0] = 1.0/(4.0*255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      vp->width_mul = 4;
+      break;
+    case GAVL_YUV_444_P:
+    case GAVL_YUV_420_P:
+    case GAVL_YUV_410_P:
+    case GAVL_YUV_411_P:
+    case GAVL_YUV_422_P:
+      vp->scale_factors[0] = 1.0/((235.0 - 16.0)*3.0);
+      vp->scale_factors[1] = 
+        (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*3.0);
+      vp->scale_factors[2] = 
+        (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*3.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      break;
+    case GAVL_YUV_444_P_16:
+    case GAVL_YUV_422_P_16:
+      vp->scale_factors[0] = 1.0/((235.0 - 16.0)*256.0*3.0);
+      vp->scale_factors[1] = 
+        (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*256.0*3.0);
+      vp->scale_factors[2] = 
+        (float)(vp->sub_h * vp->sub_v)/((240.0 - 16.0)*256.0*3.0);
+      vp->sad_func = vp->dsp_funcs->sad_16;
+      break;
+    case GAVL_RGB_48:
+      vp->scale_factors[0] = 1.0/(3.0*65535.0);
+      vp->sad_func = vp->dsp_funcs->sad_16;
+      vp->width_mul = 3;
+      break;
+    case GAVL_RGBA_64:
+      vp->scale_factors[0] = 1.0/(4.0*65535.0);
+      vp->sad_func = vp->dsp_funcs->sad_16;
+      vp->width_mul = 4;
+      break;
+    case GAVL_RGB_FLOAT:
+      vp->scale_factors[0] = 1.0/3.0;
+      vp->diff_block = diff_block_f;
+      vp->width_mul = 3;
+      break;
+    case GAVL_RGBA_FLOAT:
+      vp->scale_factors[0] = 1.0/4.0;
+      vp->diff_block = diff_block_f;
+      vp->width_mul = 4;
+      break;
+    case GAVL_YUVA_32:
+      vp->scale_factors[0] = 
+        1.0/(235.0 - 16.0 + 2.0 * (240.0 - 16.0) + 255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      vp->width_mul = 4;
+      break;
+    case GAVL_YUVA_64:
+      vp->scale_factors[0] = 
+        1.0/((235.0 - 16.0)*256.0 + 2.0 * (240.0 - 16.0)*256.0 + 255.0*256.0);
+      vp->sad_func = vp->dsp_funcs->sad_16;
+      vp->width_mul = 4;
+      break;
+    case GAVL_YUV_FLOAT:
+      vp->scale_factors[0] = 
+        1.0/3.0;
+      vp->diff_block = diff_block_f;
+      vp->width_mul = 3;
+      break;
+    case GAVL_YUVA_FLOAT:
+      vp->scale_factors[0] = 
+        1.0/4.0;
+      vp->diff_block = diff_block_f;
+      vp->width_mul = 4;
+      break;
+    case GAVL_YUY2:
+    case GAVL_UYVY:
+      vp->scale_factors[0] = 
+        1.0/(235.0 - 16.0 + 240.0 - 16.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      vp->width_mul = 2;
+      break;
+    case GAVL_YUVJ_420_P:
+    case GAVL_YUVJ_422_P:
+    case GAVL_YUVJ_444_P:
+      vp->scale_factors[0] = 1.0/(3.0 * 255.0);
+      vp->scale_factors[1] = 
+        (float)(vp->sub_h * vp->sub_v)/(3.0 * 255.0);
+      vp->scale_factors[2] = 
+        (float)(vp->sub_h * vp->sub_v)/(3.0 * 255.0);
+      vp->sad_func = vp->dsp_funcs->sad_8;
+      break;
+    case GAVL_PIXELFORMAT_NONE:
+      break;
     }
   vp->frame = gavl_video_frame_create(&vp->format);
   }
 
-static void get_output_format_decimate(void * priv,
-                                       gavl_video_format_t * format)
-  {
-  decimate_priv_t * vp;
-  vp = priv;
-  
-  gavl_video_format_copy(format, &vp->format);
-  }
-
 #define BLOCK_SIZE 16
 
-static int do_skip(decimate_priv_t * vp, gavl_video_frame_t * frame)
+static int do_skip(decimate_priv_t * vp,
+                   gavl_video_frame_t * f1, gavl_video_frame_t * f2)
   {
   int i, j, imax, jmax;
   float diff_block;
@@ -432,9 +403,9 @@
       rect.h = BLOCK_SIZE;
       gavl_rectangle_i_crop_to_format(&rect, &vp->format);
       gavl_video_frame_get_subframe(vp->format.pixelformat,
-                                    frame, vp->b1, &rect);
+                                    f1, vp->b1, &rect);
       gavl_video_frame_get_subframe(vp->format.pixelformat,
-                                    vp->frame, vp->b2, &rect);
+                                    f2, vp->b2, &rect);
       diff_block = vp->diff_block(vp, rect.w, rect.h);
       if(diff_block > vp->threshold_block * rect.w * rect.h)
         return 0;
@@ -446,36 +417,80 @@
   return 1;
   }
 
-static int read_video_decimate(void * priv, 
-                               gavl_video_frame_t * frame, int stream)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
+  gavl_source_status_t st;
   decimate_priv_t * vp;
   int skipped = 0;
+
   vp = priv;
+  
+  /* Read frame */
   if(!vp->have_frame)
     {
-    if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-      return 0;
-    gavl_video_frame_copy(&vp->format, vp->frame, frame);
+    vp->in_frame = NULL;
+    if((st = gavl_video_source_read_frame(vp->in_src, &vp->in_frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
     vp->have_frame = 1;
-    return 1;
     }
   
+  gavl_video_frame_copy(&vp->format, vp->frame, vp->in_frame);
+  gavl_video_frame_copy_metadata(vp->frame, vp->in_frame);
+  
   while(1)
     {
-    if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-      return 0;
-    if((skipped >= vp->skip_max) || !do_skip(vp, frame))
+    vp->in_frame = NULL;
+    if((st = gavl_video_source_read_frame(vp->in_src, &vp->in_frame)) !=
+       GAVL_SOURCE_OK)
+      {
+      if(st == GAVL_SOURCE_EOF)
+        {
+        // Return last frame
+        *frame = vp->frame;
+        return GAVL_SOURCE_OK;
+        }
+      else
+        return st;
+      }
+    if((skipped >= vp->skip_max) || !do_skip(vp, vp->in_frame, vp->frame))
       break;
     skipped++;
+
+    vp->frame->duration += vp->in_frame->duration;
     }
-  gavl_video_frame_copy(&vp->format, vp->frame, frame);
   
-  /* Don't know when the next frame will come */
-  frame->duration = -1; 
-  if(vp->do_log && skipped)
-    bg_log(BG_LOG_INFO, LOG_DOMAIN, "Skipped %d frames", skipped);  
-  return 1;
+  vp->frame->duration = vp->in_frame->timestamp - vp->frame->timestamp;
+  
+  *frame = vp->frame;
+  
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_video_source_t *
+connect_decimate(void * priv,
+                 gavl_video_source_t * src,
+                 const gavl_video_options_t * opt)
+  {
+  decimate_priv_t * vp = priv;
+  vp->have_frame = 0;
+  vp->in_src = src;
+  vp->have_frame = 0;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  
+  vp->format.framerate_mode = GAVL_FRAMERATE_VARIABLE;
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, GAVL_SOURCE_SRC_ALLOC,
+                                 vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -494,13 +509,7 @@
       .set_parameter =    set_parameter_decimate,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_decimate,
-    
-    .set_input_format = set_input_format_decimate,
-    .get_output_format = get_output_format_decimate,
-
-    .read_video = read_video_decimate,
+    .connect = connect_decimate,
     .reset = reset_decimate,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_deinterlace.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_deinterlace.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -49,15 +49,9 @@
 
 typedef struct deinterlace_priv_s
   {
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t in_format;
   gavl_video_format_t out_format;
   
-  gavl_video_frame_t * frame;
-
   gavl_video_options_t * opt;
   gavl_video_options_t * global_opt;
 
@@ -77,9 +71,11 @@
 
   bg_yadif_t * yadif;
   
-  int (*deint_func)(struct deinterlace_priv_s * p,
-                   gavl_video_frame_t * frame);
+  gavl_source_status_t (*deint_func)(struct deinterlace_priv_s * p,
+                                     gavl_video_frame_t ** frame);
 
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } deinterlace_priv_t;
 
 static void * create_deinterlace()
@@ -99,9 +95,9 @@
   {
   deinterlace_priv_t * vp;
   vp = priv;
-  if(vp->frame)
-    gavl_video_frame_destroy(vp->frame);
-
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  
   gavl_video_deinterlacer_destroy(vp->deint);
 
   gavl_video_options_destroy(vp->global_opt);
@@ -111,12 +107,6 @@
   free(vp);
   }
 
-static gavl_video_options_t * get_options_deinterlace(void * priv)
-  {
-  deinterlace_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
 static void reset_deinterlace(void * priv)
   {
   deinterlace_priv_t * vp;
@@ -235,12 +225,10 @@
     else if(!strcmp(val->val_str, "yadif"))
       {
       new_method = DEINTERLACE_YADIF;
-      // new_sub_method = GAVL_DEINTERLACE_BLEND;
       }
     else if(!strcmp(val->val_str, "yadif_fast"))
       {
       new_method = DEINTERLACE_YADIF_FAST;
-      // new_sub_method = GAVL_DEINTERLACE_BLEND;
       }
     if((new_method != vp->method) || 
        (new_sub_method != vp->sub_method))
@@ -306,77 +294,56 @@
  * Deinterlace functions
  */
 
-static int deinterlace_none(struct deinterlace_priv_s * vp,
-                            gavl_video_frame_t * frame)
+static gavl_source_status_t deinterlace_none(struct deinterlace_priv_s * vp,
+                                             gavl_video_frame_t ** frame)
   {
-  return vp->read_func(vp->read_data, frame, vp->read_stream);
+  return gavl_video_source_read_frame(vp->in_src, frame);
   }
 
-static int deinterlace_gavl(struct deinterlace_priv_s * vp,
-                            gavl_video_frame_t * frame)
+static gavl_source_status_t
+deinterlace_gavl(struct deinterlace_priv_s * vp,
+                 gavl_video_frame_t ** frame)
   {
-  if(!vp->frame)
-    vp->frame = gavl_video_frame_create(&vp->in_format);
+  gavl_source_status_t st;
+  gavl_video_frame_t * in_frame = NULL;
   
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
-  
-  gavl_video_deinterlacer_deinterlace(vp->deint, vp->frame, frame);
-
-  frame->timestamp = vp->frame->timestamp;
-  frame->duration = vp->frame->duration;
-  frame->timecode = vp->frame->timecode;
+  if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
   
-  return 1;
+  gavl_video_deinterlacer_deinterlace(vp->deint, in_frame, *frame);
+  gavl_video_frame_copy_metadata(*frame, in_frame);
+  return GAVL_SOURCE_OK;
   }
 
-static int deinterlace_scale_hw(struct deinterlace_priv_s * vp,
-                                gavl_video_frame_t * frame)
+static gavl_source_status_t
+deinterlace_scale_hw(struct deinterlace_priv_s * vp,
+                     gavl_video_frame_t ** frame)
   {
-  if(!vp->frame)
-    vp->frame = gavl_video_frame_create(&vp->in_format);
+  gavl_source_status_t st;
+  gavl_video_frame_t * in_frame = NULL;
 
-  
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
+  if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
   
   gavl_video_frame_get_field(vp->in_format.pixelformat,
-                             vp->frame, vp->src_field_1, vp->src_field);
-  
-  gavl_video_frame_copy(&vp->out_format, frame, vp->src_field_1);
+                             in_frame, vp->src_field_1, vp->src_field);
   
-  frame->timestamp = vp->frame->timestamp;
-  frame->duration = vp->frame->duration;
-  frame->timecode = vp->frame->timecode;
+  gavl_video_frame_copy(&vp->out_format, *frame, vp->src_field_1);
   
-  return 1;
+  gavl_video_frame_copy_metadata(*frame, in_frame);
+  return GAVL_SOURCE_OK;
   }
 
-static int deinterlace_yadif(struct deinterlace_priv_s * vp,
-                             gavl_video_frame_t * frame)
+static gavl_source_status_t deinterlace_yadif(struct deinterlace_priv_s * vp,
+                                              gavl_video_frame_t ** frame)
   {
-  return bg_yadif_read(vp->yadif, frame, 0);
-  }
-
-static void connect_input_port_deinterlace(void * priv,
-                                           bg_read_video_func_t func,
-                                           void * data, int stream,
-                                           int port)
-  {
-  deinterlace_priv_t * vp;
-  vp = priv;
-  
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    bg_yadif_connect_input(vp->yadif, func, data, stream);
-    }
+  return bg_yadif_read(vp->yadif, frame, vp->in_src);
   }
 
 static void transfer_global_options(gavl_video_options_t * opt,
-                                    gavl_video_options_t * global_opt)
+                                    const gavl_video_options_t * global_opt)
   {
   void * client_data;
   gavl_video_stop_func stop_func;
@@ -393,97 +360,72 @@
   
   }
 
+static int need_restart_deinterlace(void * priv)
+  {
+  deinterlace_priv_t * vp;
+  vp = priv;
+  return vp->need_restart;
+  }
 
 static void
-set_input_format_deinterlace(void * priv,
-                             gavl_video_format_t * format,
-                             int port)
+set_format(void * priv,
+           const gavl_video_format_t * format)
   {
   deinterlace_priv_t * vp;
   int yadif_mode;
   vp = priv;
-  if(!port)
-    {
-    if(vp->frame)
-      {
-      gavl_video_frame_destroy(vp->frame);
-      vp->frame = NULL;
-      }
-    transfer_global_options(vp->opt, vp->global_opt);
-    
-    vp->need_reinit = 1;
+
+  transfer_global_options(vp->opt, vp->global_opt);
     
-    switch(vp->method)
-      {
-      case DEINTERLACE_NONE:
-        vp->deint_func = deinterlace_none;
-        gavl_video_format_copy(&vp->in_format, format);
-        gavl_video_format_copy(&vp->out_format, format);
-        vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
-        break;
-      case DEINTERLACE_GAVL:
-        vp->deint_func = deinterlace_gavl;
-        gavl_video_format_copy(&vp->in_format, format);
-        gavl_video_format_copy(&vp->out_format, format);
-        vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
-        break;
-      case DEINTERLACE_SCALE_HW:
-        vp->deint_func = deinterlace_scale_hw;
+  vp->need_reinit = 1;
+
+  gavl_video_format_copy(&vp->in_format, format);
+  
+  switch(vp->method)
+    {
+    case DEINTERLACE_NONE:
+      vp->deint_func = deinterlace_none;
+      gavl_video_format_copy(&vp->out_format, format);
+      vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
+      break;
+    case DEINTERLACE_GAVL:
+      vp->deint_func = deinterlace_gavl;
+      gavl_video_format_copy(&vp->out_format, format);
+      vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
+      break;
+    case DEINTERLACE_SCALE_HW:
+      vp->deint_func = deinterlace_scale_hw;
         
-        vp->out_format.image_height /= 2;
-        vp->out_format.frame_height /= 2;
-        vp->out_format.pixel_height *= 2;
+      vp->out_format.image_height /= 2;
+      vp->out_format.frame_height /= 2;
+      vp->out_format.pixel_height *= 2;
 
-        gavl_video_format_copy(&vp->in_format, format);
-        gavl_video_format_copy(&vp->out_format, format);
-        vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
+      gavl_video_format_copy(&vp->out_format, format);
+      vp->out_format.interlace_mode = GAVL_INTERLACE_NONE;
         
-        break;
-      case DEINTERLACE_YADIF:
-      case DEINTERLACE_YADIF_FAST:
-        vp->deint_func = deinterlace_yadif;
+      break;
+    case DEINTERLACE_YADIF:
+    case DEINTERLACE_YADIF_FAST:
+      vp->deint_func = deinterlace_yadif;
 
-        yadif_mode = (vp->output_mode == DEINTERLACE_OUTPUT_BOTH) ?
-          1 : 0;
+      yadif_mode = (vp->output_mode == DEINTERLACE_OUTPUT_BOTH) ?
+        1 : 0;
 
-        if(vp->method == DEINTERLACE_YADIF_FAST)
-          yadif_mode += 2;
+      if(vp->method == DEINTERLACE_YADIF_FAST)
+        yadif_mode += 2;
         
-        bg_yadif_init(vp->yadif, format, vp->opt, yadif_mode);
-        gavl_video_format_copy(&vp->in_format, format);
-        bg_yadif_get_output_format(vp->yadif, &vp->out_format);
-        break;
-      }
-    
-    vp->need_restart = 0;
-    }
-  
-  if(vp->frame)
-    {
-    gavl_video_frame_destroy(vp->frame);
-    vp->frame = NULL;
+      bg_yadif_init(vp->yadif, &vp->in_format, &vp->out_format, vp->opt, yadif_mode);
+      break;
     }
-  }
-
-static int need_restart_deinterlace(void * priv)
-  {
-  deinterlace_priv_t * vp;
-  vp = priv;
-  return vp->need_restart;
-  }
-
-static void get_output_format_deinterlace(void * priv, gavl_video_format_t * format)
-  {
-  deinterlace_priv_t * vp;
-  vp = priv;
+    
+  vp->need_restart = 0;
   
-  gavl_video_format_copy(format, &vp->out_format);
   }
 
-static int read_video_deinterlace(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_source_status_t read_func(void * priv,
+                                      gavl_video_frame_t ** frame)
   {
-  deinterlace_priv_t * vp;
-  vp = priv;
+  deinterlace_priv_t * vp = priv;
 
   if(vp->need_reinit)
     {
@@ -501,6 +443,28 @@
   return vp->deint_func(vp, frame);
   }
 
+static gavl_video_source_t *
+connect_deinterlace(void * priv,
+                    gavl_video_source_t * src,
+                    const gavl_video_options_t * opt)
+  {
+  deinterlace_priv_t * vp = priv;
+  
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->in_format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func, vp, 0, vp->in_src);
+  return vp->out_src;
+  }
+
 const const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -517,14 +481,7 @@
       .set_parameter =    set_parameter_deinterlace,
       .priority =         1,
     },
-    .get_options = get_options_deinterlace,
-    
-    .connect_input_port = connect_input_port_deinterlace,
-    
-    .set_input_format = set_input_format_deinterlace,
-    .get_output_format = get_output_format_deinterlace,
-    
-    .read_video = read_video_deinterlace,
+    .connect = connect_deinterlace,
     .need_restart = need_restart_deinterlace,
     .reset = reset_deinterlace,
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_equalizer.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_equalizer.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -38,12 +38,10 @@
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
-
+#include <gmerlin/colormatrix.h>
 
 #define LOG_DOMAIN "fv_equalizer"
 
-#include "colormatrix.h"
-
 #define CLAMP_Y(val) (val > 1.0) ? 1.0 : ((val < 0.0) ? 0.0 : val)
 #define CLAMP_UV(val) (val > 0.5) ? 0.5 : ((val < -0.5) ? -0.5 : val)
 
@@ -61,10 +59,6 @@
   int offset[3];
   int advance[2];
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-
   int chroma_width;
   int chroma_height;
   int use_matrix;
@@ -79,9 +73,11 @@
                      int dststride,
                      int w, int h, float hue, float sat, int advance);
   
-  int (*read_video)(struct equalizer_priv_s *,
-                    gavl_video_frame_t * frame);
-  
+  void (*process)(struct equalizer_priv_s *,
+                  gavl_video_frame_t * frame);
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } equalizer_priv_t;
 
 static void set_coeffs(equalizer_priv_t * vp)
@@ -338,12 +334,9 @@
   }
 
 
-static int read_video_fast(equalizer_priv_t * vp,
-                           gavl_video_frame_t * frame)
+static void process_fast(equalizer_priv_t * vp,
+                         gavl_video_frame_t * frame)
   {
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-
   /* Do the conversion */
 
   if((vp->contrast != 0.0) || (vp->brightness != 0.0))
@@ -378,19 +371,14 @@
         }
       }
     }
-  return 1;
   }
 
-static int read_video_matrix(equalizer_priv_t * vp,
-                             gavl_video_frame_t * frame)
+static void process_matrix(equalizer_priv_t * vp,
+                           gavl_video_frame_t * frame)
   {
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-  
   if((vp->contrast != 0.0) || (vp->brightness != 0.0) ||
      (vp->hue != 0.0) || (vp->saturation != 1.0))
     bg_colormatrix_process(vp->mat, frame);
-  return 1;
   }
 
 static void * create_equalizer()
@@ -402,18 +390,14 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_equalizer(void * priv)
-  {
-  equalizer_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
 static void destroy_equalizer(void * priv)
   {
   equalizer_priv_t * vp;
   vp = priv;
   bg_colormatrix_destroy(vp->mat);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -526,36 +510,17 @@
     }
   }
 
-static void connect_input_port_equalizer(void * priv,
-                                         bg_read_video_func_t func,
-                                         void * data, int stream, int port)
-  {
-  equalizer_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
-
-
-
-static void set_input_format_equalizer(void * priv, gavl_video_format_t * format, int port)
+static void set_format(void * priv, const gavl_video_format_t * format)
   {
   int sub_h, sub_v;
   equalizer_priv_t * vp;
   vp = priv;
   
   vp->use_matrix = 0;
+
+  gavl_video_format_copy(&vp->format, format);
   
-  if(port)
-    return;
-  
-  switch(format->pixelformat)
+  switch(vp->format.pixelformat)
     {
     case GAVL_GRAY_8:
       vp->advance[0] = 1;
@@ -711,10 +676,9 @@
   if(vp->use_matrix)
     {
     set_coeffs(vp);
-    
-    bg_colormatrix_init(vp->mat, format, 0, vp->global_opt);
+    bg_colormatrix_init(vp->mat, &vp->format, 0, vp->global_opt);
     bg_colormatrix_set_yuv(vp->mat, vp->coeffs);
-    vp->read_video = read_video_matrix;
+    vp->process = process_matrix;
     }
   else
     {
@@ -722,31 +686,48 @@
     
     vp->chroma_width  = format->image_width / sub_h;
     vp->chroma_height = format->image_height / sub_v;
-    vp->read_video = read_video_fast;
+    vp->process = process_fast;
     }
-
-
   bg_log(BG_LOG_DEBUG, LOG_DOMAIN, "Pixelformat: %s",
          TRD(gavl_pixelformat_to_string(format->pixelformat), NULL));
-  
-  gavl_video_format_copy(&vp->format, format);
-  
   }
 
-static void get_output_format_equalizer(void * priv, gavl_video_format_t * format)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
   equalizer_priv_t * vp;
+  gavl_source_status_t st;
+
   vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
 
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) != GAVL_SOURCE_OK)
+    return st;
+  
+  vp->process(vp, *frame);
+  return GAVL_SOURCE_OK;
+  }
 
-static int
-read_video_equalizer(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_video_source_t * connect_equalizer(void * priv, gavl_video_source_t * src,
+                                               const gavl_video_options_t * opt)
   {
   equalizer_priv_t * vp;
   vp = priv;
-  return vp->read_video(vp, frame);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  vp->in_src = src;
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -765,15 +746,7 @@
       .set_parameter =    set_parameter_equalizer,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_equalizer,
-    
-    .set_input_format = set_input_format_equalizer,
-    .get_output_format = get_output_format_equalizer,
-
-    .read_video = read_video_equalizer,
-    .get_options = get_options_equalizer,
-    
+    .connect = connect_equalizer,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_flip.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_flip.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -36,13 +36,10 @@
   int flip_h;
   int flip_v;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
 
-  gavl_video_frame_t * frame;
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } flip_priv_t;
 
 static void * create_flip()
@@ -56,8 +53,8 @@
   {
   flip_priv_t * vp;
   vp = priv;
-  if(vp->frame)
-    gavl_video_frame_destroy(vp->frame);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -100,75 +97,56 @@
     vp->flip_v = val->val_i;
   }
 
-static void connect_input_port_flip(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
   flip_priv_t * vp;
-  vp = priv;
+  gavl_source_status_t st;
 
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
-
-static void set_input_format_flip(void * priv, gavl_video_format_t * format, int port)
-  {
-  flip_priv_t * vp;
+  gavl_video_frame_t * in_frame = NULL;
   vp = priv;
 
-  if(!port)
-    gavl_video_format_copy(&vp->format, format);
+  if(!vp->flip_h && !vp->flip_v)
+    return gavl_video_source_read_frame(vp->in_src, frame);
 
-  if(vp->frame)
+  if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
+  
+  if(vp->flip_h)
     {
-    gavl_video_frame_destroy(vp->frame);
-    vp->frame = NULL;
+    if(vp->flip_v)
+      gavl_video_frame_copy_flip_xy(&vp->format, *frame, in_frame);
+    else
+      gavl_video_frame_copy_flip_x(&vp->format, *frame, in_frame);
     }
+  else /* Flip y */
+    gavl_video_frame_copy_flip_y(&vp->format, *frame, in_frame);
+  gavl_video_frame_copy_metadata(*frame, in_frame);
+  return GAVL_SOURCE_OK;
   }
 
-static void get_output_format_flip(void * priv, gavl_video_format_t * format)
+static gavl_video_source_t *
+connect_flip(void * priv, gavl_video_source_t * src,
+             const gavl_video_options_t * opt)
   {
   flip_priv_t * vp;
   vp = priv;
-  
-  gavl_video_format_copy(format, &vp->format);
-  }
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
 
-static int read_video_flip(void * priv, gavl_video_frame_t * frame, int stream)
-  {
-  flip_priv_t * vp;
-  vp = priv;
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
 
-  if(!vp->flip_h && !vp->flip_v)
-    {
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
-    }
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
 
-  if(!vp->frame)
-    {
-    vp->frame = gavl_video_frame_create(&vp->format);
-    gavl_video_frame_clear(vp->frame, &vp->format);
-    }
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
-  
-  if(vp->flip_h)
-    {
-    if(vp->flip_v)
-      gavl_video_frame_copy_flip_xy(&vp->format, frame, vp->frame);
-    else
-      gavl_video_frame_copy_flip_x(&vp->format, frame, vp->frame);
-    }
-  else /* Flip y */
-    gavl_video_frame_copy_flip_y(&vp->format, frame, vp->frame);
-  
-  gavl_video_frame_copy_metadata(frame, vp->frame);
-  return 1;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -187,14 +165,8 @@
       .set_parameter =    set_parameter_flip,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_flip,
-    
-    .set_input_format = set_input_format_flip,
-    .get_output_format = get_output_format_flip,
-
-    .read_video = read_video_flip,
-    
+
+    .connect = connect_flip,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_framerate.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_framerate.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,15 +35,12 @@
 typedef struct
   {
   int need_restart;
-
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
   
   gavl_video_format_t format;
-
   bg_gavl_video_options_t opt;
-  
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } framerate_priv_t;
 
 static void * create_framerate()
@@ -60,6 +57,8 @@
   {
   framerate_priv_t * vp = priv;
   bg_gavl_video_options_free(&vp->opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -100,58 +99,52 @@
     vp->need_restart = 1;
   }
 
-static void connect_input_port_framerate(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
+static int need_restart_framerate(void * priv)
   {
   framerate_priv_t * vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
+  return vp->need_restart;
   }
 
-static void set_input_format_framerate(void * priv,
-                                         gavl_video_format_t * format,
-                                         int port)
+static gavl_source_status_t
+read_func(void * priv,
+          gavl_video_frame_t ** frame)
   {
   framerate_priv_t * vp = priv;
-  
-  if(!port)
-    {
-    gavl_video_format_copy(&vp->format, format);
-    bg_gavl_video_options_set_framerate(&vp->opt,
-                                        format,
-                                        &vp->format);
-    gavl_video_format_copy(format, &vp->format);
-    vp->need_restart = 0;
-
-    
-    }
+  return gavl_video_source_read_frame(vp->in_src, frame);
   }
 
-static void get_output_format_framerate(void * priv, gavl_video_format_t * format)
+static gavl_video_source_t *
+connect_framerate(void * priv,
+                  gavl_video_source_t * src,
+                  const gavl_video_options_t * opt)
   {
+  const gavl_video_format_t * in_format;
   framerate_priv_t * vp = priv;
   
-  gavl_video_format_copy(format, &vp->format);
-  }
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
 
-static int need_restart_framerate(void * priv)
-  {
-  framerate_priv_t * vp = priv;
-  return vp->need_restart;
-  }
+  in_format = gavl_video_source_get_src_format(vp->in_src);
+  
+  /* Set framerate */
 
-static int read_video_framerate(void * priv,
-                                  gavl_video_frame_t * frame, int stream)
-  {
-  framerate_priv_t * vp = priv;
-  return vp->read_func(vp->read_data, frame, vp->read_stream);
+  gavl_video_format_copy(&vp->format,
+                         in_format);
+
+  bg_gavl_video_options_set_framerate(&vp->opt,
+                                      in_format,
+                                      &vp->format);
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
+                                          
 
 const bg_fv_plugin_t the_plugin = 
   {
@@ -169,13 +162,8 @@
       .set_parameter =    set_parameter_framerate,
       .priority =         1,
     },
-    
-    .connect_input_port = connect_input_port_framerate,
-    
-    .set_input_format = set_input_format_framerate,
-    .get_output_format = get_output_format_framerate,
 
-    .read_video = read_video_framerate,
+    .connect = connect_framerate,
     .need_restart = need_restart_framerate,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_interlace.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_interlace.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -34,22 +34,21 @@
 typedef struct
   {
   gavl_interlace_mode_t out_interlace;
-  
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
+    
   gavl_video_format_t format;
   gavl_video_format_t field_format[2];
   
-  gavl_video_frame_t * frame;
-
+  gavl_video_frame_t * frame1;
+  
   gavl_video_frame_t * src_field;
   gavl_video_frame_t * dst_field;
 
   int need_restart;
   
-  
+  int num_frames; // 0, 1 or 2
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } interlace_priv_t;
 
 static void * create_interlace()
@@ -65,15 +64,16 @@
   {
   interlace_priv_t * vp;
   vp = priv;
-  if(vp->frame)
-    gavl_video_frame_destroy(vp->frame);
+  if(vp->frame1)
+    gavl_video_frame_destroy(vp->frame1);
 
   gavl_video_frame_null(vp->src_field);
   gavl_video_frame_null(vp->dst_field);
 
   gavl_video_frame_destroy(vp->src_field);
   gavl_video_frame_destroy(vp->dst_field);
-  
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -130,113 +130,114 @@
     }
   }
 
-static void connect_input_port_interlace(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  interlace_priv_t * vp;
-  vp = priv;
 
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
+static void copy_field(interlace_priv_t * vp,
+                       gavl_video_frame_t * src,
+                       gavl_video_frame_t * dst,
+                       int field)
+  {
+  gavl_video_frame_get_field(vp->format.pixelformat,
+                             src, vp->src_field, field);
   
+  gavl_video_frame_get_field(vp->format.pixelformat,
+                             dst, vp->dst_field, field);
+
+  gavl_video_frame_copy(&vp->field_format[field], vp->dst_field, vp->src_field);
   }
+                       
 
-static void set_input_format_interlace(void * priv,
-                                       gavl_video_format_t * format, int port)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
-  interlace_priv_t * vp;
-  vp = priv;
+  int field;
+  gavl_source_status_t st;
+  gavl_video_frame_t * frame2 = NULL;
+  interlace_priv_t * vp = priv;
 
-  if(!port)
+  field = vp->out_interlace == GAVL_INTERLACE_TOP_FIRST ? 0 : 1;
+  
+  if(!vp->frame1)
     {
-    gavl_video_format_copy(&vp->format, format);
-    
-    vp->format.frame_duration *= 2;
-    vp->format.interlace_mode = vp->out_interlace;
-    gavl_get_field_format(&vp->format, &vp->field_format[0], 0);
-    gavl_get_field_format(&vp->format, &vp->field_format[1], 1);
+    vp->frame1 = gavl_video_frame_create(&vp->format);
+    gavl_video_frame_clear(vp->frame1, &vp->format);
     }
-  if(vp->frame)
+
+  if(vp->num_frames == 0)
     {
-    gavl_video_frame_destroy(vp->frame);
-    vp->frame = NULL;
+    if((st = gavl_video_source_read_frame(vp->in_src, &vp->frame1)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    vp->num_frames++;
+    }
+  if(vp->num_frames == 1)
+    {
+    if((st = gavl_video_source_read_frame(vp->in_src, &frame2)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    vp->num_frames++;
     }
-  vp->need_restart = 0;
-  }
 
-static void
-get_output_format_interlace(void * priv, gavl_video_format_t * format)
-  {
-  interlace_priv_t * vp;
-  vp = priv;
+  /* Copy first field */
+  copy_field(vp, vp->frame1, *frame, field);
   
-  gavl_video_format_copy(format, &vp->format);
+  gavl_video_frame_copy_metadata(*frame, vp->frame1);
+  
+  field = 1 - field;
+  
+  /* Copy second field */
+  
+  copy_field(vp, frame2, *frame, field);
+  (*frame)->duration += frame2->duration;
+  vp->num_frames = 0;
+  return GAVL_SOURCE_OK;
   }
 
-static int read_video_interlace(void * priv,
-                                gavl_video_frame_t * frame,
-                                int stream)
+
+static gavl_video_source_t * connect_interlace(void * priv,
+                                               gavl_video_source_t * src,
+                                               const gavl_video_options_t * opt)
   {
-  interlace_priv_t * vp;
-  int field;
-  vp = priv;
+  const gavl_video_format_t * in_format;
 
-  field = vp->out_interlace == GAVL_INTERLACE_TOP_FIRST ? 0 : 1;
+  interlace_priv_t * vp = priv;
+
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  vp->in_src = src;
+  in_format = gavl_video_source_get_src_format(vp->in_src);
+  gavl_video_format_copy(&vp->format, in_format);
+  
+  vp->format.frame_duration *= 2;
+  vp->format.interlace_mode = vp->out_interlace;
+  gavl_get_field_format(&vp->format, &vp->field_format[0], 0);
+  gavl_get_field_format(&vp->format, &vp->field_format[1], 1);
 
-  if(!vp->frame)
+  if(vp->frame1)
     {
-    vp->frame = gavl_video_frame_create(&vp->format);
-    gavl_video_frame_clear(vp->frame, &vp->format);
+    gavl_video_frame_destroy(vp->frame1);
+    vp->frame1 = NULL;
     }
   
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
-  
-  /* Copy first field */
-  gavl_video_frame_get_field(vp->format.pixelformat,
-                             vp->frame,
-                             vp->src_field, field);
-  
-  gavl_video_frame_get_field(vp->format.pixelformat,
-                             frame,
-                             vp->dst_field, field);
+  gavl_video_source_set_dst(vp->in_src, 0, in_format);
+  vp->need_restart = 0;
+  vp->num_frames = 0;
 
-  gavl_video_frame_copy(&vp->field_format[field], vp->dst_field, vp->src_field);
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
 
-  gavl_video_frame_copy_metadata(frame, vp->frame);
+  }
 
-  field = 1 - field;
-  
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    {
-    /* First field is available, but not the second one: make it black */
-    gavl_video_frame_clear(vp->frame, &vp->format);
-    return 0;
-    }
-  else
-    {
-    frame->duration += vp->frame->duration;
-    }
-  /* Copy second field */
-  
-  gavl_video_frame_get_field(vp->format.pixelformat,
-                             vp->frame,
-                             vp->src_field, field);
-  
-  gavl_video_frame_get_field(vp->format.pixelformat,
-                             frame,
-                             vp->dst_field, field);
-  gavl_video_frame_copy(&vp->field_format[field], vp->dst_field, vp->src_field);
-  
-  
-  return 1;
+static void reset_interlace(void * priv)
+  {
+  interlace_priv_t * vp = priv;
+  vp->num_frames = 0;
   }
 
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -254,14 +255,9 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_interlace,
-    
-    .set_input_format = set_input_format_interlace,
-    .get_output_format = get_output_format_interlace,
-
-    .read_video = read_video_interlace,
+    .connect = connect_interlace,
     .need_restart = need_restart_interlace,
-    
+    .reset = reset_interlace,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_invert_rgb.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_invert_rgb.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,8 +28,7 @@
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
-
-#include "colormatrix.h"
+#include <gmerlin/colormatrix.h>
 
 #define LOG_DOMAIN "fv_invert_rgb"
 
@@ -37,10 +36,6 @@
   {
   bg_colormatrix_t * mat;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
 
   float coeffs[4][5];
@@ -50,7 +45,8 @@
 
   gavl_video_options_t * global_opt;
   
-  
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } invert_priv_t;
 
 static const float coeffs_unity[4][5] =
@@ -85,15 +81,11 @@
   vp = priv;
   bg_colormatrix_destroy(vp->mat);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
-static gavl_video_options_t * get_options_invert(void * priv)
-  {
-  invert_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
 static const bg_parameter_info_t parameters[] =
   {
     {
@@ -201,21 +193,6 @@
     }
   }
 
-static void connect_input_port_invert(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  invert_priv_t * vp;
-  vp = priv;
-  
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  }
-
 static void process_rgb24(invert_priv_t * vp, gavl_video_frame_t * frame)
   {
   int mask[3];
@@ -487,73 +464,82 @@
   bg_colormatrix_process(vp->mat, frame);
   }
 
-static void set_input_format_invert(void * priv, gavl_video_format_t * format, int port)
+static void set_format(invert_priv_t * vp, const gavl_video_format_t * format)
   {
-  invert_priv_t * vp;
-  vp = priv;
+  gavl_video_format_copy(&vp->format, format);
 
-  if(!port)
+  switch(vp->format.pixelformat)
     {
-    switch(format->pixelformat)
-      {
-      case GAVL_RGB_24:
-        vp->process = process_rgb24;
-        break;
-      case GAVL_RGB_32:
-        vp->process = process_rgb32;
-        break;
-      case GAVL_BGR_24:
-        vp->process = process_bgr24;
-        break;
-      case GAVL_BGR_32:
-        vp->process = process_bgr32;
-        break;
-      case GAVL_RGBA_32:
-        vp->process = process_rgba32;
-        break;
-      case GAVL_RGB_48:
-        vp->process = process_rgb48;
-        break;
-      case GAVL_RGBA_64:
-        vp->process = process_rgba64;
-        break;
-      case GAVL_RGB_FLOAT:
-        vp->process = process_rgb_float;
-        break;
-      case GAVL_RGBA_FLOAT:
-        vp->process = process_rgba_float;
-        break;
-      default:
-        vp->process = process_matrix;
-        bg_colormatrix_init(vp->mat, format, 0, vp->global_opt);
-        break;
-      }
-    
-    gavl_video_format_copy(&vp->format, format);
+    case GAVL_RGB_24:
+      vp->process = process_rgb24;
+      break;
+    case GAVL_RGB_32:
+      vp->process = process_rgb32;
+      break;
+    case GAVL_BGR_24:
+      vp->process = process_bgr24;
+      break;
+    case GAVL_BGR_32:
+      vp->process = process_bgr32;
+      break;
+    case GAVL_RGBA_32:
+      vp->process = process_rgba32;
+      break;
+    case GAVL_RGB_48:
+      vp->process = process_rgb48;
+      break;
+    case GAVL_RGBA_64:
+      vp->process = process_rgba64;
+      break;
+    case GAVL_RGB_FLOAT:
+      vp->process = process_rgb_float;
+      break;
+    case GAVL_RGBA_FLOAT:
+      vp->process = process_rgba_float;
+      break;
+    default:
+      vp->process = process_matrix;
+      bg_colormatrix_init(vp->mat, &vp->format, 0, vp->global_opt);
+      break;
     }
   }
 
-static void get_output_format_invert(void * priv, gavl_video_format_t * format)
+static gavl_source_status_t read_func(void * priv, gavl_video_frame_t ** frame)
   {
-  invert_priv_t * vp;
-  vp = priv;
-  gavl_video_format_copy(format, &vp->format);
+  gavl_source_status_t st;
+  invert_priv_t * vp = priv;
+
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) != GAVL_SOURCE_OK)
+    return st;
+  
+  if(vp->invert[0] || vp->invert[1] || vp->invert[2] || vp->invert[3])
+    vp->process(vp, *frame);
+  return GAVL_SOURCE_OK;
   }
 
-static int read_video_invert(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_video_source_t * connect_invert(void * priv, gavl_video_source_t * src,
+                                            const gavl_video_options_t * opt)
   {
   invert_priv_t * vp;
   vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  vp->in_src = src;
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
   
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-  
-  if(vp->invert[0] || vp->invert[1] || vp->invert[2] || vp->invert[3])
-    vp->process(vp, frame);
-  
-  return 1;
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -571,14 +557,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_invert,
-    
-    .set_input_format = set_input_format_invert,
-    .get_output_format = get_output_format_invert,
-
-    .read_video = read_video_invert,
-    .get_options = get_options_invert,
-    
+    .connect = connect_invert,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_oldcolor.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_oldcolor.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,8 +28,7 @@
 #include <gmerlin/plugin.h>
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
-
-#include "colormatrix.h"
+#include <gmerlin/colormatrix.h>
 
 #define LOG_DOMAIN "fv_oldcolor"
 
@@ -37,10 +36,6 @@
   {
   bg_colormatrix_t * mat;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   gavl_video_options_t * global_opt;
 
@@ -48,6 +43,9 @@
   int style;
   float strength;
   float gain[3];
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } oldcolor_priv_t;
 
 #define STYLE_BW    0
@@ -110,15 +108,11 @@
   vp = priv;
   bg_colormatrix_destroy(vp->mat);
   gavl_video_options_destroy(vp->global_opt);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
-static gavl_video_options_t * get_options_oldcolor(void * priv)
-  {
-  oldcolor_priv_t * vp = priv;
-  return vp->global_opt;
-  }
-
 static const bg_parameter_info_t parameters[] =
   {
     {
@@ -286,58 +280,47 @@
     }
   }
 
-static void connect_input_port_oldcolor(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  oldcolor_priv_t * vp;
-  vp = priv;
-  
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  }
 
-static void set_input_format_oldcolor(void * priv, gavl_video_format_t * format, int port)
+static gavl_source_status_t read_func(void * priv, gavl_video_frame_t ** frame)
   {
   oldcolor_priv_t * vp;
+  gavl_source_status_t st;
   vp = priv;
 
-  if(!port)
-    {
-    bg_colormatrix_init(vp->mat, format, 0, vp->global_opt);
-    gavl_video_format_copy(&vp->format, format);
-    }
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) != GAVL_SOURCE_OK)
+    return st;
+  
+  bg_colormatrix_process(vp->mat, *frame);
+  return GAVL_SOURCE_OK;
   }
 
-static void get_output_format_oldcolor(void * priv, gavl_video_format_t * format)
+static gavl_video_source_t * connect_oldcolor(void * priv, gavl_video_source_t * src,
+                                              const gavl_video_options_t * opt)
   {
   oldcolor_priv_t * vp;
   vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
 
-static int read_video_oldcolor(void * priv, gavl_video_frame_t * frame, int stream)
-  {
-  oldcolor_priv_t * vp;
-  vp = priv;
+  vp->in_src = src;
+  
+  gavl_video_format_copy(&vp->format, gavl_video_source_get_src_format(vp->in_src));
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
 
-#if 0  
-  if(!vp->oldcolor_h && !vp->oldcolor_v)
-    {
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
-    }
-#endif
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
+  bg_colormatrix_init(vp->mat, &vp->format, 0, vp->global_opt);
   
-  bg_colormatrix_process(vp->mat, frame);
-  return 1;
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
+
   }
 
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -355,14 +338,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_oldcolor,
-    
-    .set_input_format = set_input_format_oldcolor,
-    .get_output_format = get_output_format_oldcolor,
-
-    .read_video = read_video_oldcolor,
-    .get_options = get_options_oldcolor,
-    
+    .connect = connect_oldcolor,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_pixelformat.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_pixelformat.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,14 +35,13 @@
   {
   gavl_pixelformat_t pixelformat;
   int need_restart;
-
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
   
   gavl_video_format_t format;
 
   bg_parameter_info_t * parameters;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } pixelformat_priv_t;
 
 static void * create_pixelformat()
@@ -58,6 +57,8 @@
   vp = priv;
   if(vp->parameters)
     bg_parameter_info_destroy_array(vp->parameters);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -67,10 +68,11 @@
       .gettext_domain = PACKAGE,
       .gettext_directory = LOCALE_DIR,
       .name = "pixelformat",
+      .opt = "fmt",
       .long_name = TRS("Pixelformat"),
       .type = BG_PARAMETER_STRINGLIST,
       .flags = BG_PARAMETER_SYNC,
-      .val_default = { .val_str = "YUV 420 Planar" },
+      .val_default = { .val_str = "yuv420p8" },
     },
     { /* End of parameters */ },
   };
@@ -94,10 +96,10 @@
     f = gavl_get_pixelformat(i);
     if(f != GAVL_PIXELFORMAT_NONE)
       {
-      ret->multi_names_nc[index] = bg_strdup(NULL,
-                                          gavl_pixelformat_to_string(f));
-      ret->multi_labels_nc[index] = bg_strdup(NULL,
-                                           gavl_pixelformat_to_string(f));
+      ret->multi_names_nc[index] =
+        gavl_strdup(gavl_pixelformat_to_short_string(f));
+      ret->multi_labels_nc[index] =
+        gavl_strdup(gavl_pixelformat_to_string(f));
       index++;
       }
     }
@@ -127,7 +129,7 @@
   
   if(!strcmp(name, "pixelformat"))
     {
-    f = gavl_string_to_pixelformat(val->val_str);
+    f = gavl_short_string_to_pixelformat(val->val_str);
     if(vp->pixelformat != f)
       {
       vp->need_restart = 1;
@@ -136,61 +138,51 @@
     }
   }
 
-static void connect_input_port_pixelformat(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
+static int need_restart_pixelformat(void * priv)
   {
   pixelformat_priv_t * vp;
   vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
+  return vp->need_restart;
   }
 
-static void set_input_format_pixelformat(void * priv,
-                                         gavl_video_format_t * format,
-                                         int port)
+static gavl_source_status_t
+read_func(void * priv,
+          gavl_video_frame_t ** frame)
   {
-  pixelformat_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    format->pixelformat = vp->pixelformat;
-    gavl_video_format_copy(&vp->format, format);
-    vp->need_restart = 0;
-    }
+  pixelformat_priv_t * vp = priv;
+  return gavl_video_source_read_frame(vp->in_src, frame);
   }
 
-static void get_output_format_pixelformat(void * priv, gavl_video_format_t * format)
+static gavl_video_source_t *
+connect_pixelformat(void * priv,
+                  gavl_video_source_t * src,
+                  const gavl_video_options_t * opt)
   {
-  pixelformat_priv_t * vp;
-  vp = priv;
+  const gavl_video_format_t * in_format;
+  pixelformat_priv_t * vp = priv;
   
-  gavl_video_format_copy(format, &vp->format);
-  }
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
 
-static int need_restart_pixelformat(void * priv)
-  {
-  pixelformat_priv_t * vp;
-  vp = priv;
-  return vp->need_restart;
-  }
+  in_format = gavl_video_source_get_src_format(vp->in_src);
 
-static int read_video_pixelformat(void * priv,
-                                  gavl_video_frame_t * frame, int stream)
-  {
-  pixelformat_priv_t * vp;
-  vp = priv;
+  /* Set framerate */
+
+  gavl_video_format_copy(&vp->format, in_format);
+
+  vp->format.pixelformat = vp->pixelformat;
   
-  return vp->read_func(vp->read_data, frame, vp->read_stream);
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -208,12 +200,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_pixelformat,
-    
-    .set_input_format = set_input_format_pixelformat,
-    .get_output_format = get_output_format_pixelformat,
-
-    .read_video = read_video_pixelformat,
+    .connect = connect_pixelformat,
     .need_restart = need_restart_pixelformat,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_swapfields.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_swapfields.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -35,10 +35,6 @@
   {
   gavl_interlace_mode_t out_interlace;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   gavl_video_format_t field_format[2];
   
@@ -57,7 +53,9 @@
   int noop; // Do nothing
   
   int64_t next_pts;
-  
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } swapfields_priv_t;
 
 static void * create_swapfields()
@@ -82,33 +80,21 @@
     gavl_video_frame_destroy(vp->fields[0]);
   if(vp->fields[1])
     gavl_video_frame_destroy(vp->fields[1]);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
-static void connect_input_port_swapfields(void * priv,
-                                         bg_read_video_func_t func,
-                                         void * data, int stream, int port)
+static void reset_swapfields(void * priv)
   {
-  swapfields_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
+  swapfields_priv_t * vp = priv;
+  vp->init = 1;
   }
 
-static void set_input_format_swapfields(void * priv,
-                                       gavl_video_format_t * format, int port)
+static void set_format(void * priv, const gavl_video_format_t * format)
   {
   swapfields_priv_t * vp;
   vp = priv;
-
-  if(port)
-    return;
   
   vp->framerate_mult = 1;
   vp->noop = 0;
@@ -160,18 +146,11 @@
   vp->init = 1;
   }
 
-static void
-get_output_format_swapfields(void * priv, gavl_video_format_t * format)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
-  swapfields_priv_t * vp;
-  vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
+  gavl_source_status_t st;
 
-static int read_video_swapfields(void * priv,
-                                gavl_video_frame_t * frame,
-                                int stream)
-  {
   swapfields_priv_t * vp;
   int64_t pts;
   gavl_video_frame_t * swp;
@@ -180,7 +159,7 @@
 
   /* Do nothing */
   if(vp->noop)
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
+    return gavl_video_source_read_frame(vp->in_src, frame);
   
   if(!vp->fields[0])
     vp->fields[0] = gavl_video_frame_create(&vp->field_format[0]);
@@ -189,28 +168,31 @@
   
   if(vp->init)
     {
-    if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-      return 0;
-
+    if((st = gavl_video_source_read_frame(vp->in_src, frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    
     vp->last_field = vp->fields[0];
     vp->next_field = vp->fields[1];
-
+    
+    /* Save field for later use */
     gavl_video_frame_get_field(vp->format.pixelformat,
-                               frame,
+                               *frame,
                                vp->cpy_field, vp->delay_field);
     
     gavl_video_frame_copy(&vp->field_format[vp->delay_field],
                           vp->last_field, vp->cpy_field);
     vp->init = 0;
-    vp->next_pts = frame->timestamp * vp->framerate_mult +
-      (frame->duration * vp->framerate_mult) / 2;
+    vp->next_pts = (*frame)->timestamp * vp->framerate_mult +
+      ((*frame)->duration * vp->framerate_mult) / 2;
     }
 
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
+  
   gavl_video_frame_get_field(vp->format.pixelformat,
-                             frame,
+                             *frame,
                              vp->cpy_field, vp->delay_field);
 
   /* Save field for later use */
@@ -227,28 +209,39 @@
   vp->last_field = swp;
   
   /* Adjust pts */
-  pts = frame->timestamp;
-  frame->timestamp = vp->next_pts;
+  pts = (*frame)->timestamp;
+  (*frame)->timestamp = vp->next_pts;
 
   vp->next_pts = pts * vp->framerate_mult +
-    (frame->duration * vp->framerate_mult) / 2;
+    ((*frame)->duration * vp->framerate_mult) / 2;
 
-  frame->duration *= vp->framerate_mult;
+  (*frame)->duration *= vp->framerate_mult;
 
   //  fprintf(stderr, "PTS: %ld duration: %ld\n",
   //          frame->timestamp, frame->duration);
   
-  return 1;
+  return GAVL_SOURCE_OK;
   }
 
-static void reset_swapfields(void * priv)
+static gavl_video_source_t *
+connect_swapfields(void * priv, gavl_video_source_t * src,
+                   const gavl_video_options_t * opt)
   {
-  swapfields_priv_t * vp;
-  vp = priv;
+  swapfields_priv_t * vp = priv;
   vp->init = 1;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
-
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -263,14 +256,10 @@
       .destroy =   destroy_swapfields,
       .priority =         1,
     },
+    .reset = reset_swapfields,
     
-    .connect_input_port = connect_input_port_swapfields,
+    .connect = connect_swapfields,
     
-    .set_input_format = set_input_format_swapfields,
-    .get_output_format = get_output_format_swapfields,
-
-    .read_video = read_video_swapfields,
-    .reset = reset_swapfields,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_tcdisplay.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_tcdisplay.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -38,20 +38,19 @@
 
 typedef struct
   {
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   gavl_video_format_t ovl_format;
   
-  gavl_overlay_t ovl;
+  gavl_overlay_t * ovl;
   
   bg_text_renderer_t * renderer;
   gavl_overlay_blend_context_t * blender;
   
   int interpolate;
   gavl_timecode_t last_timecode;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } tc_priv_t;
 
 static void * create_tcdisplay()
@@ -69,6 +68,8 @@
   vp = priv;
   bg_text_renderer_destroy(vp->renderer);
   gavl_overlay_blend_context_destroy(vp->blender);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -224,32 +225,19 @@
 
     }
 
-static void connect_input_port_tcdisplay(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
+static void reset_tcdisplay(void * priv)
   {
   tc_priv_t * vp;
   vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
+  vp->last_timecode = GAVL_TIMECODE_UNDEFINED;
   }
 
-static void set_input_format_tcdisplay(void * priv,
-                                       gavl_video_format_t * format, int port)
+static void set_format(void * priv,
+                       const gavl_video_format_t * format)
   {
   tc_priv_t * vp;
   vp = priv;
   
-  if(port)
-    return;
-
-  
   gavl_video_format_copy(&vp->format, format);
 
   bg_text_renderer_init(vp->renderer,
@@ -260,36 +248,26 @@
                                   &vp->format,
                                   &vp->ovl_format);
 
-  if(vp->ovl.frame)
-    gavl_video_frame_destroy(vp->ovl.frame);
-  vp->ovl.frame = gavl_video_frame_create(&vp->ovl_format);
+  if(vp->ovl)
+    gavl_video_frame_destroy(vp->ovl);
+  vp->ovl = gavl_video_frame_create(&vp->ovl_format);
   vp->last_timecode = GAVL_TIMECODE_UNDEFINED;
-
-
   }
 
-static void get_output_format_tcdisplay(void * priv,
-                                 gavl_video_format_t * format)
-  {
-  tc_priv_t * vp;
-  vp = priv;
-  
-  gavl_video_format_copy(format, &vp->format);
-  }
-
-static int read_video_tcdisplay(void * priv, gavl_video_frame_t * frame,
-                                int stream)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
+  gavl_source_status_t st;
   tc_priv_t * vp;
   char str[GAVL_TIMECODE_STRING_LEN];
   char * pos;
   vp = priv;
   
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-
-
-  if(frame->timecode == GAVL_TIMECODE_UNDEFINED)
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
+  
+  if((*frame)->timecode == GAVL_TIMECODE_UNDEFINED)
     {
     if(vp->interpolate && (vp->last_timecode != GAVL_TIMECODE_UNDEFINED))
       {
@@ -308,9 +286,8 @@
     }
   else
     {
-    vp->last_timecode = frame->timecode;
+    vp->last_timecode = (*frame)->timecode;
     }
-
   
   gavl_timecode_prettyprint(&vp->format.timecode_format,
                             vp->last_timecode, str);
@@ -320,22 +297,34 @@
     *pos = '\n';
   
   //  fprintf(stderr, "Got timecode: %s\n", str);
-
   
-  bg_text_renderer_render(vp->renderer, str, &vp->ovl);
+  bg_text_renderer_render(vp->renderer, str, vp->ovl);
   // bg_text_renderer_render(vp->renderer, "Blah", &vp->ovl);
-  gavl_overlay_blend_context_set_overlay(vp->blender, &vp->ovl);
+  gavl_overlay_blend_context_set_overlay(vp->blender, vp->ovl);
   
-  gavl_overlay_blend(vp->blender, frame);
-
-  return 1;
+  gavl_overlay_blend(vp->blender, *frame);
+  
+  return GAVL_SOURCE_OK;
   }
 
-static void reset_tcdisplay(void * priv)
+static gavl_video_source_t *
+connect_tcdisplay(void * priv, gavl_video_source_t * src,
+                  const gavl_video_options_t * opt)
   {
-  tc_priv_t * vp;
-  vp = priv;
-  vp->last_timecode = GAVL_TIMECODE_UNDEFINED;
+  tc_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -355,12 +344,8 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_tcdisplay,
+    .connect = connect_tcdisplay,
     
-    .set_input_format = set_input_format_tcdisplay,
-    .get_output_format = get_output_format_tcdisplay,
-
-    .read_video = read_video_tcdisplay,
     .reset      = reset_tcdisplay,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_tctweak.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_tctweak.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -41,10 +41,6 @@
 
 typedef struct
   {
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   gavl_timecode_t last_timecode;
   int mode;
@@ -53,6 +49,9 @@
   int drop;
   int hours, minutes, seconds, frames;
   gavl_timecode_t first_timecode;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } tc_priv_t;
 
 static void * create_tctweak()
@@ -66,6 +65,8 @@
   {
   tc_priv_t * vp;
   vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -191,31 +192,12 @@
   
   }
 
-static void connect_input_port_tctweak(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  tc_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
-
-static void set_input_format_tctweak(void * priv,
-                                gavl_video_format_t * format, int port)
+static void
+set_format(void * priv, const gavl_video_format_t * format)
   {
   tc_priv_t * vp;
   vp = priv;
   
-  if(port)
-    return;
-  
   gavl_video_format_copy(&vp->format, format);
   
   vp->last_timecode = GAVL_TIMECODE_UNDEFINED;
@@ -244,15 +226,6 @@
     }
   }
 
-static void get_output_format_tctweak(void * priv,
-                                 gavl_video_format_t * format)
-  {
-  tc_priv_t * vp;
-  vp = priv;
-  
-  gavl_video_format_copy(format, &vp->format);
-  }
-
 static gavl_timecode_t do_increment(tc_priv_t * vp, gavl_timecode_t tc)
   {
   int64_t frames;
@@ -263,50 +236,52 @@
                                        frames);
   }
 
-static int read_video_tctweak(void * priv, gavl_video_frame_t * frame,
-                         int stream)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
+  gavl_source_status_t st;
   tc_priv_t * vp;
   gavl_timecode_t tc;
   vp = priv;
 
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
   
   if(!vp->format.timecode_format.int_framerate)
-    return 1;
+    return GAVL_SOURCE_OK;
   
   switch(vp->mode)
     {
     case MODE_OFF:
       break;
     case MODE_INTERPOLATE:
-      if(frame->timecode == GAVL_TIMECODE_UNDEFINED)
+      if((*frame)->timecode == GAVL_TIMECODE_UNDEFINED)
         {
         if(vp->last_timecode)
-          frame->timecode = do_increment(vp, vp->last_timecode);
+          (*frame)->timecode = do_increment(vp, vp->last_timecode);
         }
-      vp->last_timecode = frame->timecode;
+      vp->last_timecode = (*frame)->timecode;
       break;
     case MODE_REMOVE_REDUNDANT:
-      if(frame->timecode != GAVL_TIMECODE_UNDEFINED)
+      if((*frame)->timecode != GAVL_TIMECODE_UNDEFINED)
         {
         if(vp->last_timecode == GAVL_TIMECODE_UNDEFINED)
           {
-          vp->last_timecode = frame->timecode;
+          vp->last_timecode = (*frame)->timecode;
           return 1;
           }
         tc = do_increment(vp, vp->last_timecode);
-        if(tc == frame->timecode)
+        if(tc == (*frame)->timecode)
           {
-          frame->timecode = GAVL_TIMECODE_UNDEFINED;
+          (*frame)->timecode = GAVL_TIMECODE_UNDEFINED;
           }
         else
           {
-          fprintf(stderr, "Non continous timecode: ");
+          fprintf(stderr, "Non continuous timecode: ");
           gavl_timecode_dump(&vp->format.timecode_format, tc);
           fprintf(stderr, " != ");
-          gavl_timecode_dump(&vp->format.timecode_format, frame->timecode);
+          gavl_timecode_dump(&vp->format.timecode_format, (*frame)->timecode);
           fprintf(stderr, "\n");
           }
         vp->last_timecode = tc;
@@ -315,25 +290,45 @@
         vp->last_timecode = do_increment(vp, vp->last_timecode);
       break;
     case MODE_REMOVE_ALL:
-      frame->timecode = GAVL_TIMECODE_UNDEFINED;
+      (*frame)->timecode = GAVL_TIMECODE_UNDEFINED;
       break;
     case MODE_ADD:
     case MODE_ADD_FIRST:
       if(vp->last_timecode == GAVL_TIMECODE_UNDEFINED)
         {
-        frame->timecode = vp->first_timecode;
-        vp->last_timecode = frame->timecode;
+        (*frame)->timecode = vp->first_timecode;
+        vp->last_timecode = (*frame)->timecode;
         }
       else if(vp->mode == MODE_ADD)
         {
-        frame->timecode = do_increment(vp, vp->last_timecode);
-        vp->last_timecode = frame->timecode;
+        (*frame)->timecode = do_increment(vp, vp->last_timecode);
+        vp->last_timecode = (*frame)->timecode;
         }
       else
-        frame->timecode = GAVL_TIMECODE_UNDEFINED;
+        (*frame)->timecode = GAVL_TIMECODE_UNDEFINED;
       break;
     }
-  return 1;
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_video_source_t *
+connect_tctweak(void * priv, gavl_video_source_t * src,
+                const gavl_video_options_t * opt)
+  {
+  tc_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
+
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -353,12 +348,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_tctweak,
-    
-    .set_input_format = set_input_format_tctweak,
-    .get_output_format = get_output_format_tctweak,
-
-    .read_video = read_video_tctweak,
+    .connect = connect_tctweak,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_textlogo.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_textlogo.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -38,14 +38,10 @@
 
 typedef struct
   {
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   gavl_video_format_t ovl_format;
   
-  gavl_overlay_t ovl;
+  gavl_overlay_t * ovl;
   
   bg_text_renderer_t * renderer;
   gavl_overlay_blend_context_t * blender;
@@ -53,6 +49,9 @@
   char * textlogo;
 
   int need_overlay;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } tc_priv_t;
 
 static void * create_textlogo()
@@ -73,7 +72,6 @@
   
   if(vp->textlogo)
     free(vp->textlogo);
-  
   free(vp);
   }
 
@@ -220,36 +218,17 @@
     vp->need_overlay = 1;
     }
   else if(!strcmp(name, "text"))
-    vp->textlogo = bg_strdup(vp->textlogo, val->val_str);
+    vp->textlogo = gavl_strrep(vp->textlogo, val->val_str);
   else
     bg_text_renderer_set_parameter(vp->renderer,
                                    name, val);
   }
 
-static void connect_input_port_textlogo(void * priv,
-                                        bg_read_video_func_t func,
-                                        void * data, int stream, int port)
+static void set_format(void * priv,
+                       const gavl_video_format_t * format)
   {
   tc_priv_t * vp;
   vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
-
-static void set_input_format_textlogo(void * priv,
-                                       gavl_video_format_t * format, int port)
-  {
-  tc_priv_t * vp;
-  vp = priv;
-  
-  if(port)
-    return;
   
   gavl_video_format_copy(&vp->format, format);
 
@@ -261,48 +240,59 @@
                                   &vp->format,
                                   &vp->ovl_format);
 
-  if(vp->ovl.frame)
-    gavl_video_frame_destroy(vp->ovl.frame);
-  vp->ovl.frame = gavl_video_frame_create(&vp->ovl_format);
+  if(vp->ovl)
+    gavl_video_frame_destroy(vp->ovl);
+  vp->ovl = gavl_video_frame_create(&vp->ovl_format);
 
   vp->need_overlay = 1;
 
   }
 
-static void get_output_format_textlogo(void * priv,
-                                 gavl_video_format_t * format)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
-  tc_priv_t * vp;
-  vp = priv;
+  gavl_source_status_t st;
   
-  gavl_video_format_copy(format, &vp->format);
-  }
+  tc_priv_t * vp = priv;
 
-static int read_video_textlogo(void * priv, gavl_video_frame_t * frame,
-                                int stream)
-  {
-  tc_priv_t * vp;
-  vp = priv;
+  if((st = gavl_video_source_read_frame(vp->in_src, frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
   
-  if(!vp->read_func(vp->read_data, frame, vp->read_stream))
-    return 0;
-
   if(vp->need_overlay)
     {
-    gavl_video_frame_clear(vp->ovl.frame, &vp->ovl_format);
+    gavl_video_frame_clear(vp->ovl, &vp->ovl_format);
 
     if(vp->textlogo)
-      bg_text_renderer_render(vp->renderer, vp->textlogo, &vp->ovl);
+      bg_text_renderer_render(vp->renderer, vp->textlogo, vp->ovl);
     
-    gavl_overlay_blend_context_set_overlay(vp->blender, &vp->ovl);
+    gavl_overlay_blend_context_set_overlay(vp->blender, vp->ovl);
     
     vp->need_overlay = 0;
     }
   
+  gavl_overlay_blend(vp->blender, *frame);
+
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_video_source_t *
+connect_textlogo(void * priv, gavl_video_source_t * src,
+                 const gavl_video_options_t * opt)
+  {
+  tc_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+  set_format(vp, gavl_video_source_get_src_format(vp->in_src));
   
-  gavl_overlay_blend(vp->blender, frame);
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
 
-  return 1;
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -322,12 +312,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_textlogo,
-    
-    .set_input_format = set_input_format_textlogo,
-    .get_output_format = get_output_format_textlogo,
-
-    .read_video = read_video_textlogo,
+    .connect = connect_textlogo,
     
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_tlp.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_tlp.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -37,17 +37,18 @@
   {
   float factor;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   
-  gavl_video_frame_t * frame_1;
-  gavl_video_frame_t * frame_2;
+  gavl_video_frame_t * frames[2];
+
+  gavl_video_frame_t * this_frame;
+  gavl_video_frame_t * last_frame;
   
   gavl_dsp_context_t * ctx;
   int init;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
   } tlp_priv_t;
 
 static void * create_tlp()
@@ -62,12 +63,14 @@
   {
   tlp_priv_t * vp;
   vp = priv;
-  if(vp->frame_1)
-    gavl_video_frame_destroy(vp->frame_1);
-  if(vp->frame_2)
-    gavl_video_frame_destroy(vp->frame_2);
+  if(vp->frames[0])
+    gavl_video_frame_destroy(vp->frames[0]);
+  if(vp->frames[1])
+    gavl_video_frame_destroy(vp->frames[1]);
   if(vp->ctx)
     gavl_dsp_context_destroy(vp->ctx);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -116,49 +119,6 @@
     gavl_dsp_context_set_quality(vp->ctx, val->val_i);
   }
 
-static void connect_input_port_tlp(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  tlp_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
-
-static void set_input_format_tlp(void * priv, gavl_video_format_t * format, int port)
-  {
-  tlp_priv_t * vp;
-  vp = priv;
-
-  gavl_video_format_copy(&vp->format, format);
-
-  if(vp->frame_1)
-    {
-    gavl_video_frame_destroy(vp->frame_1);
-    vp->frame_1 = NULL;
-    }
-  if(vp->frame_2)
-    {
-    gavl_video_frame_destroy(vp->frame_2);
-    vp->frame_2 = NULL;
-    }
-  vp->init = 1;
-  }
-
-static void get_output_format_tlp(void * priv, gavl_video_format_t * format)
-  {
-  tlp_priv_t * vp;
-  vp = priv;
-  gavl_video_format_copy(format, &vp->format);
-  }
-
 static void reset_tlp(void * priv)
   {
   tlp_priv_t * vp;
@@ -166,39 +126,88 @@
   vp->init = 1;
   }
 
-static int read_video_tlp(void * priv, gavl_video_frame_t * frame, int stream)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
+  gavl_source_status_t st;
+  
   tlp_priv_t * vp;
   vp = priv;
   
-  if(!vp->frame_1)
-    vp->frame_1 = gavl_video_frame_create(&vp->format);
-  if(!vp->frame_2)
-    vp->frame_2 = gavl_video_frame_create(&vp->format);
+  if(!vp->frames[0])
+    vp->frames[0] = gavl_video_frame_create(&vp->format);
+  if(!vp->frames[1])
+    vp->frames[1] = gavl_video_frame_create(&vp->format);
   
   if(vp->init)
     {
-    if(!vp->read_func(vp->read_data, vp->frame_1, vp->read_stream))
-      return 0;
-    gavl_video_frame_copy(&vp->format, frame, vp->frame_1);
+    vp->this_frame = vp->frames[0];
+    vp->last_frame = vp->frames[1];
+
+    if((st = gavl_video_source_read_frame(vp->in_src, &vp->last_frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
+    *frame = vp->last_frame;
     vp->init = 0;
     }
   else
     {
-    if(!vp->read_func(vp->read_data, vp->frame_2, vp->read_stream))
-      return 0;
+    gavl_video_frame_t * in_frame = NULL;
+    gavl_video_frame_t * tmp;
     
-    gavl_dsp_interpolate_video_frame(vp->ctx, &vp->format, vp->frame_1, vp->frame_2,
-                                     frame, vp->factor);
+    if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+       GAVL_SOURCE_OK)
+      return st;
     
-    gavl_video_frame_copy(&vp->format, vp->frame_1, frame);
+    gavl_dsp_interpolate_video_frame(vp->ctx, &vp->format, vp->last_frame, in_frame,
+                                     vp->this_frame, vp->factor);
+    *frame = vp->this_frame;
+    gavl_video_frame_copy_metadata(*frame, in_frame);
+
+    /* Swap */
+    tmp = vp->this_frame;
+    vp->this_frame = vp->last_frame;
+    vp->last_frame = tmp;
     }
+  
+  return GAVL_SOURCE_OK;
+  }
 
-  gavl_video_frame_copy_metadata(frame, vp->frame_2);
-
-  return 1;
+static gavl_video_source_t *
+connect_tlp(void * priv, gavl_video_source_t * src,
+                 const gavl_video_options_t * opt)
+  {
+  tlp_priv_t * vp = priv;
+  vp->in_src = src;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  /* */
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
+  
+  if(vp->frames[0])
+    {
+    gavl_video_frame_destroy(vp->frames[0]);
+    vp->frames[0] = NULL;
+    }
+  if(vp->frames[1])
+    {
+    gavl_video_frame_destroy(vp->frames[1]);
+    vp->frames[1] = NULL;
+    }
+  vp->init = 1;
+  
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, GAVL_SOURCE_SRC_ALLOC,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -216,12 +225,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_tlp,
-    
-    .set_input_format = set_input_format_tlp,
-    .get_output_format = get_output_format_tlp,
-    
-    .read_video = read_video_tlp,
+    .connect = connect_tlp,
     .reset = reset_tlp,
   };

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_transform.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_transform.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -43,14 +43,8 @@
 
 typedef struct
   {
-  
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   
-  gavl_video_frame_t * frame;
   gavl_image_transform_t * transform;
   gavl_video_options_t * opt;
   gavl_video_options_t * global_opt;
@@ -106,8 +100,10 @@
   double whirl_radius_real;
   double whirl_radius2;
   double whirl_angle_real;
-  
-  } transform_t;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+  } transform_priv_t;
 
 static void transfer_global_options(gavl_video_options_t * opt,
                                     gavl_video_options_t * global_opt)
@@ -129,7 +125,7 @@
 
 static void * create_transform()
   {
-  transform_t * ret;
+  transform_priv_t * ret;
   ret = calloc(1, sizeof(*ret));
   ret->transform = gavl_image_transform_create();
   ret->opt = gavl_image_transform_get_options(ret->transform);
@@ -137,23 +133,15 @@
   return ret;
   }
 
-static gavl_video_options_t * get_options_transform(void * priv)
-  {
-  transform_t * vp = priv;
-  return vp->global_opt;
-  }
-
-
 static void destroy_transform(void * priv)
   {
-  transform_t * vp;
+  transform_priv_t * vp;
   vp = priv;
-  if(vp->frame)
-    gavl_video_frame_destroy(vp->frame);
-
+  
   gavl_image_transform_destroy(vp->transform);
   gavl_video_options_destroy(vp->global_opt);
-  
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   free(vp);
   }
 
@@ -417,7 +405,7 @@
 set_parameter_transform(void * priv, const char * name,
                         const bg_parameter_value_t * val)
   {
-  transform_t * vp;
+  transform_priv_t * vp;
   gavl_scale_mode_t scale_mode;
   
   vp = priv;
@@ -616,55 +604,12 @@
     }
   }
 
-static void connect_input_port_transform(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  transform_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  }
-
-static void set_input_format_transform(void * priv,
-                                gavl_video_format_t * format, int port)
-  {
-  transform_t * vp;
-  vp = priv;
-
-  if(!port)
-    {
-    gavl_video_format_copy(&vp->format, format);
-
-    if(vp->frame)
-      {
-      gavl_video_frame_destroy(vp->frame);
-      vp->frame = NULL;
-      }
-    vp->sar = (double)format->pixel_width / (double)format->pixel_height;
-    vp->changed = 1;
-    }
-  }
-
-static void get_output_format_transform(void * priv,
-                                 gavl_video_format_t * format)
-  {
-  transform_t * vp;
-  vp = priv;
-  
-  gavl_video_format_copy(format, &vp->format);
-  }
 
 static void transform_func_matrix(void * priv,
                                   double dst_x, double dst_y,
                                   double * src_x, double * src_y)
   {
-  transform_t * vp;
+  transform_priv_t * vp;
   vp = priv;
   *src_x = dst_x * vp->matrix[0][0] +
     dst_y * vp->matrix[0][1] +
@@ -715,7 +660,7 @@
   dst[1][2] = (src[0][2] * src[1][0] - src[0][0] * src[1][2]) / det;
   }
 
-static void init_transform_matrix(transform_t * vp, double mat[2][3])
+static void init_transform_matrix(transform_priv_t * vp, double mat[2][3])
   {
   double mat1[2][3];
   double mat2[2][3];
@@ -741,7 +686,7 @@
   matrixmult(mat2, mat3, vp->matrix);
   }
 
-static void init_matrix_rotate(transform_t * vp)
+static void init_matrix_rotate(transform_priv_t * vp)
   {
   double mat[2][3];
   double sin_angle, cos_angle;
@@ -767,7 +712,7 @@
   
   }
 
-static void init_matrix_affine(transform_t * vp)
+static void init_matrix_affine(transform_priv_t * vp)
   {
   double mat1[2][3];
   double mat2[2][3];
@@ -804,7 +749,7 @@
                                    double *newy)
   {
   double  w;
-  transform_t * vp;
+  transform_priv_t * vp;
   vp = priv;
   w = vp->matrix3[2][0] * x + vp->matrix3[2][1] * y + vp->matrix3[2][2];
   
@@ -956,7 +901,7 @@
                    matrix[0][2] * matrix[1][1]));
 
   return determinant;
-}
+  }
 
 
 static void
@@ -998,10 +943,10 @@
   inv[2][2] =   (mat[0][0] * mat[1][1] -
                  mat[0][1] * mat[1][0]) * det;
 
-}
+  }
 
 
-static void init_perspective(transform_t * vp)
+static void init_perspective(transform_priv_t * vp)
   {
   double tl[2];
   double tr[2];
@@ -1055,7 +1000,7 @@
   matrix3_invert(mat, vp->matrix3);
   }
 
-static void init_lens_effect(transform_t * vp)
+static void init_lens_effect(transform_priv_t * vp)
   {
   if(EQUAL(vp->lens_effect_diameter, 0.0))
     {
@@ -1083,7 +1028,7 @@
                                        double *newx,
                                        double *newy)
   {
-  transform_t * vp;
+  transform_priv_t * vp;
   double distance;
   double shift;
   double x1, y1;
@@ -1111,7 +1056,7 @@
     }
   }
 
-static void init_whirl(transform_t * vp)
+static void init_whirl(transform_priv_t * vp)
   {
   if(EQUAL(vp->whirl_radius, 0.0) ||
      (EQUAL(vp->whirl_angle, 0.0) &&
@@ -1140,7 +1085,7 @@
                                  double *newx,
                                  double *newy)
   {
-  transform_t * vp;
+  transform_priv_t * vp;
   double dx, dy, d, dist, factor, sina, cosa, ang;
   vp = priv;
   
@@ -1179,7 +1124,7 @@
   *newy = (sina * dx + cosa * dy)           + vp->whirl_center_real[1];
   }
 
-static void init_transform(transform_t * vp)
+static void init_transform(transform_priv_t * vp)
   {
   gavl_image_transform_func func;
   vp->changed = 0;
@@ -1221,38 +1166,62 @@
   
   }
 
-static int read_video_transform(void * priv, gavl_video_frame_t * frame,
-                         int stream)
+
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
-  transform_t * vp;
+  transform_priv_t * vp;
+  gavl_source_status_t st;
+  gavl_video_frame_t * in_frame = NULL;
   vp = priv;
 
-  //  fprintf (stderr, "vp->do_transform: %d\n", vp->do_transform);
-
   if(vp->changed)
     init_transform(vp);
     
   if(!vp->do_transform)
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
-  
-  if(!vp->frame)
-    {
-    vp->frame = gavl_video_frame_create(&vp->format);
-    gavl_video_frame_clear(vp->frame, &vp->format);
-    }
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
+    return gavl_video_source_read_frame(vp->in_src, frame);
 
+  if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
   
-  gavl_video_frame_fill(frame, &vp->format, vp->bg_color);
+  gavl_video_frame_fill(*frame, &vp->format, vp->bg_color);
+  gavl_image_transform_transform(vp->transform, in_frame, *frame);
+  gavl_video_frame_copy_metadata(*frame, in_frame);
   
-  gavl_image_transform_transform(vp->transform, vp->frame, frame);
+  return GAVL_SOURCE_OK;
+  }
 
-  gavl_video_frame_copy_metadata(frame, vp->frame);
+static gavl_video_source_t *
+connect_transform(void * priv,
+                  gavl_video_source_t * src,
+                  const gavl_video_options_t * opt)
+  {
+  transform_priv_t * vp;
+  vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
+
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
+  
+  vp->sar = (double)vp->format.pixel_width / (double)vp->format.pixel_height;
   
-  return 1;
+  if(opt)
+    gavl_video_options_copy(vp->global_opt, opt);
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  
+  vp->changed = 1;
+
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                 vp, 0,
+                                 vp->in_src);
+  return vp->out_src;
   }
 
+
 const bg_fv_plugin_t the_plugin = 
   {
     .common =
@@ -1270,14 +1239,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_transform,
-    .get_options        = get_options_transform,
-    
-    .set_input_format = set_input_format_transform,
-    .get_output_format = get_output_format_transform,
-
-    .read_video = read_video_transform,
-    
+    .connect = connect_transform,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/videofilters/fv_zoom.c -> gmerlin-4256.tar.gz/plugins/videofilters/fv_zoom.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -37,13 +37,8 @@
   float scale_h;
   float scale_v;
   
-  bg_read_video_func_t read_func;
-  void * read_data;
-  int read_stream;
-  
   gavl_video_format_t format;
   
-  gavl_video_frame_t * frame;
   gavl_video_scaler_t * scaler;
   gavl_video_options_t * opt;
   
@@ -53,11 +48,14 @@
   gavl_scale_mode_t scale_mode;
   
   float bg_color[4];
-  } zs_priv_t;
+
+  gavl_video_source_t * in_src;
+  gavl_video_source_t * out_src;
+  } zoom_priv_t;
 
 static void * create_zoom()
   {
-  zs_priv_t * ret;
+  zoom_priv_t * ret;
   ret = calloc(1, sizeof(*ret));
   ret->scaler = gavl_video_scaler_create();
   ret->opt = gavl_video_scaler_get_options(ret->scaler);
@@ -66,12 +64,12 @@
 
 static void destroy_zoom(void * priv)
   {
-  zs_priv_t * vp;
+  zoom_priv_t * vp;
   vp = priv;
-  if(vp->frame)
-    gavl_video_frame_destroy(vp->frame);
-
+  
   gavl_video_scaler_destroy(vp->scaler);
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
   
   free(vp);
   }
@@ -172,7 +170,7 @@
 
 static void set_parameter_zoom(void * priv, const char * name, const bg_parameter_value_t * val)
   {
-  zs_priv_t * vp;
+  zoom_priv_t * vp;
   gavl_scale_mode_t scale_mode;
   gavl_downscale_filter_t new_downscale_filter;
 
@@ -248,52 +246,11 @@
     }
   }
 
-static void connect_input_port_zoom(void * priv,
-                                    bg_read_video_func_t func,
-                                    void * data, int stream, int port)
-  {
-  zs_priv_t * vp;
-  vp = priv;
 
-  if(!port)
-    {
-    vp->read_func = func;
-    vp->read_data = data;
-    vp->read_stream = stream;
-    }
-  
-  }
-
-static void set_input_format_zoom(void * priv,
-                                gavl_video_format_t * format, int port)
-  {
-  zs_priv_t * vp;
-  vp = priv;
-
-  if(!port)
-    gavl_video_format_copy(&vp->format, format);
-
-  if(vp->frame)
-    {
-    gavl_video_frame_destroy(vp->frame);
-    vp->frame = NULL;
-    }
-  vp->changed = 1;
-  }
 
-static void get_output_format_zoom(void * priv,
-                                 gavl_video_format_t * format)
-  {
-  zs_priv_t * vp;
-  vp = priv;
-  
-  gavl_video_format_copy(format, &vp->format);
-  }
-
-static void init_scaler(zs_priv_t * vp)
+static void init_scaler(zoom_priv_t * vp)
   {
   int i_tmp;
-  float f_tmp;
   gavl_rectangle_f_t src_rect;
   gavl_rectangle_i_t dst_rect;
 
@@ -302,7 +259,6 @@
 
   if(vp->scale_h > 1.0)
     {
-    f_tmp = vp->format.image_width * vp->scale_h;
     src_rect.w = (float)vp->format.image_width / vp->scale_h;
     src_rect.x = ((float)vp->format.image_width - src_rect.w)/2.0;
     }
@@ -317,7 +273,6 @@
 
   if(vp->scale_v > 1.0)
     {
-    f_tmp = vp->format.image_height * vp->scale_v;
     src_rect.h = (float)vp->format.image_height / vp->scale_v;
     src_rect.y = ((float)vp->format.image_height - src_rect.h)/2.0;
     }
@@ -338,35 +293,56 @@
   vp->changed = 0;
   }
 
-static int read_video_zoom(void * priv, gavl_video_frame_t * frame,
-                         int stream)
+static gavl_source_status_t
+read_func(void * priv, gavl_video_frame_t ** frame)
   {
-  zs_priv_t * vp;
+  gavl_source_status_t st;
+  zoom_priv_t * vp;
+  gavl_video_frame_t * in_frame = NULL;
   vp = priv;
 
   if((vp->scale_h == 1.0) && (vp->scale_v == 1.0))
     {
-    return vp->read_func(vp->read_data, frame, vp->read_stream);
+    return gavl_video_source_read_frame(vp->in_src, frame);
     }
-  
-  if(!vp->frame)
-    {
-    vp->frame = gavl_video_frame_create(&vp->format);
-    gavl_video_frame_clear(vp->frame, &vp->format);
-    }
-  if(!vp->read_func(vp->read_data, vp->frame, vp->read_stream))
-    return 0;
 
+  if((st = gavl_video_source_read_frame(vp->in_src, &in_frame)) !=
+     GAVL_SOURCE_OK)
+    return st;
+  
   if(vp->changed)
     init_scaler(vp);
   
-  gavl_video_frame_fill(frame, &vp->format, vp->bg_color);
+  gavl_video_frame_fill(*frame, &vp->format, vp->bg_color);
+  gavl_video_scaler_scale(vp->scaler, in_frame, *frame);
+  gavl_video_frame_copy_metadata(*frame, in_frame);
   
-  gavl_video_scaler_scale(vp->scaler, vp->frame, frame);
+  return GAVL_SOURCE_OK;
+  }
+
+static gavl_video_source_t *
+connect_zoom(void * priv, gavl_video_source_t * src, const gavl_video_options_t * opt)
+  {
+  zoom_priv_t * vp = priv;
+  if(vp->out_src)
+    gavl_video_source_destroy(vp->out_src);
 
-  gavl_video_frame_copy_metadata(frame, vp->frame);
+  vp->in_src = src;
+  gavl_video_format_copy(&vp->format,
+                         gavl_video_source_get_src_format(vp->in_src));
+  
+  
+  if(opt)
+    gavl_video_options_copy(vp->opt, opt);
   
-  return 1;
+  gavl_video_source_set_dst(vp->in_src, 0, &vp->format);
+  
+  vp->changed = 1;
+  vp->out_src =
+    gavl_video_source_create_source(read_func,
+                                    vp, 0,
+                                    vp->in_src);
+  return vp->out_src;
   }
 
 const bg_fv_plugin_t the_plugin = 
@@ -386,12 +362,7 @@
       .priority =         1,
     },
     
-    .connect_input_port = connect_input_port_zoom,
-    
-    .set_input_format = set_input_format_zoom,
-    .get_output_format = get_output_format_zoom,
-
-    .read_video = read_video_zoom,
+    .connect = connect_zoom,
     
   };

gmerlin-1.2.0.tar.gz/plugins/visualization/Makefile.am -> gmerlin-4256.tar.gz/plugins/visualization/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/visualization/vis_scope.c -> gmerlin-4256.tar.gz/plugins/visualization/vis_scope.c Changed

gmerlin-1.2.0.tar.gz/plugins/wavwrite/Makefile.am -> gmerlin-4256.tar.gz/plugins/wavwrite/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/wavwrite/e_wav.c -> gmerlin-4256.tar.gz/plugins/wavwrite/e_wav.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -64,10 +64,19 @@
 #define RIFF_SIZE_OFFSET 4
 // #define DATA_SIZE_OFFSET 40
 
+#define FORMAT_WAV 0
+#define FORMAT_RAW 1
+
 typedef struct wav_s
   {
-  int bytes_per_sample;
-  FILE * output;
+  // int bytes_per_sample;
+
+  int block_align;
+  int bits;
+
+  int file_format;
+  
+  gavf_io_t * output;
   int data_size_offset;
   gavl_audio_format_t format;
 
@@ -76,33 +85,43 @@
   char * filename;
   uint32_t channel_mask;
 
+  gavl_audio_frame_t * frame;
+  
   uint8_t * buffer;
   int buffer_alloc;
   void (*convert_func)(struct wav_s*, uint8_t * samples, int num_samples);
   bg_encoder_callbacks_t * cb;
+  gavl_audio_sink_t * sink;
+
+  int be;
+  int swap_endian;
+  gavl_dsp_context_t * dsp;
+
+  
   } wav_t;
 
-static int write_8(FILE * output, uint32_t val)
+static int write_8(gavf_io_t * output, uint32_t val)
   {
   uint8_t c = val;
-  if(fwrite(&c, 1, 1, output) < 1)
+  if(gavf_io_write_data(output, &c, 1) < 1)
     return 0;
   return 1;
   }
 
-static int write_16(FILE * output, uint32_t val)
+static int write_16(gavf_io_t * output, uint32_t val)
   {
   uint8_t c[2];
   
   c[0] = val & 0xff;
   c[1] = (val >> 8) & 0xff;
   
-  if(fwrite(c, 1, 2, output) < 2)
+  if(gavf_io_write_data(output, c, 2) < 2)
     return 0;
+  
   return 1;
   }
 
-static int write_32(FILE * output, uint32_t val)
+static int write_32(gavf_io_t* output, uint32_t val)
   {
   uint8_t c[4];
   
@@ -110,12 +129,12 @@
   c[1] = (val >> 8) & 0xff;
   c[2] = (val >> 16) & 0xff;
   c[3] = (val >> 24) & 0xff;
-  if(fwrite(c, 1, 4, output) < 4)
+  if(gavf_io_write_data(output, c, 4) < 4)
     return 0;
   return 1;
   }
 
-static int write_fourcc(FILE * output, char c1, char c2, char c3, char c4)
+static int write_fourcc(gavf_io_t* output, char c1, char c2, char c3, char c4)
   {
   char c[4];
 
@@ -123,7 +142,7 @@
   c[1] = c2;
   c[2] = c3;
   c[3] = c4;
-  if(fwrite(c, 1, 4, output) < 4)
+  if(gavf_io_write_data(output, (uint8_t*)c, 4) < 4)
     return 0;
   return 1;
   }
@@ -163,7 +182,7 @@
   }
 #endif
 
-static void convert_24(struct wav_s*w, uint8_t * samples, int num_samples)
+static void convert_24_le(struct wav_s*w, uint8_t * samples, int num_samples)
   {
   int i;
   uint32_t * src = (uint32_t*)samples;
@@ -179,6 +198,22 @@
     }
   }
 
+static void convert_24_be(struct wav_s*w, uint8_t * samples, int num_samples)
+  {
+  int i;
+  uint32_t * src = (uint32_t*)samples;
+  uint8_t * dst = w->buffer;
+
+  for(i = 0; i < num_samples; i++)
+    {
+    dst[0] = (src[0] >> 24) & 0xff;
+    dst[1] = (src[0] >> 16) & 0xff;
+    dst[2] = (src[0] >> 8) & 0xff;
+    src++;
+    dst+=3;
+    }
+  }
+
 
 /* Write info chunk */
 
@@ -209,10 +244,10 @@
     len = strlen(info.tag)+1; \
     if(len > 1) \
       { \
-      if(fwrite(#tag, 1, 4, output) < 4)\
+      if(gavf_io_write_data(output, (const uint8_t*)#tag, 4) < 4)        \
         return 0; \
       write_32(output, len); \
-      if(fwrite(info.tag, 1, len, output) < len) \
+      if(gavf_io_write_data(output, (const uint8_t*)info.tag, len) < len)     \
         return 0; \
       if(len % 2) \
         { \
@@ -224,7 +259,7 @@
 
 #define BUFFER_SIZE 256
 
-static int write_info_chunk(FILE * output, gavl_metadata_t * m)
+static int write_info_chunk(gavf_io_t * output, gavl_metadata_t * m)
   {
   int len;
   int total_len;
@@ -303,13 +338,14 @@
   wav = priv;
 
   if(wav->output)
-    fclose(wav->output);
+    gavf_io_destroy(wav->output);
 
+  if(wav->sink)
+    gavl_audio_sink_destroy(wav->sink);
+  
   free(wav);
   }
 
-
-
 static const bg_parameter_info_t audio_parameters[] =
   {
     {
@@ -319,12 +355,26 @@
       .val_default = { .val_str = "16" },
       .multi_names =     (char const *[]){ "8", "16", "24", "32", NULL },
     },
+    {
+      .name =        "be",
+      .long_name =   TRS("Output big endian (Raw only)"),
+      .type =        BG_PARAMETER_CHECKBUTTON,
+      .val_default = { .val_i = 0 },
+    },
     { /* End of parameters */ }
   };
 
 static const bg_parameter_info_t parameters[] =
   {
     {
+      .name =        "format",
+      .long_name =   TRS("Format"),
+      .type =        BG_PARAMETER_STRINGLIST,
+      .val_default = { .val_str = "waw" },
+      .multi_names = (char const*[]){ "wav", "raw", NULL},
+      .multi_labels = (char const*[]){ "WAV", "Raw", NULL},
+    },
+    {
       .name =        "write_info_chunk",
       .long_name =   TRS("Write info chunk"),
       .type =        BG_PARAMETER_CHECKBUTTON,
@@ -346,14 +396,14 @@
 static int write_PCMWAVEFORMAT(wav_t * wav)
   {
   return
-    (write_32(wav->output, 16) &&                                               /* Size   */
-     write_16(wav->output, 0x0001) &&                                            /* wFormatTag */
-     write_16(wav->output, wav->format.num_channels) &&                          /* nChannels */
-     write_32(wav->output, wav->format.samplerate) &&                           /* nSamplesPerSec */
-     write_32(wav->output, wav->bytes_per_sample *
-              wav->format.num_channels * wav->format.samplerate) &&             /* nAvgBytesPerSec */
-     write_16(wav->output, wav->bytes_per_sample * wav->format.num_channels) && /* nBlockAlign */
-     write_16(wav->output, wav->bytes_per_sample * 8));                        /* wBitsPerSample */
+    (write_32(wav->output, 16) &&     /* Size   */
+     write_16(wav->output, 0x0001) && /* wFormatTag */
+     write_16(wav->output, wav->format.num_channels) && /* nChannels */
+     write_32(wav->output, wav->format.samplerate) &&   /* nSamplesPerSec */
+     write_32(wav->output, wav->block_align *
+              wav->format.samplerate) &&                /* nAvgBytesPerSec */
+     write_16(wav->output, wav->block_align) &&         /* nBlockAlign */
+     write_16(wav->output, (wav->block_align / wav->format.num_channels) * 8)); /* wBitsPerSample */
   }
 
 const struct
@@ -403,21 +453,21 @@
   uint8_t guid[16] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
                       0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
 
-  return(write_32(wav->output, 40) &&                                               /* Size   */
-         write_16(wav->output, 0xfffe) &&                                           /* wFormatTag */
-         write_16(wav->output, wav->format.num_channels) &&                         /* nChannels */
-         write_32(wav->output, wav->format.samplerate) &&                           /* nSamplesPerSec */
-         write_32(wav->output, wav->bytes_per_sample *
-                  wav->format.num_channels * wav->format.samplerate) &&             /* nAvgBytesPerSec */
-         write_16(wav->output, wav->bytes_per_sample * wav->format.num_channels) && /* nBlockAlign */
-         write_16(wav->output, wav->bytes_per_sample * 8) &&                        /* wBitsPerSample */
-         write_16(wav->output, 22) &&                                               /* cbSize         */
-         write_16(wav->output, wav->bytes_per_sample * 8) &&                        /* wValidBitsPerSample */
+  return(write_32(wav->output, 40) &&                       /* Size   */
+         write_16(wav->output, 0xfffe) &&                   /* wFormatTag */
+         write_16(wav->output, wav->format.num_channels) && /* nChannels */
+         write_32(wav->output, wav->format.samplerate) &&   /* nSamplesPerSec */
+         write_32(wav->output, wav->block_align *
+                  wav->format.samplerate) &&                /* nAvgBytesPerSec */
+         write_16(wav->output, wav->block_align) &&         /* nBlockAlign */
+         write_16(wav->output, (wav->block_align / wav->format.num_channels) * 8) && /* wBitsPerSample */
+         write_16(wav->output, 22) &&                        /* cbSize         */
+         write_16(wav->output, (wav->block_align / wav->format.num_channels) * 8) && /* wValidBitsPerSample */
 
   /* Write channel mask */
 
-         write_32(wav->output, wav->channel_mask) &&            /* dwChannelMask */
-         (fwrite(guid, 1, 16, wav->output) == 16));
+         write_32(wav->output, wav->channel_mask) &&         /* dwChannelMask */
+         (gavf_io_write_data(wav->output, guid, 16) == 16));
     }
 
 static void set_audio_parameter_wav(void * data, int stream,
@@ -432,13 +482,12 @@
     
   if(!name)
     return;
-
   
   if(!strcmp(name, "bits"))
-    {
-    wav->bytes_per_sample = atoi(v->val_str) / 8;
-    }
-  }
+    wav->bits = atoi(v->val_str);
+  else if(!strcmp(name, "be"))
+    wav->be = v->val_i;
+}
 
 static void set_parameter_wav(void * data, const char * name,
                               const bg_parameter_value_t * v)
@@ -450,36 +499,65 @@
     return;
   if(!strcmp(name, "write_info_chunk"))
     wav->write_info_chunk = v->val_i;
+  if(!strcmp(name, "format"))
+    {
+    if(!strcmp(v->val_str, "wav"))
+      wav->file_format = FORMAT_WAV;
+    if(!strcmp(v->val_str, "raw"))
+      wav->file_format = FORMAT_RAW;
+    }
+  }
+
+static int open_io_wav(void * data, gavf_io_t * io,
+                       const gavl_metadata_t * metadata,
+                       const gavl_chapter_list_t * chapter_list)
+  {
+  wav_t * wav;
+  wav = data;
+  wav->output = io;
+
+  if(metadata)
+    gavl_metadata_copy(&wav->metadata, metadata);
+
+  return 1;
   }
 
 static int open_wav(void * data, const char * filename,
                     const gavl_metadata_t * metadata,
-                    const bg_chapter_list_t * chapter_list)
+                    const gavl_chapter_list_t * chapter_list)
   {
-  int result;
   wav_t * wav;
+  gavf_io_t * io;
   wav = data;
-  
-  wav->filename = bg_filename_ensure_extension(filename, "wav");
-
-  if(!bg_encoder_cb_create_output_file(wav->cb, wav->filename))
-    return 0;
-  
-  wav->output = fopen(wav->filename, "wb");
 
-  if(!wav->output)
+  if(!strcmp(filename, "-"))
     {
-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open output file: %s",
-           strerror(errno));
-    result = 0;
+    if(wav->file_format != FORMAT_RAW)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Only raw audio can be written to a pipe");
+      return 0;
+      }
+    io = gavf_io_create_file(stdout, 1, 0, 0);
     }
   else
-    result = 1;
+    {
+    FILE * f;
+    wav->filename = bg_filename_ensure_extension(filename, "wav");
 
-  if(metadata)
-    gavl_metadata_copy(&wav->metadata, metadata);
-  
-  return result;
+    if(!bg_encoder_cb_create_output_file(wav->cb, wav->filename))
+      return 0;
+
+    f = fopen(wav->filename, "wb");
+    if(!f)
+      {
+      bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s: %s",
+             wav->filename, strerror(errno));
+      return 0;
+      }
+    io = gavf_io_create_file(f, 1, 1, 1);
+    }
+
+  return open_io_wav(data, io, metadata, chapter_list);
   }
 
 
@@ -498,16 +576,12 @@
   return 0;
   }
 
-static int write_audio_frame_wav(void * data, gavl_audio_frame_t * frame,
-                                  int stream)
+static gavl_sink_status_t write_func_wav(void * data, gavl_audio_frame_t * frame)
   {
-  int num_samples, num_bytes;
-  wav_t * wav;
-  
-  wav = data;
-  
-  num_samples = frame->valid_samples * wav->format.num_channels;
-  num_bytes = num_samples * wav->bytes_per_sample;
+  int num_bytes;
+  wav_t * wav = data;
+
+  num_bytes = frame->valid_samples * wav->block_align;
   
   if(wav->convert_func)
     {
@@ -516,33 +590,33 @@
       wav->buffer_alloc = num_bytes + 1024;
       wav->buffer = realloc(wav->buffer, wav->buffer_alloc);
       }
-    wav->convert_func(wav, frame->samples.u_8, num_samples);
-    if(fwrite(wav->buffer, 1, num_bytes, wav->output) < num_bytes)
-      return 0;
+    wav->convert_func(wav, frame->samples.u_8, frame->valid_samples * wav->format.samples_per_frame);
+    if(gavf_io_write_data(wav->output, wav->buffer, num_bytes) < num_bytes)
+      return GAVL_SINK_ERROR;
     }
   else
     {
-    if(fwrite(frame->samples.s_8, 1, num_bytes, wav->output) < num_bytes)
-      return 0;
+    if(wav->swap_endian)
+      gavl_dsp_audio_frame_swap_endian(wav->dsp,
+                                       wav->frame,
+                                       &wav->format);
+    
+    if(gavf_io_write_data(wav->output, frame->samples.u_8, num_bytes) < num_bytes)
+      return GAVL_SINK_ERROR;
     }
-  return 1;
+  return GAVL_SINK_OK;
   }
 
-static void get_audio_format_wav(void * data, int stream,
-                                 gavl_audio_format_t * ret)
+static gavl_audio_frame_t * get_func_wav(void * data)
   {
-  wav_t * wav;
-  wav = data;
-  gavl_audio_format_copy(ret, &wav->format);
+  wav_t * wav = data;
+  return wav->frame;
   }
 
-static int start_wav(void * data)
+static int write_wav_header(wav_t * wav)
   {
-  wav_t * wav;
-  wav = data;
-
   /* Write the header and adjust format */
-
+  
   if(!write_fourcc(wav->output, 'R', 'I', 'F', 'F') || /* "RIFF" */
      !write_32(wav->output, 0x00000000) ||             /*  size  */
      !write_fourcc(wav->output, 'W', 'A', 'V', 'E') || /* "WAVE" */
@@ -566,37 +640,72 @@
   
   write_fourcc(wav->output, 'd', 'a', 't', 'a'); /* "data" */
   
-  wav->data_size_offset = ftell(wav->output);
+  wav->data_size_offset = gavf_io_position(wav->output);
   write_32(wav->output, 0x00000000);             /*  size  */
+  return 1;
+  }
+
+static int start_wav(void * data)
+  {
+  wav_t * wav;
+  wav = data;
+
+  wav->block_align = (wav->bits / 8) * wav->format.num_channels;
+  
+  if((wav->file_format == FORMAT_WAV) &&
+     !write_wav_header(wav))
+    return 0;
   
   /* Adjust format */
   
-  switch(wav->bytes_per_sample)
+  switch(wav->bits)
     {
-    case 1:
+    case 8:
       wav->format.sample_format = GAVL_SAMPLE_U8;
       break;
-    case 2:
+    case 16:
       wav->format.sample_format = GAVL_SAMPLE_S16;
 #ifdef WORDS_BIGENDIAN
-      wav->convert_func = convert_16_be;
+      if(!wav->be)
+        wav->swap_endian = 1;
+#else
+      if(wav->be)
+        wav->swap_endian = 1;
 #endif
       break;
-    case 3:
-      wav->convert_func = convert_24;
+    case 24:
+      if(wav->be)
+        wav->convert_func = convert_24_be;
+      else
+        wav->convert_func = convert_24_le;
+      
       wav->format.sample_format = GAVL_SAMPLE_S32;
       break;
-    case 4:
+    case 32:
 #ifdef WORDS_BIGENDIAN
-      wav->convert_func = convert_32_be;
+      if(!wav->be)
+        wav->swap_endian = 1;
+#else
+      if(wav->be)
+        wav->swap_endian = 1;
 #endif
       wav->format.sample_format = GAVL_SAMPLE_S32;
       break;
     }
+
+  if(wav->swap_endian)
+    {
+    wav->dsp = gavl_dsp_context_create();
+    wav->format.samples_per_frame = 1024;
+    wav->frame = gavl_audio_frame_create(&wav->format);
+    }
+  wav->sink = gavl_audio_sink_create(wav->frame ? get_func_wav : NULL,
+                                     write_func_wav, wav,
+                                     &wav->format);
+  
   return 1;
   }
 
-
 static int close_wav(void * data, int do_delete)
   {
   int ret = 1;
@@ -606,34 +715,61 @@
 
   if(!do_delete)
     {
-    total_bytes = ftell(wav->output);
-    /* Finalize data section */
-    fseek(wav->output, wav->data_size_offset, SEEK_SET);
-    write_32(wav->output, total_bytes - wav->data_size_offset - 4);
-    /* Finalize RIFF */
-    fseek(wav->output, RIFF_SIZE_OFFSET, SEEK_SET);
-    write_32(wav->output, total_bytes - RIFF_SIZE_OFFSET - 4);
-
-    /* Write info chunk */
-    if(wav->write_info_chunk)
+    if(wav->file_format == FORMAT_WAV)
       {
-      fseek(wav->output, total_bytes, SEEK_SET);
-      ret = write_info_chunk(wav->output, &wav->metadata);
-      total_bytes = ftell(wav->output);
+      total_bytes = gavf_io_position(wav->output);
+      /* Finalize data section */
+      gavf_io_seek(wav->output, wav->data_size_offset, SEEK_SET);
+      write_32(wav->output, total_bytes - wav->data_size_offset - 4);
+      /* Finalize RIFF */
+      gavf_io_seek(wav->output, RIFF_SIZE_OFFSET, SEEK_SET);
+      write_32(wav->output, total_bytes - RIFF_SIZE_OFFSET - 4);
+    
+      /* Write info chunk */
+      if(wav->write_info_chunk)
+        {
+        gavf_io_seek(wav->output, total_bytes, SEEK_SET);
+        ret = write_info_chunk(wav->output, &wav->metadata);
+        total_bytes = gavf_io_position(wav->output);
+        }
       }
     }
   if(wav->output)
-    fclose(wav->output);
+    gavf_io_destroy(wav->output);
   
-  if(do_delete)
+  if(do_delete && wav->filename)
     remove(wav->filename);
-
+  
   gavl_metadata_free(&wav->metadata);
   
+  if(wav->sink)
+    {
+    gavl_audio_sink_destroy(wav->sink);
+    wav->sink = NULL;
+    }
+
+  if(wav->dsp)
+    {
+    gavl_dsp_context_destroy(wav->dsp);
+    wav->dsp = NULL;
+    }
+
+  if(wav->frame)
+    {
+    gavl_audio_frame_destroy(wav->frame);
+    wav->frame = NULL;
+    }
+  
   wav->output = NULL;
   return ret;
   }
 
+static gavl_audio_sink_t * get_audio_sink_wav(void * data, int stream)
+  {
+  wav_t * wav = data;
+  return wav->sink;
+  }
+
 const bg_encoder_plugin_t the_plugin =
   {
     .common =
@@ -643,7 +779,7 @@
       .long_name =         TRS("Wave writer"),
       .description =       TRS("Simple writer for wave files, supports 8, 16, 24 and 32 bit PCM"),
       .type =              BG_PLUGIN_ENCODER_AUDIO,
-      .flags =             BG_PLUGIN_FILE,
+      .flags =             BG_PLUGIN_FILE | BG_PLUGIN_PIPE | BG_PLUGIN_GAVF_IO,
       .priority =          BG_PLUGIN_PRIORITY_MAX,
       .create =            create_wav,
       .destroy =           destroy_wav,
@@ -656,6 +792,7 @@
     .set_callbacks =       set_callbacks_wav,
     
     .open =                open_wav,
+    .open_io =             open_io_wav,
     
     .get_audio_parameters =    get_audio_parameters_wav,
 
@@ -663,10 +800,9 @@
     
     .set_audio_parameter =     set_audio_parameter_wav,
 
-    .get_audio_format =        get_audio_format_wav,
+    .get_audio_sink =          get_audio_sink_wav,
 
     .start =               start_wav,
-    .write_audio_frame =   write_audio_frame_wav,
     .close =               close_wav
   };

gmerlin-1.2.0.tar.gz/plugins/x11/Makefile.am -> gmerlin-4256.tar.gz/plugins/x11/Makefile.am Changed

gmerlin-1.2.0.tar.gz/plugins/x11/i_x11.c -> gmerlin-4256.tar.gz/plugins/x11/i_x11.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -28,6 +28,7 @@
 typedef struct
   {
   bg_x11_grab_window_t * win;
+  gavl_video_source_t * src;
   } x11_t;
 
 static void * create_x11()
@@ -40,12 +41,6 @@
   return x11;
   }
 
-static void destroy_x11(void * priv)
-  {
-  x11_t * x11 = priv;
-  bg_x11_grab_window_destroy(x11->win);
-  free(priv);  
-  }
 
 static const bg_parameter_info_t * get_parameters_x11(void * priv)
   {
@@ -69,22 +64,46 @@
 
 static int open_x11(void * priv,
                     gavl_audio_format_t * audio_format,
-                    gavl_video_format_t * format)
+                    gavl_video_format_t * format, gavl_metadata_t * m)
   {
   x11_t * x11 = priv;
-  return bg_x11_grab_window_init(x11->win, format);
+  if(!bg_x11_grab_window_init(x11->win, format))
+    return 0;
+  x11->src = gavl_video_source_create(bg_x11_grab_window_grab, x11->win,
+                                      GAVL_SOURCE_SRC_ALLOC, format);
+  return 1;
   }
 
 static void close_x11(void * priv)
   {
   x11_t * x11 = priv;
   bg_x11_grab_window_close(x11->win);
+  gavl_video_source_destroy(x11->src);
+  x11->src = NULL;
+  }
+
+static void destroy_x11(void * priv)
+  {
+  x11_t * x11 = priv;
+
+  if(x11->src)
+    close_x11(priv);
+
+  bg_x11_grab_window_destroy(x11->win);
+  free(priv);  
   }
 
+
 static int read_frame_x11(void * priv, gavl_video_frame_t * frame, int stream)
   {
   x11_t * x11 = priv;
-  return bg_x11_grab_window_grab(x11->win, frame);
+  return (gavl_video_source_read_frame(x11->src, &frame) == GAVL_SOURCE_OK);
+  }
+
+static gavl_video_source_t * get_video_source_x11(void * priv)
+  {
+  x11_t * x11 = priv;
+  return x11->src;
   }
 
 const bg_recorder_plugin_t the_plugin =
@@ -109,6 +128,7 @@
     .open =       open_x11,
     .close =      close_x11,
     .read_video = read_frame_x11,
+    .get_video_source = get_video_source_x11,
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/plugins/x11/ov_x11.c -> gmerlin-4256.tar.gz/plugins/x11/ov_x11.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -79,6 +79,9 @@
     { BG_KEY_NONE,                     0,  0                      },
   };
 
+static void close_x11(void * data);
+
+
 typedef struct
   {
   bg_x11_window_t * win;
@@ -114,8 +117,6 @@
   gavl_video_format_t window_format;
   
   /* Still image stuff */
-  int do_still;
-  gavl_video_frame_t * still_frame;
   
   /* Accelerator map */
 
@@ -128,8 +129,6 @@
 
   int keep_aspect;
 
-  gavl_video_frame_t * frame;
-  
   } x11_t;
 
 /* Utility functions */
@@ -579,11 +578,6 @@
   priv->window_callbacks.set_fullscreen = set_fullscreen;
   
   /* For updating OSD */
-#if 0
-  priv->window_callbacks.brightness_callback = brightness_callback;
-  priv->window_callbacks.saturation_callback = saturation_callback;
-  priv->window_callbacks.contrast_callback = contrast_callback;
-#endif
   priv->window_callbacks.data = priv;
   
   return priv;
@@ -592,6 +586,8 @@
 static void destroy_x11(void * data)
   {
   x11_t * priv = data;
+
+  close_x11(data);
   
   if(priv->parameters)
     bg_parameter_info_destroy_array(priv->parameters);
@@ -773,7 +769,7 @@
 static void set_window_x11(void * data, const char * window_id)
   {
   x11_t * priv = data;
-  priv->window_id = bg_strdup(priv->window_id, window_id);
+  priv->window_id = gavl_strrep(priv->window_id, window_id);
   }
 
 static const char * get_window_x11(void * data)
@@ -800,7 +796,6 @@
                             icon, icon_format);
   }
 
-
 static int open_x11(void * data, gavl_video_format_t * format, int keep_aspect)
   {
   x11_t * priv = data;
@@ -817,61 +812,25 @@
   
   priv->keep_aspect = keep_aspect;
   priv->is_open = 1;
+  
   set_drawing_coords(priv);
   
   return result;
   }
 
-static gavl_video_frame_t * get_frame_x11(void * data)
-  {
-  x11_t * priv = data;
-
-  if(!priv->frame)
-    priv->frame = bg_x11_window_create_frame(priv->win);
-  return priv->frame;
-  }
-
-static gavl_overlay_t * create_overlay_x11(void * data, int id)
+static gavl_video_sink_t * get_sink_x11(void * data)
   {
   x11_t * priv = data;
-  return bg_x11_window_create_overlay(priv->win, id);
+  return bg_x11_window_get_sink(priv->win);
   }
 
-static void destroy_overlay_x11(void * data, int id, gavl_overlay_t * ovl)
-  {
-  x11_t * priv = data;
-  bg_x11_window_destroy_overlay(priv->win, id, ovl);
-  }
-
-
-static int
+static gavl_video_sink_t *
 add_overlay_stream_x11(void * data, gavl_video_format_t * format)
   {
   x11_t * priv = data;
-  /* Realloc */
   return bg_x11_window_add_overlay_stream(priv->win, format);
   }
 
-static void set_overlay_x11(void * data, int stream, gavl_overlay_t * ovl)
-  {
-  x11_t * priv = data;
-  bg_x11_window_set_overlay(priv->win, stream, ovl);
-  }
-
-
-static void put_video_x11(void * data, gavl_video_frame_t * frame)
-  {
-  x11_t * priv = data;
-  bg_x11_window_put_frame(priv->win, frame);
-  }
-
-static void put_still_x11(void * data, gavl_video_frame_t * frame)
-  {
-  x11_t * priv = data;
-  bg_x11_window_put_still(priv->win, frame);
-  
-  }
-
 static void handle_events_x11(void * data)
   {
   x11_t * priv = data;
@@ -886,11 +845,6 @@
     priv->is_open = 0;
     bg_x11_window_close_video(priv->win);
     }
-  if(priv->frame)
-    {
-    bg_x11_window_destroy_frame(priv->win, priv->frame);
-    priv->frame = NULL;
-    }
   }
 
 static void update_aspect_x11(void * data, int pixel_width,
@@ -919,40 +873,41 @@
       .long_name =     TRS("X11"),
       .description =   TRS("X11 display driver with support for XVideo, XImage and OpenGL. Shared memory (XShm) is used where available."),
       .type =          BG_PLUGIN_OUTPUT_VIDEO,
-      .flags =         BG_PLUGIN_PLAYBACK | BG_PLUGIN_EMBED_WINDOW,
+      .flags =         BG_PLUGIN_PLAYBACK | BG_PLUGIN_EMBED_WINDOW | BG_PLUGIN_OV_STILL,
       .priority =      BG_PLUGIN_PRIORITY_MAX,
       .create =        create_x11,
       .destroy =       destroy_x11,
 
-      .get_parameters = get_parameters_x11,
-      .set_parameter =  set_parameter_x11,
-      .get_parameter =  get_parameter_x11
+      .get_parameters   = get_parameters_x11,
+      .set_parameter    = set_parameter_x11,
+      .get_parameter    = get_parameter_x11
     },
-    .set_callbacks =  set_callbacks_x11,
+    .set_callbacks      = set_callbacks_x11,
+    
+    .set_window         = set_window_x11,
+    .get_window         = get_window_x11,
+    .set_window_options = set_window_options_x11,
+    .set_window_title   = set_window_title_x11,
+    .open               = open_x11,
+    .get_sink           = get_sink_x11,
     
-    .set_window =         set_window_x11,
-    .get_window =         get_window_x11,
-    .set_window_options =   set_window_options_x11,
-    .set_window_title =   set_window_title_x11,
-    .open =               open_x11,
-    .get_frame =    get_frame_x11,
+    //.get_frame          = get_frame_x11,
 
     .add_overlay_stream = add_overlay_stream_x11,
 
-    .create_overlay =    create_overlay_x11,
+    //    .create_overlay     = create_overlay_x11,
 
-    .set_overlay =        set_overlay_x11,
+    //    .set_overlay        = set_overlay_x11,
 
-    .put_video =          put_video_x11,
-    .put_still =          put_still_x11,
-
-    .handle_events =  handle_events_x11,
+    //    .put_frame          = put_frame_x11,
+    
+    .handle_events      = handle_events_x11,
     
-    .destroy_overlay =   destroy_overlay_x11,
-    .close =          close_x11,
-    .update_aspect =  update_aspect_x11,
+    // .destroy_overlay    = destroy_overlay_x11,
+    .close              = close_x11,
+    .update_aspect      = update_aspect_x11,
     
-    .show_window =    show_window_x11
+    .show_window        = show_window_x11
   };
 
 /* Include this into all plugin modules exactly once

gmerlin-1.2.0.tar.gz/po/ChangeLog -> gmerlin-4256.tar.gz/po/ChangeLog Changed

gmerlin-1.2.0.tar.gz/po/Makefile.in.in -> gmerlin-4256.tar.gz/po/Makefile.in.in Changed

@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -8,12 +8,14 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.15
+# Origin: gettext-0.18.3
+GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -30,7 +32,17 @@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
 mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@
 
 GMSGFMT_ = @GMSGFMT@
@@ -77,8 +89,8 @@
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
 .sin.sed:
 	sed -e '/^#/d' $< > t-$@
@@ -90,6 +102,13 @@
 all-yes: stamp-po
 all-no:
 
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
 # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
 # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
 # we don't want to bother translators with empty POT files). We assume that
@@ -105,6 +124,7 @@
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -119,17 +139,43 @@
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+	       LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
+	     else \
+	       LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	     fi; \
+	   } | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
 	else \
 	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
 	fi; \
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address="$$msgid_bugs_address"
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -157,8 +203,15 @@
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
 	else \
 	  $(MAKE) $${lang}.po-create; \
 	fi
@@ -181,7 +234,6 @@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -233,7 +285,6 @@
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -359,9 +410,15 @@
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
@@ -382,9 +439,13 @@
 update-gmo: Makefile $(GMOFILES)
 	@:
 
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
 Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
 
 force:

gmerlin-1.2.0.tar.gz/po/Rules-quot -> gmerlin-4256.tar.gz/po/Rules-quot Changed

@@ -14,13 +14,13 @@
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \

gmerlin-1.2.0.tar.gz/po/de.po -> gmerlin-4256.tar.gz/po/de.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gmerlin 0.3.6\n"
 "Report-Msgid-Bugs-To: gmerlin-general@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-06-08 13:50+0200\n"
+"POT-Creation-Date: 2011-02-12 00:21+0100\n"
 "PO-Revision-Date: 2009-12-19 00:17+0100\n"
 "Last-Translator: Burkhard Plaum <gmerlin@users.sourceforge.net>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -65,17 +65,17 @@
 msgstr "Verbindungsaufbau zu PulseAudio fehlgeschlagen: %s"
 
 #: plugins/pulseaudio/i_pulse.c:70 plugins/oss/i_oss.c:57
-#: plugins/alsa/i_alsa.c:49 lib/mediafiledevice.c:100
+#: plugins/alsa/i_alsa.c:49
 msgid "Channel Mode"
 msgstr "Kanalmodus"
 
 #: plugins/pulseaudio/i_pulse.c:74 plugins/oss/i_oss.c:61
-#: plugins/alsa/i_alsa.c:53 lib/mediafiledevice.c:104
+#: plugins/alsa/i_alsa.c:53
 msgid "Mono"
 msgstr "Mono"
 
 #: plugins/pulseaudio/i_pulse.c:74 plugins/oss/i_oss.c:61
-#: plugins/alsa/i_alsa.c:53 lib/mediafiledevice.c:104
+#: plugins/alsa/i_alsa.c:53
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -85,12 +85,12 @@
 msgstr "Bits"
 
 #: plugins/pulseaudio/i_pulse.c:85 plugins/oss/i_oss.c:72
-#: plugins/alsa/i_alsa.c:64 lib/mediafiledevice.c:108
+#: plugins/alsa/i_alsa.c:64
 msgid "Samplerate [Hz]"
 msgstr "Abtastrate [Hz]"
 
-#: plugins/pulseaudio/i_pulse.c:93 plugins/cdaudio/i_cdaudio.c:588
-#: plugins/cdaudio/i_cdaudio.c:630
+#: plugins/pulseaudio/i_pulse.c:93 plugins/cdaudio/i_cdaudio.c:584
+#: plugins/cdaudio/i_cdaudio.c:626
 msgid "Server"
 msgstr "Server"
 
@@ -116,29 +116,25 @@
 "PulseAudio Aufnahme. Du kannst die Quelle bestimmen, wo wir das Signal "
 "herbekommen."
 
-#: plugins/subwriters/e_subtext.c:75
-#, fuzzy
-msgid "Ignoring empty subtitle"
-msgstr "Ignoriere Zeilenumbrüche"
-
-#: plugins/subwriters/e_subtext.c:265 plugins/image/iw_pnm.c:194
-#: plugins/postprocessors/e_pp_vcdimager.c:110 plugins/lqt/e_lqt.c:703
+#: plugins/subwriters/e_subtext.c:243 plugins/image/iw_pnm.c:166
+#: plugins/postprocessors/e_pp_vcdimager.c:110 plugins/lqt/e_lqt.c:633
+#: lib/gtk/infowindow.c:695
 msgid "Format"
 msgstr "Format"
 
-#: plugins/subwriters/e_subtext.c:269
+#: plugins/subwriters/e_subtext.c:247
 msgid "Subrip (.srt)"
 msgstr "Subrip (.srt)"
 
-#: plugins/subwriters/e_subtext.c:269
+#: plugins/subwriters/e_subtext.c:247
 msgid "MPlayer mpsub"
 msgstr "MPlayer mpsub"
 
-#: plugins/subwriters/e_subtext.c:308 lib/gtk/plugininfo.c:161
+#: plugins/subwriters/e_subtext.c:286 lib/gtk/plugininfo.c:161
 msgid "Text subtitle exporter"
 msgstr "Exporteur für Textuntertitel"
 
-#: plugins/subwriters/e_subtext.c:309
+#: plugins/subwriters/e_subtext.c:287
 msgid ""
 "Plugin for exporting text subtitles. Supported formats are MPSub and SRT"
 msgstr ""
@@ -153,12 +149,12 @@
 msgid "Input Mode"
 msgstr "Einlesemodus"
 
-#: plugins/esd/i_esd.c:67 apps/recorder/recorder_window.c:622
+#: plugins/esd/i_esd.c:67 apps/recorder/recorder_window.c:614
 msgid "Record"
 msgstr "Aufnehmen"
 
 #: plugins/esd/i_esd.c:67 apps/camelot/webcam_window.c:584
-#: apps/recorder/recorder_window.c:759
+#: apps/recorder/recorder_window.c:751
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -183,14 +179,14 @@
 msgid "Framerate"
 msgstr "Bildwiederholrate"
 
-#: plugins/v4l/pwc.c:83 plugins/tiff/iw_tiff.c:188
+#: plugins/v4l/pwc.c:83 plugins/tiff/iw_tiff.c:164
 msgid "Compression"
 msgstr "Kompression"
 
 #: plugins/v4l/pwc.c:87 plugins/videofilters/fv_deinterlace.c:146
-#: plugins/tiff/iw_tiff.c:191 include/gmerlin/bggavl.h:229
-#: include/gmerlin/bggavl.h:324 include/gmerlin/bggavl.h:633
-#: include/gmerlin/bggavl.h:657
+#: plugins/tiff/iw_tiff.c:167 include/gmerlin/bggavl.h:229
+#: include/gmerlin/bggavl.h:324 include/gmerlin/bggavl.h:630
+#: include/gmerlin/bggavl.h:654
 msgid "None"
 msgstr "Kein(s)"
 
@@ -253,8 +249,8 @@
 #: plugins/v4l/pwc.c:160 plugins/videofilters/fv_cropscale.c:431
 #: plugins/cdaudio/cdparanoia.c:195 include/gmerlin/bggavl.h:289
 #: include/gmerlin/bggavl.h:308 include/gmerlin/bggavl.h:323
-#: include/gmerlin/bggavl.h:657 include/gmerlin/bggavl.h:670
-#: lib/x11/x11_window.c:1195
+#: include/gmerlin/bggavl.h:654 include/gmerlin/bggavl.h:667
+#: lib/x11/x11_window.c:1190
 msgid "Auto"
 msgstr "Automatisch"
 
@@ -320,15 +316,14 @@
 msgid "VIDIOCGMBUF failed: %s"
 msgstr "VIDIOCGMBUF fehlgeschlagen: %s"
 
-#: plugins/v4l/i_v4l.c:306 plugins/v4l2/ov_v4l2.c:298
+#: plugins/v4l/i_v4l.c:306
 #, c-format
 msgid "mmap failed: %s"
 msgstr "mmap fehlgeschlagen: %s"
 
 #: plugins/v4l/i_v4l.c:406 plugins/oss/i_oss.c:51 plugins/oss/oa_oss.c:67
-#: plugins/postprocessors/cdrdao_common.h:37 plugins/v4l2/i_v4l2.c:711
-#: plugins/v4l2/ov_v4l2.c:100 apps/camelot/vloopback.c:730
-#: lib/gtk/treewidget.c:1119
+#: plugins/postprocessors/cdrdao_common.h:37 plugins/v4l2/i_v4l2.c:933
+#: apps/camelot/vloopback.c:730 lib/gtk/treewidget.c:1115
 msgid "Device"
 msgstr "Gerät"
 
@@ -336,55 +331,55 @@
 msgid "V4L Device"
 msgstr "V4L Gerät"
 
-#: plugins/v4l/i_v4l.c:417 plugins/v4l/i_v4l.c:422 plugins/v4l2/i_v4l2.c:729
-#: plugins/v4l2/i_v4l2.c:734 apps/camelot/vloopback.c:746
+#: plugins/v4l/i_v4l.c:417 plugins/v4l/i_v4l.c:422 plugins/v4l2/i_v4l2.c:944
+#: plugins/v4l2/i_v4l2.c:949 apps/camelot/vloopback.c:746
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: plugins/v4l/i_v4l.c:433 plugins/v4l2/i_v4l2.c:745
+#: plugins/v4l/i_v4l.c:433 plugins/v4l2/i_v4l2.c:960
 #: apps/camelot/vloopback.c:757
 msgid "QSIF (160x112)"
 msgstr "QSIF (160x112)"
 
-#: plugins/v4l/i_v4l.c:434 plugins/v4l2/i_v4l2.c:746
+#: plugins/v4l/i_v4l.c:434 plugins/v4l2/i_v4l2.c:961
 #: apps/camelot/vloopback.c:758
 msgid "QCIF (176x144)"
 msgstr "QCIF (176x144)"
 
-#: plugins/v4l/i_v4l.c:435 plugins/v4l2/i_v4l2.c:747
+#: plugins/v4l/i_v4l.c:435 plugins/v4l2/i_v4l2.c:962
 #: apps/camelot/vloopback.c:759
 msgid "QVGA (320x240)"
 msgstr "QVGA (320x240)"
 
-#: plugins/v4l/i_v4l.c:436 plugins/v4l2/i_v4l2.c:748
+#: plugins/v4l/i_v4l.c:436 plugins/v4l2/i_v4l2.c:963
 #: apps/camelot/vloopback.c:760
 msgid "SIF(352x240)"
 msgstr "SIF(352x240)"
 
-#: plugins/v4l/i_v4l.c:437 plugins/v4l2/i_v4l2.c:749
+#: plugins/v4l/i_v4l.c:437 plugins/v4l2/i_v4l2.c:964
 #: apps/camelot/vloopback.c:761
 msgid "CIF (352x288)"
 msgstr "CIF (352x288)"
 
-#: plugins/v4l/i_v4l.c:438 plugins/v4l2/i_v4l2.c:750
+#: plugins/v4l/i_v4l.c:438 plugins/v4l2/i_v4l2.c:965
 #: apps/camelot/vloopback.c:762
 msgid "VGA (640x480)"
 msgstr "VGA (640x480)"
 
 #: plugins/v4l/i_v4l.c:439 plugins/videofilters/fv_cropscale.c:227
-#: plugins/v4l2/i_v4l2.c:751 include/gmerlin/bggavl.h:171
-#: include/gmerlin/bggavl.h:464 apps/camelot/vloopback.c:763
+#: plugins/v4l2/i_v4l2.c:966 include/gmerlin/bggavl.h:171
+#: include/gmerlin/bggavl.h:461 apps/camelot/vloopback.c:763
 msgid "User defined"
 msgstr "Benutzerdefiniert"
 
 #: plugins/v4l/i_v4l.c:444 plugins/videofilters/fv_cropscale.c:259
-#: plugins/v4l2/i_v4l2.c:756 include/gmerlin/bggavl.h:390
+#: plugins/v4l2/i_v4l2.c:971 include/gmerlin/bggavl.h:387
 #: apps/camelot/vloopback.c:769
 msgid "User defined width"
 msgstr "Benutzerdefinierte Breite"
 
 #: plugins/v4l/i_v4l.c:452 plugins/videofilters/fv_cropscale.c:270
-#: plugins/v4l2/i_v4l2.c:764 include/gmerlin/bggavl.h:401
+#: plugins/v4l2/i_v4l2.c:979 include/gmerlin/bggavl.h:398
 #: apps/camelot/vloopback.c:778
 msgid "User defined height"
 msgstr "Benutzerdefinierte Höhe"
@@ -422,142 +417,142 @@
 msgstr ""
 "video4linux Aufnahmeplugin. Unterstützt nur Video und keine Tunergeräte."
 
-#: plugins/image/ir_tga.c:103
+#: plugins/image/ir_tga.c:99
 msgid "Read tga failed"
 msgstr "TGA lesen fehlgeschlagen"
 
-#: plugins/image/ir_tga.c:228
+#: plugins/image/ir_tga.c:216
 msgid "TGA reader"
 msgstr "TGA Importeur"
 
-#: plugins/image/ir_tga.c:229
+#: plugins/image/ir_tga.c:217
 msgid "Reader for TGA images"
 msgstr "Importeur für TGA bilder"
 
-#: plugins/image/ir_bmp.c:234 plugins/image/ir_pnm.c:108 lib/singlepic.c:1030
+#: plugins/image/ir_bmp.c:226 plugins/image/ir_pnm.c:104 lib/singlepic.c:993
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "Kann Datei %s nicht öffnen: %s"
 
-#: plugins/image/ir_bmp.c:244
+#: plugins/image/ir_bmp.c:236
 msgid "Cannot read File type"
 msgstr "Kann Dateityp nicht lesen"
 
-#: plugins/image/ir_bmp.c:249
+#: plugins/image/ir_bmp.c:242
 msgid "File is no BMP"
 msgstr "Datei ist keine BMP Datei"
 
-#: plugins/image/ir_bmp.c:290
+#: plugins/image/ir_bmp.c:286
 msgid "Cannot detect image dimensions"
 msgstr "Kann Bildgröße nicht ermitteln"
 
-#: plugins/image/ir_bmp.c:298
+#: plugins/image/ir_bmp.c:295
 #, c-format
 msgid "Depth %d not supported"
 msgstr "Tiefe %d nicht unterstützt"
 
-#: plugins/image/ir_bmp.c:760
+#: plugins/image/ir_bmp.c:745
 msgid "BMP reader"
 msgstr "BMP Importeur"
 
-#: plugins/image/ir_bmp.c:761
+#: plugins/image/ir_bmp.c:746
 msgid "Reader for BMP images"
 msgstr "Importeur für BMP Bilder"
 
-#: plugins/image/iw_tga.c:140 plugins/image/iw_tga.c:143
+#: plugins/image/iw_tga.c:139 plugins/image/iw_tga.c:142
 #, c-format
 msgid "Cannot save %s: %s"
 msgstr "Kann %s nicht speichern: %s"
 
-#: plugins/image/iw_tga.c:160
+#: plugins/image/iw_tga.c:159
 msgid "Do RLE compression"
 msgstr "Verwende RLE Kompression"
 
-#: plugins/image/iw_tga.c:192
+#: plugins/image/iw_tga.c:191
 msgid "TGA writer"
 msgstr "TGA Exporteur"
 
-#: plugins/image/iw_tga.c:193
+#: plugins/image/iw_tga.c:192
 msgid "Writer for TGA images"
 msgstr "Exporteur für TGA Bilder"
 
-#: plugins/image/ir_pnm.c:127
+#: plugins/image/ir_pnm.c:123
 msgid "Can't read File type"
 msgstr "Kann Dateityp nicht lesen"
 
-#: plugins/image/ir_pnm.c:142
+#: plugins/image/ir_pnm.c:138
 msgid "File is no pnm"
 msgstr "Datei ist kein PNM"
 
-#: plugins/image/ir_pnm.c:168 plugins/image/ir_pnm.c:241
+#: plugins/image/ir_pnm.c:164 plugins/image/ir_pnm.c:237
 #, c-format
 msgid "File is no pnm (%.1s%.1s%.1s)"
 msgstr "Datei ist kein pnm (%.1s%.1s%.1s)"
 
-#: plugins/image/ir_pnm.c:185
+#: plugins/image/ir_pnm.c:181
 msgid "Cannot read width"
 msgstr "Kann Breite nicht lesen"
 
-#: plugins/image/ir_pnm.c:198
+#: plugins/image/ir_pnm.c:194
 msgid "Cannot read height"
 msgstr "Kann Höhe nicht lesen"
 
-#: plugins/image/ir_pnm.c:211
+#: plugins/image/ir_pnm.c:207
 msgid "Cannot read maxval"
 msgstr "Kann Maxval nicht lesen"
 
-#: plugins/image/ir_pnm.c:235
+#: plugins/image/ir_pnm.c:231
 msgid "PAM format not suported"
 msgstr "PAM format nicht unterstützt"
 
-#: plugins/image/ir_pnm.c:310
+#: plugins/image/ir_pnm.c:300
 msgid "PBMascii"
 msgstr "PBMascii"
 
-#: plugins/image/ir_pnm.c:344
+#: plugins/image/ir_pnm.c:334
 msgid "PBMbin"
 msgstr "PBMbin"
 
-#: plugins/image/ir_pnm.c:382
+#: plugins/image/ir_pnm.c:372
 msgid "PGMascii"
 msgstr "PGMascii"
 
-#: plugins/image/ir_pnm.c:409
+#: plugins/image/ir_pnm.c:399
 msgid "PGMascii_16"
 msgstr "PGMascii_16"
 
-#: plugins/image/ir_pnm.c:438
+#: plugins/image/ir_pnm.c:428
 msgid "PGMbin"
 msgstr "PGMbin"
 
-#: plugins/image/ir_pnm.c:461
+#: plugins/image/ir_pnm.c:451
 msgid "PGMbin_16"
 msgstr "PGMbin_16"
 
-#: plugins/image/ir_pnm.c:486
+#: plugins/image/ir_pnm.c:476
 msgid "PPMascii"
 msgstr "PPMascii"
 
-#: plugins/image/ir_pnm.c:529
+#: plugins/image/ir_pnm.c:519
 msgid "PPMascii_16"
 msgstr "PPMascii_16"
 
-#: plugins/image/ir_pnm.c:607
+#: plugins/image/ir_pnm.c:597
 msgid "PPMbin_16"
 msgstr "PPMbin_16"
 
-#: plugins/image/ir_pnm.c:655
+#: plugins/image/ir_pnm.c:638
 msgid "PNM reader"
 msgstr "PNM Importeur"
 
-#: plugins/image/ir_pnm.c:656
+#: plugins/image/ir_pnm.c:639
 msgid "Reader for PBM/PGM/PPM images"
 msgstr "Importeur für PBM/PGM/PPM Bilder"
 
-#: plugins/image/iw_bmp.c:129 plugins/image/iw_pnm.c:115
+#: plugins/image/iw_bmp.c:129 plugins/image/iw_pnm.c:92
 #: plugins/oss/i_oss.c:202 plugins/oss/oa_oss.c:144 plugins/oss/oa_oss.c:154
-#: plugins/oss/oa_oss.c:164 plugins/png/pngwriter.c:56
-#: plugins/tiff/iw_tiff.c:98 plugins/jpeg/iw_jpeg.c:115
+#: plugins/oss/oa_oss.c:164 plugins/png/pngwriter.c:54
+#: plugins/tiff/iw_tiff.c:96 plugins/jpeg/iw_jpeg.c:114
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr "Kann %s nicht öffnen: %s"
@@ -570,42 +565,40 @@
 msgid "Writer for BMP images"
 msgstr "Exporteur für BMP Bilder"
 
-#: plugins/image/iw_pnm.c:197
+#: plugins/image/iw_pnm.c:169
 msgid "Binary"
 msgstr "Binär"
 
-#: plugins/image/iw_pnm.c:197
+#: plugins/image/iw_pnm.c:169
 msgid "ASCII"
 msgstr "ASCII"
 
-#: plugins/image/iw_pnm.c:203 lib/metadata.c:101
+#: plugins/image/iw_pnm.c:175 lib/metadata.c:149
 msgid "Comment"
 msgstr "Kommentar"
 
-#: plugins/image/iw_pnm.c:207
+#: plugins/image/iw_pnm.c:179
 msgid "Comment which will be written in front of every file"
 msgstr "Kommentar (wird an jeden Dateianfang geschrieben"
 
-#: plugins/image/iw_pnm.c:243
-#, fuzzy
-msgid "PPM/PGM writer"
+#: plugins/image/iw_pnm.c:218
+msgid "PPM writer"
 msgstr "PPM Exporteur"
 
-#: plugins/image/iw_pnm.c:244
-#, fuzzy
-msgid "Writer for PPM/PGM images"
+#: plugins/image/iw_pnm.c:219
+msgid "Writer for PPM images"
 msgstr "Exporteur für PPM Bilder"
 
-#: plugins/x11/ov_x11.c:551
+#: plugins/x11/ov_x11.c:549
 #, c-format
 msgid "Got window size: %d %d"
 msgstr "Fentstergröße erhalten: %d %d"
 
-#: plugins/x11/ov_x11.c:919 plugins/x11/i_x11.c:96
+#: plugins/x11/ov_x11.c:915 plugins/x11/i_x11.c:96
 msgid "X11"
 msgstr "X11"
 
-#: plugins/x11/ov_x11.c:920
+#: plugins/x11/ov_x11.c:916
 msgid ""
 "X11 display driver with support for XVideo, XImage and OpenGL. Shared memory "
 "(XShm) is used where available."
@@ -642,7 +635,7 @@
 msgid "Samplerate %f kHz not supported by device %s"
 msgstr "Abtastrate %f kHz wird nicht unterstützt vom Gerät %s"
 
-#: plugins/oss/i_oss.c:282 plugins/oss/oa_oss.c:569
+#: plugins/oss/i_oss.c:282 plugins/oss/oa_oss.c:563
 msgid "OSS"
 msgstr "OSS"
 
@@ -687,16 +680,11 @@
 msgid "Device %s supports no %d-channel sound"
 msgstr "Gerät %s unterstützt keinen %d-kanal Sound"
 
-#: plugins/oss/oa_oss.c:462 plugins/oss/oa_oss.c:469 plugins/oss/oa_oss.c:477
-#, fuzzy, c-format
-msgid "Write failed: %s"
-msgstr "mmap fehlgeschlagen: %s"
-
-#: plugins/oss/oa_oss.c:509
+#: plugins/oss/oa_oss.c:503
 msgid "SNDCTL_DSP_GETODELAY ioctl failed"
 msgstr "SNDCTL_DSP_GETODELAY ioctl fehlgeschlagen"
 
-#: plugins/oss/oa_oss.c:570
+#: plugins/oss/oa_oss.c:564
 msgid "OSS output driver"
 msgstr "OSS Ausgabetreiber"
 
@@ -708,11 +696,11 @@
 msgid "Scope plugin"
 msgstr "Oszi Plugin"
 
-#: plugins/audiofilters/fa_sampleformat.c:70 include/gmerlin/bggavl.h:640
+#: plugins/audiofilters/fa_sampleformat.c:70 include/gmerlin/bggavl.h:637
 msgid "Sampleformat"
 msgstr "Zahlenformat"
 
-#: plugins/audiofilters/fa_sampleformat.c:200 include/gmerlin/bggavl.h:628
+#: plugins/audiofilters/fa_sampleformat.c:200 include/gmerlin/bggavl.h:625
 msgid "Force sampleformat"
 msgstr "Erzwinge Zahlenformat"
 
@@ -772,11 +760,11 @@
 msgid "Unknown error"
 msgstr "Unbekanner Fehler"
 
-#: plugins/alsa/i_alsa.c:343 plugins/alsa/oa_alsa.c:472
+#: plugins/alsa/i_alsa.c:341 plugins/alsa/oa_alsa.c:471
 msgid "Alsa"
 msgstr "Alsa"
 
-#: plugins/alsa/i_alsa.c:344
+#: plugins/alsa/i_alsa.c:342
 msgid "Alsa recorder"
 msgstr "Alsa Aufnahme"
 
@@ -835,7 +823,7 @@
 msgid "snd_pcm_write returned %s"
 msgstr "snd_pcm_write gab %s zurück"
 
-#: plugins/alsa/oa_alsa.c:473
+#: plugins/alsa/oa_alsa.c:472
 msgid "Alsa output plugin with support for channel configurations up to 5.1"
 msgstr ""
 "Alsa Ausgabeplugin mit Unterstützung für Kanalkonfigurationen bis zu 5.1"
@@ -997,58 +985,58 @@
 "Überspringe die 10 Sekunden Pause bevor das Schreiben oder Simulieren "
 "beginnt."
 
-#: plugins/postprocessors/e_pp_cdrdao.c:96
+#: plugins/postprocessors/e_pp_cdrdao.c:93
 msgid "Audio CD options"
 msgstr "Audio CD Optionen"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:101
+#: plugins/postprocessors/e_pp_cdrdao.c:98
 msgid "TOC file"
 msgstr "Inhaltsverzeichnis-Datei"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:107
+#: plugins/postprocessors/e_pp_cdrdao.c:104
 msgid "Gap between tracks"
 msgstr "Lücke zwischen Tracks"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:110
+#: plugins/postprocessors/e_pp_cdrdao.c:107
 msgid ""
 "Pre gap of each track in CD frames (1/75 seconds). Default is 150 (2 sec)."
 msgstr ""
 "\"Pre gap\" für jedes Stück in CD Rahmen (1/75 Sekunden). Voreinstellung ist "
 "150 (2 Sekunden)."
 
-#: plugins/postprocessors/e_pp_cdrdao.c:114
+#: plugins/postprocessors/e_pp_cdrdao.c:111
 msgid "Write CD-Text"
 msgstr "Schreibe CD-Text"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:243
+#: plugins/postprocessors/e_pp_cdrdao.c:240
 #, c-format
 msgid "Cannot get duration of file %s"
 msgstr "Kann Dauer der Datei %s nicht ermitteln"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:290
+#: plugins/postprocessors/e_pp_cdrdao.c:282
 msgid "Skipping cdrdao run (no tracks)"
 msgstr "Überspringe cdrdao Lauf (keine Stücke)"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:433
+#: plugins/postprocessors/e_pp_cdrdao.c:410
 #, c-format
 msgid "Wrote %s"
 msgstr "%s geschrieben"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:443
-#: plugins/postprocessors/e_pp_cdrdao.c:447
+#: plugins/postprocessors/e_pp_cdrdao.c:420
+#: plugins/postprocessors/e_pp_cdrdao.c:424
 #: plugins/postprocessors/e_pp_vcdimager.c:365
 #: plugins/postprocessors/e_pp_vcdimager.c:369
 #: plugins/postprocessors/e_pp_vcdimager.c:376
-#: plugins/postprocessors/e_pp_vcdimager.c:378 lib/tree.c:1478 lib/ocr.c:265
+#: plugins/postprocessors/e_pp_vcdimager.c:378 lib/tree.c:1434
 #, c-format
 msgid "Removing %s"
 msgstr "Lösche %s"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:466
+#: plugins/postprocessors/e_pp_cdrdao.c:443
 msgid "Audio CD generator/burner"
 msgstr "Audio CDs erzeugen/brennen"
 
-#: plugins/postprocessors/e_pp_cdrdao.c:467
+#: plugins/postprocessors/e_pp_cdrdao.c:444
 msgid ""
 "This is a frontend for generating audio CD images (optionally with CD-Text) "
 "for cdrdao (http://cdrdao.sourceforge.net). Optional burning is also "
@@ -1356,26 +1344,25 @@
 msgid "Both fields"
 msgstr "Unteres Feld zuerst"
 
-#: plugins/videofilters/fv_deinterlace.c:510
+#: plugins/videofilters/fv_deinterlace.c:508
 msgid "Deinterlacer"
 msgstr "Deinterlacer"
 
-#: plugins/videofilters/fv_deinterlace.c:511
+#: plugins/videofilters/fv_deinterlace.c:509
 msgid "Deinterlace with various algorithms"
 msgstr "Deinterlacer mit verschiedenen Methoden"
 
 #: plugins/videofilters/fv_transform.c:166
-#: plugins/videofilters/fv_textlogo.c:86
-#: plugins/videofilters/fv_tcdisplay.c:81 plugins/cdaudio/i_cdaudio.c:541
-#: apps/player/cfgdialog.c:104 apps/transcoder/transcoder_window.c:1304
-#: apps/transcoder/transcoder_window.c:1331
-#: apps/transcoder/transcoder_window.c:1354 apps/transcoder/trackdialog.c:87
+#: plugins/videofilters/fv_tcdisplay.c:81 plugins/cdaudio/i_cdaudio.c:537
+#: apps/player/cfgdialog.c:104 apps/transcoder/transcoder_window.c:1301
+#: apps/transcoder/transcoder_window.c:1328
+#: apps/transcoder/transcoder_window.c:1351 apps/transcoder/trackdialog.c:87
 #: apps/transcoder/trackdialog.c:226 apps/transcoder/trackdialog.c:296
 #: apps/transcoder/trackdialog.c:382 apps/transcoder/trackdialog.c:450
 #: apps/visualizer/gmerlin_visualizer.c:890
-#: apps/recorder/recorder_window.c:724 apps/recorder/recorder_window.c:743
-#: lib/player_subtitle.c:117 lib/pluginregistry.c:2114
-#: lib/x11/x11_window.c:1112 lib/transcoder_track.c:1326
+#: apps/recorder/recorder_window.c:716 apps/recorder/recorder_window.c:735
+#: lib/pluginregistry.c:2037 lib/x11/x11_window.c:1107
+#: lib/transcoder_track.c:1314
 msgid "General"
 msgstr "Generell"
 
@@ -1429,8 +1416,8 @@
 "langsamsten."
 
 #: plugins/videofilters/fv_transform.c:201 plugins/videofilters/fv_zoom.c:160
-#: plugins/lqt/e_lqt.c:948 include/gmerlin/bggavl.h:367
-#: lib/x11/x11_window.c:1170 lib/ocr.c:152
+#: plugins/lqt/e_lqt.c:850 include/gmerlin/bggavl.h:377
+#: lib/x11/x11_window.c:1165
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
@@ -1528,8 +1515,6 @@
 msgstr "Vergrößerungsfaktor"
 
 #: plugins/videofilters/fv_transform.c:372
-#: plugins/videofilters/fv_textlogo.c:136
-#: plugins/videofilters/fv_textlogo.c:145
 #: plugins/videofilters/fv_tcdisplay.c:132
 #: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:98
 #: lib/textrenderer.c:107 lib/osd.c:121 lib/osd.c:129
@@ -1552,164 +1537,6 @@
 msgid "Transform the image with different methods"
 msgstr "Transformiere das Bild mit verschiedenen Methoden"
 
-#: plugins/videofilters/fv_swapfields.c:137
-msgid "Unsupported interlace mode, need top-first or bottom-first"
-msgstr ""
-
-#: plugins/videofilters/fv_swapfields.c:258
-#, fuzzy
-msgid "Swap fields"
-msgstr "Oberes Feld zuerst"
-
-#: plugins/videofilters/fv_swapfields.c:259
-#, fuzzy
-msgid "Swap field order"
-msgstr "Ausgabedateien"
-
-#: plugins/videofilters/fv_textlogo.c:91
-msgid "Text"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:94
-msgid "Text to display"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:98
-#: plugins/videofilters/fv_tcdisplay.c:94 lib/textrenderer.c:60
-msgid "Render options"
-msgstr "Renderoptionen"
-
-#: plugins/videofilters/fv_textlogo.c:103
-#: plugins/videofilters/fv_tcdisplay.c:99 plugins/lqt/e_lqt.c:942
-#: lib/textrenderer.c:65
-msgid "Text color"
-msgstr "Textfarbe"
-
-#: plugins/videofilters/fv_textlogo.c:110
-#: plugins/videofilters/fv_cropscale.c:317
-#: plugins/videofilters/fv_tcdisplay.c:106 lib/textrenderer.c:72 lib/osd.c:101
-msgid "Border color"
-msgstr "Randfarbe"
-
-#: plugins/videofilters/fv_textlogo.c:116
-#: plugins/videofilters/fv_tcdisplay.c:112 lib/textrenderer.c:78 lib/osd.c:107
-msgid "Border width"
-msgstr "Randfarbe"
-
-#: plugins/videofilters/fv_textlogo.c:126
-#: plugins/videofilters/fv_tcdisplay.c:122 apps/player/display.c:110
-#: apps/transcoder/transcoder_window.c:195 lib/textrenderer.c:88
-msgid "Font"
-msgstr "Schrift"
-
-#: plugins/videofilters/fv_textlogo.c:132
-#: plugins/videofilters/fv_tcdisplay.c:128 lib/textrenderer.c:94 lib/osd.c:117
-msgid "Horizontal justify"
-msgstr "Horizontale Ausrichtung"
-
-#: plugins/videofilters/fv_textlogo.c:136
-#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
-msgid "Left"
-msgstr "Links"
-
-#: plugins/videofilters/fv_textlogo.c:136
-#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
-msgid "Right"
-msgstr "Rechts"
-
-#: plugins/videofilters/fv_textlogo.c:141
-#: plugins/videofilters/fv_tcdisplay.c:137 lib/textrenderer.c:103
-#: lib/osd.c:125
-msgid "Vertical justify"
-msgstr "Vertikale Ausrichtung"
-
-#: plugins/videofilters/fv_textlogo.c:145
-#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
-#: lib/osd.c:129
-msgid "Top"
-msgstr "Oben"
-
-#: plugins/videofilters/fv_textlogo.c:145
-#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
-#: lib/osd.c:129
-msgid "Bottom"
-msgstr "Unten"
-
-#: plugins/videofilters/fv_textlogo.c:149
-#: plugins/videofilters/fv_tcdisplay.c:145 lib/textrenderer.c:111
-msgid "Cache size"
-msgstr "Cachegröße"
-
-#: plugins/videofilters/fv_textlogo.c:156
-#: plugins/videofilters/fv_tcdisplay.c:152 lib/textrenderer.c:117
-msgid ""
-"Specify, how many different characters are cached for faster rendering. For "
-"European languages, this never needs to be larger than 255."
-msgstr ""
-"Gib an, wieviele verschiedene Zeichen zur schelleren Darstellung "
-"zwischengespeichert werden. Für europäische Sprachen muß dieser Wert nie "
-"größer als 255 sein."
-
-#: plugins/videofilters/fv_textlogo.c:160
-#: plugins/videofilters/fv_tcdisplay.c:156 lib/textrenderer.c:121
-#: lib/osd.c:133
-msgid "Left border"
-msgstr "Linker Rand"
-
-#: plugins/videofilters/fv_textlogo.c:165
-#: plugins/videofilters/fv_tcdisplay.c:161 lib/textrenderer.c:126
-#: lib/osd.c:138
-msgid "Distance from the left text border to the image border"
-msgstr "Abstand vom linken Textrand zum Bildrand"
-
-#: plugins/videofilters/fv_textlogo.c:169
-#: plugins/videofilters/fv_tcdisplay.c:165 lib/textrenderer.c:130
-#: lib/osd.c:142
-msgid "Right border"
-msgstr "Rechter Rand"
-
-#: plugins/videofilters/fv_textlogo.c:174
-#: plugins/videofilters/fv_tcdisplay.c:170 lib/textrenderer.c:135
-#: lib/osd.c:147
-msgid "Distance from the right text border to the image border"
-msgstr "Abstand vom rechten Textrand zum Bildrand"
-
-#: plugins/videofilters/fv_textlogo.c:178
-#: plugins/videofilters/fv_tcdisplay.c:174 lib/textrenderer.c:139
-#: lib/osd.c:151
-msgid "Top border"
-msgstr "Oberer Rand"
-
-#: plugins/videofilters/fv_textlogo.c:183
-#: plugins/videofilters/fv_tcdisplay.c:179 lib/textrenderer.c:144
-#: lib/osd.c:156
-msgid "Distance from the top text border to the image border"
-msgstr "Abstand vom oberen Textrand zum Bildrand"
-
-#: plugins/videofilters/fv_textlogo.c:192
-#: plugins/videofilters/fv_tcdisplay.c:188 lib/textrenderer.c:153
-#: lib/osd.c:165
-msgid "Distance from the bottom text border to the image border"
-msgstr "Abstand vom unteren Textrand zum Bildrand"
-
-#: plugins/videofilters/fv_textlogo.c:196
-#: plugins/videofilters/fv_textlogo.c:199
-#: plugins/videofilters/fv_tcdisplay.c:192
-#: plugins/videofilters/fv_tcdisplay.c:195 lib/textrenderer.c:157
-#: lib/textrenderer.c:159
-msgid "Ignore linebreaks"
-msgstr "Ignoriere Zeilenumbrüche"
-
-#: plugins/videofilters/fv_textlogo.c:314
-#, fuzzy
-msgid "Text logo"
-msgstr "Textfarbe"
-
-#: plugins/videofilters/fv_textlogo.c:315
-#, fuzzy
-msgid "Burn a static text onto video frames"
-msgstr "Brenne Timecodes in Videobilder"
-
 #: plugins/videofilters/colormatrix.c:1434
 #: plugins/videofilters/fv_colorbalance.c:610
 #: plugins/videofilters/fv_equalizer.c:729
@@ -1754,8 +1581,8 @@
 msgstr "Schneide so viele Pixel vom unteren Rand der Quellbilder."
 
 #: plugins/videofilters/fv_cropscale.c:189
-#: plugins/videofilters/fv_cropscale.c:194 include/gmerlin/bggavl.h:495
-#: include/gmerlin/bggavl.h:512
+#: plugins/videofilters/fv_cropscale.c:194 include/gmerlin/bggavl.h:492
+#: include/gmerlin/bggavl.h:509
 msgid "Image size"
 msgstr "Bildgröße"
 
@@ -1764,108 +1591,108 @@
 msgid "From Source"
 msgstr "Wie Quelle"
 
-#: plugins/videofilters/fv_cropscale.c:228 include/gmerlin/bggavl.h:465
+#: plugins/videofilters/fv_cropscale.c:228 include/gmerlin/bggavl.h:462
 msgid "PAL DVD D1 4:3 (720 x 576)"
 msgstr "PAL DVD D1 4:3 (720 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:229 include/gmerlin/bggavl.h:466
+#: plugins/videofilters/fv_cropscale.c:229 include/gmerlin/bggavl.h:463
 msgid "PAL DVD D1 16:9 (720 x 576)"
 msgstr "PAL DVD D1 16:9 (720 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:230 include/gmerlin/bggavl.h:467
+#: plugins/videofilters/fv_cropscale.c:230 include/gmerlin/bggavl.h:464
 msgid "PAL DV 4:3 (720 x 576)"
 msgstr "PAL DV 4:3 (720 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:231 include/gmerlin/bggavl.h:468
+#: plugins/videofilters/fv_cropscale.c:231 include/gmerlin/bggavl.h:465
 msgid "PAL DV 16:9 (720 x 576)"
 msgstr "PAL DV 16:9 (720 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:232 include/gmerlin/bggavl.h:469
+#: plugins/videofilters/fv_cropscale.c:232 include/gmerlin/bggavl.h:466
 msgid "PAL CVD (352 x 576)"
 msgstr "PAL CVD (352 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:233 include/gmerlin/bggavl.h:470
+#: plugins/videofilters/fv_cropscale.c:233 include/gmerlin/bggavl.h:467
 msgid "PAL VCD (352 x 288)"
 msgstr "PAL VCD (352 x 288)"
 
-#: plugins/videofilters/fv_cropscale.c:234 include/gmerlin/bggavl.h:471
+#: plugins/videofilters/fv_cropscale.c:234 include/gmerlin/bggavl.h:468
 msgid "PAL SVCD 4:3 (480 x 576)"
 msgstr "PAL SVCD 4:3 (480 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:235 include/gmerlin/bggavl.h:472
+#: plugins/videofilters/fv_cropscale.c:235 include/gmerlin/bggavl.h:469
 msgid "PAL SVCD 16:9 (480 x 576)"
 msgstr "PAL SVCD 16:9 (480 x 576)"
 
-#: plugins/videofilters/fv_cropscale.c:236 include/gmerlin/bggavl.h:473
+#: plugins/videofilters/fv_cropscale.c:236 include/gmerlin/bggavl.h:470
 msgid "NTSC DVD D1 4:3 (720 x 480)"
 msgstr "NTSC DVD D1 4:3 (720 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:237 include/gmerlin/bggavl.h:474
+#: plugins/videofilters/fv_cropscale.c:237 include/gmerlin/bggavl.h:471
 msgid "NTSC DVD D1 16:9 (720 x 480)"
 msgstr "NTSC DVD D1 16:9 (720 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:238 include/gmerlin/bggavl.h:475
+#: plugins/videofilters/fv_cropscale.c:238 include/gmerlin/bggavl.h:472
 msgid "NTSC DV 4:3 (720 x 480)"
 msgstr "NTSC DV 4:3 (720 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:239 include/gmerlin/bggavl.h:476
+#: plugins/videofilters/fv_cropscale.c:239 include/gmerlin/bggavl.h:473
 msgid "NTSC DV 16:9 (720 x 480)"
 msgstr "NTSC DV 16:9 (720 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:240 include/gmerlin/bggavl.h:477
+#: plugins/videofilters/fv_cropscale.c:240 include/gmerlin/bggavl.h:474
 msgid "NTSC CVD (352 x 480)"
 msgstr "NTSC CVD (352 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:241 include/gmerlin/bggavl.h:478
+#: plugins/videofilters/fv_cropscale.c:241 include/gmerlin/bggavl.h:475
 msgid "NTSC VCD (352 x 240)"
 msgstr "NTSC VCD (352 x 240)"
 
-#: plugins/videofilters/fv_cropscale.c:242 include/gmerlin/bggavl.h:479
+#: plugins/videofilters/fv_cropscale.c:242 include/gmerlin/bggavl.h:476
 msgid "NTSC SVCD 4:3 (480 x 480)"
 msgstr "NTSC SVCD 4:3 (480 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:243 include/gmerlin/bggavl.h:480
+#: plugins/videofilters/fv_cropscale.c:243 include/gmerlin/bggavl.h:477
 msgid "NTSC SVCD 16:9 (480 x 480)"
 msgstr "NTSC SVCD 16:9 (480 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:244 include/gmerlin/bggavl.h:481
+#: plugins/videofilters/fv_cropscale.c:244 include/gmerlin/bggavl.h:478
 msgid "HD 720p/i (1280x720)"
 msgstr "HD 720p/i (1280x720)"
 
-#: plugins/videofilters/fv_cropscale.c:245 include/gmerlin/bggavl.h:482
+#: plugins/videofilters/fv_cropscale.c:245 include/gmerlin/bggavl.h:479
 msgid "HD 1080p/i (1920x1080)"
 msgstr "HD 1080p/i (1920x1080)"
 
-#: plugins/videofilters/fv_cropscale.c:246 include/gmerlin/bggavl.h:483
+#: plugins/videofilters/fv_cropscale.c:246 include/gmerlin/bggavl.h:480
 msgid "VGA (640 x 480)"
 msgstr "VGA (640 x 480)"
 
-#: plugins/videofilters/fv_cropscale.c:247 include/gmerlin/bggavl.h:484
+#: plugins/videofilters/fv_cropscale.c:247 include/gmerlin/bggavl.h:481
 msgid "QVGA (320 x 240)"
 msgstr "QVGA (320 x 240)"
 
-#: plugins/videofilters/fv_cropscale.c:248 include/gmerlin/bggavl.h:485
+#: plugins/videofilters/fv_cropscale.c:248 include/gmerlin/bggavl.h:482
 msgid "SQCIF (128 × 96)"
 msgstr "SQCIF (128 × 96)"
 
-#: plugins/videofilters/fv_cropscale.c:249 include/gmerlin/bggavl.h:486
+#: plugins/videofilters/fv_cropscale.c:249 include/gmerlin/bggavl.h:483
 msgid "QCIF (176 × 144)"
 msgstr "QCIF (176 × 144)"
 
-#: plugins/videofilters/fv_cropscale.c:250 include/gmerlin/bggavl.h:487
+#: plugins/videofilters/fv_cropscale.c:250 include/gmerlin/bggavl.h:484
 msgid "CIF (352 × 288)"
 msgstr "CIF (352 × 288)"
 
-#: plugins/videofilters/fv_cropscale.c:251 include/gmerlin/bggavl.h:488
+#: plugins/videofilters/fv_cropscale.c:251 include/gmerlin/bggavl.h:485
 msgid "4CIF (704 × 576)"
 msgstr "4CIF (704 × 576)"
 
-#: plugins/videofilters/fv_cropscale.c:252 include/gmerlin/bggavl.h:489
+#: plugins/videofilters/fv_cropscale.c:252 include/gmerlin/bggavl.h:486
 msgid "16CIF (1408 × 1152)"
 msgstr "16CIF (1408 × 1152)"
 
-#: plugins/videofilters/fv_cropscale.c:255 include/gmerlin/bggavl.h:505
-#: include/gmerlin/bggavl.h:524
+#: plugins/videofilters/fv_cropscale.c:255 include/gmerlin/bggavl.h:502
+#: include/gmerlin/bggavl.h:521
 msgid ""
 "Set the output image size. For a user defined size, you must specify the "
 "width and height as well as the pixel width and pixel height."
@@ -1873,7 +1700,7 @@
 "Wähle die ausgegebene Bildgröße. Für \"Benutzerdefiniert\" mußt Du die "
 "Breite, Höhe, Pixelbreite und Pixelhöhe unten angeben."
 
-#: plugins/videofilters/fv_cropscale.c:266 include/gmerlin/bggavl.h:397
+#: plugins/videofilters/fv_cropscale.c:266 include/gmerlin/bggavl.h:394
 msgid ""
 "User defined width in pixels. Only meaningful if you selected \"User defined"
 "\" for the image size."
@@ -1881,7 +1708,7 @@
 "Benutzerdefinierte Breite in Pixels. Nur von Bedeutung, wenn "
 "\"Benutzerdefiniert\" für die Bildgröße gewählt wurde."
 
-#: plugins/videofilters/fv_cropscale.c:277 include/gmerlin/bggavl.h:408
+#: plugins/videofilters/fv_cropscale.c:277 include/gmerlin/bggavl.h:405
 msgid ""
 "User defined height in pixels. Only meaningful if you selected \"User defined"
 "\" for the image size."
@@ -1889,11 +1716,11 @@
 "Benutzerdefinierte Höhe in Pixels. Nur von Bedeutung, wenn "
 "\"Benutzerdefiniert\" für die Bildgröße gewählt wurde."
 
-#: plugins/videofilters/fv_cropscale.c:281 include/gmerlin/bggavl.h:412
+#: plugins/videofilters/fv_cropscale.c:281 include/gmerlin/bggavl.h:409
 msgid "User defined pixel width"
 msgstr "Benutzerdefinierte Pixelbreite"
 
-#: plugins/videofilters/fv_cropscale.c:288 include/gmerlin/bggavl.h:419
+#: plugins/videofilters/fv_cropscale.c:288 include/gmerlin/bggavl.h:416
 msgid ""
 "User defined pixel width. Only meaningful if you selected \"User defined\" "
 "for the image size."
@@ -1901,11 +1728,11 @@
 "Benutzerdefinierte Pixelbreite. Nur von Bedeutung, wenn \"Benutzerdefiniert"
 "\" für die Bildgröße gewählt wurde."
 
-#: plugins/videofilters/fv_cropscale.c:292 include/gmerlin/bggavl.h:423
+#: plugins/videofilters/fv_cropscale.c:292 include/gmerlin/bggavl.h:420
 msgid "User defined pixel height"
 msgstr "Benutzerdefinierte Pixelhöhe"
 
-#: plugins/videofilters/fv_cropscale.c:299 include/gmerlin/bggavl.h:430
+#: plugins/videofilters/fv_cropscale.c:299 include/gmerlin/bggavl.h:427
 msgid ""
 "User defined pixel height. Only meaningful if you selected \"User defined\" "
 "for the image size."
@@ -1929,18 +1756,23 @@
 "Lasse das Aspektverhältnis genauso erscheinen wie in der Quelle, "
 "möglicherweise mit zusätzlichen Rändern"
 
+#: plugins/videofilters/fv_cropscale.c:317
+#: plugins/videofilters/fv_tcdisplay.c:106 lib/textrenderer.c:72 lib/osd.c:101
+msgid "Border color"
+msgstr "Randfarbe"
+
 #: plugins/videofilters/fv_cropscale.c:322
 msgid "Color of the image borders."
 msgstr "Farbe für die Bildränder"
 
 #: plugins/videofilters/fv_cropscale.c:346
 #: plugins/videofilters/fv_cropscale.c:351 plugins/videofilters/fv_zoom.c:106
-#: include/gmerlin/bggavl.h:332 lib/x11/x11_window.c:1184
+#: include/gmerlin/bggavl.h:332 lib/x11/x11_window.c:1179
 msgid "Scale mode"
 msgstr "Skaliermethode"
 
 #: plugins/videofilters/fv_cropscale.c:358 plugins/videofilters/fv_zoom.c:113
-#: include/gmerlin/bggavl.h:339 lib/x11/x11_window.c:1205
+#: include/gmerlin/bggavl.h:339 lib/x11/x11_window.c:1200
 msgid ""
 "Choose scaling method. Auto means to choose based on the conversion quality. "
 "Nearest is fastest, Sinc with Lanczos window is slowest."
@@ -1950,12 +1782,12 @@
 "langsamsten."
 
 #: plugins/videofilters/fv_cropscale.c:362 plugins/videofilters/fv_zoom.c:117
-#: include/gmerlin/bggavl.h:343 lib/x11/x11_window.c:1209
+#: include/gmerlin/bggavl.h:343 lib/x11/x11_window.c:1204
 msgid "Scale order"
 msgstr "Skalierordnung"
 
 #: plugins/videofilters/fv_cropscale.c:369 plugins/videofilters/fv_zoom.c:124
-#: include/gmerlin/bggavl.h:350 lib/x11/x11_window.c:1214
+#: include/gmerlin/bggavl.h:350 lib/x11/x11_window.c:1209
 msgid "Order for sinc scaling"
 msgstr "Ordnung für sinc Skalierung"
 
@@ -2074,11 +1906,134 @@
 msgid "Interpolate missing timecodes"
 msgstr "Interpoliere fehlende Timecodes"
 
-#: plugins/videofilters/fv_tcdisplay.c:347
+#: plugins/videofilters/fv_tcdisplay.c:94 lib/textrenderer.c:60
+msgid "Render options"
+msgstr "Renderoptionen"
+
+#: plugins/videofilters/fv_tcdisplay.c:99 plugins/lqt/e_lqt.c:844
+#: lib/textrenderer.c:65
+msgid "Text color"
+msgstr "Textfarbe"
+
+#: plugins/videofilters/fv_tcdisplay.c:112 lib/textrenderer.c:78 lib/osd.c:107
+msgid "Border width"
+msgstr "Randfarbe"
+
+#: plugins/videofilters/fv_tcdisplay.c:122 apps/player/display.c:110
+#: apps/transcoder/transcoder_window.c:195 lib/textrenderer.c:88
+msgid "Font"
+msgstr "Schrift"
+
+#: plugins/videofilters/fv_tcdisplay.c:128 lib/textrenderer.c:94 lib/osd.c:117
+msgid "Horizontal justify"
+msgstr "Horizontale Ausrichtung"
+
+#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
+msgid "Left"
+msgstr "Links"
+
+#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
+msgid "Right"
+msgstr "Rechts"
+
+#: plugins/videofilters/fv_tcdisplay.c:137 lib/textrenderer.c:103
+#: lib/osd.c:125
+msgid "Vertical justify"
+msgstr "Vertikale Ausrichtung"
+
+#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
+#: lib/osd.c:129
+msgid "Top"
+msgstr "Oben"
+
+#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
+#: lib/osd.c:129
+msgid "Bottom"
+msgstr "Unten"
+
+#: plugins/videofilters/fv_tcdisplay.c:145 lib/textrenderer.c:111
+msgid "Cache size"
+msgstr "Cachegröße"
+
+#: plugins/videofilters/fv_tcdisplay.c:152 lib/textrenderer.c:117
+msgid ""
+"Specify, how many different characters are cached for faster rendering. For "
+"European languages, this never needs to be larger than 255."
+msgstr ""
+"Gib an, wieviele verschiedene Zeichen zur schelleren Darstellung "
+"zwischengespeichert werden. Für europäische Sprachen muß dieser Wert nie "
+"größer als 255 sein."
+
+#: plugins/videofilters/fv_tcdisplay.c:156 lib/textrenderer.c:121
+#: lib/osd.c:133
+msgid "Left border"
+msgstr "Linker Rand"
+
+#: plugins/videofilters/fv_tcdisplay.c:161 lib/textrenderer.c:126
+#: lib/osd.c:138
+msgid "Distance from the left text border to the image border"
+msgstr "Abstand vom linken Textrand zum Bildrand"
+
+#: plugins/videofilters/fv_tcdisplay.c:165 lib/textrenderer.c:130
+#: lib/osd.c:142
+msgid "Right border"
+msgstr "Rechter Rand"
+
+#: plugins/videofilters/fv_tcdisplay.c:170 lib/textrenderer.c:135
+#: lib/osd.c:147
+msgid "Distance from the right text border to the image border"
+msgstr "Abstand vom rechten Textrand zum Bildrand"
+
+#: plugins/videofilters/fv_tcdisplay.c:174 lib/textrenderer.c:139
+#: lib/osd.c:151
+msgid "Top border"
+msgstr "Oberer Rand"
+
+#: plugins/videofilters/fv_tcdisplay.c:179 lib/textrenderer.c:144
+#: lib/osd.c:156
+msgid "Distance from the top text border to the image border"
+msgstr "Abstand vom oberen Textrand zum Bildrand"
+
+#: plugins/videofilters/fv_tcdisplay.c:188 lib/textrenderer.c:153
+#: lib/osd.c:165
+msgid "Distance from the bottom text border to the image border"
+msgstr "Abstand vom unteren Textrand zum Bildrand"
+
+#: plugins/videofilters/fv_tcdisplay.c:192
+#: plugins/videofilters/fv_tcdisplay.c:195 lib/textrenderer.c:157
+#: lib/textrenderer.c:159
+msgid "Ignore linebreaks"
+msgstr "Ignoriere Zeilenumbrüche"
+
+#: plugins/videofilters/fv_tcdisplay.c:199 lib/textrenderer.c:168
+msgid "Default width"
+msgstr "Voreingestellte Breite"
+
+#: plugins/videofilters/fv_tcdisplay.c:208 lib/textrenderer.c:176
+msgid "Default height"
+msgstr "Voreingestellte Höhe"
+
+#: plugins/videofilters/fv_tcdisplay.c:217 lib/textrenderer.c:184
+msgid "Default Colorspace"
+msgstr "Voreingestellter Farbraum"
+
+#: plugins/videofilters/fv_tcdisplay.c:222 lib/textrenderer.c:188
+msgid "YCrCb"
+msgstr "YCrCb"
+
+#: plugins/videofilters/fv_tcdisplay.c:222 lib/textrenderer.c:188
+msgid "RGB"
+msgstr "RGB"
+
+#: plugins/videofilters/fv_tcdisplay.c:226 lib/textrenderer.c:192
+msgid "Default Framerate"
+msgstr "Voreingestellte Bildwiederholrate"
+
+#: plugins/videofilters/fv_tcdisplay.c:383
 msgid "Display timecodes"
 msgstr "Timecodes einblenden"
 
-#: plugins/videofilters/fv_tcdisplay.c:348
+#: plugins/videofilters/fv_tcdisplay.c:384
 msgid "Burn timecodes into video frames"
 msgstr "Brenne Timecodes in Videobilder"
 
@@ -2091,7 +2046,7 @@
 msgstr "Zoome vertikal"
 
 #: plugins/videofilters/fv_zoom.c:151 plugins/videofilters/fv_tlp.c:91
-#: plugins/jpeg/iw_jpeg.c:265
+#: plugins/jpeg/iw_jpeg.c:264
 msgid "Quality"
 msgstr "Qualität"
 
@@ -2183,12 +2138,12 @@
 msgid "Bottom first"
 msgstr "Unteres Feld zuerst"
 
-#: plugins/videofilters/fv_interlace.c:246
+#: plugins/videofilters/fv_interlace.c:245
 #, fuzzy
 msgid "Interlace"
 msgstr "Deinterlace"
 
-#: plugins/videofilters/fv_interlace.c:247
+#: plugins/videofilters/fv_interlace.c:246
 msgid "Interlace video images. Output has half the input framerate."
 msgstr ""
 
@@ -2427,11 +2382,11 @@
 msgid "Gauss"
 msgstr "Gauß"
 
-#: plugins/videofilters/fv_blur.c:236 include/gmerlin/bggavl.h:658
+#: plugins/videofilters/fv_blur.c:236 include/gmerlin/bggavl.h:655
 msgid "Triangular"
 msgstr "Dreieck"
 
-#: plugins/videofilters/fv_blur.c:237 include/gmerlin/bggavl.h:657
+#: plugins/videofilters/fv_blur.c:237 include/gmerlin/bggavl.h:654
 msgid "Rectangular"
 msgstr "Rechteck"
 
@@ -2531,61 +2486,61 @@
 msgid "Writer for GAVL images"
 msgstr "Exporteur für TGA Bilder"
 
-#: plugins/mikmod/i_mikmod.c:125
+#: plugins/mikmod/i_mikmod.c:124
 msgid "Cannot find mikmod executable"
 msgstr "Kann das mikmod programm nicht finden"
 
-#: plugins/mikmod/i_mikmod.c:204
+#: plugins/mikmod/i_mikmod.c:201
 msgid "Unrecognized fileformat"
 msgstr "Unbekanntens Dateiformat"
 
-#: plugins/mikmod/i_mikmod.c:254 lib/gtk/infowindow.c:711
-#: lib/gtk/infowindow.c:730 lib/gtk/infowindow.c:749
+#: plugins/mikmod/i_mikmod.c:251 lib/gtk/infowindow.c:717
+#: lib/gtk/infowindow.c:735 lib/gtk/infowindow.c:753
 msgid "Output format"
 msgstr "Ausgabeformat"
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Mono 8bit"
 msgstr "Mono 8bit"
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Stereo 8bit"
 msgstr "Stereo 8bit"
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Mono 16bit"
 msgstr "Mono 16bit"
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Stereo 16bit"
 msgstr "Stereo 16bit"
 
-#: plugins/mikmod/i_mikmod.c:263 include/gmerlin/bggavl.h:531
-#: include/gmerlin/bggavl.h:537
+#: plugins/mikmod/i_mikmod.c:260 include/gmerlin/bggavl.h:528
+#: include/gmerlin/bggavl.h:534
 msgid "Samplerate"
 msgstr "Abtastrate"
 
-#: plugins/mikmod/i_mikmod.c:272
+#: plugins/mikmod/i_mikmod.c:269
 msgid "Look for hidden patterns in module"
 msgstr "Such nach versteckten Mustern im Modul"
 
-#: plugins/mikmod/i_mikmod.c:278
+#: plugins/mikmod/i_mikmod.c:275
 msgid "Use surround mixing"
 msgstr "Benutze Surround-Mixing"
 
-#: plugins/mikmod/i_mikmod.c:284
+#: plugins/mikmod/i_mikmod.c:281
 msgid "Force volume fade at the end of module"
 msgstr "Erzwinge Ausblenden am Modulende"
 
-#: plugins/mikmod/i_mikmod.c:290
+#: plugins/mikmod/i_mikmod.c:287
 msgid "Use interpolate mixing"
 msgstr "Interpolierendes Mischen"
 
-#: plugins/mikmod/i_mikmod.c:345
+#: plugins/mikmod/i_mikmod.c:342
 msgid "mikmod input plugin"
 msgstr "Mikmod Quellplugin"
 
-#: plugins/mikmod/i_mikmod.c:346
+#: plugins/mikmod/i_mikmod.c:343
 msgid "Simple wrapper, which calls the mikmod program"
 msgstr "Einfacger Wrapper der das mikmod Programm aufruft."
 
@@ -2652,35 +2607,39 @@
 msgid "CD-ROM Drive (%s)"
 msgstr "CD-ROM Laufwerk (%s)"
 
-#: plugins/cdaudio/i_cdaudio.c:243
+#: plugins/cdaudio/i_cdaudio.c:217
+msgid "CD audio track"
+msgstr "CD Audio Track"
+
+#: plugins/cdaudio/i_cdaudio.c:237
 msgid "Got metadata from CD-Text"
 msgstr "Metadaten von CD-Text erhalten"
 
-#: plugins/cdaudio/i_cdaudio.c:260
+#: plugins/cdaudio/i_cdaudio.c:254
 #, c-format
 msgid "Got metadata from gmerlin cache (%s)"
 msgstr "Metadaten vom Gmerlin cache erhalten (%s)"
 
-#: plugins/cdaudio/i_cdaudio.c:276
+#: plugins/cdaudio/i_cdaudio.c:270
 #, c-format
 msgid "Got metadata from musicbrainz (%s)"
 msgstr "Metadaten von Musicbrainz erhalten (%s)"
 
-#: plugins/cdaudio/i_cdaudio.c:295
+#: plugins/cdaudio/i_cdaudio.c:289
 #, c-format
 msgid "Got metadata from CDDB (%s)"
 msgstr "Metadaten von CDDB erhalten (%s)"
 
-#: plugins/cdaudio/i_cdaudio.c:321
+#: plugins/cdaudio/i_cdaudio.c:315
 #, c-format
 msgid "Audio CD track %02d"
 msgstr "Audio CD track %02d"
 
-#: plugins/cdaudio/i_cdaudio.c:546
+#: plugins/cdaudio/i_cdaudio.c:542
 msgid "Trackname template"
 msgstr "Trackname Maske"
 
-#: plugins/cdaudio/i_cdaudio.c:549
+#: plugins/cdaudio/i_cdaudio.c:545
 msgid ""
 "Template for track name generation from metadata\n"
 "%p:    Artist\n"
@@ -2700,19 +2659,19 @@
 "%y:    Jahr\n"
 "%c:    Kommentar"
 
-#: plugins/cdaudio/i_cdaudio.c:560
+#: plugins/cdaudio/i_cdaudio.c:556
 msgid "Use CD-Text"
 msgstr "Benutze CD-Text"
 
-#: plugins/cdaudio/i_cdaudio.c:563
+#: plugins/cdaudio/i_cdaudio.c:559
 msgid "Try to get CD metadata from CD-Text"
 msgstr "Versuche, CD Metadaten von CD-Text zu erhalten"
 
-#: plugins/cdaudio/i_cdaudio.c:567
+#: plugins/cdaudio/i_cdaudio.c:563
 msgid "Use locally saved metadata"
 msgstr "Benutze lokal gespeicherte Metadaten"
 
-#: plugins/cdaudio/i_cdaudio.c:570
+#: plugins/cdaudio/i_cdaudio.c:566
 msgid ""
 "Whenever we obtain CD metadata from the internet, we save them into $HOME/."
 "gmerlin/cdaudio_metadata. If you got wrong metadata for a CD, disabling this "
@@ -2723,49 +2682,49 @@
 "bekommen hast, kannst Du diese Option abschalten und die Metadaten werden "
 "erneut geholt und die gespeicherten überschrieben."
 
-#: plugins/cdaudio/i_cdaudio.c:577
+#: plugins/cdaudio/i_cdaudio.c:573
 msgid "Musicbrainz"
 msgstr "Musicbrainz"
 
-#: plugins/cdaudio/i_cdaudio.c:582
+#: plugins/cdaudio/i_cdaudio.c:578
 msgid "Use Musicbrainz"
 msgstr "Benutze Musicbrainz"
 
-#: plugins/cdaudio/i_cdaudio.c:594 plugins/cdaudio/i_cdaudio.c:636
-#: lib/lcdproc.c:118
+#: plugins/cdaudio/i_cdaudio.c:590 plugins/cdaudio/i_cdaudio.c:632
+#: lib/lcdproc.c:115
 msgid "Port"
 msgstr "Port"
 
-#: plugins/cdaudio/i_cdaudio.c:602 plugins/cdaudio/i_cdaudio.c:650
+#: plugins/cdaudio/i_cdaudio.c:598 plugins/cdaudio/i_cdaudio.c:646
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/cdaudio/i_cdaudio.c:604 plugins/cdaudio/i_cdaudio.c:652
+#: plugins/cdaudio/i_cdaudio.c:600 plugins/cdaudio/i_cdaudio.c:648
 msgid "Proxy server (leave empty for direct connection)"
 msgstr "Proxy server (leerlassen für Direktverbindung)"
 
-#: plugins/cdaudio/i_cdaudio.c:608 plugins/cdaudio/i_cdaudio.c:613
-#: plugins/cdaudio/i_cdaudio.c:656 plugins/cdaudio/i_cdaudio.c:661
+#: plugins/cdaudio/i_cdaudio.c:604 plugins/cdaudio/i_cdaudio.c:609
+#: plugins/cdaudio/i_cdaudio.c:652 plugins/cdaudio/i_cdaudio.c:657
 msgid "Proxy port"
 msgstr "Proxy port"
 
-#: plugins/cdaudio/i_cdaudio.c:619
+#: plugins/cdaudio/i_cdaudio.c:615
 msgid "Cddb"
 msgstr "Cddb"
 
-#: plugins/cdaudio/i_cdaudio.c:624
+#: plugins/cdaudio/i_cdaudio.c:620
 msgid "Use Cddb"
 msgstr "Benutze Cddb"
 
-#: plugins/cdaudio/i_cdaudio.c:644
+#: plugins/cdaudio/i_cdaudio.c:640
 msgid "Path"
 msgstr "Pfad"
 
-#: plugins/cdaudio/i_cdaudio.c:665
+#: plugins/cdaudio/i_cdaudio.c:661
 msgid "Proxy username"
 msgstr "Proxy Benutzername"
 
-#: plugins/cdaudio/i_cdaudio.c:667
+#: plugins/cdaudio/i_cdaudio.c:663
 msgid ""
 "User name for proxy (leave empty for poxies, which don't require "
 "authentication)"
@@ -2773,36 +2732,36 @@
 "Benutzername für den Proxy. Leerlassen, wenn der Proxy keine "
 "Authentifizierung erfordert."
 
-#: plugins/cdaudio/i_cdaudio.c:671
+#: plugins/cdaudio/i_cdaudio.c:667
 msgid "Proxy password"
 msgstr "Proxy Passwort"
 
-#: plugins/cdaudio/i_cdaudio.c:673
+#: plugins/cdaudio/i_cdaudio.c:669
 msgid "Password for proxy"
 msgstr "Password für den Proxy"
 
-#: plugins/cdaudio/i_cdaudio.c:677
+#: plugins/cdaudio/i_cdaudio.c:673
 msgid "Timeout"
 msgstr "Maximalzeit"
 
-#: plugins/cdaudio/i_cdaudio.c:682
+#: plugins/cdaudio/i_cdaudio.c:678
 msgid "Timeout (in seconds) for connections to the CDDB server"
 msgstr "Maximale Verbindungszeit (in Sekunden) für CDDB Server"
 
-#: plugins/cdaudio/i_cdaudio.c:766
+#: plugins/cdaudio/i_cdaudio.c:762
 #, c-format
 msgid "Ejecting disk failed: %s"
 msgstr "Disk Auswerfen fehlgeschlagen: %s"
 
-#: plugins/cdaudio/i_cdaudio.c:768
+#: plugins/cdaudio/i_cdaudio.c:764
 msgid "Ejecting disk failed"
 msgstr "Disk Auswerfen fehlgeschlagen"
 
-#: plugins/cdaudio/i_cdaudio.c:792
+#: plugins/cdaudio/i_cdaudio.c:788
 msgid "Audio CD player/ripper"
 msgstr "Audio CD Spieler/Ripper"
 
-#: plugins/cdaudio/i_cdaudio.c:793
+#: plugins/cdaudio/i_cdaudio.c:789
 msgid ""
 "Plugin for audio CDs. Supports both playing with direct connection from the "
 "CD-drive to the souncard and ripping with cdparanoia. Metadata are obtained "
@@ -2814,15 +2773,15 @@
 "Musicbrainz, freedb oder CD-Text geholt. Metadaten werden in $HOME/gmerlin/"
 "cdaudio_metadata zwischengespeichert."
 
-#: plugins/png/e_spumux.c:224 plugins/png/iw_png.c:96
+#: plugins/png/e_spumux.c:222 plugins/png/iw_png.c:96
 msgid "Compression level"
 msgstr "Kompressionslevel"
 
-#: plugins/png/e_spumux.c:246
+#: plugins/png/e_spumux.c:244
 msgid "spumux overlay exporter"
 msgstr "Spumux Overlay Exporteur"
 
-#: plugins/png/e_spumux.c:247
+#: plugins/png/e_spumux.c:245
 msgid ""
 "Exports overlay subtitles into the format used by spumux (http://dvdauthor."
 "sourceforge.net)"
@@ -2830,11 +2789,11 @@
 "Exportiert Overlay Untertitel im Format von spumux (http://dvdauthor."
 "sourceforge.net)"
 
-#: plugins/png/ir_png.c:311
+#: plugins/png/ir_png.c:299
 msgid "PNG reader"
 msgstr "PNG Importeur"
 
-#: plugins/png/ir_png.c:312
+#: plugins/png/ir_png.c:300
 msgid "Reader for PNG images"
 msgstr "Importeur für PNG Bilder"
 
@@ -2856,240 +2815,157 @@
 msgid "Writer for PNG images"
 msgstr "Exporteur für PNG Bilder"
 
-#: plugins/v4l2/i_v4l2.c:108 plugins/v4l2/i_v4l2.c:153
+#: plugins/v4l2/i_v4l2.c:245 plugins/v4l2/i_v4l2.c:254
+#: plugins/v4l2/i_v4l2.c:296 plugins/v4l2/i_v4l2.c:360
+#: plugins/v4l2/i_v4l2.c:372
 #, fuzzy
 msgid "Out of memory"
 msgstr "Draußen"
 
-#: plugins/v4l2/i_v4l2.c:131 plugins/v4l2/ov_v4l2.c:254
+#: plugins/v4l2/i_v4l2.c:275
 #, fuzzy, c-format
 msgid "%s does not support memory mapping"
 msgstr "Plugin %s unterstützt keine eingebetteten Fenster"
 
-#: plugins/v4l2/i_v4l2.c:137 plugins/v4l2/ov_v4l2.c:260
-#, fuzzy, c-format
-msgid "VIDIOC_REQBUFS failed: %s"
-msgstr "VIDIOCGMBUF fehlgeschlagen: %s"
-
-#: plugins/v4l2/i_v4l2.c:144 plugins/v4l2/ov_v4l2.c:267
+#: plugins/v4l2/i_v4l2.c:287
 #, c-format
 msgid "Insufficient buffer memory on %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:169 plugins/v4l2/ov_v4l2.c:284
-#, fuzzy, c-format
-msgid "VIDIOC_QUERYBUF failed: %s"
-msgstr "VIDIOCGPICT fehlgeschlagen: %s"
-
-#: plugins/v4l2/i_v4l2.c:195 plugins/v4l2/i_v4l2.c:617
-#: plugins/v4l2/ov_v4l2.c:359
-#, fuzzy, c-format
-msgid "VIDIOC_QBUF failed: %s"
-msgstr "VIDIOCGMBUF fehlgeschlagen: %s"
+#: plugins/v4l2/i_v4l2.c:346
+#, c-format
+msgid "%s does not support user pointer i/o"
+msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:206 plugins/v4l2/ov_v4l2.c:372
+#: plugins/v4l2/i_v4l2.c:433 apps/camelot/vloopback.c:494
 #, fuzzy, c-format
-msgid "VIDIOC_STREAMON failed: %s"
-msgstr "VIDIOCSPICT fehlgeschlagen: %s"
+msgid "Opening %s failed: %s"
+msgstr "Disk Auswerfen fehlgeschlagen: %s"
 
-#: plugins/v4l2/i_v4l2.c:229 plugins/v4l2/ov_v4l2.c:192
+#: plugins/v4l2/i_v4l2.c:441
 #, fuzzy, c-format
-msgid "VIDIOC_ENUM_FMT failed: %s"
-msgstr "VIDIOCGPICT fehlgeschlagen: %s"
+msgid "%s is no V4L2 device"
+msgstr "V4L Gerät"
 
-#: plugins/v4l2/i_v4l2.c:261 plugins/v4l2/i_v4l2.c:370
-#: plugins/v4l2/i_v4l2.c:400
+#: plugins/v4l2/i_v4l2.c:447
 #, fuzzy, c-format
-msgid "VIDIOC_G_FMT failed: %s"
+msgid "VIDIOC_QUERYCAP failed: %s"
 msgstr "VIDIOCGPICT fehlgeschlagen: %s"
 
-#: plugins/v4l2/i_v4l2.c:301 plugins/v4l2/ov_v4l2.c:453
+#: plugins/v4l2/i_v4l2.c:459
 #, fuzzy, c-format
 msgid "Device name: %s"
 msgstr ""
 "\n"
 "Lizenz: %s"
 
-#: plugins/v4l2/i_v4l2.c:305 plugins/v4l2/ov_v4l2.c:458
+#: plugins/v4l2/i_v4l2.c:463
+#, c-format
+msgid "%s is no video capture device"
+msgstr ""
+
+#: plugins/v4l2/i_v4l2.c:470
 msgid "Trying mmap i/o"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:310
+#: plugins/v4l2/i_v4l2.c:475
 msgid "Trying read i/o"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:348
+#: plugins/v4l2/i_v4l2.c:513
 msgid "Trying v4lconvert"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:356
+#: plugins/v4l2/i_v4l2.c:523
 #, fuzzy
 msgid "Got no supported pixelformat"
 msgstr "Nicht unterstütztes Zahlenformat"
 
-#: plugins/v4l2/i_v4l2.c:383 plugins/v4l2/ov_v4l2.c:485
+#: plugins/v4l2/i_v4l2.c:536 plugins/v4l2/i_v4l2.c:566
 #, fuzzy, c-format
-msgid "VIDIOC_S_FMT failed: %s"
-msgstr "VIDIOCSPICT fehlgeschlagen: %s"
+msgid "VIDIOC_G_FMT failed: %s"
+msgstr "VIDIOCGPICT fehlgeschlagen: %s"
 
-#: plugins/v4l2/i_v4l2.c:457 plugins/v4l2/ov_v4l2.c:322
+#: plugins/v4l2/i_v4l2.c:549
 #, fuzzy, c-format
-msgid "VIDIOC_STREAMOFF failed: %s"
+msgid "VIDIOC_S_FMT failed: %s"
 msgstr "VIDIOCSPICT fehlgeschlagen: %s"
 
-#: plugins/v4l2/i_v4l2.c:537 plugins/v4l2/i_v4l2.c:549
-#, fuzzy, c-format
-msgid "read failed: %s"
-msgstr "mmap fehlgeschlagen: %s"
-
-#: plugins/v4l2/i_v4l2.c:579 plugins/v4l2/ov_v4l2.c:539
-#, fuzzy, c-format
-msgid "VIDIOC_DQBUF failed: %s"
-msgstr "VIDIOCGMBUF fehlgeschlagen: %s"
-
-#: plugins/v4l2/i_v4l2.c:651
-#, fuzzy, c-format
-msgid "Select failed: %s"
-msgstr "Verbindung fehlgeschlagen: %s"
-
-#: plugins/v4l2/i_v4l2.c:657
+#: plugins/v4l2/i_v4l2.c:872
 #, fuzzy
 msgid "Select timeout"
 msgstr "Wähle eine Datei"
 
-#: plugins/v4l2/i_v4l2.c:716 plugins/v4l2/ov_v4l2.c:105
+#: plugins/v4l2/i_v4l2.c:938
 #, fuzzy
 msgid "V4L2 Device"
 msgstr "V4L Gerät"
 
-#: plugins/v4l2/i_v4l2.c:722
+#: plugins/v4l2/i_v4l2.c:1190
 #, fuzzy
-msgid "Force read"
-msgstr "Bildwiederholrate"
-
-#: plugins/v4l2/i_v4l2.c:725 plugins/v4l2/ov_v4l2.c:114
-#, fuzzy
-msgid "Don't use memory mapping"
-msgstr "Plugin %s unterstützt keine eingebetteten Fenster"
+msgid "Failure"
+msgstr "Datei"
 
-#: plugins/v4l2/i_v4l2.c:892 plugins/v4l2/ov_v4l2.c:613
+#: plugins/v4l2/i_v4l2.c:1204
 #, fuzzy
 msgid "V4L2"
 msgstr "V4L"
 
-#: plugins/v4l2/i_v4l2.c:893
+#: plugins/v4l2/i_v4l2.c:1205
 #, fuzzy
 msgid ""
 "video4linux 2 recording plugin. Supports only video and no tuner decives."
 msgstr ""
 "video4linux Aufnahmeplugin. Unterstützt nur Video und keine Tunergeräte."
 
-#: plugins/v4l2/convert.c:84
+#: plugins/v4l2/convert.c:81
 #, fuzzy
 msgid "Initializing libv4lconvert failed"
 msgstr "Alsa Initialisierung fehlgeschlagen"
 
-#: plugins/v4l2/convert.c:94
+#: plugins/v4l2/convert.c:91
 msgid "Initializing libv4lconvert failed (resolution not directly supported)"
 msgstr ""
 
-#: plugins/v4l2/ov_v4l2.c:111
-#, fuzzy
-msgid "Force write"
-msgstr "Bildwiederholrate"
-
-#: plugins/v4l2/ov_v4l2.c:341
-#, fuzzy, c-format
-msgid "write failed: %s"
-msgstr "mmap fehlgeschlagen: %s"
-
-#: plugins/v4l2/ov_v4l2.c:431
-msgid "Forcing square pixels"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:463
-msgid "Trying write i/o"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:475
-#, fuzzy, c-format
-msgid "Using %s"
-msgstr "Bereinige %s"
-
-#: plugins/v4l2/ov_v4l2.c:614
-#, fuzzy
-msgid "V4L2 output driver"
-msgstr "OSS Ausgabetreiber"
-
-#: plugins/v4l2/v4l2_common.c:378
-#, fuzzy
-msgid "VIDIOC_S_CTRL Failed"
-msgstr "VIDIOCSPICT fehlgeschlagen: %s"
-
-#: plugins/v4l2/v4l2_common.c:414
-#, fuzzy
-msgid "VIDIOC_G_CTRL Failed"
-msgstr "VIDIOCGPICT fehlgeschlagen: %s"
-
-#: plugins/v4l2/v4l2_common.c:431 apps/camelot/vloopback.c:494
-#, fuzzy, c-format
-msgid "Opening %s failed: %s"
-msgstr "Disk Auswerfen fehlgeschlagen: %s"
-
-#: plugins/v4l2/v4l2_common.c:440
-#, fuzzy, c-format
-msgid "%s is no V4L2 device"
-msgstr "V4L Gerät"
-
-#: plugins/v4l2/v4l2_common.c:446
-#, fuzzy, c-format
-msgid "VIDIOC_QUERYCAP failed: %s"
-msgstr "VIDIOCGPICT fehlgeschlagen: %s"
-
-#: plugins/v4l2/v4l2_common.c:454
-#, fuzzy, c-format
-msgid "%s is no video %s device"
-msgstr "V4L Gerät"
-
-#: plugins/lqt/i_lqt.c:46 apps/plugincfg/gmerlin_plugincfg.c:281
-#: apps/transcoder/trackdialog.c:217 apps/recorder/recorder_window.c:722
-#: lib/pluginregistry.c:2125 lib/pluginregistry.c:2609 lib/player_audio.c:181
-#: lib/gtk/infowindow.c:697
+#: plugins/lqt/i_lqt.c:44 apps/plugincfg/gmerlin_plugincfg.c:281
+#: apps/transcoder/trackdialog.c:217 apps/recorder/recorder_window.c:714
+#: lib/pluginregistry.c:2048 lib/pluginregistry.c:2520 lib/player_audio.c:181
+#: lib/gtk/infowindow.c:704
 msgid "Audio"
 msgstr "Audio"
 
-#: plugins/lqt/i_lqt.c:52
+#: plugins/lqt/i_lqt.c:50
 msgid "Audio Codecs"
 msgstr "Audio Codecs"
 
-#: plugins/lqt/i_lqt.c:53
+#: plugins/lqt/i_lqt.c:51
 msgid "Sort and configure audio codecs"
 msgstr "Sortiere und konfiguriere Audio Codecs"
 
-#: plugins/lqt/i_lqt.c:57 apps/transcoder/trackdialog.c:288
-#: apps/recorder/recorder_window.c:740 lib/player_video.c:134
-#: lib/pluginregistry.c:2136 lib/pluginregistry.c:2616
-#: lib/gtk/infowindow.c:716
+#: plugins/lqt/i_lqt.c:55 apps/transcoder/trackdialog.c:288
+#: apps/recorder/recorder_window.c:732 lib/player_video.c:134
+#: lib/pluginregistry.c:2059 lib/pluginregistry.c:2527
+#: lib/gtk/infowindow.c:722
 msgid "Video"
 msgstr "Video"
 
-#: plugins/lqt/i_lqt.c:63
+#: plugins/lqt/i_lqt.c:61
 msgid "Video Codecs"
 msgstr "Video Codecs"
 
-#: plugins/lqt/i_lqt.c:64
+#: plugins/lqt/i_lqt.c:62
 msgid "Sort and configure video codecs"
 msgstr "Sortiere und konfiguriere Video Codecs"
 
-#: plugins/lqt/i_lqt.c:281
+#: plugins/lqt/i_lqt.c:248
 msgid "More than one chapter track found, using first one"
 msgstr "Mehr als ein Kapiteltrack gefunden, nehme ersten."
 
-#: plugins/lqt/i_lqt.c:572
+#: plugins/lqt/i_lqt.c:518
 msgid "libquicktime input plugin"
 msgstr "Libquicktime Quellenplugin"
 
-#: plugins/lqt/i_lqt.c:573
+#: plugins/lqt/i_lqt.c:519
 msgid "Input plugin based on libquicktime"
 msgstr "Quellenplugin basierend auf libquicktime"
 
@@ -3098,75 +2974,75 @@
 msgid "%s Compatible with"
 msgstr "%s kompatibel mit"
 
-#: plugins/lqt/e_lqt.c:41
+#: plugins/lqt/e_lqt.c:40
 msgid "Codec"
 msgstr "Codec"
 
-#: plugins/lqt/e_lqt.c:183
+#: plugins/lqt/e_lqt.c:182
 #, c-format
 msgid "Cannot open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: plugins/lqt/e_lqt.c:478
+#: plugins/lqt/e_lqt.c:421
 #, c-format
 msgid "Audio codec %s cannot be written to AVI files"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:542
+#: plugins/lqt/e_lqt.c:472
 #, fuzzy
 msgid "AVI subtitles not supported"
 msgstr "PAM format nicht unterstützt"
 
-#: plugins/lqt/e_lqt.c:590
+#: plugins/lqt/e_lqt.c:520
 #, c-format
 msgid "Omitting chapter %d: time (%f) > duration (%f)"
 msgstr "Lasse Kapitel %d weg: Startzeit (%f) > Dauer (%f)"
 
-#: plugins/lqt/e_lqt.c:629
+#: plugins/lqt/e_lqt.c:559
 msgid "Making streamable...."
 msgstr "Mache streamfähig..."
 
-#: plugins/lqt/e_lqt.c:631
+#: plugins/lqt/e_lqt.c:561
 msgid "Making streamable....done"
 msgstr "Mache streamfähig...fertig"
 
-#: plugins/lqt/e_lqt.c:706
+#: plugins/lqt/e_lqt.c:636
 msgid "Quicktime"
 msgstr "Quicktime"
 
-#: plugins/lqt/e_lqt.c:706
+#: plugins/lqt/e_lqt.c:636
 msgid "AVI"
 msgstr "AVI"
 
-#: plugins/lqt/e_lqt.c:706
+#: plugins/lqt/e_lqt.c:636
 msgid "AVI (Opendml)"
 msgstr "AVI (Opendml)"
 
-#: plugins/lqt/e_lqt.c:707
+#: plugins/lqt/e_lqt.c:637
 msgid "MP4"
 msgstr "MP4"
 
-#: plugins/lqt/e_lqt.c:707
+#: plugins/lqt/e_lqt.c:637
 msgid "M4A"
 msgstr "M4A"
 
-#: plugins/lqt/e_lqt.c:707
+#: plugins/lqt/e_lqt.c:637
 msgid "3GP"
 msgstr "3GP"
 
-#: plugins/lqt/e_lqt.c:712
+#: plugins/lqt/e_lqt.c:642
 msgid "Make streamable"
 msgstr "Make streamable"
 
-#: plugins/lqt/e_lqt.c:714
+#: plugins/lqt/e_lqt.c:644
 msgid "Make the file streamable afterwards (uses twice the diskspace)"
 msgstr "Mache die Datei streamfähig (benötigt doppelten Festplattenplatz)"
 
-#: plugins/lqt/e_lqt.c:718
+#: plugins/lqt/e_lqt.c:648
 msgid "Maximum RIFF size"
 msgstr "Maximum RIFF size"
 
-#: plugins/lqt/e_lqt.c:723
+#: plugins/lqt/e_lqt.c:653
 msgid ""
 "Maximum RIFF size (in MB) for OpenDML AVIs. The default (1GB) is reasonable "
 "and should only be changed by people who know what they do."
@@ -3174,27 +3050,27 @@
 "Maximale RIFF-Größe (in MB) für OpenDML AVIs. Die Voreinstellung (1GB) ist "
 "vernünftig und sollte nur von denen geändert werden, die wissen was sie tun."
 
-#: plugins/lqt/e_lqt.c:914
+#: plugins/lqt/e_lqt.c:816
 msgid "Text box (top)"
 msgstr "Text Box (open)"
 
-#: plugins/lqt/e_lqt.c:921
+#: plugins/lqt/e_lqt.c:823
 msgid "Text box (left)"
 msgstr "Text box (links)"
 
-#: plugins/lqt/e_lqt.c:928
+#: plugins/lqt/e_lqt.c:830
 msgid "Text box (bottom)"
 msgstr "Text box (unten)"
 
-#: plugins/lqt/e_lqt.c:935
+#: plugins/lqt/e_lqt.c:837
 msgid "Text box (right)"
 msgstr "Text box (rechts)"
 
-#: plugins/lqt/e_lqt.c:999
+#: plugins/lqt/e_lqt.c:901
 msgid "Quicktime encoder"
 msgstr "Quicktime Enkoder"
 
-#: plugins/lqt/e_lqt.c:1000
+#: plugins/lqt/e_lqt.c:902
 msgid ""
 "Encoder based on libquicktime (http://libquicktime.sourceforge.net) Writes "
 "Quicktime, AVI (optionally ODML), MP4, M4A and 3GPP. Supported codecs range "
@@ -3210,140 +3086,140 @@
 "Untertitel."
 
 # Kann %s nicht öffnen
-#: plugins/tiff/iw_tiff.c:101 apps/cmdlineplayer/gmerlin_play.c:543
+#: plugins/tiff/iw_tiff.c:99 apps/cmdlineplayer/gmerlin_play.c:544
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:192
 #: tests/gmerlin_visualize.c:478
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kann %s nicht öffnen"
 
-#: plugins/tiff/iw_tiff.c:191
+#: plugins/tiff/iw_tiff.c:167
 msgid "Packbits"
 msgstr "Packbits"
 
-#: plugins/tiff/iw_tiff.c:191
+#: plugins/tiff/iw_tiff.c:167
 msgid "Deflate"
 msgstr "Deflate"
 
-#: plugins/tiff/iw_tiff.c:191
+#: plugins/tiff/iw_tiff.c:167
 msgid "JPEG"
 msgstr "JPEG"
 
-#: plugins/tiff/iw_tiff.c:198
+#: plugins/tiff/iw_tiff.c:174
 msgid "JPEG quality"
 msgstr "JPEG Qualität"
 
-#: plugins/tiff/iw_tiff.c:206
+#: plugins/tiff/iw_tiff.c:182
 msgid "Deflate compression level"
 msgstr "Deflate Kompressionslevel"
 
-#: plugins/tiff/iw_tiff.c:253
+#: plugins/tiff/iw_tiff.c:229
 msgid "TIFF writer"
 msgstr "TIFF Exporteur"
 
-#: plugins/tiff/iw_tiff.c:254
+#: plugins/tiff/iw_tiff.c:230
 msgid "Writer for TIFF images"
 msgstr "Exporteur für TIFF Bilder"
 
-#: plugins/tiff/ir_tiff.c:106
+#: plugins/tiff/ir_tiff.c:100
 msgid "Seeked beyond buffer."
 msgstr "Hinter den Puffer gesucht."
 
-#: plugins/tiff/ir_tiff.c:616
+#: plugins/tiff/ir_tiff.c:610
 msgid "Unsupported compression for LOGL/LOGLUV"
 msgstr "Nicht unterstützte Kompression für LOGL/LOGLUV"
 
-#: plugins/tiff/ir_tiff.c:660 plugins/tiff/ir_tiff.c:690
-#: plugins/tiff/ir_tiff.c:722
+#: plugins/tiff/ir_tiff.c:654 plugins/tiff/ir_tiff.c:684
+#: plugins/tiff/ir_tiff.c:716
 msgid "Unsupported samples per pixel"
 msgstr "Nicht unterstützte Abtastwerte pro Pixel"
 
-#: plugins/tiff/ir_tiff.c:696
+#: plugins/tiff/ir_tiff.c:690
 #, c-format
 msgid "Unsupported bits per sample (%d) for UINT"
 msgstr "Nicht unterstützte Bits pro Abtastwert (%d) für UINT"
 
-#: plugins/tiff/ir_tiff.c:703
+#: plugins/tiff/ir_tiff.c:697
 msgid "Didn't get max sample value"
 msgstr "Maximaler Abtastwert nicht erhalten."
 
-#: plugins/tiff/ir_tiff.c:706
+#: plugins/tiff/ir_tiff.c:700
 msgid "Didn't get min sample value"
 msgstr "Minimaler Abtastwert nicht erhalten."
 
-#: plugins/tiff/ir_tiff.c:728
+#: plugins/tiff/ir_tiff.c:722
 #, c-format
 msgid "Unsupported depth %d for IEEE float"
 msgstr "Nicht unterstützte Tiefe %d für IEEE Fließkomma."
 
-#: plugins/tiff/ir_tiff.c:738
+#: plugins/tiff/ir_tiff.c:732
 msgid "Unsupported sampleformat"
 msgstr "Nicht unterstütztes Zahlenformat"
 
-#: plugins/tiff/ir_tiff.c:743
+#: plugins/tiff/ir_tiff.c:737
 #, c-format
 msgid "Unknown sampleformat %d"
 msgstr "Unbekanntes Zahlenformat: %d"
 
-#: plugins/tiff/ir_tiff.c:869
+#: plugins/tiff/ir_tiff.c:862
 msgid "BUG!!! convert_func == 0x0"
 msgstr "BUG!!! convert_func == 0x0"
 
-#: plugins/tiff/ir_tiff.c:905
+#: plugins/tiff/ir_tiff.c:892
 msgid "TIFF reader"
 msgstr "TIFF Importeur"
 
-#: plugins/tiff/ir_tiff.c:906
+#: plugins/tiff/ir_tiff.c:893
 msgid "Reader for TIFF images"
 msgstr "Importeur für TIFF Bilder"
 
-#: plugins/jpeg/iw_jpeg.c:186
+#: plugins/jpeg/iw_jpeg.c:185
 #, c-format
 msgid "Illegal pixelformat: %s"
 msgstr "Illegales Pixelformat: %s"
 
-#: plugins/jpeg/iw_jpeg.c:273
+#: plugins/jpeg/iw_jpeg.c:272
 msgid "Chroma sampling"
 msgstr "Farbabtastung"
 
-#: plugins/jpeg/iw_jpeg.c:325
+#: plugins/jpeg/iw_jpeg.c:324
 msgid "JPEG writer"
 msgstr "JPEG Exporteur"
 
-#: plugins/jpeg/iw_jpeg.c:326
+#: plugins/jpeg/iw_jpeg.c:325
 msgid "Writer for JPEG images"
 msgstr "Exporteur für JPEG Bilder"
 
-#: plugins/jpeg/ir_jpeg.c:274
+#: plugins/jpeg/ir_jpeg.c:245
 msgid "Illegal pixelformat"
 msgstr "Illegales Pixelformat"
 
-#: plugins/jpeg/ir_jpeg.c:295
+#: plugins/jpeg/ir_jpeg.c:266
 msgid "JPEG reader"
 msgstr "JPEG Importeur"
 
-#: plugins/jpeg/ir_jpeg.c:296
+#: plugins/jpeg/ir_jpeg.c:267
 msgid "Reader for JPEG images"
 msgstr "Importeur für JPEG-Bilder"
 
-#: plugins/wavwrite/e_wav.c:317
+#: plugins/wavwrite/e_wav.c:315
 msgid "Bits per sample"
 msgstr "Bits pro Abtastwert"
 
-#: plugins/wavwrite/e_wav.c:329
+#: plugins/wavwrite/e_wav.c:327
 msgid "Write info chunk"
 msgstr "Schreibe Info Chunk"
 
-#: plugins/wavwrite/e_wav.c:472
+#: plugins/wavwrite/e_wav.c:470
 #, c-format
 msgid "Cannot open output file: %s"
 msgstr "Kann Ausgabedatei %s nicht öffnen"
 
-#: plugins/wavwrite/e_wav.c:643
+#: plugins/wavwrite/e_wav.c:640
 msgid "Wave writer"
 msgstr "Wave Exporteur"
 
-#: plugins/wavwrite/e_wav.c:644
+#: plugins/wavwrite/e_wav.c:641
 msgid "Simple writer for wave files, supports 8, 16, 24 and 32 bit PCM"
 msgstr ""
 "Einfacher Exporteur für Wav-Dateien. Unterstützt 8, 16, 24 and 32 bit PCM."
@@ -3373,7 +3249,7 @@
 "Geschwindigkeit. Werte über 3 schalten langsame, hochqualitative "
 "Berechnungen ein."
 
-#: include/gmerlin/bggavl.h:142 lib/singlepic.c:76
+#: include/gmerlin/bggavl.h:142 lib/singlepic.c:75
 msgid "Timescale"
 msgstr "Zeitskala"
 
@@ -3385,7 +3261,7 @@
 "Zeitskala für benutzerdefinierte Bildwiederholfrequenz "
 "(Bildwiederholfrequenz = Zeitskala / Bilddauer)"
 
-#: include/gmerlin/bggavl.h:151 lib/singlepic.c:84
+#: include/gmerlin/bggavl.h:151 lib/singlepic.c:83
 msgid "Frame duration"
 msgstr "Bilddauer"
 
@@ -3442,9 +3318,9 @@
 msgid "Deinterlace mode"
 msgstr "Deinterlacemethode"
 
-#: include/gmerlin/bggavl.h:229 include/gmerlin/bggavl.h:589
-#: apps/transcoder/tracklist.c:1269 lib/gtk/albumwidget.c:1508
-#: lib/gtk/albumwidget.c:2906
+#: include/gmerlin/bggavl.h:229 include/gmerlin/bggavl.h:586
+#: apps/transcoder/tracklist.c:1028 lib/gtk/albumwidget.c:1504
+#: lib/gtk/albumwidget.c:2902
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -3524,34 +3400,34 @@
 msgstr "Pixelformat erzwingen"
 
 #: include/gmerlin/bggavl.h:290 include/gmerlin/bggavl.h:309
-#: lib/x11/x11_window.c:1196
+#: lib/x11/x11_window.c:1191
 msgid "Nearest"
 msgstr "Nächstes Pixel"
 
 #: include/gmerlin/bggavl.h:291 include/gmerlin/bggavl.h:310
-#: lib/x11/x11_window.c:1197
+#: lib/x11/x11_window.c:1192
 msgid "Bilinear"
 msgstr "Bilinear"
 
 #: include/gmerlin/bggavl.h:292 include/gmerlin/bggavl.h:311
-#: lib/x11/x11_window.c:1198
+#: lib/x11/x11_window.c:1193
 msgid "Quadratic"
 msgstr "Quadratisch"
 
 #: include/gmerlin/bggavl.h:293 include/gmerlin/bggavl.h:312
-#: lib/x11/x11_window.c:1199
+#: lib/x11/x11_window.c:1194
 msgid "Cubic B-Spline"
 msgstr "Kubisch B-Spline"
 
-#: include/gmerlin/bggavl.h:294 lib/x11/x11_window.c:1200
+#: include/gmerlin/bggavl.h:294 lib/x11/x11_window.c:1195
 msgid "Cubic Mitchell-Netravali"
 msgstr "Kubisch Mitchell-Netravali"
 
-#: include/gmerlin/bggavl.h:295 lib/x11/x11_window.c:1201
+#: include/gmerlin/bggavl.h:295 lib/x11/x11_window.c:1196
 msgid "Cubic Catmull-Rom"
 msgstr "Kubisch Catmull-Rom"
 
-#: include/gmerlin/bggavl.h:296 lib/x11/x11_window.c:1202
+#: include/gmerlin/bggavl.h:296 lib/x11/x11_window.c:1197
 msgid "Sinc with Lanczos window"
 msgstr "sin(x)/x mit Lanczos Fenster"
 
@@ -3575,26 +3451,19 @@
 "Mache immer Farbenebenen-Resampling, wenn die Farbplazierungen verschieden "
 "sind. Normalerweise wird dies nur für Qualitätsstufen über 3 gemacht."
 
-#: include/gmerlin/bggavl.h:371
-msgid ""
-"Background color to use, when alpha mode above is \"Blend background color\"."
-msgstr ""
-"Hintergrundfarbe, die verwendet wird, wenn der Transparenzmodus oben auf "
-"\"Hintergrundfarbe einblenden\" steht."
-
-#: include/gmerlin/bggavl.h:377
+#: include/gmerlin/bggavl.h:367
 msgid "Alpha mode"
 msgstr "Transparenzmodus"
 
-#: include/gmerlin/bggavl.h:382
+#: include/gmerlin/bggavl.h:372
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: include/gmerlin/bggavl.h:382
+#: include/gmerlin/bggavl.h:372
 msgid "Blend background color"
 msgstr "Hintergrundfarbe einblenden"
 
-#: include/gmerlin/bggavl.h:383
+#: include/gmerlin/bggavl.h:373
 msgid ""
 "This option is used if the source has an alpha (=transparency) channel, but "
 "the output supports no transparency. Either, the transparency is ignored, or "
@@ -3605,16 +3474,23 @@
 "Transparenz ignoriert, oder eine Hintergrundfarbe, die Du unten angibst, "
 "wird eingeblendet."
 
-#: include/gmerlin/bggavl.h:520
+#: include/gmerlin/bggavl.h:381
+msgid ""
+"Background color to use, when alpha mode above is \"Blend background color\"."
+msgstr ""
+"Hintergrundfarbe, die verwendet wird, wenn der Transparenzmodus oben auf "
+"\"Hintergrundfarbe einblenden\" steht."
+
+#: include/gmerlin/bggavl.h:517
 #, fuzzy
 msgid "From source"
 msgstr "Wie Quelle"
 
-#: include/gmerlin/bggavl.h:544
+#: include/gmerlin/bggavl.h:541
 msgid "Fixed samplerate"
 msgstr "Feste Abtastrate"
 
-#: include/gmerlin/bggavl.h:548
+#: include/gmerlin/bggavl.h:545
 msgid ""
 "If disabled, the output samplerate is taken from the source. If enabled, the "
 "samplerate you specify below us used."
@@ -3623,60 +3499,60 @@
 "übernommen. Wenn eingeschaltet, wird die Abtastrate, die Du unten angibst, "
 "genommen."
 
-#: include/gmerlin/bggavl.h:555
+#: include/gmerlin/bggavl.h:552
 msgid "Front channels"
 msgstr "Frontkanäle"
 
-#: include/gmerlin/bggavl.h:564
+#: include/gmerlin/bggavl.h:561
 msgid "Rear channels"
 msgstr "Hinterkanäle"
 
-#: include/gmerlin/bggavl.h:573 lib/formats.c:195
+#: include/gmerlin/bggavl.h:570 lib/formats.c:195
 msgid "LFE"
 msgstr "Subwoofer"
 
-#: include/gmerlin/bggavl.h:580
+#: include/gmerlin/bggavl.h:577
 msgid "Front to rear mode"
 msgstr "Vorne nach hinten modus"
 
-#: include/gmerlin/bggavl.h:588
+#: include/gmerlin/bggavl.h:585
 msgid "Mute"
 msgstr "Stumm"
 
-#: include/gmerlin/bggavl.h:590
+#: include/gmerlin/bggavl.h:587
 msgid "Diff"
 msgstr "Differenz"
 
-#: include/gmerlin/bggavl.h:592
+#: include/gmerlin/bggavl.h:589
 msgid ""
 "Mix mode when the output format has rear channels, but the source doesn't."
 msgstr "Mischmodus wenn die Ausgabe Hinterkanäle hat, aber die Quelle nicht."
 
-#: include/gmerlin/bggavl.h:597
+#: include/gmerlin/bggavl.h:594
 msgid "Stereo to mono mode"
 msgstr "Stereo nach Mono Mode"
 
-#: include/gmerlin/bggavl.h:605
+#: include/gmerlin/bggavl.h:602
 msgid "Choose left"
 msgstr "Nehme Links"
 
-#: include/gmerlin/bggavl.h:606
+#: include/gmerlin/bggavl.h:603
 msgid "Choose right"
 msgstr "Nehme Rechts"
 
-#: include/gmerlin/bggavl.h:607
+#: include/gmerlin/bggavl.h:604
 msgid "Mix"
 msgstr "Mischen"
 
-#: include/gmerlin/bggavl.h:609
+#: include/gmerlin/bggavl.h:606
 msgid "Mix mode when downmixing Stereo to Mono."
 msgstr "Mischmethode zum Heruntermischen von Stereo auf Mono."
 
-#: include/gmerlin/bggavl.h:616
+#: include/gmerlin/bggavl.h:613
 msgid "Fixed channel setup"
 msgstr "Feste Kanalkonfiguration"
 
-#: include/gmerlin/bggavl.h:620
+#: include/gmerlin/bggavl.h:617
 msgid ""
 "If disabled, the output channel configuration is taken from the source. If "
 "enabled, the setup you specify below us used."
@@ -3684,27 +3560,27 @@
 "Wenn ausgeschaltet, wird die Kanalkonfiguration von der Quelle übernommen. "
 "Wenn eingeschaltet, wird die Konfiguration, die Du unten angibst, verwendet."
 
-#: include/gmerlin/bggavl.h:633
+#: include/gmerlin/bggavl.h:630
 msgid "8 bit"
 msgstr "8 bit"
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "16 bit"
 msgstr "16 bit"
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "32 bit"
 msgstr "32 bit"
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "Float"
 msgstr "Fließkomma"
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "Double"
 msgstr "Fließkomma (doppelt)"
 
-#: include/gmerlin/bggavl.h:634
+#: include/gmerlin/bggavl.h:631
 msgid ""
 "Force a sampleformat to be used for processing. None means to take the input "
 "format."
@@ -3712,22 +3588,22 @@
 "Erzwinge Zahlenformat für die Verarbeitung. Kein(s) bedeutet nehme das "
 "Quellenformat."
 
-#: include/gmerlin/bggavl.h:646
+#: include/gmerlin/bggavl.h:643
 #, fuzzy
 msgid "Sampleformat to be used for processing."
 msgstr ""
 "Erzwinge Zahlenformat für die Verarbeitung. Kein(s) bedeutet nehme das "
 "Quellenformat."
 
-#: include/gmerlin/bggavl.h:652
+#: include/gmerlin/bggavl.h:649
 msgid "Dither mode"
 msgstr "Dithermodus"
 
-#: include/gmerlin/bggavl.h:658
+#: include/gmerlin/bggavl.h:655
 msgid "Shaped"
 msgstr "Geformt"
 
-#: include/gmerlin/bggavl.h:659
+#: include/gmerlin/bggavl.h:656
 msgid ""
 "Dither mode. Auto means to use the quality level. Subsequent options are "
 "ordered by increasing quality (i.e. decreasing speed)."
@@ -3736,31 +3612,31 @@
 "Optionen sind nach aufsteigender Qualität (absteigender Geschwindigkeit) "
 "geordnet."
 
-#: include/gmerlin/bggavl.h:665
+#: include/gmerlin/bggavl.h:662
 msgid "Resample mode"
 msgstr "Resamplemodus"
 
-#: include/gmerlin/bggavl.h:670
+#: include/gmerlin/bggavl.h:667
 msgid "Zero order hold"
 msgstr "0. Ordnung halten"
 
-#: include/gmerlin/bggavl.h:670
+#: include/gmerlin/bggavl.h:667
 msgid "Linear"
 msgstr "Linear"
 
-#: include/gmerlin/bggavl.h:671
+#: include/gmerlin/bggavl.h:668
 msgid "Sinc fast"
 msgstr "Sinc (schnellste Berechnung)"
 
-#: include/gmerlin/bggavl.h:671
+#: include/gmerlin/bggavl.h:668
 msgid "Sinc medium"
 msgstr "Sinc (mittel)"
 
-#: include/gmerlin/bggavl.h:671
+#: include/gmerlin/bggavl.h:668
 msgid "Sinc best"
 msgstr "Sinc (beste Qualität)"
 
-#: include/gmerlin/bggavl.h:672
+#: include/gmerlin/bggavl.h:669
 msgid ""
 "Resample mode. Auto means to use the quality level. Subsequent options are "
 "ordered by increasing quality (i.e. decreasing speed)."
@@ -3769,12 +3645,12 @@
 "Optionen sind nach aufsteigender Qualität (absteigender Geschwindigkeit) "
 "geordnet."
 
-#: include/gmerlin/bggavl.h:678
+#: include/gmerlin/bggavl.h:675
 #, fuzzy
 msgid "Number of threads"
 msgstr "Zahl der Meldungen"
 
-#: include/gmerlin/bggavl.h:683
+#: include/gmerlin/bggavl.h:680
 msgid ""
 "Threads to launch for processing operations. Changing this requires program "
 "restart"
@@ -3813,7 +3689,7 @@
 "%s\n"
 "fehlgeschlagen."
 
-#: apps/player/skinbrowser.c:406
+#: apps/player/skinbrowser.c:405
 msgid "Skin browser"
 msgstr "Skinbrowser"
 
@@ -3821,39 +3697,39 @@
 msgid "Gmerlin player"
 msgstr "Gmerlin Player"
 
-#: apps/player/gmerlin.c:711
+#: apps/player/gmerlin.c:703
 msgid "General Options"
 msgstr "Allgemeine Optionen"
 
-#: apps/player/gmerlin.c:717
+#: apps/player/gmerlin.c:709
 msgid "Skip error tracks"
 msgstr "Überspringe fehlerhafte Tracks"
 
-#: apps/player/gmerlin.c:720
+#: apps/player/gmerlin.c:712
 msgid "If a track cannot be opened, switch to the next one"
 msgstr "Wenn ein Track nicht geöffnet werden kann, springe zum nächsten."
 
-#: apps/player/gmerlin.c:724
+#: apps/player/gmerlin.c:716
 msgid "Don't advance"
 msgstr "Nicht weiterschalten"
 
-#: apps/player/gmerlin.c:730
+#: apps/player/gmerlin.c:722
 msgid "Shuffle mode"
 msgstr "Zufallswiedergabe"
 
-#: apps/player/gmerlin.c:736 apps/player/mainmenu.c:751
+#: apps/player/gmerlin.c:728 apps/player/mainmenu.c:748
 msgid "Off"
 msgstr "Aus"
 
-#: apps/player/gmerlin.c:737
+#: apps/player/gmerlin.c:729
 msgid "Current album"
 msgstr "Aktuelles Album"
 
-#: apps/player/gmerlin.c:738
+#: apps/player/gmerlin.c:730
 msgid "All open albums"
 msgstr "Alle offenen Alben"
 
-#: apps/player/gmerlin.c:744
+#: apps/player/gmerlin.c:736
 msgid "Show tooltips"
 msgstr "Zeige Tooltips"
 
@@ -3865,13 +3741,12 @@
 msgid "Gmerlin GUI Player"
 msgstr "Gmerlin GUI Spieler"
 
-#: apps/player/main.c:58 apps/player/gmerlin_remote.c:567
-#: apps/transcoder/main.c:74 apps/transcoder/gmerlin_transcoder_remote.c:179
+#: apps/player/main.c:58 apps/player/gmerlin_remote.c:476
+#: apps/transcoder/main.c:74 apps/transcoder/gmerlin_transcoder_remote.c:189
 msgid "Default port for the remote control"
 msgstr "Voreingestellter Port für die Fernbedienung"
 
-#: apps/player/main.c:63 apps/cmdlinerecorder/gmerlin-record.c:321
-#: apps/cmdlineplayer/gmerlin_play.c:842 apps/nmjedit/gmerlin-nmjedit.c:174
+#: apps/player/main.c:63 apps/cmdlineplayer/gmerlin_play.c:852
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:98 tests/fvtest.c:179
 msgid "Cache of the plugin registry (shared by all applicatons)"
 msgstr ""
@@ -3919,13 +3794,13 @@
 msgid "Visualization"
 msgstr "Visualisierung"
 
-#: apps/player/cfgdialog.c:86 lib/pluginregistry.c:2158
-#: lib/pluginregistry.c:2623
+#: apps/player/cfgdialog.c:86 lib/pluginregistry.c:2081
+#: lib/pluginregistry.c:2534
 msgid "Text subtitles"
 msgstr "Text Untertitel"
 
 #: apps/player/cfgdialog.c:89 apps/transcoder/trackdialog.c:374
-#: apps/transcoder/trackdialog.c:442 lib/gtk/infowindow.c:735
+#: apps/transcoder/trackdialog.c:442 lib/gtk/infowindow.c:740
 msgid "Subtitles"
 msgstr "Untertitel"
 
@@ -3939,12 +3814,12 @@
 msgstr "Quelle"
 
 #: apps/player/cfgdialog.c:122 apps/plugincfg/gmerlin_plugincfg.c:273
-#: apps/transcoder/transcoder_window.c:1391
+#: apps/transcoder/transcoder_window.c:1388
 msgid "Input plugins"
 msgstr "Quellenplugins"
 
 #: apps/player/cfgdialog.c:130 apps/plugincfg/gmerlin_plugincfg.c:574
-#: apps/transcoder/transcoder_window.c:1399
+#: apps/transcoder/transcoder_window.c:1396
 msgid "Image readers"
 msgstr "Bilderimporteure"
 
@@ -3956,7 +3831,7 @@
 msgid "Display"
 msgstr "Display"
 
-#: apps/player/cfgdialog.c:161 apps/player/mainmenu.c:1009
+#: apps/player/cfgdialog.c:161 apps/player/mainmenu.c:1028
 msgid "Media Tree"
 msgstr "Media Tree"
 
@@ -3964,10 +3839,10 @@
 msgid "Remote control"
 msgstr "Fernbedienung"
 
-#: apps/player/cfgdialog.c:181 apps/player/mainmenu.c:1015
-#: apps/camelot/webcam_window.c:803 apps/transcoder/transcoder_window.c:1432
+#: apps/player/cfgdialog.c:181 apps/player/mainmenu.c:1034
+#: apps/camelot/webcam_window.c:803 apps/transcoder/transcoder_window.c:1429
 #: apps/visualizer/gmerlin_visualizer.c:908
-#: apps/recorder/recorder_window.c:803
+#: apps/recorder/recorder_window.c:795
 msgid "Log window"
 msgstr "Meldungen"
 
@@ -3975,158 +3850,170 @@
 msgid "LCDproc"
 msgstr "LCDproc"
 
-#: apps/player/mainmenu.c:765 apps/player/mainmenu.c:802
-#: apps/player/mainmenu.c:1192
+#: apps/player/mainmenu.c:762 apps/player/mainmenu.c:799
+#: apps/player/mainmenu.c:1211
 msgid "Options..."
 msgstr "Optionen..."
 
-#: apps/player/mainmenu.c:769
+#: apps/player/mainmenu.c:766
 msgid "Filters..."
 msgstr "Filter..."
 
-#: apps/player/mainmenu.c:772
+#: apps/player/mainmenu.c:769
 msgid "Output plugin..."
 msgstr "Ausgabeplugin..."
 
-#: apps/player/mainmenu.c:797
+#: apps/player/mainmenu.c:794
 msgid "Enable visualizations"
 msgstr "Verwende Visualisierungen"
 
-#: apps/player/mainmenu.c:806 lib/gtk/treewidget.c:1412
+#: apps/player/mainmenu.c:803 lib/gtk/treewidget.c:1408
 msgid "Plugin..."
 msgstr "Plugin..."
 
-#: apps/player/mainmenu.c:941
+#: apps/player/mainmenu.c:950
 #, c-format
 msgid "Chapter %d [%s]"
 msgstr "Kapitel %d [%s]"
 
-#: apps/player/mainmenu.c:1012
+#: apps/player/mainmenu.c:984 apps/player/mainmenu.c:1007
+#: lib/stringutils.c:587
+#, c-format
+msgid "Stream %d [%s]"
+msgstr "Stream %d [%s]"
+
+#: apps/player/mainmenu.c:987 apps/player/mainmenu.c:1010
+#: lib/stringutils.c:589
+#, c-format
+msgid "Stream %d"
+msgstr "Stream %d"
+
+#: apps/player/mainmenu.c:1031
 msgid "Info window"
 msgstr "Track information"
 
-#: apps/player/mainmenu.c:1022 apps/transcoder/transcoder_window.c:862
+#: apps/player/mainmenu.c:1041 apps/transcoder/transcoder_window.c:862
 msgid "About..."
 msgstr "Über..."
 
-#: apps/player/mainmenu.c:1024 apps/transcoder/transcoder_window.c:863
+#: apps/player/mainmenu.c:1043 apps/transcoder/transcoder_window.c:863
 msgid "Userguide"
 msgstr "Benutzerhandbuch"
 
-#: apps/player/mainmenu.c:1045 apps/transcoder/transcoder_window.c:847
+#: apps/player/mainmenu.c:1064 apps/transcoder/transcoder_window.c:847
 msgid "Preferences..."
 msgstr "Präferenzen..."
 
-#: apps/player/mainmenu.c:1052
+#: apps/player/mainmenu.c:1071
 msgid "Skins..."
 msgstr "Skins..."
 
-#: apps/player/mainmenu.c:1056
+#: apps/player/mainmenu.c:1075
 msgid "Multimedia keys..."
 msgstr "Multimedia Tasten..."
 
-#: apps/player/mainmenu.c:1062
+#: apps/player/mainmenu.c:1081
 msgid "Seek forward"
 msgstr "Vorwärts suchen"
 
-#: apps/player/mainmenu.c:1069
+#: apps/player/mainmenu.c:1088
 msgid "Seek backward"
 msgstr "Rückwärts suchen"
 
-#: apps/player/mainmenu.c:1076
+#: apps/player/mainmenu.c:1095
 msgid "Increase volume"
 msgstr "Lauter"
 
-#: apps/player/mainmenu.c:1083
+#: apps/player/mainmenu.c:1102
 msgid "Decrease volume"
 msgstr "Leiser"
 
-#: apps/player/mainmenu.c:1089 apps/player/gmerlin_remote.c:414
+#: apps/player/mainmenu.c:1108 apps/player/gmerlin_remote.c:337
 msgid "Toggle mute"
 msgstr "Stummschalten"
 
-#: apps/player/mainmenu.c:1095
+#: apps/player/mainmenu.c:1114
 msgid "Next track"
 msgstr "Nächster Track"
 
-#: apps/player/mainmenu.c:1100
+#: apps/player/mainmenu.c:1119
 msgid "Previous track"
 msgstr "Vorheriger Track"
 
-#: apps/player/mainmenu.c:1105
+#: apps/player/mainmenu.c:1124
 msgid "Next chapter"
 msgstr "Nächstes Kapitel"
 
-#: apps/player/mainmenu.c:1111
+#: apps/player/mainmenu.c:1130
 msgid "Previous chapter"
 msgstr "Vorheriges Kapitel"
 
-#: apps/player/mainmenu.c:1116 lib/gtk/treewidget.c:1336
-#: lib/gtk/treewidget.c:2046
+#: apps/player/mainmenu.c:1135 lib/gtk/treewidget.c:1332
+#: lib/gtk/treewidget.c:2042
 msgid "Goto current track"
 msgstr "Gehe zum nächsten Track"
 
-#: apps/player/mainmenu.c:1123
+#: apps/player/mainmenu.c:1142
 msgid "Copy current track to favourites"
 msgstr "Kopiere aktuellen Track zu Favoriten"
 
-#: apps/player/mainmenu.c:1131
+#: apps/player/mainmenu.c:1150
 msgid "Seek to start"
 msgstr "Zum Anfang suchen"
 
-#: apps/player/mainmenu.c:1136 lib/player.c:331
+#: apps/player/mainmenu.c:1155 lib/player.c:331
 msgid "Pause"
 msgstr "Pause"
 
-#: apps/player/mainmenu.c:1141
+#: apps/player/mainmenu.c:1160
 msgid "Quit gmerlin"
 msgstr "Gmerlin beenden"
 
-#: apps/player/mainmenu.c:1152
+#: apps/player/mainmenu.c:1171
 msgid "Transcoder"
 msgstr "Transkoder"
 
-#: apps/player/mainmenu.c:1156 apps/visualizer/gmerlin_visualizer.c:899
+#: apps/player/mainmenu.c:1175 apps/visualizer/gmerlin_visualizer.c:899
 msgid "Visualizer"
 msgstr "Visualisierer"
 
-#: apps/player/mainmenu.c:1160
+#: apps/player/mainmenu.c:1179
 msgid "Mixer"
 msgstr "Mischpult"
 
-#: apps/player/mainmenu.c:1167
+#: apps/player/mainmenu.c:1186
 msgid "Audio..."
 msgstr "Audio..."
 
-#: apps/player/mainmenu.c:1171
+#: apps/player/mainmenu.c:1190
 msgid "Video..."
 msgstr "Video..."
 
-#: apps/player/mainmenu.c:1175
+#: apps/player/mainmenu.c:1194
 msgid "Subtitles..."
 msgstr "Untertitel..."
 
-#: apps/player/mainmenu.c:1179
+#: apps/player/mainmenu.c:1198
 msgid "Chapters..."
 msgstr "Kapitel"
 
-#: apps/player/mainmenu.c:1184
+#: apps/player/mainmenu.c:1203
 msgid "Visualization..."
 msgstr "Visualisierung..."
 
-#: apps/player/mainmenu.c:1188
+#: apps/player/mainmenu.c:1207
 msgid "Windows..."
 msgstr "Fenster..."
 
-#: apps/player/mainmenu.c:1196
+#: apps/player/mainmenu.c:1215
 msgid "Commands..."
 msgstr "Befehle..."
 
-#: apps/player/mainmenu.c:1200
+#: apps/player/mainmenu.c:1219
 msgid "Accessories..."
 msgstr "Zubehör..."
 
-#: apps/player/mainmenu.c:1204
+#: apps/player/mainmenu.c:1223
 msgid "Help..."
 msgstr "Hilfe..."
 
@@ -4159,80 +4046,80 @@
 msgid "Repeat mode"
 msgstr "Wiederholmodus"
 
-#: apps/player/gmerlin_remote.c:201
+#: apps/player/gmerlin_remote.c:124
 msgid "Option -addplay requires an argument\n"
 msgstr "Option -addplay erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:223
+#: apps/player/gmerlin_remote.c:146
 msgid "Option -add requires an argument\n"
 msgstr "Option -add erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:246
+#: apps/player/gmerlin_remote.c:169
 msgid "Option -openplay requires an argument\n"
 msgstr "Option -openplay erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:268
+#: apps/player/gmerlin_remote.c:191
 msgid "Option -open requires an argument\n"
 msgstr "Option -open erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:291
+#: apps/player/gmerlin_remote.c:214
 msgid "Option -volume requires an argument\n"
 msgstr "Option -volume erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:314
+#: apps/player/gmerlin_remote.c:237
 msgid "Option -volume_rel requires an argument\n"
 msgstr "Option -volume_rel erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:339
+#: apps/player/gmerlin_remote.c:262
 msgid "Option -seek_rel requires an argument\n"
 msgstr "Option -seek_rel erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:364
+#: apps/player/gmerlin_remote.c:287
 msgid "Option -chapter requires an argument\n"
 msgstr "Option -chapter erfordert ein Argument\n"
 
-#: apps/player/gmerlin_remote.c:389
+#: apps/player/gmerlin_remote.c:312
 msgid "Play current track"
 msgstr "Spiele aktuellen Track"
 
-#: apps/player/gmerlin_remote.c:394
+#: apps/player/gmerlin_remote.c:317
 msgid "Switch to next track"
 msgstr "Nächster Track"
 
-#: apps/player/gmerlin_remote.c:399
+#: apps/player/gmerlin_remote.c:322
 msgid "Switch to previous track"
 msgstr "Vorheriger Track"
 
-#: apps/player/gmerlin_remote.c:404
+#: apps/player/gmerlin_remote.c:327
 msgid "Stop playback"
 msgstr "Beende Wiedergabe"
 
-#: apps/player/gmerlin_remote.c:409
+#: apps/player/gmerlin_remote.c:332
 msgid "Pause playback"
 msgstr "Unterbreche Weidergabe"
 
-#: apps/player/gmerlin_remote.c:419 apps/player/gmerlin_remote.c:425
+#: apps/player/gmerlin_remote.c:342 apps/player/gmerlin_remote.c:348
 msgid "<gml>"
 msgstr "<gml>"
 
-#: apps/player/gmerlin_remote.c:420
+#: apps/player/gmerlin_remote.c:343
 msgid "Add <gml> to the incoming album"
 msgstr "Füge <gml> zum Eingangs-Album"
 
-#: apps/player/gmerlin_remote.c:426
+#: apps/player/gmerlin_remote.c:349
 msgid "Add <gml> to the incoming album and play it"
 msgstr "Füge <gml> zum Eingangs-Album und starte Wiedergabe"
 
-#: apps/player/gmerlin_remote.c:431 apps/player/gmerlin_remote.c:437
+#: apps/player/gmerlin_remote.c:354 apps/player/gmerlin_remote.c:360
 msgid "<device>"
 msgstr "<Gerät>"
 
-#: apps/player/gmerlin_remote.c:432
+#: apps/player/gmerlin_remote.c:355
 msgid "Open album for <device>. Device must be a GML (e.g. dvd:///dev/hdd)."
 msgstr ""
 "Öffne Album für <Gerät>. Gerät muß eine GML sein (z.B. dvd:///dev/hdd)."
 
-#: apps/player/gmerlin_remote.c:438
+#: apps/player/gmerlin_remote.c:361
 msgid ""
 "Open album for <device> and play first track. Device must be a GML (e.g. "
 "dvd:///dev/hdd)."
@@ -4240,27 +4127,27 @@
 "Öffne Album für <Gerät> und spiele ersten Track. Gerät muß eine GML sein (z."
 "B. dvd:///dev/hdd)"
 
-#: apps/player/gmerlin_remote.c:443
+#: apps/player/gmerlin_remote.c:366
 msgid "<volume>"
 msgstr "<Lautstärke>"
 
-#: apps/player/gmerlin_remote.c:444
+#: apps/player/gmerlin_remote.c:367
 msgid "Set player volume. <volume> is in dB, 0.0 is max"
 msgstr "Setze Wiedergabelautstärke. <Lautstärke> ist in dB, 0.0 ist maximal"
 
-#: apps/player/gmerlin_remote.c:449 apps/player/gmerlin_remote.c:455
+#: apps/player/gmerlin_remote.c:372 apps/player/gmerlin_remote.c:378
 msgid "<diff>"
 msgstr "<diff>"
 
-#: apps/player/gmerlin_remote.c:450
+#: apps/player/gmerlin_remote.c:373
 msgid "In- or decrease player volume. <diff> is in dB"
 msgstr "Erhöhe oder Verringere die Lautstärke. <diff> ist in dB"
 
-#: apps/player/gmerlin_remote.c:456
+#: apps/player/gmerlin_remote.c:379
 msgid "Seek relative. <diff> is in seconds."
 msgstr "Suche relativ. <diff> ist in Sekunden"
 
-#: apps/player/gmerlin_remote.c:462
+#: apps/player/gmerlin_remote.c:385
 msgid ""
 "Go to the specified chapter. Use '+' and '-' to go to the next or previous "
 "chapter respectively"
@@ -4268,61 +4155,46 @@
 "Gehe zu einem bestimmten Kapitel. Mit '+' oder '.' kommst Du zum nächsten "
 "bzw. vorherigen Kapitel"
 
-#: apps/player/gmerlin_remote.c:467
-#, fuzzy
-msgid "Print name of the current track"
-msgstr "Gehe zum nächsten Track"
-
-#: apps/player/gmerlin_remote.c:472
-#, fuzzy
-msgid "Print metadata of the current track"
-msgstr "Gehe zum nächsten Track"
-
-#: apps/player/gmerlin_remote.c:477
-#, fuzzy
-msgid "Print time of the current track"
-msgstr "Gehe zum nächsten Track"
-
-#: apps/player/gmerlin_remote.c:492
+#: apps/player/gmerlin_remote.c:401
 msgid "Option -host requires an argument"
 msgstr "Option -host erfordert ein Argument"
 
-#: apps/player/gmerlin_remote.c:504
+#: apps/player/gmerlin_remote.c:413
 msgid "Option -port requires an argument"
 msgstr "Option -port erfordert ein Argument"
 
-#: apps/player/gmerlin_remote.c:522
+#: apps/player/gmerlin_remote.c:431
 msgid "Host to connect to, default is localhost"
 msgstr "Rechner zum Verbinden. Voreinstellung ist localhost"
 
-#: apps/player/gmerlin_remote.c:528
+#: apps/player/gmerlin_remote.c:437
 msgid "Port to connect to"
 msgstr "Port zum Verbinden"
 
-#: apps/player/gmerlin_remote.c:533
+#: apps/player/gmerlin_remote.c:442
 msgid "Launch new player if necessary"
 msgstr "Starte neuen Player wenn nötig"
 
-#: apps/player/gmerlin_remote.c:560
-#: apps/transcoder/gmerlin_transcoder_remote.c:172
+#: apps/player/gmerlin_remote.c:469
+#: apps/transcoder/gmerlin_transcoder_remote.c:182
 msgid "[options] command\n"
 msgstr "[Optionen] Befehl\n"
 
-#: apps/player/gmerlin_remote.c:561
+#: apps/player/gmerlin_remote.c:470
 msgid "Remote control command for the Gmerlin GUI Player\n"
 msgstr "Fernbedienung für den Gmerlin GUI Player\n"
 
-#: apps/player/gmerlin_remote.c:562
-#: apps/transcoder/gmerlin_transcoder_remote.c:174
+#: apps/player/gmerlin_remote.c:471
+#: apps/transcoder/gmerlin_transcoder_remote.c:184
 msgid "Global options"
 msgstr "Globale Optionen"
 
-#: apps/player/gmerlin_remote.c:563
-#: apps/transcoder/gmerlin_transcoder_remote.c:175
+#: apps/player/gmerlin_remote.c:472
+#: apps/transcoder/gmerlin_transcoder_remote.c:185
 msgid "Commands"
 msgstr "Befehle"
 
-#: apps/player/gmerlin_remote.c:605
+#: apps/player/gmerlin_remote.c:514
 msgid "Cannot launch gmerlin process"
 msgstr "Kann keinen gmerlin Prozess starten"
 
@@ -4355,8 +4227,8 @@
 msgstr "Ausgabe"
 
 #: apps/plugincfg/gmerlin_plugincfg.c:536
-#: apps/transcoder/transcoder_window.c:1383
-#: apps/recorder/recorder_window.c:777
+#: apps/transcoder/transcoder_window.c:1380
+#: apps/recorder/recorder_window.c:769
 msgid "Encoders"
 msgstr "Enkoder"
 
@@ -4368,35 +4240,6 @@
 msgid "Image writers"
 msgstr "Bild Exporteure"
 
-#: apps/cmdlinerecorder/gmerlin-record.c:315 apps/transcoder/main.c:68
-#: apps/nmjedit/gmerlin-nmjedit.c:168
-msgid "[options]\n"
-msgstr "[Optionen]\n"
-
-#: apps/cmdlinerecorder/gmerlin-record.c:316
-#, fuzzy
-msgid "Commandline recorder\n"
-msgstr "Kommandozeilen-Multimediaplayer\n"
-
-#: apps/cmdlinerecorder/gmerlin-record.c:317
-#: apps/transcoder/transcoder_window.c:1006 apps/transcoder/main.c:70
-#: apps/cmdlineplayer/gmerlin_play.c:838 apps/nmjedit/gmerlin-nmjedit.c:170
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:94 tests/imgconvert.c:97
-#: tests/fvtest.c:175 tests/cfgtest.c:624 tests/visualization.c:78
-#: tests/gmerlin_visualize.c:344
-msgid "Options"
-msgstr "Optionen"
-
-#: apps/cmdlinerecorder/gmerlin-record.c:323
-#: apps/cmdlineplayer/gmerlin_play.c:844 apps/nmjedit/gmerlin-nmjedit.c:176
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:100 tests/fvtest.c:181
-msgid ""
-"Default plugin parameters are read from there. Use gmerlin_plugincfg to "
-"change them."
-msgstr ""
-"Voreingestellte Pluginparameter werden von hier gelesen. Nehme "
-"gmerlin_plugincfg um die zu ändern"
-
 #: apps/camelot/webcam.c:52 apps/camelot/webcam.c:561
 msgid "read_frame failed"
 msgstr "read_frame fehlgeschlagen"
@@ -4419,7 +4262,7 @@
 msgid "Initializing %s failed, check settings"
 msgstr "Initialisierung von %s fehlgeschlagen, überprüfe Einstellungen"
 
-#: apps/camelot/webcam.c:683 lib/player_video.c:249
+#: apps/camelot/webcam.c:683 lib/player_video.c:251
 msgid "Restarting playback due to changed video filters"
 msgstr "Starte Abspielen neu wegen geänderter Videofilter"
 
@@ -4631,15 +4474,15 @@
 msgid "Pixelformat for write mode"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:309 apps/recorder/recorder_window.c:441
+#: apps/camelot/webcam_window.c:309 apps/recorder/recorder_window.c:440
 #, c-format
 msgid "Framerate: %.2f fps"
 msgstr "Bildwiederholrate: %.2f fps"
 
 #: apps/camelot/webcam_window.c:434 apps/camelot/webcam_window.c:456
-#: apps/camelot/webcam_window.c:494 lib/recorder_video.c:160
-#: lib/recorder_video.c:284 lib/recorder_video.c:388 lib/singlepic.c:755
-#: lib/transcoder_track.c:182 lib/recorder_audio.c:93 lib/ovl2text.c:157
+#: apps/camelot/webcam_window.c:494 lib/recorder_video.c:140
+#: lib/recorder_video.c:247 lib/recorder_video.c:352 lib/singlepic.c:722
+#: lib/transcoder_track.c:173 lib/recorder_audio.c:72
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -4673,10 +4516,10 @@
 msgid "Set"
 msgstr "Übernehmen"
 
-#: apps/camelot/webcam_window.c:567 apps/transcoder/transcoder_window.c:1315
-#: apps/transcoder/transcoder_window.c:1341 apps/transcoder/trackdialog.c:234
-#: apps/transcoder/trackdialog.c:304 apps/recorder/recorder_window.c:732
-#: apps/recorder/recorder_window.c:751
+#: apps/camelot/webcam_window.c:567 apps/transcoder/transcoder_window.c:1312
+#: apps/transcoder/transcoder_window.c:1338 apps/transcoder/trackdialog.c:234
+#: apps/transcoder/trackdialog.c:304 apps/recorder/recorder_window.c:724
+#: apps/recorder/recorder_window.c:743
 msgid "Filters"
 msgstr "Filter"
 
@@ -4696,7 +4539,7 @@
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: apps/camelot/webcam_window.c:684 lib/recorder.c:520
+#: apps/camelot/webcam_window.c:684 lib/recorder.c:475
 msgid ""
 "Extension is appended by the plugin\n"
 "%t    Inserts time\n"
@@ -4716,21 +4559,21 @@
 msgid "Frame counter"
 msgstr "Bilderzähler"
 
-#: apps/camelot/webcam_window.c:721 apps/recorder/recorder_window.c:787
+#: apps/camelot/webcam_window.c:721 apps/recorder/recorder_window.c:779
 msgid "Output files"
 msgstr "Ausgabedateien"
 
-#: apps/camelot/webcam_window.c:737 apps/recorder/recorder_window.c:614
+#: apps/camelot/webcam_window.c:737 apps/recorder/recorder_window.c:606
 #: lib/gtk/aboutwindow.c:126
 msgid "About"
 msgstr "Über"
 
 #: apps/camelot/webcam_window.c:738 apps/transcoder/transcoder_window.c:858
-#: apps/recorder/recorder_window.c:616
+#: apps/recorder/recorder_window.c:608
 msgid "Log messages"
 msgstr "Meldungen"
 
-#: apps/camelot/webcam_window.c:739 apps/recorder/recorder_window.c:618
+#: apps/camelot/webcam_window.c:739 apps/recorder/recorder_window.c:610
 #, fuzzy
 msgid "Preferences"
 msgstr "Präferenzen..."
@@ -4764,7 +4607,7 @@
 msgid "Capture interval (in seconds)"
 msgstr "Aufnahmeintervall (in Sekunden)"
 
-#: apps/camelot/webcam_window.c:860 lib/recorder.c:496
+#: apps/camelot/webcam_window.c:860 lib/recorder.c:451
 msgid "Output directory"
 msgstr "Ausgabeverzeichnis"
 
@@ -4866,6 +4709,14 @@
 msgid "File"
 msgstr "Datei"
 
+#: apps/transcoder/transcoder_window.c:1006 apps/transcoder/main.c:70
+#: apps/cmdlineplayer/gmerlin_play.c:848
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:94 tests/imgconvert.c:97
+#: tests/fvtest.c:175 tests/cfgtest.c:624 tests/visualization.c:78
+#: tests/gmerlin_visualize.c:344
+msgid "Options"
+msgstr "Optionen"
+
 #: apps/transcoder/transcoder_window.c:1011
 msgid "Actions"
 msgstr "Aktionen"
@@ -4883,46 +4734,50 @@
 msgid "Help"
 msgstr "Hilfe"
 
-#: apps/transcoder/transcoder_window.c:1274
+#: apps/transcoder/transcoder_window.c:1271
 msgid "Transcoder configuration"
 msgstr "Transkoderkonfiguration"
 
-#: apps/transcoder/transcoder_window.c:1279
+#: apps/transcoder/transcoder_window.c:1276
 msgid "Output options"
 msgstr "Ausgabeoptionen"
 
-#: apps/transcoder/transcoder_window.c:1290
+#: apps/transcoder/transcoder_window.c:1287
 msgid "Track defaults"
 msgstr "Track Voreinstellungen"
 
-#: apps/transcoder/transcoder_window.c:1299
+#: apps/transcoder/transcoder_window.c:1296
 msgid "Audio defaults"
 msgstr "Audio Voreinstellungen"
 
-#: apps/transcoder/transcoder_window.c:1328
+#: apps/transcoder/transcoder_window.c:1325
 msgid "Video defaults"
 msgstr "Video Voreinstellungen"
 
-#: apps/transcoder/transcoder_window.c:1349
+#: apps/transcoder/transcoder_window.c:1346
 msgid "Text subtitle defaults"
 msgstr "Text Untertitel Voreinstellungen"
 
-#: apps/transcoder/transcoder_window.c:1364 apps/transcoder/trackdialog.c:390
+#: apps/transcoder/transcoder_window.c:1361 apps/transcoder/trackdialog.c:390
 msgid "Textrenderer"
 msgstr "Textrenderer"
 
-#: apps/transcoder/transcoder_window.c:1375
+#: apps/transcoder/transcoder_window.c:1372
 msgid "Overlay subtitle defaults"
 msgstr "Overlay Unrertitel Voreinstellungen"
 
-#: apps/transcoder/transcoder_window.c:1410
+#: apps/transcoder/transcoder_window.c:1407
 msgid "Window"
 msgstr "Fenster"
 
-#: apps/transcoder/transcoder_window.c:1421
+#: apps/transcoder/transcoder_window.c:1418
 msgid "Remote"
 msgstr "Fernbedienung"
 
+#: apps/transcoder/main.c:68
+msgid "[options]\n"
+msgstr "[Optionen]\n"
+
 #: apps/transcoder/main.c:69
 msgid "GTK multimedia transcoder\n"
 msgstr "GTK Multimediatranscoder\n"
@@ -4931,183 +4786,128 @@
 msgid "Postprocessing"
 msgstr "Weiterverarbeitung"
 
-#: apps/transcoder/gmerlin_transcoder_remote.c:173
+#: apps/transcoder/gmerlin_transcoder_remote.c:183
 msgid "Remote control command for the Gmerlin GUI transcoder\n"
 msgstr "Fernbedienung für den GTK Multimediatranscoder\n"
 
-#: apps/transcoder/gmerlin_transcoder_remote.c:214
+#: apps/transcoder/gmerlin_transcoder_remote.c:224
 msgid "Cannot launch transcoder process"
 msgstr "Kann Transkoderprozess nicht starten"
 
-#: apps/transcoder/tracklist.c:832
+#: apps/transcoder/tracklist.c:821
 #, fuzzy
 msgid "Encoder configuration"
 msgstr "Transkoderkonfiguration"
 
-#: apps/transcoder/tracklist.c:891
-msgid ""
-"Use \"-\" to clear this field for all tracks. Empty string means to leave it "
-"unchanged for all tracks"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:902
-#, fuzzy
-msgid "Mass tag"
-msgstr "Meldung"
-
-#: apps/transcoder/tracklist.c:951 lib/tree.c:1176
-msgid "Format for track names"
-msgstr "Format für Tracknamen"
-
-#: apps/transcoder/tracklist.c:953 lib/tree.c:1179
-msgid ""
-"Format specifier for tracknames from\n"
-"metadata\n"
-"%p:    Artist\n"
-"%a:    Album\n"
-"%g:    Genre\n"
-"%t:    Track name\n"
-"%<d>n: Track number with <d> digits\n"
-"%y:    Year\n"
-"%c:    Comment"
-msgstr ""
-"Format für Erzeugung von Tracknamen aus Metadaten\n"
-"%p:    Künstler\n"
-"%a:    Album\n"
-"%g:    Genre\n"
-"%t:    Trackname\n"
-"%<d>n: Tracknummer mit <d> Stellen\n"
-"%y:    Jahr\n"
-"%c:    Kommentar"
-
-#: apps/transcoder/tracklist.c:1007
-#, fuzzy
-msgid "Auto rename"
-msgstr "Automatische Geschwindigkeit"
-
-#: apps/transcoder/tracklist.c:1096 lib/gtk/albumwidget.c:2899
+#: apps/transcoder/tracklist.c:875 lib/gtk/albumwidget.c:2895
 msgid "Add files"
 msgstr "Dateien hinzufügen"
 
-#: apps/transcoder/tracklist.c:1229 lib/gtk/albumwidget.c:1453
+#: apps/transcoder/tracklist.c:994 lib/gtk/albumwidget.c:1449
 msgid "Files..."
 msgstr "Dateien..."
 
-#: apps/transcoder/tracklist.c:1231
+#: apps/transcoder/tracklist.c:996
 msgid "Urls..."
 msgstr "Urls..."
 
-#: apps/transcoder/tracklist.c:1233
+#: apps/transcoder/tracklist.c:998
 msgid "Drives..."
 msgstr "Laufwerke..."
 
-#: apps/transcoder/tracklist.c:1241
+#: apps/transcoder/tracklist.c:1006
 msgid "Move Up"
 msgstr "Verschiebe hoch"
 
-#: apps/transcoder/tracklist.c:1243
+#: apps/transcoder/tracklist.c:1008
 msgid "Move Down"
 msgstr "Verschiebe nach unten"
 
-#: apps/transcoder/tracklist.c:1245 lib/gtk/treewidget.c:1386
-#: lib/gtk/albumwidget.c:1494
+#: apps/transcoder/tracklist.c:1010 lib/gtk/treewidget.c:1382
+#: lib/gtk/albumwidget.c:1490
 msgid "Remove"
 msgstr "Löschen"
 
-#: apps/transcoder/tracklist.c:1247
+#: apps/transcoder/tracklist.c:1012
 msgid "Configure..."
 msgstr "Konfigurieren..."
 
-#: apps/transcoder/tracklist.c:1249
+#: apps/transcoder/tracklist.c:1014
 msgid "Edit chapters..."
 msgstr "Kapitel bearbeiten"
 
-#: apps/transcoder/tracklist.c:1251
-msgid "Mass tag..."
-msgstr ""
-
-#: apps/transcoder/tracklist.c:1253
-#, fuzzy
-msgid "Auto numbering"
-msgstr "Gmerlin beenden"
-
-#: apps/transcoder/tracklist.c:1255
-#, fuzzy
-msgid "Auto rename..."
-msgstr "Umbenennen..."
-
-#: apps/transcoder/tracklist.c:1257
+#: apps/transcoder/tracklist.c:1016
 msgid "Change encoders..."
 msgstr "Wechsele Enkoder..."
 
-#: apps/transcoder/tracklist.c:1264 lib/gtk/albumwidget.c:1501
-#: lib/gtk/albumwidget.c:2904
+#: apps/transcoder/tracklist.c:1023 lib/gtk/albumwidget.c:1497
+#: lib/gtk/albumwidget.c:2900
 msgid "Cut"
 msgstr "Auschneiden"
 
-#: apps/transcoder/tracklist.c:1273 lib/gtk/albumwidget.c:1515
-#: lib/gtk/albumwidget.c:2908
+#: apps/transcoder/tracklist.c:1032 lib/gtk/albumwidget.c:1511
+#: lib/gtk/albumwidget.c:2904
 msgid "Paste"
 msgstr "Einfügen"
 
-#: apps/transcoder/tracklist.c:1284 lib/gtk/albumwidget.c:1581
+#: apps/transcoder/tracklist.c:1043 lib/gtk/albumwidget.c:1577
 #: lib/gtk/cfg_device.c:339
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: apps/transcoder/tracklist.c:1290 lib/gtk/albumwidget.c:1595
+#: apps/transcoder/tracklist.c:1049 lib/gtk/albumwidget.c:1591
 msgid "Selected..."
 msgstr "Ausgewählte..."
 
-#: apps/transcoder/tracklist.c:1296 lib/gtk/albumwidget.c:1588
+#: apps/transcoder/tracklist.c:1055 lib/gtk/albumwidget.c:1584
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: apps/transcoder/tracklist.c:1302
+#: apps/transcoder/tracklist.c:1061
 msgid "Postprocess..."
 msgstr "Weiterverarbeitung..."
 
-#: apps/transcoder/tracklist.c:1517 lib/gtk/albumwidget.c:2934
+#: apps/transcoder/tracklist.c:1272 lib/gtk/albumwidget.c:2930
 msgid "Total playback time"
 msgstr "Gesamtspielzeit"
 
-#: apps/transcoder/tracklist.c:1526
+#: apps/transcoder/tracklist.c:1281
 msgid "Append files to the task list"
 msgstr "Füge Dateien an die Aufgabenliste an"
 
-#: apps/transcoder/tracklist.c:1531
+#: apps/transcoder/tracklist.c:1286
 msgid "Append URLs to the task list"
 msgstr "Füge URLs an die Aufgabenliste an"
 
-#: apps/transcoder/tracklist.c:1536
+#: apps/transcoder/tracklist.c:1291
 msgid "Append removable media to the task list"
 msgstr "Füge Wechselmedien an die Aufgabenliste an"
 
-#: apps/transcoder/tracklist.c:1541
+#: apps/transcoder/tracklist.c:1296
 msgid "Delete selected tracks"
 msgstr "Lösche ausgewählte Tracks"
 
-#: apps/transcoder/tracklist.c:1546
+#: apps/transcoder/tracklist.c:1301
 msgid "Configure selected track"
 msgstr "Konfiguriere ausgewählten Track"
 
-#: apps/transcoder/tracklist.c:1551 lib/gtk/chapterdialog.c:343
+#: apps/transcoder/tracklist.c:1306 lib/gtk/chapterdialog.c:341
 msgid "Edit chapters"
 msgstr "Bearbeite Kapitel"
 
-#: apps/transcoder/tracklist.c:1556
+#: apps/transcoder/tracklist.c:1311
 msgid "Change encoder plugins for selected tracks"
 msgstr "Ändere Enkoderplugins für ausgewählte Tracks"
 
-#: apps/transcoder/tracklist.c:1561
+#: apps/transcoder/tracklist.c:1316
 msgid "Copy selected tracks to clipboard"
 msgstr "Kopiere ausgewählte Tracks in die Zwischenablage"
 
-#: apps/transcoder/tracklist.c:1565
+#: apps/transcoder/tracklist.c:1320
 msgid "Cut selected tracks to clipboard"
 msgstr "Verschiebe ausgewählte Tracks in die Zwischenablage"
 
-#: apps/transcoder/tracklist.c:1570
+#: apps/transcoder/tracklist.c:1325
 msgid "Paste tracks from clipboard"
 msgstr "Füge Tracks von der Zwischenablage ein"
 
@@ -5115,9 +4915,8 @@
 msgid "Track options"
 msgstr "Trackoptionen"
 
-#: apps/transcoder/trackdialog.c:96 apps/recorder/recorder_window.c:795
-#: lib/gtk/infowindow.c:692 lib/gtk/infowindow.c:701 lib/gtk/infowindow.c:720
-#: lib/gtk/infowindow.c:739
+#: apps/transcoder/trackdialog.c:96 apps/recorder/recorder_window.c:787
+#: lib/gtk/infowindow.c:699
 msgid "Metadata"
 msgstr "Metadaten"
 
@@ -5228,12 +5027,12 @@
 msgstr "Visualisierung neu starten"
 
 #: apps/visualizer/gmerlin_visualizer.c:1052
-#: apps/recorder/recorder_window.c:627
+#: apps/recorder/recorder_window.c:619
 msgid "Fullscreen mode"
 msgstr "Vollbild"
 
 #: apps/visualizer/gmerlin_visualizer.c:1054
-#: apps/recorder/recorder_window.c:629
+#: apps/recorder/recorder_window.c:621
 msgid "Leave fullscreen mode"
 msgstr "Beende Vollbild"
 
@@ -5249,37 +5048,37 @@
 msgid "Launch help in a webwroswer"
 msgstr "Starte Hilfe im Webbrowser"
 
-#: apps/cmdlineplayer/gmerlin_play.c:558
+#: apps/cmdlineplayer/gmerlin_play.c:559
 #, c-format
 msgid "No such track %d"
 msgstr "Kein solcher Track %d"
 
-#: apps/cmdlineplayer/gmerlin_play.c:600
+#: apps/cmdlineplayer/gmerlin_play.c:601
 #, c-format
 msgid "Got redirector %s (%d/%d)"
 msgstr "Weiterleitung erhalten %s (%d/%d)"
 
-#: apps/cmdlineplayer/gmerlin_play.c:687
+#: apps/cmdlineplayer/gmerlin_play.c:703
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: apps/cmdlineplayer/gmerlin_play.c:695
+#: apps/cmdlineplayer/gmerlin_play.c:710
 #, c-format
 msgid "Audio streams %d"
 msgstr "Audio streams %d"
 
-#: apps/cmdlineplayer/gmerlin_play.c:700
+#: apps/cmdlineplayer/gmerlin_play.c:715
 #, c-format
 msgid "Video streams %d"
 msgstr "Video streams %d"
 
-#: apps/cmdlineplayer/gmerlin_play.c:705
+#: apps/cmdlineplayer/gmerlin_play.c:720
 #, c-format
 msgid "Subtitle streams %d"
 msgstr "Untertitelstream %d"
 
-#: apps/cmdlineplayer/gmerlin_play.c:717
+#: apps/cmdlineplayer/gmerlin_play.c:732
 #, c-format
 msgid ""
 "Playing audio stream %d\n"
@@ -5294,7 +5093,7 @@
 "Ausgabeformat:\n"
 "%s"
 
-#: apps/cmdlineplayer/gmerlin_play.c:732
+#: apps/cmdlineplayer/gmerlin_play.c:747
 #, c-format
 msgid ""
 "Playing video stream %d\n"
@@ -5309,46 +5108,75 @@
 "Ausgabeformat:\n"
 "%s"
 
-#: apps/cmdlineplayer/gmerlin_play.c:759
+#: apps/cmdlineplayer/gmerlin_play.c:754
+#, c-format
+msgid "Format: %s"
+msgstr "Format: %s"
+
+#: apps/cmdlineplayer/gmerlin_play.c:758
+#, c-format
+msgid "Audio stream: %s"
+msgstr "Audiostream: %s"
+
+#: apps/cmdlineplayer/gmerlin_play.c:762
+#, c-format
+msgid "Video stream: %s"
+msgstr "Videostream: %s"
+
+#: apps/cmdlineplayer/gmerlin_play.c:766
+#, c-format
+msgid "Subtitle stream: %s"
+msgstr "Untertitelstream: %s"
+
+#: apps/cmdlineplayer/gmerlin_play.c:771
 msgid "Player cleaned up"
 msgstr "Spieler aufgeräumt"
 
-#: apps/cmdlineplayer/gmerlin_play.c:776
+#: apps/cmdlineplayer/gmerlin_play.c:786
 msgid "Player now playing"
 msgstr "Spieler spielt jetzt"
 
-#: apps/cmdlineplayer/gmerlin_play.c:780
+#: apps/cmdlineplayer/gmerlin_play.c:790
 msgid "Player now seeking"
 msgstr "Spieler sucht jetzt"
 
-#: apps/cmdlineplayer/gmerlin_play.c:784
+#: apps/cmdlineplayer/gmerlin_play.c:794
 msgid "Player now changing"
 msgstr "Spieler wechselt jetzt"
 
-#: apps/cmdlineplayer/gmerlin_play.c:836
+#: apps/cmdlineplayer/gmerlin_play.c:846
 msgid "[options] gml...\n"
 msgstr "[Optionen] gml...\n"
 
-#: apps/cmdlineplayer/gmerlin_play.c:837
+#: apps/cmdlineplayer/gmerlin_play.c:847
 msgid "Commandline Multimedia player\n"
 msgstr "Kommandozeilen-Multimediaplayer\n"
 
-#: apps/kbd/kbd_daemon.c:97
+#: apps/cmdlineplayer/gmerlin_play.c:854
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:100 tests/fvtest.c:181
+msgid ""
+"Default plugin parameters are read from there. Use gmerlin_plugincfg to "
+"change them."
+msgstr ""
+"Voreingestellte Pluginparameter werden von hier gelesen. Nehme "
+"gmerlin_plugincfg um die zu ändern"
+
+#: apps/kbd/kbd_daemon.c:147
 #, c-format
 msgid "Grabbing key (Code: %d, modifiers: %s) failed"
 msgstr ""
 "Exklusiver Zugriff auf Taste (Code: %d, Modifizierer: %s) fehlgeschlagen"
 
-#: apps/kbd/kbd_daemon.c:132
+#: apps/kbd/kbd_daemon.c:182
 msgid "Exiting"
 msgstr "Beende"
 
-#: apps/kbd/kbd_daemon.c:200
+#: apps/kbd/kbd_daemon.c:253
 #, c-format
 msgid "State %02x -> %02x\n"
 msgstr "Status %02x -> %02x\n"
 
-#: apps/kbd/kbd_daemon.c:239
+#: apps/kbd/kbd_daemon.c:292
 msgid "Reloaded keys"
 msgstr "Tasten neu geladen"
 
@@ -5386,7 +5214,7 @@
 
 #: apps/kbd/kbd_config.c:619
 msgid ""
-"Switch deamon on and off. If you want to start the daemon with each start of "
+"Switch daemon on and off. If you want to start the daemon with each start of "
 "X, add \"gmerlin_kbd\" to your startup programs"
 msgstr ""
 "Schalte den Dämon ein und aus. Wenn Du den Dämon bei jedem Start von X "
@@ -5400,11 +5228,11 @@
 msgid "Delete key"
 msgstr "Taste löschen"
 
-#: apps/alsamixer/g_card.c:637
+#: apps/alsamixer/g_card.c:639
 msgid "Card controls"
 msgstr "Einstellungen für Karte"
 
-#: apps/alsamixer/g_card.c:642
+#: apps/alsamixer/g_card.c:644
 #, c-format
 msgid "Controls for %s"
 msgstr "Einstellungen für %s"
@@ -5445,201 +5273,55 @@
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: apps/alsamixer/g_control.c:863
+#: apps/alsamixer/g_control.c:867
 msgid "Tone"
 msgstr "Klang"
 
-#: apps/alsamixer/g_control.c:894
+#: apps/alsamixer/g_control.c:898
 msgid "Treble"
 msgstr "Höhen"
 
-#: apps/alsamixer/g_control.c:924
+#: apps/alsamixer/g_control.c:928
 msgid "Bass"
 msgstr "Tiefen"
 
-#: apps/alsamixer/g_control.c:1011
+#: apps/alsamixer/g_control.c:1015
 msgid "Rec"
 msgstr "Aufnahmne"
 
-#: apps/alsamixer/g_control.c:1057
+#: apps/alsamixer/g_control.c:1061
 msgid "Play"
 msgstr "Abspielen"
 
-#: apps/alsamixer/g_control.c:1405
+#: apps/alsamixer/g_control.c:1412
 #, c-format
 msgid "Type %s not handled for %s"
 msgstr "Typ %s wird nicht behandelt für %s"
 
-#: apps/nmjedit/file.c:59
-#, fuzzy, c-format
-msgid "Opening directory %s failed: %s"
-msgstr "Starten eines Prozesses fehlgeschlagen: %s"
-
-#: apps/nmjedit/bgalbum.c:51 tests/album2pls.c:75 lib/mediafiledevice.c:229
-#, fuzzy, c-format
-msgid "Album file %s could not be opened"
-msgstr "Quellplugin konnte nicht geladen werden"
-
-#: apps/nmjedit/bgalbum.c:60 tests/album2pls.c:85 lib/mediafiledevice.c:238
-#, c-format
-msgid "Album file %s contains no entries"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:71
-#, fuzzy, c-format
-msgid "No directory found for location %s"
-msgstr "Kein Plugin gefunden für Bild %s"
-
-#: apps/nmjedit/bgalbum.c:93
-#, c-format
-msgid "Clearing existent playlist %s"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:149
-#, c-format
-msgid "Song %s not found"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:47
-#, fuzzy, c-format
-msgid "SQL query: \"%s\" failed: %s"
-msgstr "Disk Auswerfen fehlgeschlagen: %s"
-
-#: apps/nmjedit/nmjedit.c:431
-#, fuzzy, c-format
-msgid "Adding %s"
-msgstr "%s hinzufügen"
-
-#: apps/nmjedit/nmjedit.c:437 apps/nmjedit/nmjedit.c:488
-#, fuzzy, c-format
-msgid "Scanned %d files"
-msgstr "Dateien hinzufügen"
-
-#: apps/nmjedit/nmjedit.c:484
-#, fuzzy, c-format
-msgid "Updating %s"
-msgstr "Lade %s"
-
-#: apps/nmjedit/nmjedit.c:500
-#, c-format
-msgid "Found %d files in database"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:571
-#, fuzzy, c-format
-msgid "Directory %s exists"
-msgstr "Reinige Verzeichnis beim Beenden"
-
-#: apps/nmjedit/nmjedit.c:576 apps/nmjedit/nmjedit.c:601
-#, fuzzy, c-format
-msgid "Directory %s doesn't exist"
-msgstr "Reinige Verzeichnis beim Beenden"
-
-#: apps/nmjedit/nmjedit.c:697 apps/thumbnailer/gmerlin-video-thumbnailer.c:266
-#, fuzzy, c-format
-msgid "No plugin for %s"
-msgstr "Kein Plugin gefunden für Bild %s"
-
-#: apps/nmjedit/nmjedit.c:705 apps/thumbnailer/gmerlin-video-thumbnailer.c:274
-#: lib/tree.c:1120 lib/transcoder_track.c:820 lib/transcoder_track.c:831
-#: lib/album.c:2270
-#, c-format
-msgid "Loading %s failed"
-msgstr "Laden von %s fehlgeschlagen"
-
-#: apps/nmjedit/nmjedit.c:714 apps/thumbnailer/gmerlin-video-thumbnailer.c:375
-#, fuzzy
-msgid "Writing image header failed"
-msgstr "Schreibe Abbild"
-
-#: apps/nmjedit/nmjedit.c:729 apps/nmjedit/nmjedit.c:738
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:393
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:403
-#, fuzzy
-msgid "Writing image failed"
-msgstr "Schreibe Abbild"
-
-#: apps/nmjedit/nmjedit.c:863
-#, fuzzy, c-format
-msgid "Removing empty genre %s"
-msgstr "Lösche %s"
-
-#: apps/nmjedit/nmjedit.c:898
-#, fuzzy, c-format
-msgid "Removing empty person %s"
-msgstr "Lösche %s"
-
-#: apps/nmjedit/dir.c:115
-msgid "Either ID or path must be set in directory\n"
-msgstr ""
-
-#: apps/nmjedit/song.c:150
-msgid "Either ID or path must be set in directory"
-msgstr ""
-
-#: apps/nmjedit/song.c:286
-#, fuzzy, c-format
-msgid "Adding song %s"
-msgstr "Audio: %s"
-
-#: apps/nmjedit/song.c:442
-#, c-format
-msgid "Deleting song %s"
-msgstr ""
-
-#: apps/nmjedit/album.c:129
-#, fuzzy, c-format
-msgid "Adding album %s"
-msgstr "Füge Alben zu %s hinzu"
-
-#: apps/nmjedit/album.c:205
-#, fuzzy, c-format
-msgid "Using thumbnail %s"
-msgstr "Videofilter"
-
-#: apps/nmjedit/album.c:302
-#, fuzzy, c-format
-msgid "Removing empty album %s"
-msgstr "Öffne Album %s"
-
-#: apps/nmjedit/album.c:318
-#, fuzzy, c-format
-msgid "Removing thumbnail %s"
-msgstr "Lösche %s"
-
-#: apps/nmjedit/album.c:325
-#, fuzzy, c-format
-msgid "Removing poster %s"
-msgstr "Lösche %s"
-
-#: apps/nmjedit/gmerlin-nmjedit.c:169
-msgid "Editor for NMJ2 databases\n"
-msgstr ""
-
-#: apps/recorder/recorder_window.c:502
+#: apps/recorder/recorder_window.c:501
 msgid "Error, check messages and settings"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:620
+#: apps/recorder/recorder_window.c:612
 #, fuzzy
 msgid "Reopen inputs"
 msgstr "Neu öffnen"
 
-#: apps/recorder/recorder_window.c:624
+#: apps/recorder/recorder_window.c:616
 msgid "Make snapshot"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:631
+#: apps/recorder/recorder_window.c:623
 #, fuzzy
 msgid "Hide controls"
 msgstr "Einstellungen für Karte"
 
-#: apps/recorder/recorder_window.c:717
+#: apps/recorder/recorder_window.c:709
 #, fuzzy
 msgid "Recorder configuration"
 msgstr "Transkoderkonfiguration"
 
-#: apps/recorder/recorder_window.c:767
+#: apps/recorder/recorder_window.c:759
 msgid "Snapshots"
 msgstr ""
 
@@ -5683,6 +5365,17 @@
 msgid "File %s has no video"
 msgstr "Mische aufs Video"
 
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:266
+#, fuzzy, c-format
+msgid "No plugin for %s"
+msgstr "Kein Plugin gefunden für Bild %s"
+
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:274 lib/tree.c:1114
+#: lib/transcoder_track.c:830 lib/album.c:2119
+#, c-format
+msgid "Loading %s failed"
+msgstr "Laden von %s fehlgeschlagen"
+
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:317
 #, fuzzy
 msgid "Cannot reset stream after failed seek"
@@ -5693,6 +5386,17 @@
 msgid "Couldn't read frame"
 msgstr "Kann Adresse nicht auflösen"
 
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:375
+#, fuzzy
+msgid "Writing image header failed"
+msgstr "Schreibe Abbild"
+
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:393
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:403
+#, fuzzy
+msgid "Writing image failed"
+msgstr "Schreibe Abbild"
+
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:416
 #, c-format
 msgid "Successfully saved %s"
@@ -5800,64 +5504,45 @@
 msgid "Saving snapshot %s"
 msgstr ""
 
-#: lib/recorder_video.c:154
+#: lib/recorder_video.c:134
 #, fuzzy
 msgid "Record video"
 msgstr "Aufnahme"
 
-#: lib/recorder_video.c:166
-msgid "Limit fps"
-msgstr ""
-
-#: lib/recorder_video.c:170
-msgid ""
-"Limit frames per second. By default, the maximum possible framerate will be "
-"used."
-msgstr ""
-
-#: lib/recorder_video.c:175
+#: lib/recorder_video.c:146
 msgid "fps limit"
 msgstr ""
 
-#: lib/recorder_video.c:181
+#: lib/recorder_video.c:152
 msgid ""
 "Specify the maximum framerate for input plugins, which can capture images "
 "really fast"
 msgstr ""
 
-#: lib/recorder_video.c:278
+#: lib/recorder_video.c:241
 #, fuzzy
 msgid "Enable monitor"
 msgstr "Verwende Monitor"
 
-#: lib/recorder_video.c:369
+#: lib/recorder_video.c:333
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatisch aufnehmen"
 
-#: lib/recorder_video.c:374
+#: lib/recorder_video.c:338
 #, fuzzy
 msgid "Snapshot interval"
 msgstr "Aufnahmeintervall"
 
-#: lib/recorder_video.c:383
+#: lib/recorder_video.c:347
 msgid "Overwrite existing files"
 msgstr ""
 
-#: lib/recorder_video.c:710 lib/recorder_audio.c:236
-msgid "Read failed (device unplugged?)"
-msgstr ""
-
 #: lib/bggavl.c:393 lib/bggavl.c:411
 #, c-format
 msgid "Unknown scale mode %s\n"
 msgstr "Unbekannter Skaliermodus: %s\n"
 
-#: lib/player_subtitle.c:122 lib/transcoder_track.c:324
-#, fuzzy
-msgid "Time offset"
-msgstr "Rot Offset"
-
 #: lib/transcoder_pp.c:209
 #, c-format
 msgid "Not adding %s: Unsupported filename"
@@ -5885,7 +5570,7 @@
 msgid "Restarting playback due to changed video options"
 msgstr "Starte Abspielen neu wegen geänderter Videoeinstellungen"
 
-#: lib/player_video.c:278 lib/player_loop.c:1123 lib/player_audio.c:320
+#: lib/player_video.c:280 lib/player_loop.c:1164 lib/player_audio.c:322
 msgid "Detected EOF"
 msgstr ""
 
@@ -5936,121 +5621,116 @@
 msgid "Remixing to stereo for filter \"%s\""
 msgstr "Mische zu Stereo für Filter %s"
 
-#: lib/searchpath.c:154
+#: lib/searchpath.c:142
 #, fuzzy, c-format
 msgid "Creating directory %s failed: %s"
 msgstr "Starten eines Prozesses fehlgeschlagen: %s"
 
-#: lib/searchpath.c:160 lib/transcoder.c:1882
+#: lib/searchpath.c:148 lib/transcoder.c:1838
 #, c-format
 msgid "Created directory %s"
 msgstr "Verzeichnis erstellt: %s"
 
-#: lib/pluginregistry.c:626 lib/pluginregistry.c:1571
+#: lib/pluginregistry.c:557 lib/pluginregistry.c:1499
 #, c-format
 msgid "Plugin %s has no or wrong version"
 msgstr "Plugin %s hat keine oder eine falsche Version"
 
-#: lib/pluginregistry.c:632
+#: lib/pluginregistry.c:564
 #, c-format
 msgid "No symbol the_plugin in %s"
 msgstr "Kein Symbol \"the_plugin\" in %s"
 
-#: lib/pluginregistry.c:636
+#: lib/pluginregistry.c:569
 #, c-format
 msgid "Plugin %s has zero priority"
 msgstr "Plugin %s hat Null als Priorität"
 
-#: lib/pluginregistry.c:647
+#: lib/pluginregistry.c:579
 #, fuzzy, c-format
 msgid "Not loading %s (blacklisted)"
 msgstr "Laden von %s fehlgeschlagen"
 
-#: lib/pluginregistry.c:749 lib/pluginregistry.c:1560
+#: lib/pluginregistry.c:683 lib/pluginregistry.c:1488
 #, c-format
 msgid "dlopen failed for %s: %s"
 msgstr "dlopen fehlgeschlagen für %s: %s"
 
-#: lib/pluginregistry.c:1343
+#: lib/pluginregistry.c:1273
 #, c-format
 msgid "bg_plugin_ref %s: %d"
 msgstr "bg_plugin_ref %s: %d"
 
-#: lib/pluginregistry.c:1407
+#: lib/pluginregistry.c:1337
 #, c-format
 msgid "bg_plugin_unref_nolock %s: %d"
 msgstr "bg_plugin_unref_nolock %s: %d"
 
-#: lib/pluginregistry.c:1418
+#: lib/pluginregistry.c:1348
 #, c-format
 msgid "bg_plugin_unref %s: %d"
 msgstr "bg_plugin_unref %s: %d"
 
-#: lib/pluginregistry.c:1443 lib/pluginregistry.c:1497
+#: lib/pluginregistry.c:1372 lib/pluginregistry.c:1425
 #, c-format
 msgid "No plugin found for image %s"
 msgstr "Kein Plugin gefunden für Bild %s"
 
-#: lib/pluginregistry.c:1578
-#, fuzzy, c-format
-msgid "dlsym failed for %s: %s"
-msgstr "dlopen fehlgeschlagen für %s: %s"
-
-#: lib/pluginregistry.c:1666
+#: lib/pluginregistry.c:1593
 msgid "Invalid plugin type for video output"
 msgstr "Ungültiger Plugintyp für Videoausgabe"
 
-#: lib/pluginregistry.c:1673
+#: lib/pluginregistry.c:1599
 #, c-format
 msgid "Plugin %s doesn't support embedded windows"
 msgstr "Plugin %s unterstützt keine eingebetteten Fenster"
 
-#: lib/pluginregistry.c:1921
+#: lib/pluginregistry.c:1846
 #, c-format
 msgid "Loading plugin \"%s\" failed"
 msgstr "Laden von Plugin \"%s\" fehlgeschlagen"
 
-#: lib/pluginregistry.c:1933 lib/pluginregistry.c:1970
+#: lib/pluginregistry.c:1858 lib/pluginregistry.c:1895
 #, c-format
 msgid "Opening %s with \"%s\" failed"
 msgstr "Öffnen von %s mit \"%s\" fehlgeschlagen"
 
-#: lib/pluginregistry.c:2147 lib/pluginregistry.c:2630
+#: lib/pluginregistry.c:2070 lib/pluginregistry.c:2541
 #, fuzzy
 msgid "Overlay subtitles"
 msgstr "Overlay Unrertitel Voreinstellungen"
 
-#: lib/pluginregistry.c:2302
+#: lib/pluginregistry.c:2222
 msgid "Registry settings"
 msgstr ""
 
-#: lib/pluginregistry.c:2309
+#: lib/pluginregistry.c:2229
 #, fuzzy
 msgid "Plugin settings"
 msgstr "Pluginoptionen"
 
-#: lib/pluginregistry.c:2316 lib/gtk/plugin_multi.c:402
+#: lib/pluginregistry.c:2236 lib/gtk/plugin_multi.c:402
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: lib/pluginregistry.c:2323 lib/gtk/plugin_multi.c:394
+#: lib/pluginregistry.c:2243 lib/gtk/plugin_multi.c:394
 msgid "Protocols"
 msgstr "Protokolle"
 
-#: lib/pluginregistry.c:2330 lib/gtk/plugin_multi.c:384
+#: lib/pluginregistry.c:2250 lib/gtk/plugin_multi.c:384
 msgid "Priority"
 msgstr "Priorität"
 
-#: lib/pluginregistry.c:2588
+#: lib/pluginregistry.c:2499
 msgid "Write audio stream to video file if possible"
 msgstr ""
 
-#: lib/pluginregistry.c:2595
+#: lib/pluginregistry.c:2506
 #, fuzzy
 msgid "Write text subtitles to video file if possible"
 msgstr "Schreibe Textuntertitel in die Videodatei"
 
-#: lib/pluginregistry.c:2602
+#: lib/pluginregistry.c:2513
 #, fuzzy
 msgid "Write overlay subtitles to video file if possible"
 msgstr "Schreibe Oberlayuntertitel in die Videodatei"
@@ -6084,15 +5764,15 @@
 msgid "No plugin given"
 msgstr "Kein Quellplugin definiert"
 
-#: lib/visualize_slave.c:674
+#: lib/visualize_slave.c:680
 msgid "Joined thread"
 msgstr "Thread beendet"
 
-#: lib/visualize_slave.c:693
+#: lib/visualize_slave.c:699
 msgid "Started thread"
 msgstr "Thread gestarted"
 
-#: lib/visualize_slave.c:929
+#: lib/visualize_slave.c:940
 #, fuzzy
 msgid "Starting visualization failed"
 msgstr "Starten des Quellplugins fehlgeschlagen"
@@ -6143,12 +5823,12 @@
 msgid "Got visualization plugin %s"
 msgstr "Visualisierungsplugin erhalten: %s"
 
-#: lib/thumbnail.c:134 lib/bgxml.c:77
+#: lib/thumbnail.c:140 lib/bgxml.c:77
 #, c-format
 msgid "Cannot stat %s: %s"
 msgstr "Kann Dateistatus von %s nicht ermitteln: %s"
 
-#: lib/thumbnail.c:143
+#: lib/thumbnail.c:149
 #, fuzzy
 msgid "Cannot get home directory"
 msgstr "Verzeichnis erstellt: %s"
@@ -6606,7 +6286,7 @@
 msgid "@item Files\n"
 msgstr "@item Dateien\n"
 
-#: lib/cmdline.c:697
+#: lib/cmdline.c:699
 msgid ""
 "Supported options:\n"
 "\n"
@@ -6614,260 +6294,212 @@
 "Unterstützte Optionen:\n"
 "\n"
 
-#: lib/cmdline.c:777
+#: lib/cmdline.c:779
 #, c-format
 msgid "[1|0] (default: %d)"
 msgstr "[1|0] (Voreinstellung: %d)"
 
-#: lib/cmdline.c:786 lib/cmdline.c:800
+#: lib/cmdline.c:788 lib/cmdline.c:802
 msgid "<number> ("
 msgstr "<Zahl> ("
 
-#: lib/cmdline.c:792
+#: lib/cmdline.c:794
 #, c-format
 msgid "default: %d)"
 msgstr "Voreinstellung: %d)"
 
-#: lib/cmdline.c:811
+#: lib/cmdline.c:813
 #, c-format
 msgid "default: %%.%df)"
 msgstr "Voreinstellung: %%.%df)"
 
-#: lib/cmdline.c:827 lib/cmdline.c:840 lib/cmdline.c:847
+#: lib/cmdline.c:829 lib/cmdline.c:842 lib/cmdline.c:849
 msgid "<string>"
 msgstr "<zeichenkette>"
 
-#: lib/cmdline.c:830
+#: lib/cmdline.c:832
 #, c-format
 msgid " (Default: %s)"
 msgstr " (Voreinstellung: %s)"
 
-#: lib/cmdline.c:857
+#: lib/cmdline.c:859
 msgid "Supported strings: "
 msgstr "Unterstützte Kennzeichner:"
 
-#: lib/cmdline.c:879 lib/cmdline.c:960
+#: lib/cmdline.c:881 lib/cmdline.c:956
 #, c-format
 msgid "Default: %s"
 msgstr "Voreinstellung: %s"
 
-#: lib/cmdline.c:886
+#: lib/cmdline.c:888
 #, c-format
 msgid "<r>,<g>,<b> (default: %.3f,%.3f,%.3f)"
 msgstr "<r>,<g>,<b> (Voreinstellung: %.3f,%.3f,%.3f)"
 
-#: lib/cmdline.c:897 lib/cmdline.c:1029
+#: lib/cmdline.c:899 lib/cmdline.c:1025
 msgid "<r>, <g> and <b> are in the range 0.0..1.0"
 msgstr "<r>, <g> und <b> sind im Bereich 0.0..1.0"
 
-#: lib/cmdline.c:904
+#: lib/cmdline.c:906
 #, c-format
 msgid "<r>,<g>,<b>,<a> (default: %.3f,%.3f,%.3f,%.3f)"
 msgstr "<r>,<g>,<b>,<a> (Voreinstellung: %.3f,%.3f,%.3f,%.3f)"
 
-#: lib/cmdline.c:916
+#: lib/cmdline.c:918
 msgid "<r>, <g>, <b> and <a> are in the range 0.0..1.0"
 msgstr "<r>, <g> <b> und <a> sind im Bereich 0.0..1.0"
 
-#: lib/cmdline.c:923
+#: lib/cmdline.c:925
 msgid "option[{suboptions}]"
 msgstr "option[{unteroptionen}]"
 
-#: lib/cmdline.c:932 lib/cmdline.c:978
+#: lib/cmdline.c:934 lib/cmdline.c:974
 msgid "Supported options: "
 msgstr "Unterstützte Optionen: "
 
-#: lib/cmdline.c:954
-#, fuzzy
-msgid "<None>"
-msgstr "Kein(s)"
-
-#: lib/cmdline.c:966
+#: lib/cmdline.c:962
 msgid "{option[{suboptions}][:option[{suboptions}]...]}"
 msgstr "{option[{unteroptionen}][:option[{unteroptionen}]...]}"
 
-#: lib/cmdline.c:998
+#: lib/cmdline.c:994
 msgid "{[[HH:]MM:]SS} ("
 msgstr "{[[HH:]MM:]SS} ("
 
-#: lib/cmdline.c:1008
+#: lib/cmdline.c:1004
 #, c-format
 msgid "default: %s)"
 msgstr "Voreinstellung: %s)"
 
-#: lib/cmdline.c:1016
+#: lib/cmdline.c:1012
 msgid "Seconds can be fractional (i.e. with decimal point)\n"
 msgstr "Sekunden können gebrochen sein (d.h. mit Dezimalpunkt)\n"
 
-#: lib/cmdline.c:1019
+#: lib/cmdline.c:1015
 #, c-format
 msgid "<x>,<y> (default: %.3f,%.3f)"
 msgstr "<x>,<y> (Voreinstellung: %.3f,%.3f)"
 
-#: lib/cmdline.c:1068 lib/cmdline.c:1071
+#: lib/cmdline.c:1064 lib/cmdline.c:1067
 #, c-format
 msgid "Suboptions for %s=%s"
 msgstr "Unteroptionen %s=%s"
 
-#: lib/cmdline.c:1076
+#: lib/cmdline.c:1072
 #, c-format
 msgid "Suboptions for %s"
 msgstr "Unteroptionen für %s"
 
-#: lib/ov.c:181
-#, c-format
-msgid "Using hardeware overlay for stream %d"
-msgstr ""
-
-#: lib/ov.c:190
-#, c-format
-msgid "Using software overlay for stream %d"
-msgstr ""
-
-#: lib/converters.c:331 lib/converters.c:338
+#: lib/converters.c:329 lib/converters.c:336
 #, fuzzy
 msgid "variable"
 msgstr " (variabel)"
 
-#: lib/converters.c:344
+#: lib/converters.c:342
 #, fuzzy, c-format
 msgid "Doing framerate conversion %s -> %s"
 msgstr "Ändere Bildwiederholfrequenz %5.2f (%s) -> %5.2f (%s)"
 
-#: lib/converters.c:373
+#: lib/converters.c:371
 #, c-format
 msgid "Initialized video converter, %d steps"
 msgstr "Initialisierte Videokonverter (%d Schritte)"
 
-#: lib/mediafiledevice.c:116 lib/metadata.c:59
-msgid "Album"
-msgstr "Album"
-
-#: lib/mediafiledevice.c:121
-#, fuzzy
-msgid "Shuffle"
-msgstr "Zufallswiedergabe"
-
-#: lib/mediafiledevice.c:222
-#, fuzzy
-msgid "No album file given"
-msgstr "Kein Quellplugin definiert"
-
-#: lib/mediafiledevice.c:259
-#, c-format
-msgid "Album file %s contains no usable entries"
-msgstr ""
-
-#: lib/mediafiledevice.c:295
-msgid "Reloading album (file changed)"
-msgstr ""
-
-#: lib/mediafiledevice.c:488
-#, fuzzy
-msgid "Audiofile recorder"
-msgstr "Audiorecorder"
-
-#: lib/mediafiledevice.c:489
-msgid ""
-"Take a bunch of audio file and make them available as a recording device"
-msgstr ""
-
-#: lib/lcdproc.c:106
+#: lib/lcdproc.c:103
 msgid "Enable LCDproc"
 msgstr "Schalte LCDproc ein"
 
-#: lib/lcdproc.c:112
+#: lib/lcdproc.c:109
 msgid "Hostname"
 msgstr "Rechnername"
 
-#: lib/lcdproc.c:126
+#: lib/lcdproc.c:123
 msgid "Display track name and time"
 msgstr "Zeige Name und Zeit an"
 
-#: lib/lcdproc.c:132
+#: lib/lcdproc.c:129
 msgid "Display audio/video formats"
 msgstr "Zeige Audio- und Videoformate an"
 
-#: lib/lcdproc.c:138
+#: lib/lcdproc.c:135
 msgid "Display audio/video descriptions"
 msgstr "Zeige Audio- und Videobeschreibnungen an"
 
-#: lib/lcdproc.c:165 lib/lcdproc.c:170
+#: lib/lcdproc.c:162 lib/lcdproc.c:167
 msgid "Sending command failed"
 msgstr "Befehl schicken fehlgeschlagen"
 
-#: lib/lcdproc.c:193
+#: lib/lcdproc.c:190
 #, c-format
 msgid "Command \"%s\" not unserstood by server"
 msgstr "Befehl \"%s\" vom Server nicht verstanden"
 
-#: lib/lcdproc.c:214
+#: lib/lcdproc.c:211
 #, c-format
-msgid "Could not resolve adress for: %s"
+msgid "Could not resolve address for: %s"
 msgstr "Konnte Adresse nicht auflösen für %s"
 
-#: lib/lcdproc.c:221
+#: lib/lcdproc.c:218
 #, c-format
 msgid "Could not connect to server at %s:%d"
 msgstr "Konnte keine Verbindung zum Server %s:%d aufbauen"
 
-#: lib/lcdproc.c:231
+#: lib/lcdproc.c:228
 msgid "Could not send hello message"
 msgstr "Konnte keine \"hello\" Nachricht schicken"
 
-#: lib/lcdproc.c:237
+#: lib/lcdproc.c:234
 msgid "Could not get server welcome line"
 msgstr "Konnte keine \"welcome\" Zeile bekommen"
 
-#: lib/lcdproc.c:246
+#: lib/lcdproc.c:243
 #, c-format
 msgid "Invalid answer: %s"
 msgstr "Ungültige Antwort: %s"
 
-#: lib/lcdproc.c:278
+#: lib/lcdproc.c:275
 #, c-format
 msgid "Connection to server established, display size: %dx%d"
 msgstr "Verbindung zum Server hergestellt, Displaygröße: %dx%d"
 
-#: lib/lcdproc.c:290 lib/lcdproc.c:837
+#: lib/lcdproc.c:287 lib/lcdproc.c:792
 msgid "Connection to server closed due to error"
 msgstr "Verbindung zum Server aufgrund eines Fehlers geschlossen"
 
-#: lib/lcdproc.c:931
+#: lib/lcdproc.c:886
 msgid "Server connection closed"
 msgstr "Serververbindung beendet"
 
-#: lib/player_loop.c:291
+#: lib/player_loop.c:314
 #, fuzzy
 msgid "Cannot pause live stream"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: lib/player_loop.c:1200
+#: lib/player_loop.c:1241
 msgid "Ignoring command while playback is interrupted"
 msgstr "Ignoriere Befehl während das Absplielen unterbrochen ist"
 
-#: lib/charset.c:97
+#: lib/charset.c:96
 msgid "Invalid Multibyte sequence"
 msgstr "Ungültige Multibyte-Sequenz"
 
-#: lib/charset.c:101
+#: lib/charset.c:99
 msgid "Incomplete Multibyte sequence"
 msgstr "Unvollständige Multibyte-Sequenz"
 
-#: lib/transcoder.c:507
+#: lib/transcoder.c:486
 #, c-format
 msgid "Transcoding took %s (%.2f %% of realtime duration)"
 msgstr ""
 
-#: lib/transcoder.c:517
+#: lib/transcoder.c:496
 msgid "Output Directory"
 msgstr "Ausgabeverzeichnis"
 
-#: lib/transcoder.c:523
+#: lib/transcoder.c:502
 msgid "Delete incomplete output files"
 msgstr "Lösche unvollständige Ausgabedateien"
 
-#: lib/transcoder.c:526
+#: lib/transcoder.c:505
 msgid ""
 "Delete the encoded files if you hit the stop button. This option will "
 "automatically be disabled, when the track is an URL"
@@ -6875,56 +6507,56 @@
 "Lösche enkodierte Dateien wenn Du den \"Stop\"-Button drückst. Diese Option "
 "wird automatisch deaktiviert, wenn der Track eine URL ist."
 
-#: lib/transcoder.c:531
+#: lib/transcoder.c:510
 msgid "Clean up after postprocessing"
 msgstr "Aufräumen nach der Weiterverarbeitung"
 
-#: lib/transcoder.c:533
+#: lib/transcoder.c:512
 msgid "Clean up all encoded files, which were postprocessed"
 msgstr "Lösche alle enkodierten Dateien, die weiterverarbeitet wurden"
 
-#: lib/transcoder.c:537
+#: lib/transcoder.c:516
 msgid "Send finished files to player"
 msgstr "Schicke fertige Dateien zum Player"
 
-#: lib/transcoder.c:1212
+#: lib/transcoder.c:1185
 #, c-format
 msgid "Using statistics file: %s"
 msgstr "Benutze Statistikdatei: %s"
 
-#: lib/transcoder.c:1347
+#: lib/transcoder.c:1315
 msgid "Encoding audio failed"
 msgstr "Ton Enkodieren fehlgeschlagen"
 
-#: lib/transcoder.c:1666
+#: lib/transcoder.c:1630
 msgid "Encoding video failed"
 msgstr "Bild Enkodieren fehlgeschlagen"
 
-#: lib/transcoder.c:1756 lib/transcoder.c:1809
+#: lib/transcoder.c:1715 lib/transcoder.c:1765
 msgid "Encoding subtitles failed"
 msgstr "Untertitel Enkodieren fehlgeschlagen"
 
-#: lib/transcoder.c:1876
+#: lib/transcoder.c:1832
 #, c-format
 msgid "Cannot create directory %s: %s, using default"
 msgstr "Kann Verzeichnis %s nicht erstellen: %s, nehme Voreinstellung"
 
-#: lib/transcoder.c:1933
+#: lib/transcoder.c:1889
 #, c-format
 msgid "Postprocessing %s"
 msgstr "Weiterverarbeitung von %s"
 
-#: lib/transcoder.c:1937 lib/transcoder.c:3184
+#: lib/transcoder.c:1893 lib/transcoder.c:3127
 #, c-format
 msgid "Transcoding %s [Track %d, Pass %d/%d]"
 msgstr "Transkodiere %s [Track %d, Durchgang %d/%d]"
 
-#: lib/transcoder.c:1942
+#: lib/transcoder.c:1898
 #, c-format
 msgid "Transcoding %s [Track %d]"
 msgstr "Transkodiere %s [Track %d]"
 
-#: lib/transcoder.c:1953
+#: lib/transcoder.c:1909
 #, c-format
 msgid ""
 "Metadata:\n"
@@ -6933,7 +6565,7 @@
 "Metadaten:\n"
 "%s"
 
-#: lib/transcoder.c:1970
+#: lib/transcoder.c:1926
 #, c-format
 msgid ""
 "Audio stream %d input format:\n"
@@ -6942,7 +6574,7 @@
 "Audiostream %d, Quellformat:\n"
 "%s"
 
-#: lib/transcoder.c:1976
+#: lib/transcoder.c:1932
 #, c-format
 msgid ""
 "Audio stream %d output format:\n"
@@ -6951,7 +6583,7 @@
 "Audiostream %d, Ausgabeformat:\n"
 "%s"
 
-#: lib/transcoder.c:1984
+#: lib/transcoder.c:1940
 #, fuzzy, c-format
 msgid ""
 "Audio stream %d format:\n"
@@ -6960,7 +6592,7 @@
 "Audiostream %d, Quellformat:\n"
 "%s"
 
-#: lib/transcoder.c:1999
+#: lib/transcoder.c:1955
 #, c-format
 msgid ""
 "Video stream %d input format:\n"
@@ -6969,7 +6601,7 @@
 "Videostream %d, Quellformat:\n"
 "%s"
 
-#: lib/transcoder.c:2004
+#: lib/transcoder.c:1960
 #, c-format
 msgid ""
 "Video stream %d output format:\n"
@@ -6978,7 +6610,7 @@
 "Videostream %d, Ausgabeformat:\n"
 "%s"
 
-#: lib/transcoder.c:2011
+#: lib/transcoder.c:1967
 #, fuzzy, c-format
 msgid ""
 "Video stream %d format:\n"
@@ -6987,110 +6619,110 @@
 "Videostream %d, Quellformat:\n"
 "%s"
 
-#: lib/transcoder.c:2023
+#: lib/transcoder.c:1979 lib/transcoder.c:1998
 #, c-format
 msgid "Text subtitle stream %d: Blending onto video stream %d"
 msgstr "Text-Untertitelstream %d: Mische auf Videostream %d"
 
-#: lib/transcoder.c:2028
+#: lib/transcoder.c:1984 lib/transcoder.c:2003
 #, c-format
 msgid "Text subtitle stream %d: Exporting to file"
 msgstr "Text-Untertitelstream %d: Exportiere in Datei"
 
-#: lib/transcoder.c:2042
-#, fuzzy, c-format
-msgid "Overlay subtitle stream %d: Blending onto video stream %d"
-msgstr "Text-Untertitelstream %d: Mische auf Videostream %d"
-
-#: lib/transcoder.c:2047
-#, fuzzy, c-format
-msgid "Overlay subtitle stream %d: Exporting to file"
-msgstr "Text-Untertitelstream %d: Exportiere in Datei"
-
-#: lib/transcoder.c:2093
+#: lib/transcoder.c:2048
 #, c-format
 msgid "Cannot find plugin %s"
 msgstr "Kann Plugin %s nicht finden"
 
-#: lib/transcoder.c:2124
+#: lib/transcoder.c:2055
+#, c-format
+msgid "Cannot open plugin %s"
+msgstr "Kann Plugin %s nicht öffnen"
+
+#: lib/transcoder.c:2072
+#, c-format
+msgid "Cannot open %s with plugin %s"
+msgstr "Kann %s nicht mit Plugin %s öffnen"
+
+#: lib/transcoder.c:2088
 #, c-format
 msgid "Invalid track number %d"
 msgstr "Ungültige Tracknummer %d"
 
-#: lib/transcoder.c:2154
+#: lib/transcoder.c:2118
 #, fuzzy, c-format
 msgid "Audio stream %d cannot be read compressed"
 msgstr "Audiostream %d: %s Abtastwerte transkodiert"
 
-#: lib/transcoder.c:2164
+#: lib/transcoder.c:2128
 #, fuzzy, c-format
 msgid "Audio stream %d cannot be written compressed"
 msgstr "Audiostream %d: %s Abtastwerte transkodiert"
 
-#: lib/transcoder.c:2169
+#: lib/transcoder.c:2133
 #, c-format
 msgid "Copying compressed audio stream %d"
 msgstr ""
 
-#: lib/transcoder.c:2183
+#: lib/transcoder.c:2147
 #, fuzzy, c-format
 msgid "Video stream %d cannot be read compressed"
 msgstr "Videostream %d: %s Bilder transkodiert"
 
-#: lib/transcoder.c:2195 lib/transcoder.c:2210
+#: lib/transcoder.c:2159 lib/transcoder.c:2174
 #, c-format
 msgid "Not copying video stream %d: Will blend subtitles"
 msgstr ""
 
-#: lib/transcoder.c:2223
+#: lib/transcoder.c:2187
 #, fuzzy, c-format
 msgid "Video stream %d cannot be written compressed"
 msgstr "Videostream %d: %s Bilder transkodiert"
 
-#: lib/transcoder.c:2228
+#: lib/transcoder.c:2192
 #, c-format
 msgid "Copying compressed video stream %d"
 msgstr ""
 
-#: lib/transcoder.c:2351 lib/player_input.c:219
+#: lib/transcoder.c:2315 lib/player_input.c:219
 msgid "Starting input plugin failed"
 msgstr "Starten des Quellplugins fehlgeschlagen"
 
-#: lib/transcoder.c:2361 lib/transcoder.c:2370
+#: lib/transcoder.c:2325 lib/transcoder.c:2334
 msgid "Cannot seek to start point"
 msgstr "Kann nicht zum Startpunkt suchen"
 
-#: lib/transcoder.c:2381
+#: lib/transcoder.c:2345
 msgid "End time if before start time"
 msgstr "Endzeit vor Anfangszeit"
 
-#: lib/transcoder.c:2543 lib/transcoder.c:2591
+#: lib/transcoder.c:2507 lib/transcoder.c:2555
 msgid "Subtitle stream cannot be handled"
 msgstr "Untertitelstream kann nicht verarbeitet werden"
 
-#: lib/transcoder.c:2612
+#: lib/transcoder.c:2576
 msgid "Input and output are the same file"
 msgstr "Quelle und Ausgabe sind die gleiche Datei"
 
-#: lib/transcoder.c:2924
+#: lib/transcoder.c:2871
 msgid "Zero peaks detected (silent file?). Disabling normalization."
 msgstr "Null Spitzenwerte detektiert (stumme Datei?). Deaktiviere Normierung"
 
-#: lib/transcoder.c:2930
+#: lib/transcoder.c:2877
 #, c-format
 msgid "Correcting volume by %.2f dB"
 msgstr "Korrigiere Lautstärke um %.2f dB"
 
-#: lib/transcoder.c:2989
+#: lib/transcoder.c:2936
 msgid "No stream to encode"
 msgstr "Kein Stream zum Enkodieren"
 
-#: lib/transcoder.c:3393
+#: lib/transcoder.c:3331
 #, c-format
 msgid "Video stream %d: Transcoded %s frames"
 msgstr "Videostream %d: %s Bilder transkodiert"
 
-#: lib/transcoder.c:3404
+#: lib/transcoder.c:3342
 #, c-format
 msgid "Audio stream %d: Transcoded %s samples"
 msgstr "Audiostream %d: %s Abtastwerte transkodiert"
@@ -7140,38 +6772,38 @@
 msgid "Could not find free port"
 msgstr "Kann Socket nicht binden"
 
-#: lib/x11/x11_video.c:233
+#: lib/x11/x11_video.c:232
 #, c-format
 msgid "Trying %s driver"
 msgstr ""
 
-#: lib/x11/x11_video.c:237
+#: lib/x11/x11_video.c:236
 #, fuzzy, c-format
 msgid "Opening %s driver failed"
 msgstr "Speichern von %s fehlgeschlagen"
 
-#: lib/x11/x11_video.c:245
+#: lib/x11/x11_video.c:244
 #, fuzzy, c-format
 msgid "Opening %s driver succeeded"
 msgstr "Speichern von %s fehlgeschlagen"
 
-#: lib/x11/x11_window.c:1116
+#: lib/x11/x11_window.c:1111
 msgid "Auto resize window"
 msgstr "Fenstergröße automatisch ändern"
 
-#: lib/x11/x11_window.c:1150
+#: lib/x11/x11_window.c:1145
 msgid "Disable Screensaver for normal playback"
 msgstr "Deaktiviere Bildschirmschoner für normales Abspielen"
 
-#: lib/x11/x11_window.c:1156
+#: lib/x11/x11_window.c:1151
 msgid "Disable Screensaver for fullscreen playback"
 msgstr "Deaktiviere Bildschirmschoner für Abspielen im Vollbildmodus"
 
-#: lib/x11/x11_window.c:1162
+#: lib/x11/x11_window.c:1157
 msgid "Force hardware scaling"
 msgstr "Erzwinge Hardwareskalierung"
 
-#: lib/x11/x11_window.c:1164
+#: lib/x11/x11_window.c:1159
 msgid ""
 "Use hardware scaling even if it involves more CPU intensive pixelformat "
 "conversions"
@@ -7179,25 +6811,25 @@
 "Benutze Hardwareskalierung auch wenn es mehr rechenaufwendige Pixelformat-"
 "Umwandlungen erfordert"
 
-#: lib/x11/x11_window.c:1173
+#: lib/x11/x11_window.c:1168
 msgid ""
 "Specify the background color for videos with alpha channel. This is only "
 "used by the OpenGL driver."
 msgstr ""
 
-#: lib/x11/x11_window.c:1179
+#: lib/x11/x11_window.c:1174
 msgid "Software scaler"
 msgstr "Softwareskalierer"
 
-#: lib/x11/x11_window.c:1218 lib/x11/x11_window.c:1223
+#: lib/x11/x11_window.c:1213 lib/x11/x11_window.c:1218
 msgid "Scale quality"
 msgstr "Skalierungsqualität"
 
-#: lib/x11/x11_window.c:1389
+#: lib/x11/x11_window.c:1384
 msgid "Could not get GL Visual"
 msgstr "Kein GL Visual erhalten"
 
-#: lib/x11/x11_window.c:1404
+#: lib/x11/x11_window.c:1399
 #, c-format
 msgid "Got Visual 0x%lx depth %d"
 msgstr ""
@@ -7245,35 +6877,35 @@
 msgid "Disable screensaver and energy saving mode"
 msgstr ""
 
-#: lib/x11/grab.c:602
+#: lib/x11/grab.c:601
 #, c-format
 msgid "Window geometry: %dx%d+%d+%d"
 msgstr ""
 
-#: lib/x11/grab.c:673
+#: lib/x11/grab.c:672
 #, fuzzy
 msgid "Couldn't get shared memory segment"
 msgstr "Konnte keine \"welcome\" Zeile bekommen"
 
-#: lib/x11/grab.c:681
+#: lib/x11/grab.c:680
 msgid "Couldn't attach shared memory segment"
 msgstr ""
 
-#: lib/x11/grab.c:687
+#: lib/x11/grab.c:686
 msgid "Using shared memory for grabbing"
 msgstr ""
 
-#: lib/x11/grab.c:776
+#: lib/x11/grab.c:775
 #, c-format
 msgid "Cursor too wide, increase MAX_CURSOR_SIZE in grab.c to %d"
 msgstr ""
 
-#: lib/x11/grab.c:783
+#: lib/x11/grab.c:782
 #, c-format
 msgid "Cursor too high, increase MAX_CURSOR_SIZE in grab.c to %d"
 msgstr ""
 
-#: lib/x11/grab.c:903
+#: lib/x11/grab.c:902
 msgid "XShmGetImage failed"
 msgstr ""
 
@@ -7286,30 +6918,6 @@
 msgid "Default format"
 msgstr "Voreingestelltes Format"
 
-#: lib/textrenderer.c:168
-msgid "Default width"
-msgstr "Voreingestellte Breite"
-
-#: lib/textrenderer.c:176
-msgid "Default height"
-msgstr "Voreingestellte Höhe"
-
-#: lib/textrenderer.c:184
-msgid "Default Colorspace"
-msgstr "Voreingestellter Farbraum"
-
-#: lib/textrenderer.c:188
-msgid "YCrCb"
-msgstr "YCrCb"
-
-#: lib/textrenderer.c:188
-msgid "RGB"
-msgstr "RGB"
-
-#: lib/textrenderer.c:192
-msgid "Default Framerate"
-msgstr "Voreingestellte Bildwiederholrate"
-
 #: lib/tree.c:252 lib/tree.c:435
 msgid "Incoming"
 msgstr "Eingang"
@@ -7318,89 +6926,114 @@
 msgid "Favourites"
 msgstr "Favoriten"
 
-#: lib/tree.c:1086
+#: lib/tree.c:1080
 msgid "Doubleclick on a track first"
 msgstr "Erst auf einen Track doppelklicken"
 
-#: lib/tree.c:1107
+#: lib/tree.c:1101
 #, c-format
 msgid "Cannot open %s: no plugin found"
 msgstr "Kann %s nicht öffnen: Kein Plugin gefunden"
 
-#: lib/tree.c:1111
+#: lib/tree.c:1105
 #, c-format
 msgid "Loading %s (plugin: %s)"
 msgstr "Lade %s (Plugin: %s)"
 
-#: lib/tree.c:1130
+#: lib/tree.c:1124
 #, c-format
 msgid "Selecting track %d for %s failed"
 msgstr "Auswahl des Tracks %d für %s fehlgeschlagen"
 
-#: lib/tree.c:1169
+#: lib/tree.c:1162
 msgid "Use metadata for track names"
 msgstr "Benutze Metadaten für Tracknamen"
 
-#: lib/tree.c:1172
+#: lib/tree.c:1165
 msgid "If disabled, track name will be taken from filename"
 msgstr "Wenn deaktiviert, wird der Trackname aus dem Dateinamen erzeugt"
 
-#: lib/tree.c:1192
+#: lib/tree.c:1169
+msgid "Format for track names"
+msgstr "Format für Tracknamen"
+
+#: lib/tree.c:1172
+msgid ""
+"Format specifier for tracknames from\n"
+"metadata\n"
+"%p:    Artist\n"
+"%a:    Album\n"
+"%g:    Genre\n"
+"%t:    Track name\n"
+"%<d>n: Track number with <d> digits\n"
+"%y:    Year\n"
+"%c:    Comment"
+msgstr ""
+"Format für Erzeugung von Tracknamen aus Metadaten\n"
+"%p:    Künstler\n"
+"%a:    Album\n"
+"%g:    Genre\n"
+"%t:    Trackname\n"
+"%<d>n: Tracknummer mit <d> Stellen\n"
+"%y:    Jahr\n"
+"%c:    Kommentar"
+
+#: lib/tree.c:1185
 msgid "Purge directory on exit"
 msgstr "Reinige Verzeichnis beim Beenden"
 
-#: lib/tree.c:1195
+#: lib/tree.c:1188
 msgid ""
 "Purge directory (i.e. delete\n"
 "unused album files) at program exit"
 msgstr "Reinige Verzeichnis (d.h. lösche unbenutzte Albumdateien) beim Beenden"
 
-#: lib/tree.c:1200
-#, fuzzy
-msgid "Blacklisted extensions"
-msgstr "Hintergrundlichtausgleich"
+#: lib/tree.c:1193 lib/transcoder_track.c:179
+msgid "Prefer EDL"
+msgstr "EDl bevorzugen"
 
-#: lib/tree.c:1203
-msgid "File extensions, which are never loaded automatically"
-msgstr ""
+#: lib/tree.c:1196
+msgid ""
+"For files, which contain edit decision lists and raw streams, this option "
+"selects which one to decode. This setting is saved in the album once the "
+"file is loaded."
+msgstr ""
+"Für Dateien, die EDLs und Rohstreams enthalten, letg diese Option fest, "
+"welche von beiden abgespielt werden soll. Die Einstellung wird im Album "
+"gespeichert, sobald die Datei geladen wurde."
 
-#: lib/tree.c:1207
+#: lib/tree.c:1200
 #, fuzzy
-msgid "Blacklisted filenames"
+msgid "Blacklist"
 msgstr "Aufgabenliste"
 
-#: lib/tree.c:1209
-msgid "Filenames, which are never loaded automatically"
+#: lib/tree.c:1203
+msgid "File extensions, which are never loaded automatically"
 msgstr ""
 
-#: lib/tree.c:1463
+#: lib/tree.c:1419
 #, c-format
 msgid "Purging %s"
 msgstr "Bereinige %s"
 
-#: lib/tree.c:1580
+#: lib/tree.c:1536
 msgid "No current track for copying to favourites"
 msgstr "Kein aktueller Track zum Kopieren zu Favoriten"
 
-#: lib/singlepic.c:97
+#: lib/singlepic.c:96
 msgid "Display time"
 msgstr "Anzeigedauer"
 
-#: lib/singlepic.c:102
+#: lib/singlepic.c:101
 msgid "Time to pass until the next track will be selected. 0 means infinite."
 msgstr ""
 "Zeit, die vergeht, bis der nächste Track gewählt wird. 0 heißt unendlich."
 
-#: lib/singlepic.c:327
-#, fuzzy, c-format
-msgid "Plugin %s could not be loaded"
-msgstr "Quellplugin konnte nicht geladen werden"
-
-#: lib/singlepic.c:594
+#: lib/singlepic.c:548
 msgid "Image video input plugin"
 msgstr "Bilder als Video"
 
-#: lib/singlepic.c:595
+#: lib/singlepic.c:549
 msgid ""
 "This plugin reads series of images as a video. It uses the installed image "
 "readers."
@@ -7408,26 +7041,26 @@
 "Dieses Plugin liest eine Reihe Bilder als Video. Es benutzt die "
 "installierten Bildimporteure."
 
-#: lib/singlepic.c:641
+#: lib/singlepic.c:595
 msgid ""
 "This plugin reads images as stills. It uses the installed image readers."
 msgstr ""
 "Dieses Plugin liest Standbilder. Es benutzt die installierten Bildimporteure."
 
-#: lib/singlepic.c:760
+#: lib/singlepic.c:727
 msgid "Framenumber digits"
 msgstr "Dezimalstellen für Bildnummer"
 
-#: lib/singlepic.c:768
+#: lib/singlepic.c:735
 msgid "Framenumber offset"
 msgstr "Offset für Bildnummer"
 
-#: lib/singlepic.c:1037
+#: lib/singlepic.c:1000
 #, fuzzy, c-format
 msgid "Couldn't write data to %s: %s"
 msgstr "Kann Verzeichnis %s nicht erstellen: %s"
 
-#: lib/singlepic.c:1098
+#: lib/singlepic.c:1061
 msgid ""
 "This plugin encodes a video as a series of images. It uses the installed "
 "image writers."
@@ -7435,80 +7068,126 @@
 "Dieses Plugin exportiert Video als Bilderserie. Es benutzt die installierten "
 "Bildexportplugins"
 
-#: lib/metadata.c:38
+#: lib/metadata.c:108
 msgid "Artist"
 msgstr "Künstler"
 
-#: lib/metadata.c:45
-#, fuzzy
-msgid "Album artist"
-msgstr "Künstler"
-
-#: lib/metadata.c:52
+#: lib/metadata.c:113
 msgid "Title"
 msgstr "Titel"
 
-#: lib/metadata.c:66 lib/transcoder_track.c:194 lib/gtk/infowindow.c:782
+#: lib/metadata.c:118
+msgid "Album"
+msgstr "Album"
+
+#: lib/metadata.c:123 lib/transcoder_track.c:185 lib/gtk/infowindow.c:786
 msgid "Track"
 msgstr "Track"
 
-#: lib/metadata.c:73
+#: lib/metadata.c:128
 msgid "Genre"
 msgstr "Genre"
 
-#: lib/metadata.c:80
+#: lib/metadata.c:133
 msgid "Author"
 msgstr "Autor"
 
-#: lib/metadata.c:87
+#: lib/metadata.c:138
 msgid "Copyright"
 msgstr "Copyright"
 
-#: lib/metadata.c:94
-#, fuzzy
-msgid "Year"
-msgstr "Linear"
+#: lib/metadata.c:143
+msgid "Date"
+msgstr "Datum"
 
-#: lib/metadata.c:448
+#: lib/metadata.c:145
+msgid "Complete date or year only"
+msgstr "Komplettes Datum oder nur das Jahr"
+
+#: lib/metadata.c:426
 #, c-format
-msgid "%s%s%s\n"
-msgstr ""
+msgid "Author:\t %s\n"
+msgstr "Autor:\t %s\n"
+
+#: lib/metadata.c:431
+#, c-format
+msgid "Artist:\t %s\n"
+msgstr "Künstler:\t %s\n"
+
+#: lib/metadata.c:436
+#, c-format
+msgid "Title:\t %s\n"
+msgstr "Titel:\t %s\n"
+
+#: lib/metadata.c:441
+#, c-format
+msgid "Album:\t %s\n"
+msgstr "Album:\t %s\n"
+
+#: lib/metadata.c:446
+#, c-format
+msgid "Copyright:\t %s\n"
+msgstr "Copyright:\t %s\n"
+
+#: lib/metadata.c:451
+#, c-format
+msgid "Genre:\t %s\n"
+msgstr "Genre:\t %s\n"
+
+#: lib/metadata.c:456
+#, c-format
+msgid "Date:\t %s\n"
+msgstr "Datum:\t %s\n"
+
+#: lib/metadata.c:461
+#, c-format
+msgid "Track:\t %d\n"
+msgstr "Track:\t %d\n"
+
+#: lib/metadata.c:466
+#, c-format
+msgid "Comment:\t %s\n"
+msgstr "Kommentar:\t %s\n"
 
 #: lib/player_audio.c:246
 msgid "Restarting playback due to changed audio options"
 msgstr "Starte Abspielen neu wegen geänderter Audioeinstellungen"
 
-#: lib/player_audio.c:288
+#: lib/player_audio.c:290
 msgid "Restarting playback due to changed audio filters"
 msgstr "Starte Abspielen neu wegen geänderter Audiofilter"
 
-#: lib/transcoder_track.c:170 lib/gtk/infowindow.c:767
-#: lib/gtk/treewidget.c:1123 lib/gtk/chapterdialog.c:185
+#: lib/transcoder_track.c:161 lib/gtk/infowindow.c:771
+#: lib/gtk/treewidget.c:1119 lib/gtk/chapterdialog.c:184
 #: lib/gtk/presetmenu.c:181
 msgid "Name"
 msgstr "Name"
 
-#: lib/transcoder_track.c:176 lib/gtk/infowindow.c:777
+#: lib/transcoder_track.c:167 lib/gtk/infowindow.c:781
 msgid "Location"
 msgstr "Ort"
 
-#: lib/transcoder_track.c:188 lib/gtk/fileselect.c:269
-msgid "Prefer EDL"
-msgstr "EDl bevorzugen"
+#: lib/transcoder_track.c:181
+msgid ""
+"For files, which contain edit decision lists and raw streams, this option "
+"selects which one to decode."
+msgstr ""
+"Für Dateien, die EDLs und Rohstreams enthalten, letg diese Option fest, "
+"welche von beiden abgespielt werden soll."
 
-#: lib/transcoder_track.c:200
+#: lib/transcoder_track.c:191
 msgid "Subdirectory"
 msgstr "Unterverzeichnis"
 
-#: lib/transcoder_track.c:202
+#: lib/transcoder_track.c:193
 msgid "Subdirectory, where this track will be written to"
 msgstr "Unterverzeichnis, in das die Tracks geschrieben werden"
 
-#: lib/transcoder_track.c:242
+#: lib/transcoder_track.c:233
 msgid "Postprocess only"
 msgstr "Nur Weiterverarbeiten"
 
-#: lib/transcoder_track.c:244
+#: lib/transcoder_track.c:235
 msgid ""
 "Skip transcoding of this track and send the file directly to the "
 "postprocessor."
@@ -7516,11 +7195,11 @@
 "Überspringe Transkodieren dieses Tracks und schicke die Datei direkt zum "
 "Weiterverarbeiten"
 
-#: lib/transcoder_track.c:248
+#: lib/transcoder_track.c:239
 msgid "Set start time"
 msgstr "Setze die Startzeit"
 
-#: lib/transcoder_track.c:252
+#: lib/transcoder_track.c:243
 msgid ""
 "Specify a start time below. This time will be slightly wrong if the input "
 "format doesn't support sample accurate seeking."
@@ -7528,76 +7207,76 @@
 "Gib unten eine Startzeit an. Diese Zeit wird geringfügig falsch sein, wenn "
 "die Quelle kein exaktes Suchen unterstützt."
 
-#: lib/transcoder_track.c:257
+#: lib/transcoder_track.c:248
 msgid "Start time"
 msgstr "Startzeit"
 
-#: lib/transcoder_track.c:264
+#: lib/transcoder_track.c:255
 msgid "Set end time"
 msgstr "Setzte Endzeit"
 
-#: lib/transcoder_track.c:268
+#: lib/transcoder_track.c:259
 msgid "Specify an end time below."
 msgstr "Gib unten eine Endzeit an"
 
-#: lib/transcoder_track.c:272
+#: lib/transcoder_track.c:263
 msgid "End time"
 msgstr "Endzeit"
 
-#: lib/transcoder_track.c:286 lib/transcoder_track.c:351
-#: lib/transcoder_track.c:1331 lib/transcoder_track.c:1360
+#: lib/transcoder_track.c:277 lib/transcoder_track.c:333
+#: lib/transcoder_track.c:1319 lib/transcoder_track.c:1348
 msgid "Action"
 msgstr "Aktion"
 
-#: lib/transcoder_track.c:294 lib/transcoder_track.c:357
-#: lib/transcoder_track.c:1336 lib/transcoder_track.c:1366
+#: lib/transcoder_track.c:285 lib/transcoder_track.c:339
+#: lib/transcoder_track.c:1324 lib/transcoder_track.c:1354
 msgid "Forget"
 msgstr "Vergessen"
 
-#: lib/transcoder_track.c:295
+#: lib/transcoder_track.c:286
 msgid "Transcode as text"
 msgstr "Transkodiere als Text"
 
-#: lib/transcoder_track.c:296
+#: lib/transcoder_track.c:287
 msgid "Transcode as overlay"
 msgstr "Transkodiere als Overlay"
 
-#: lib/transcoder_track.c:297 lib/transcoder_track.c:359
+#: lib/transcoder_track.c:288 lib/transcoder_track.c:341
 msgid "Blend onto video"
 msgstr "Mische aufs Video"
 
-#: lib/transcoder_track.c:299
+#: lib/transcoder_track.c:290
 msgid "Select action for this subtitle stream."
 msgstr "Wähle Aktion für diesen Untertitelstream"
 
-#: lib/transcoder_track.c:303 lib/transcoder_track.c:365
-#: lib/transcoder_track.c:1372
+#: lib/transcoder_track.c:294 lib/transcoder_track.c:347
+#: lib/transcoder_track.c:1360
 msgid "Input Language"
 msgstr "Ursprüngliche Sprache"
 
-#: lib/transcoder_track.c:309 lib/transcoder_track.c:371
-#: lib/transcoder_track.c:1378 lib/recorder_audio.c:99
+#: lib/transcoder_track.c:300 lib/transcoder_track.c:353
+#: lib/transcoder_track.c:1366 lib/recorder_audio.c:78
 msgid "Language"
 msgstr "Sprache"
 
-#: lib/transcoder_track.c:317 lib/transcoder_track.c:379
-#: lib/transcoder_track.c:1386
+#: lib/transcoder_track.c:308 lib/transcoder_track.c:361
+#: lib/transcoder_track.c:1374
 msgid "Force language"
 msgstr "Erzwinge Sprache"
 
-#: lib/transcoder_track.c:320 lib/transcoder_track.c:382
-#: lib/transcoder_track.c:1389
+#: lib/transcoder_track.c:311 lib/transcoder_track.c:364
+#: lib/transcoder_track.c:1377
 msgid ""
 "Force the given language even if the input has the language set differently."
 msgstr ""
 "Erzwinge die angegebene Sprache, selbst wenn die Quelle was anderes "
 "behautpet."
 
-#: lib/transcoder_track.c:333
+#: lib/transcoder_track.c:315
 msgid "Video stream"
 msgstr "Videostream"
 
-#: lib/transcoder_track.c:338
+#: lib/transcoder_track.c:320
 msgid ""
 "Attach subtitle stream to this video stream. For blending, this video stream "
 "will get the subtitles. For encoding, take frame dimensions and framerate "
@@ -7608,30 +7287,30 @@
 "Für das Enkodieren werden Bildwiederholrate und -größe von diesem "
 "Videostream genommen, da diese manchmal von Enkodern gebraucht werden."
 
-#: lib/transcoder_track.c:358 lib/transcoder_track.c:1334
-#: lib/transcoder_track.c:1364 lib/gtk/albumwidget.c:1543
+#: lib/transcoder_track.c:340 lib/transcoder_track.c:1322
+#: lib/transcoder_track.c:1352 lib/gtk/albumwidget.c:1539
 msgid "Transcode"
 msgstr "Transkodieren"
 
-#: lib/transcoder_track.c:386
+#: lib/transcoder_track.c:368
 msgid "Video stream to blend onto"
 msgstr "Videostream zum draufmischen"
 
-#: lib/transcoder_track.c:1335 lib/transcoder_track.c:1365
+#: lib/transcoder_track.c:1323 lib/transcoder_track.c:1353
 msgid "Copy (if possible)"
 msgstr ""
 
-#: lib/transcoder_track.c:1338 lib/transcoder_track.c:1368
+#: lib/transcoder_track.c:1326 lib/transcoder_track.c:1356
 msgid ""
 "Choose the desired action for the stream. If copying is not possible, the "
 "stream will be transcoded"
 msgstr ""
 
-#: lib/transcoder_track.c:1343
+#: lib/transcoder_track.c:1331
 msgid "Enable 2-pass encoding"
 msgstr "Aktiviere 2-Pass Enkodierung"
 
-#: lib/transcoder_track.c:1345
+#: lib/transcoder_track.c:1333
 msgid ""
 "Encode this stream in 2 passes, i.e. analyze it first and do the final "
 "transcoding in the second pass. This enables higher quality within the given "
@@ -7641,11 +7320,11 @@
 "enkodiere ihn endgütlig im zweiten Durchlauf. Dies bringt bessere Qualität "
 "für eine gegebene Bitrate aber verdoppelt in etwa die Enkodierzeit."
 
-#: lib/transcoder_track.c:1393
+#: lib/transcoder_track.c:1381
 msgid "Normalize audio"
 msgstr "Normiere Audio"
 
-#: lib/transcoder_track.c:1395
+#: lib/transcoder_track.c:1383
 msgid ""
 "This will enable 2 pass transcoding. In the first pass, the peak volume is "
 "detected. In the second pass, the stream is transcoded with normalized "
@@ -7683,50 +7362,50 @@
 msgid "Duration (milliseconds)"
 msgstr "Dauer (Millisekunden)"
 
-#: lib/remote.c:102
+#: lib/remote.c:101
 msgid "Setting up socket failed, this instance won't be reachable via remote"
 msgstr ""
 "Initialisierung des Sockets fehlgeschlagen. Diese Instanz wird nicht mit der "
 "Fernbedienung erreichbar sein."
 
-#: lib/remote.c:107
+#: lib/remote.c:106
 #, c-format
 msgid "Remote socket listening at port %d"
 msgstr "Socket für Fernbedienung lauscht an Port %d"
 
-#: lib/remote.c:127
+#: lib/remote.c:126
 msgid "Reading hello line failed"
 msgstr "Lesen der Begrüßungszeile fehlgeschlagen"
 
-#: lib/remote.c:136 lib/remote.c:457
+#: lib/remote.c:135 lib/remote.c:433
 msgid "Protocol mismatch"
 msgstr "Protokolle stimmen nicht überein"
 
-#: lib/remote.c:187
+#: lib/remote.c:186
 msgid "Client connection closed"
 msgstr "Clientverbindung geschlossen"
 
-#: lib/remote.c:211
+#: lib/remote.c:210
 msgid "New client connection"
 msgstr "Neue Clientverbindung"
 
-#: lib/remote.c:321
+#: lib/remote.c:299
 msgid "Allow connections from other machines"
 msgstr "Erlaube Verbindungen von anderen Maschinen"
 
-#: lib/remote.c:327
+#: lib/remote.c:305
 msgid "Maximum number of connections"
 msgstr "Maximale Zahl der Verbindungen"
 
-#: lib/remote.c:427
+#: lib/remote.c:405
 msgid "Connecting failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: lib/remote.c:439
+#: lib/remote.c:416
 msgid "Sending initialization string failed"
 msgstr "Senden des Initialisierungsstrings fehlgeschlagen"
 
-#: lib/remote.c:448
+#: lib/remote.c:424
 msgid "Reading welcome line failed"
 msgstr "Lesen der Bergrüßungszeile fehlgeschlagen"
 
@@ -7767,50 +7446,11 @@
 msgid "Chapter %d"
 msgstr "Kapitel %d"
 
-#: lib/stringutils.c:181
+#: lib/stringutils.c:179
 #, c-format
 msgid "Cannot open file \"%s\" for writing"
 msgstr "Kann Datei \"%s\" nicht zum Schreiben öffnen"
 
-#: lib/stringutils.c:595
-#, c-format
-msgid "Stream %d [%s]"
-msgstr "Stream %d [%s]"
-
-#: lib/stringutils.c:597
-#, c-format
-msgid "Stream %d"
-msgstr "Stream %d"
-
-#: lib/ocr.c:88
-#, fuzzy, c-format
-msgid "Writing image file %s"
-msgstr "Schreibe Abbild"
-
-#: lib/ocr.c:129
-msgid "No engine found"
-msgstr ""
-
-#: lib/ocr.c:155
-msgid ""
-"Background color to use, when converting formats with transparency to "
-"grayscale"
-msgstr ""
-
-#: lib/ocr.c:159
-#, fuzzy
-msgid "Temporary directory"
-msgstr "Wähle ein Verzeichnis"
-
-#: lib/ocr.c:162
-msgid "Temporary directory for image files"
-msgstr ""
-
-#: lib/ocr.c:257
-#, c-format
-msgid "OCR failed, keeping %s"
-msgstr ""
-
 #: lib/socket.c:149
 #, c-format
 msgid "Cannot resolve address of %s: %s"
@@ -7885,77 +7525,91 @@
 msgid "Got initial audio timestamp: %s"
 msgstr "Erster Audiozeitstempel erhalten: %s"
 
-#: lib/album_xml.c:226
+#: lib/album_xml.c:232
 #, c-format
 msgid "Couldn't open album file %s"
 msgstr "Konnte Albumdatei %s nicht öffnen"
 
-#: lib/encoder.c:183
+#: lib/encoder.c:177
 #, fuzzy, c-format
 msgid "Created output file %s"
 msgstr "Kann Ausgabedatei %s nicht öffnen"
 
-#: lib/encoder.c:199
+#: lib/encoder.c:193
 #, fuzzy, c-format
 msgid "Created temp file %s\n"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: lib/encoder.c:651
+#: lib/encoder.c:615
 msgid "Multipass encoding not supported by encoder plugin"
 msgstr "Multipassenkodierung wird vom Enkoderplugin nicht unterstützt"
 
-#: lib/gtk/infowindow.c:516
+#: lib/gtk/infowindow.c:520
 #, c-format
 msgid "Name:\t%s"
 msgstr "Name:\t%s"
 
-#: lib/gtk/infowindow.c:526
+#: lib/gtk/infowindow.c:530
 #, c-format
 msgid "Input plugin:\t%s"
 msgstr "Quellenplugin:\t%s"
 
-#: lib/gtk/infowindow.c:535
+#: lib/gtk/infowindow.c:539
 #, c-format
 msgid "Location:\t%s"
 msgstr "Ort:\t%s"
 
-#: lib/gtk/infowindow.c:543
+#: lib/gtk/infowindow.c:547
 #, c-format
 msgid "Track:\t%d"
 msgstr "Track:\t%d"
 
-#: lib/gtk/infowindow.c:590
+#: lib/gtk/infowindow.c:565
+#, c-format
+msgid "Format:\t%s"
+msgstr "Format:\t%s"
+
+#: lib/gtk/infowindow.c:576 lib/gtk/infowindow.c:586
+#, c-format
+msgid "Stream type:\t%s"
+msgstr "Streamtyp:\t%s"
+
+#: lib/gtk/infowindow.c:594
 #, c-format
 msgid "Audio stream %d/%d"
 msgstr "Audiostream %d/%d"
 
-#: lib/gtk/infowindow.c:605
+#: lib/gtk/infowindow.c:609
 #, c-format
 msgid "Subtitle stream %d/%d [%s]"
 msgstr "Untertitelstream %d/%d [%s]"
 
-#: lib/gtk/infowindow.c:620
+#: lib/gtk/infowindow.c:624
 #, c-format
 msgid "Video stream %d/%d"
 msgstr "Videostream %d/%d"
 
-#: lib/gtk/infowindow.c:706 lib/gtk/infowindow.c:725 lib/gtk/infowindow.c:744
+#: lib/gtk/infowindow.c:708 lib/gtk/infowindow.c:726 lib/gtk/infowindow.c:744
+msgid "Stream type"
+msgstr "Streamtyp"
+
+#: lib/gtk/infowindow.c:712 lib/gtk/infowindow.c:730 lib/gtk/infowindow.c:748
 msgid "Input format"
 msgstr "Quellenformat"
 
-#: lib/gtk/infowindow.c:772
+#: lib/gtk/infowindow.c:776
 msgid "Input plugin"
 msgstr "Quellenplugin"
 
-#: lib/gtk/infowindow.c:1040
+#: lib/gtk/infowindow.c:1048
 msgid "Copy selected"
 msgstr "Kopiere Auswahl"
 
-#: lib/gtk/infowindow.c:1042
+#: lib/gtk/infowindow.c:1050
 msgid "Copy all"
 msgstr "Kopiere Alles"
 
-#: lib/gtk/infowindow.c:1090
+#: lib/gtk/infowindow.c:1098
 msgid "Gmerlin Track Info"
 msgstr "Gmerlin Track Info"
 
@@ -7963,71 +7617,71 @@
 msgid "Album name"
 msgstr "Albumname"
 
-#: lib/gtk/treewidget.c:966 lib/gtk/treewidget.c:2043
+#: lib/gtk/treewidget.c:966 lib/gtk/treewidget.c:2039
 msgid "Rename album"
 msgstr "Album umbenennen"
 
-#: lib/gtk/treewidget.c:1130
+#: lib/gtk/treewidget.c:1126
 msgid "Add device"
 msgstr "Gerät hinzufügen"
 
-#: lib/gtk/treewidget.c:1344
+#: lib/gtk/treewidget.c:1340
 msgid "Expand all"
 msgstr "Alles ausklappen"
 
-#: lib/gtk/treewidget.c:1348
+#: lib/gtk/treewidget.c:1344
 msgid "Collapse all"
 msgstr "Alles einklappen"
 
-#: lib/gtk/treewidget.c:1352
+#: lib/gtk/treewidget.c:1348
 msgid "Tabbed mode"
 msgstr "Tabbed Modus"
 
-#: lib/gtk/treewidget.c:1356
+#: lib/gtk/treewidget.c:1352
 msgid "Windowed mode"
 msgstr "Fenstermodus"
 
-#: lib/gtk/treewidget.c:1366
+#: lib/gtk/treewidget.c:1362
 msgid "Open"
 msgstr "Öffnen"
 
-#: lib/gtk/treewidget.c:1370
+#: lib/gtk/treewidget.c:1366
 msgid "Close"
 msgstr "Schließen"
 
-#: lib/gtk/treewidget.c:1374
+#: lib/gtk/treewidget.c:1370
 msgid "New..."
 msgstr "Neu..."
 
-#: lib/gtk/treewidget.c:1378
+#: lib/gtk/treewidget.c:1374
 msgid "New from directory..."
 msgstr "Neu von Verzeichnis..."
 
-#: lib/gtk/treewidget.c:1382 lib/gtk/albumwidget.c:1533
+#: lib/gtk/treewidget.c:1378 lib/gtk/albumwidget.c:1529
 msgid "Rename..."
 msgstr "Umbenennen..."
 
-#: lib/gtk/treewidget.c:1395
+#: lib/gtk/treewidget.c:1391
 msgid "Scan for devices"
 msgstr "Suche nach Geräten"
 
-#: lib/gtk/treewidget.c:1399
+#: lib/gtk/treewidget.c:1395
 msgid "Add device..."
 msgstr "Füge Gerät hinzu..."
 
-#: lib/gtk/treewidget.c:1406 lib/gtk/albumwidget.c:1601
+#: lib/gtk/treewidget.c:1402 lib/gtk/albumwidget.c:1597
 msgid "Album..."
 msgstr "Album..."
 
-#: lib/gtk/treewidget.c:1419
+#: lib/gtk/treewidget.c:1415
 msgid "Tree..."
 msgstr "Baum..."
 
-#: lib/gtk/treewidget.c:2041
+#: lib/gtk/treewidget.c:2037
 msgid "Delete album"
 msgstr "Lösche Album"
 
-#: lib/gtk/treewidget.c:2050
+#: lib/gtk/treewidget.c:2046
 msgid "New album"
 msgstr "Neues Album"
 
@@ -8100,32 +7754,32 @@
 msgid "Plugin options"
 msgstr "Pluginoptionen"
 
-#: lib/gtk/fileselect.c:232
+#: lib/gtk/fileselect.c:225
 msgid "Recursive"
 msgstr "Rekursiv"
 
-#: lib/gtk/fileselect.c:240
+#: lib/gtk/fileselect.c:233
 msgid "Add subdirectories as subalbums"
 msgstr "Füge Unterverzeichnisse als Unteralben hinzu"
 
-#: lib/gtk/fileselect.c:245
+#: lib/gtk/fileselect.c:238
 #, fuzzy
 msgid "Watch directories"
 msgstr "Verzeichnis erstellt: %s"
 
-#: lib/gtk/chapterdialog.c:194
+#: lib/gtk/chapterdialog.c:193
 msgid "Time"
 msgstr "Zeit"
 
-#: lib/gtk/chapterdialog.c:222 lib/gtk/chapterdialog.c:362
+#: lib/gtk/chapterdialog.c:221 lib/gtk/chapterdialog.c:360
 msgid "Edit chapter"
 msgstr "Bearbeite Kapitel"
 
-#: lib/gtk/chapterdialog.c:360
+#: lib/gtk/chapterdialog.c:358
 msgid "Add new chapter"
 msgstr "Neues Kapitel hinzufügen"
 
-#: lib/gtk/chapterdialog.c:364
+#: lib/gtk/chapterdialog.c:362
 msgid "Delete chapter"
 msgstr "Lösche Kapitel"
 
@@ -8195,163 +7849,163 @@
 msgid "Save preset"
 msgstr "Speichere Profil"
 
-#: lib/gtk/presetmenu.c:323
+#: lib/gtk/presetmenu.c:319
 #, fuzzy
 msgid "Save new..."
 msgstr "Speichern unter..."
 
-#: lib/gtk/presetmenu.c:326
+#: lib/gtk/presetmenu.c:322
 #, fuzzy
 msgid "Load..."
 msgstr "Befehle..."
 
-#: lib/gtk/presetmenu.c:332
+#: lib/gtk/presetmenu.c:328
 #, fuzzy
 msgid "Save to..."
 msgstr "Speichern unter..."
 
-#: lib/gtk/presetmenu.c:338
+#: lib/gtk/presetmenu.c:334
 #, fuzzy
 msgid "Delete..."
 msgstr "Ausgewählte..."
 
-#: lib/gtk/presetmenu.c:349
+#: lib/gtk/presetmenu.c:345
 #, fuzzy
 msgid "Preset"
 msgstr "Nächstes Pixel"
 
-#: lib/gtk/urlselect.c:179
+#: lib/gtk/urlselect.c:177
 msgid "URL:"
 msgstr "URL:"
 
-#: lib/gtk/albumwidget.c:1130
+#: lib/gtk/albumwidget.c:1126
 msgid "Track name"
 msgstr "Trackname"
 
-#: lib/gtk/albumwidget.c:1141
+#: lib/gtk/albumwidget.c:1137
 msgid "Rename entry"
 msgstr "Eintrag umbenennen"
 
-#: lib/gtk/albumwidget.c:1153
+#: lib/gtk/albumwidget.c:1149
 #, c-format
 msgid "Add files to album %s"
 msgstr "Füge Dateien zum Album %s hinzu"
 
-#: lib/gtk/albumwidget.c:1179
+#: lib/gtk/albumwidget.c:1175
 #, c-format
 msgid "Add URLS to album %s"
 msgstr "Füge URLs zum Album %s hinzu"
 
-#: lib/gtk/albumwidget.c:1263
+#: lib/gtk/albumwidget.c:1259
 #, c-format
 msgid "Add albums to %s"
 msgstr "Füge Alben zu %s hinzu"
 
-#: lib/gtk/albumwidget.c:1455
+#: lib/gtk/albumwidget.c:1451
 msgid "URLs..."
 msgstr "URLs..."
 
-#: lib/gtk/albumwidget.c:1457
+#: lib/gtk/albumwidget.c:1453
 msgid "Albums..."
 msgstr "Alben..."
 
-#: lib/gtk/albumwidget.c:1469
+#: lib/gtk/albumwidget.c:1465
 msgid "Copy to favourites"
 msgstr "Kopiere zu Favoriten"
 
-#: lib/gtk/albumwidget.c:1478
+#: lib/gtk/albumwidget.c:1474
 msgid "Move to top"
 msgstr "Verschiebe ganz nach oben"
 
-#: lib/gtk/albumwidget.c:1486
+#: lib/gtk/albumwidget.c:1482
 msgid "Move to bottom"
 msgstr "Verschiebe ganz nach unten"
 
-#: lib/gtk/albumwidget.c:1522
+#: lib/gtk/albumwidget.c:1518
 msgid "Find..."
 msgstr "Suche..."
 
-#: lib/gtk/albumwidget.c:1536
+#: lib/gtk/albumwidget.c:1532
 msgid "Info..."
 msgstr "Info..."
 
-#: lib/gtk/albumwidget.c:1550
+#: lib/gtk/albumwidget.c:1546
 msgid "Refresh"
 msgstr "Neu Laden"
 
-#: lib/gtk/albumwidget.c:1553
+#: lib/gtk/albumwidget.c:1549
 msgid "Export as EDL"
 msgstr "Als EDL exportieren"
 
-#: lib/gtk/albumwidget.c:1566
+#: lib/gtk/albumwidget.c:1562
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: lib/gtk/albumwidget.c:1570
+#: lib/gtk/albumwidget.c:1566
 msgid "Sort"
 msgstr "Sortieren"
 
-#: lib/gtk/albumwidget.c:1607
+#: lib/gtk/albumwidget.c:1603
 msgid "Select error tracks"
 msgstr "Wähle Fehlertracks aus"
 
-#: lib/gtk/albumwidget.c:1610
+#: lib/gtk/albumwidget.c:1606
 msgid "Show toolbar"
 msgstr "Zeige Werkzeugleiste"
 
-#: lib/gtk/albumwidget.c:2901
+#: lib/gtk/albumwidget.c:2897
 msgid "Add URLs"
 msgstr "Füge URLs hinzu"
 
-#: lib/gtk/albumwidget.c:2914
+#: lib/gtk/albumwidget.c:2910
 msgid "Close album and eject disc"
 msgstr "Schließe Album und werfe Disk aus"
 
-#: lib/gtk/albumwidget.c:2920
+#: lib/gtk/albumwidget.c:2916
 msgid "Copy selected tracks to favourites"
 msgstr "Kopiere ausgewählte Tracks zu Favoriten"
 
-#: lib/gtk/albumwidget.c:2923
+#: lib/gtk/albumwidget.c:2919
 msgid "Rename selected track"
 msgstr "Benenne ausgewählten Track um"
 
-#: lib/gtk/albumwidget.c:2926
+#: lib/gtk/albumwidget.c:2922
 msgid "Show track info"
 msgstr "Zeige Trackinformationen"
 
-#: lib/gtk/albumwidget.c:2929
+#: lib/gtk/albumwidget.c:2925
 msgid "Find tracks"
 msgstr "Suche Tracks"
 
-#: lib/gtk/albumwidget.c:3130
+#: lib/gtk/albumwidget.c:3126
 msgid "Backward search hit top, continuing at bottom"
 msgstr "Rückwärtssuche hat Angang erreicht, mache am Ende weiter"
 
-#: lib/gtk/albumwidget.c:3139
+#: lib/gtk/albumwidget.c:3135
 msgid "Backward search: No tracks found"
 msgstr "Rückwärtssuche: Keine Tracks gefunden"
 
-#: lib/gtk/albumwidget.c:3158
+#: lib/gtk/albumwidget.c:3154
 msgid "Forward search hit bottom, continuing at top"
 msgstr "Vorwärtssuche hat Ende erreicht. Mache am Anfang weiter"
 
-#: lib/gtk/albumwidget.c:3167
+#: lib/gtk/albumwidget.c:3163
 msgid "Forward search: No tracks found"
 msgstr "Vorwärtssuche: Keine Tracks gefunden"
 
-#: lib/gtk/albumwidget.c:3291
+#: lib/gtk/albumwidget.c:3287
 msgid "Exact match"
 msgstr "Genaue Übereinstimmung"
 
-#: lib/gtk/albumwidget.c:3292
+#: lib/gtk/albumwidget.c:3288
 msgid "String is an exact substring"
 msgstr "String ist ein exakter Teilstring"
 
-#: lib/gtk/albumwidget.c:3296
+#: lib/gtk/albumwidget.c:3292
 msgid "Match case"
 msgstr "Groß/Kleinschreibung beachten"
 
-#: lib/gtk/albumwidget.c:3297
+#: lib/gtk/albumwidget.c:3293
 msgid "Match upper and lower case"
 msgstr "Groß/Kleinschreibung beachten"
 
@@ -8407,15 +8061,15 @@
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: lib/gtk/driveselect.c:225
+#: lib/gtk/driveselect.c:224
 msgid "Drive:"
 msgstr "Laufwerk:"
 
-#: lib/gtk/cfg_dialog.c:502
+#: lib/gtk/cfg_dialog.c:497
 msgid "No options here, choose subcategory"
 msgstr "Keine Optionen hier, gehe zu Unterkategorie"
 
-#: lib/gtk/cfg_dialog.c:682
+#: lib/gtk/cfg_dialog.c:676
 msgid "No options available"
 msgstr "Keine Optionen verfügbar"
 
@@ -8569,57 +8223,27 @@
 msgid "Message"
 msgstr "Meldung"
 
-#: lib/recorder.c:52
-#, fuzzy, c-format
-msgid "New track: %s"
-msgstr "Nächster Track"
-
-#: lib/recorder.c:502
+#: lib/recorder.c:457
 #, fuzzy
 msgid "Output filename mask"
 msgstr "Ausgabedateien"
 
-#: lib/recorder.c:505
+#: lib/recorder.c:460
 msgid ""
 "Extension is appended by the plugin\n"
 "For the date and time formatting, consult the documentation\n"
 "of the strftime(3) function"
 msgstr ""
 
-#: lib/recorder.c:511
+#: lib/recorder.c:466
 #, fuzzy
 msgid "Snapshot directory"
 msgstr "Ausgabeverzeichnis"
 
-#: lib/recorder.c:517
+#: lib/recorder.c:472
 msgid "Snapshot filename mask"
 msgstr ""
 
-#: lib/recorder.c:562
-#, fuzzy
-msgid "Metadata mode"
-msgstr "Metadaten"
-
-#: lib/recorder.c:568
-#, fuzzy
-msgid "Static"
-msgstr "Automatisch aufnehmen"
-
-#: lib/recorder.c:569
-#, fuzzy
-msgid "From input"
-msgstr "Videoausgabe"
-
-#: lib/recorder.c:570
-#, fuzzy
-msgid "From player"
-msgstr "Gmerlin Player"
-
-#: lib/recorder.c:731
-#, fuzzy, c-format
-msgid "New track %s"
-msgstr "Nächster Track"
-
 #: lib/subprocess.c:168
 #, c-format
 msgid "Created process: %s [%d]"
@@ -8672,7 +8296,7 @@
 msgid "Change"
 msgstr ""
 
-#: lib/recorder_audio.c:87
+#: lib/recorder_audio.c:66
 #, fuzzy
 msgid "Record audio"
 msgstr "Kein Audio"
@@ -8693,136 +8317,105 @@
 "Author: %s\n"
 "%s"
 
-#: lib/album.c:499 lib/album.c:545
-msgid "Not exporting empty album"
-msgstr ""
-
-#: lib/album.c:506 lib/album.c:552
-#, fuzzy, c-format
-msgid "Could not open %s: %s"
-msgstr "Kann %s nicht öffnen"
-
-#: lib/album.c:610
+#: lib/album.c:486
 msgid "Unnamed disc"
 msgstr "Namenlose Disk"
 
-#: lib/album.c:713
+#: lib/album.c:588
 #, c-format
 msgid "%s disappeared, updating album"
 msgstr ""
 
-#: lib/album.c:723
+#: lib/album.c:598
 #, c-format
 msgid "%s appeared, updating album"
 msgstr ""
 
-#: lib/album.c:825
+#: lib/album.c:700
 #, c-format
 msgid "Album %s already open"
 msgstr "Album %s ist bereits offen"
 
-#: lib/album.c:830
+#: lib/album.c:705
 #, c-format
 msgid "Opening album %s"
 msgstr "Öffne Album %s"
 
-#: lib/album.c:975
+#: lib/album.c:850
 #, c-format
 msgid "Not closing album %s (open_count > 0)"
 msgstr "Werde Album %s nicht schließen (open_count > 0)"
 
-#: lib/album.c:978
+#: lib/album.c:853
 #, c-format
 msgid "Closing album %s"
 msgstr "Schließe Album %s"
 
-#: lib/album.c:2210
+#: lib/album.c:2097
 #, c-format
 msgid "Not loading %s (blacklisted extension)"
 msgstr ""
 
-#: lib/album.c:2221
-#, fuzzy, c-format
-msgid "Not loading %s (blacklisted filename)"
-msgstr "Laden von %s fehlgeschlagen"
-
-#: lib/album.c:2251
+#: lib/album.c:2101
 #, c-format
 msgid "Loading %s"
 msgstr "Lade %s"
 
-#: lib/album.c:2295
+#: lib/album.c:2144
 #, c-format
 msgid "Loaded %s (track %d of %d)"
 msgstr "%s geladen (Track %d von %d)"
 
-#: lib/album.c:2497
+#: lib/album.c:2346
 msgid "Ejecting disc failed"
 msgstr "Datenträger auswerfen fehlgeschlagen"
 
-#: lib/album.c:2615
+#: lib/album.c:2464
 msgid "Invalid selection range given"
 msgstr "Ungültiger Auswahlbereich"
 
-#: lib/ovl2text.c:159
-msgid "Plugin for writing the text subtitles"
-msgstr ""
-
-#: lib/ovl2text.c:233
-#, fuzzy
-msgid "Overlay to text converter"
-msgstr "Exporteur für Overlayuntertitel"
-
-#: lib/ovl2text.c:234
-#, fuzzy
-msgid "Exports overlay subtitles to a text format by performing an OCR."
-msgstr ""
-"Exportiert Overlay Untertitel im Format von spumux (http://dvdauthor."
-"sourceforge.net)"
-
-#: lib/edldec.c:642
+#: lib/edldec.c:640
 msgid "EDL only works with seekable sources"
 msgstr "EDL funktioniert nur mit suchbaren Quellen"
 
-#: lib/edldec.c:1018
+#: lib/edldec.c:1016
 msgid "Unexpected EOF, clearing frame"
 msgstr "Unerwartetes Dateiende, lösche Bild"
 
-#: lib/edldec.c:1185
+#: lib/edldec.c:1183
 msgid "Seeked audio out of range"
 msgstr "Audiosuche reichte außerhalb des Bereichs"
 
-#: lib/edldec.c:1205
+#: lib/edldec.c:1203
 msgid "Seeked video out of range"
 msgstr "Videosuche reichte außerhalb des Bereichs"
 
-#: lib/edldec.c:1227 lib/edldec.c:1248
+#: lib/edldec.c:1225 lib/edldec.c:1246
 msgid "Seeked text subtitles out of range"
 msgstr "Textuntertitel-Suche reichte außerhalb des Bereichs"
 
-#: lib/edldec.c:1372
+#: lib/edldec.c:1370
 msgid "EDL decoder"
 msgstr "EDL decoder"
 
-#: lib/edldec.c:1373
-#, fuzzy
-msgid "This metaplugin decodes an EDL as if it was a single file."
+#: lib/edldec.c:1371
+msgid "This metaplugin decodes and EDL as if it was a single file."
 msgstr "Dieses Metaplugin dekodiert eine EDL als wäre sie eine einzige Datei"
 
-#: lib/filters.c:193
+#: lib/filters.c:197
 msgid "Audio Filters"
 msgstr "Audiofilter"
 
-#: lib/filters.c:353
+#: lib/filters.c:350
 #, c-format
 msgid "Initialized audio filter %s"
 msgstr "Initialisierte Audiofilter %s"
 
-#: lib/filters.c:623
+#: lib/filters.c:625
 msgid "Video Filters"
 msgstr "Videofilter"
 
-#: lib/filters.c:778
+#: lib/filters.c:771
 #, c-format
 msgid "Initialized video filter %s"
 msgstr "Initialisierte Videofilter %s"
@@ -8876,89 +8469,6 @@
 "\n"
 "Lizenz: %s"
 
-#~ msgid "CD audio track"
-#~ msgstr "CD Audio Track"
-
-#, fuzzy
-#~ msgid "Failure"
-#~ msgstr "Datei"
-
-#~ msgid "Format: %s"
-#~ msgstr "Format: %s"
-
-#~ msgid "Audio stream: %s"
-#~ msgstr "Audiostream: %s"
-
-#~ msgid "Video stream: %s"
-#~ msgstr "Videostream: %s"
-
-#~ msgid "Subtitle stream: %s"
-#~ msgstr "Untertitelstream: %s"
-
-#~ msgid "Cannot open plugin %s"
-#~ msgstr "Kann Plugin %s nicht öffnen"
-
-#~ msgid "Cannot open %s with plugin %s"
-#~ msgstr "Kann %s nicht mit Plugin %s öffnen"
-
-#~ msgid ""
-#~ "For files, which contain edit decision lists and raw streams, this option "
-#~ "selects which one to decode. This setting is saved in the album once the "
-#~ "file is loaded."
-#~ msgstr ""
-#~ "Für Dateien, die EDLs und Rohstreams enthalten, letg diese Option fest, "
-#~ "welche von beiden abgespielt werden soll. Die Einstellung wird im Album "
-#~ "gespeichert, sobald die Datei geladen wurde."
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Complete date or year only"
-#~ msgstr "Komplettes Datum oder nur das Jahr"
-
-#~ msgid "Author:\t %s\n"
-#~ msgstr "Autor:\t %s\n"
-
-#~ msgid "Artist:\t %s\n"
-#~ msgstr "Künstler:\t %s\n"
-
-#~ msgid "Title:\t %s\n"
-#~ msgstr "Titel:\t %s\n"
-
-#~ msgid "Album:\t %s\n"
-#~ msgstr "Album:\t %s\n"
-
-#~ msgid "Copyright:\t %s\n"
-#~ msgstr "Copyright:\t %s\n"
-
-#~ msgid "Genre:\t %s\n"
-#~ msgstr "Genre:\t %s\n"
-
-#~ msgid "Date:\t %s\n"
-#~ msgstr "Datum:\t %s\n"
-
-#~ msgid "Track:\t %d\n"
-#~ msgstr "Track:\t %d\n"
-
-#~ msgid "Comment:\t %s\n"
-#~ msgstr "Kommentar:\t %s\n"
-
-#~ msgid ""
-#~ "For files, which contain edit decision lists and raw streams, this option "
-#~ "selects which one to decode."
-#~ msgstr ""
-#~ "Für Dateien, die EDLs und Rohstreams enthalten, letg diese Option fest, "
-#~ "welche von beiden abgespielt werden soll."
-
-#~ msgid "Format:\t%s"
-#~ msgstr "Format:\t%s"
-
-#~ msgid "Stream type:\t%s"
-#~ msgstr "Streamtyp:\t%s"
-
-#~ msgid "Stream type"
-#~ msgstr "Streamtyp"
-
 #~ msgid "Inputs"
 #~ msgstr "Quellen"
 
@@ -9095,6 +8605,9 @@
 #~ msgid "Output file: %s"
 #~ msgstr "Ausgabedatei: %s"
 
+#~ msgid "Could not open %s"
+#~ msgstr "Kann %s nicht öffnen"
+
 #~ msgid "Could not start %s"
 #~ msgstr "Konnte %s nicht starten"
 
@@ -9180,3 +8693,6 @@
 #~ msgstr ""
 #~ "Erzwinge Fließkommaverarbeitung. Dies verbessert die Qualität, kann aber "
 #~ "die Wiedergabe auch bremsen."
+
+#~ msgid "Ignore linebreaks in subtitles."
+#~ msgstr "Ignoriere Zeilenumbrüche"

gmerlin-1.2.0.tar.gz/po/gmerlin.pot -> gmerlin-4256.tar.gz/po/gmerlin.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: gmerlin-general@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-06-08 13:50+0200\n"
+"POT-Creation-Date: 2011-02-12 00:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,17 +60,17 @@
 msgstr ""
 
 #: plugins/pulseaudio/i_pulse.c:70 plugins/oss/i_oss.c:57
-#: plugins/alsa/i_alsa.c:49 lib/mediafiledevice.c:100
+#: plugins/alsa/i_alsa.c:49
 msgid "Channel Mode"
 msgstr ""
 
 #: plugins/pulseaudio/i_pulse.c:74 plugins/oss/i_oss.c:61
-#: plugins/alsa/i_alsa.c:53 lib/mediafiledevice.c:104
+#: plugins/alsa/i_alsa.c:53
 msgid "Mono"
 msgstr ""
 
 #: plugins/pulseaudio/i_pulse.c:74 plugins/oss/i_oss.c:61
-#: plugins/alsa/i_alsa.c:53 lib/mediafiledevice.c:104
+#: plugins/alsa/i_alsa.c:53
 msgid "Stereo"
 msgstr ""
 
@@ -80,12 +80,12 @@
 msgstr ""
 
 #: plugins/pulseaudio/i_pulse.c:85 plugins/oss/i_oss.c:72
-#: plugins/alsa/i_alsa.c:64 lib/mediafiledevice.c:108
+#: plugins/alsa/i_alsa.c:64
 msgid "Samplerate [Hz]"
 msgstr ""
 
-#: plugins/pulseaudio/i_pulse.c:93 plugins/cdaudio/i_cdaudio.c:588
-#: plugins/cdaudio/i_cdaudio.c:630
+#: plugins/pulseaudio/i_pulse.c:93 plugins/cdaudio/i_cdaudio.c:584
+#: plugins/cdaudio/i_cdaudio.c:626
 msgid "Server"
 msgstr ""
 
@@ -106,28 +106,25 @@
 "PulseAudio capture. You can specify the source, where we'll get the audio."
 msgstr ""
 
-#: plugins/subwriters/e_subtext.c:75
-msgid "Ignoring empty subtitle"
-msgstr ""
-
-#: plugins/subwriters/e_subtext.c:265 plugins/image/iw_pnm.c:194
-#: plugins/postprocessors/e_pp_vcdimager.c:110 plugins/lqt/e_lqt.c:703
+#: plugins/subwriters/e_subtext.c:243 plugins/image/iw_pnm.c:166
+#: plugins/postprocessors/e_pp_vcdimager.c:110 plugins/lqt/e_lqt.c:633
+#: lib/gtk/infowindow.c:695
 msgid "Format"
 msgstr ""
 
-#: plugins/subwriters/e_subtext.c:269
+#: plugins/subwriters/e_subtext.c:247
 msgid "Subrip (.srt)"
 msgstr ""
 
-#: plugins/subwriters/e_subtext.c:269
+#: plugins/subwriters/e_subtext.c:247
 msgid "MPlayer mpsub"
 msgstr ""
 
-#: plugins/subwriters/e_subtext.c:308 lib/gtk/plugininfo.c:161
+#: plugins/subwriters/e_subtext.c:286 lib/gtk/plugininfo.c:161
 msgid "Text subtitle exporter"
 msgstr ""
 
-#: plugins/subwriters/e_subtext.c:309
+#: plugins/subwriters/e_subtext.c:287
 msgid ""
 "Plugin for exporting text subtitles. Supported formats are MPSub and SRT"
 msgstr ""
@@ -140,12 +137,12 @@
 msgid "Input Mode"
 msgstr ""
 
-#: plugins/esd/i_esd.c:67 apps/recorder/recorder_window.c:622
+#: plugins/esd/i_esd.c:67 apps/recorder/recorder_window.c:614
 msgid "Record"
 msgstr ""
 
 #: plugins/esd/i_esd.c:67 apps/camelot/webcam_window.c:584
-#: apps/recorder/recorder_window.c:759
+#: apps/recorder/recorder_window.c:751
 msgid "Monitor"
 msgstr ""
 
@@ -170,14 +167,14 @@
 msgid "Framerate"
 msgstr ""
 
-#: plugins/v4l/pwc.c:83 plugins/tiff/iw_tiff.c:188
+#: plugins/v4l/pwc.c:83 plugins/tiff/iw_tiff.c:164
 msgid "Compression"
 msgstr ""
 
 #: plugins/v4l/pwc.c:87 plugins/videofilters/fv_deinterlace.c:146
-#: plugins/tiff/iw_tiff.c:191 include/gmerlin/bggavl.h:229
-#: include/gmerlin/bggavl.h:324 include/gmerlin/bggavl.h:633
-#: include/gmerlin/bggavl.h:657
+#: plugins/tiff/iw_tiff.c:167 include/gmerlin/bggavl.h:229
+#: include/gmerlin/bggavl.h:324 include/gmerlin/bggavl.h:630
+#: include/gmerlin/bggavl.h:654
 msgid "None"
 msgstr ""
 
@@ -240,8 +237,8 @@
 #: plugins/v4l/pwc.c:160 plugins/videofilters/fv_cropscale.c:431
 #: plugins/cdaudio/cdparanoia.c:195 include/gmerlin/bggavl.h:289
 #: include/gmerlin/bggavl.h:308 include/gmerlin/bggavl.h:323
-#: include/gmerlin/bggavl.h:657 include/gmerlin/bggavl.h:670
-#: lib/x11/x11_window.c:1195
+#: include/gmerlin/bggavl.h:654 include/gmerlin/bggavl.h:667
+#: lib/x11/x11_window.c:1190
 msgid "Auto"
 msgstr ""
 
@@ -307,15 +304,14 @@
 msgid "VIDIOCGMBUF failed: %s"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:306 plugins/v4l2/ov_v4l2.c:298
+#: plugins/v4l/i_v4l.c:306
 #, c-format
 msgid "mmap failed: %s"
 msgstr ""
 
 #: plugins/v4l/i_v4l.c:406 plugins/oss/i_oss.c:51 plugins/oss/oa_oss.c:67
-#: plugins/postprocessors/cdrdao_common.h:37 plugins/v4l2/i_v4l2.c:711
-#: plugins/v4l2/ov_v4l2.c:100 apps/camelot/vloopback.c:730
-#: lib/gtk/treewidget.c:1119
+#: plugins/postprocessors/cdrdao_common.h:37 plugins/v4l2/i_v4l2.c:933
+#: apps/camelot/vloopback.c:730 lib/gtk/treewidget.c:1115
 msgid "Device"
 msgstr ""
 
@@ -323,55 +319,55 @@
 msgid "V4L Device"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:417 plugins/v4l/i_v4l.c:422 plugins/v4l2/i_v4l2.c:729
-#: plugins/v4l2/i_v4l2.c:734 apps/camelot/vloopback.c:746
+#: plugins/v4l/i_v4l.c:417 plugins/v4l/i_v4l.c:422 plugins/v4l2/i_v4l2.c:944
+#: plugins/v4l2/i_v4l2.c:949 apps/camelot/vloopback.c:746
 msgid "Resolution"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:433 plugins/v4l2/i_v4l2.c:745
+#: plugins/v4l/i_v4l.c:433 plugins/v4l2/i_v4l2.c:960
 #: apps/camelot/vloopback.c:757
 msgid "QSIF (160x112)"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:434 plugins/v4l2/i_v4l2.c:746
+#: plugins/v4l/i_v4l.c:434 plugins/v4l2/i_v4l2.c:961
 #: apps/camelot/vloopback.c:758
 msgid "QCIF (176x144)"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:435 plugins/v4l2/i_v4l2.c:747
+#: plugins/v4l/i_v4l.c:435 plugins/v4l2/i_v4l2.c:962
 #: apps/camelot/vloopback.c:759
 msgid "QVGA (320x240)"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:436 plugins/v4l2/i_v4l2.c:748
+#: plugins/v4l/i_v4l.c:436 plugins/v4l2/i_v4l2.c:963
 #: apps/camelot/vloopback.c:760
 msgid "SIF(352x240)"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:437 plugins/v4l2/i_v4l2.c:749
+#: plugins/v4l/i_v4l.c:437 plugins/v4l2/i_v4l2.c:964
 #: apps/camelot/vloopback.c:761
 msgid "CIF (352x288)"
 msgstr ""
 
-#: plugins/v4l/i_v4l.c:438 plugins/v4l2/i_v4l2.c:750
+#: plugins/v4l/i_v4l.c:438 plugins/v4l2/i_v4l2.c:965
 #: apps/camelot/vloopback.c:762
 msgid "VGA (640x480)"
 msgstr ""
 
 #: plugins/v4l/i_v4l.c:439 plugins/videofilters/fv_cropscale.c:227
-#: plugins/v4l2/i_v4l2.c:751 include/gmerlin/bggavl.h:171
-#: include/gmerlin/bggavl.h:464 apps/camelot/vloopback.c:763
+#: plugins/v4l2/i_v4l2.c:966 include/gmerlin/bggavl.h:171
+#: include/gmerlin/bggavl.h:461 apps/camelot/vloopback.c:763
 msgid "User defined"
 msgstr ""
 
 #: plugins/v4l/i_v4l.c:444 plugins/videofilters/fv_cropscale.c:259
-#: plugins/v4l2/i_v4l2.c:756 include/gmerlin/bggavl.h:390
+#: plugins/v4l2/i_v4l2.c:971 include/gmerlin/bggavl.h:387
 #: apps/camelot/vloopback.c:769
 msgid "User defined width"
 msgstr ""
 
 #: plugins/v4l/i_v4l.c:452 plugins/videofilters/fv_cropscale.c:270
-#: plugins/v4l2/i_v4l2.c:764 include/gmerlin/bggavl.h:401
+#: plugins/v4l2/i_v4l2.c:979 include/gmerlin/bggavl.h:398
 #: apps/camelot/vloopback.c:778
 msgid "User defined height"
 msgstr ""
@@ -408,142 +404,142 @@
 msgid "video4linux recording plugin. Supports only video and no tuner decives."
 msgstr ""
 
-#: plugins/image/ir_tga.c:103
+#: plugins/image/ir_tga.c:99
 msgid "Read tga failed"
 msgstr ""
 
-#: plugins/image/ir_tga.c:228
+#: plugins/image/ir_tga.c:216
 msgid "TGA reader"
 msgstr ""
 
-#: plugins/image/ir_tga.c:229
+#: plugins/image/ir_tga.c:217
 msgid "Reader for TGA images"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:234 plugins/image/ir_pnm.c:108 lib/singlepic.c:1030
+#: plugins/image/ir_bmp.c:226 plugins/image/ir_pnm.c:104 lib/singlepic.c:993
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:244
+#: plugins/image/ir_bmp.c:236
 msgid "Cannot read File type"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:249
+#: plugins/image/ir_bmp.c:242
 msgid "File is no BMP"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:290
+#: plugins/image/ir_bmp.c:286
 msgid "Cannot detect image dimensions"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:298
+#: plugins/image/ir_bmp.c:295
 #, c-format
 msgid "Depth %d not supported"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:760
+#: plugins/image/ir_bmp.c:745
 msgid "BMP reader"
 msgstr ""
 
-#: plugins/image/ir_bmp.c:761
+#: plugins/image/ir_bmp.c:746
 msgid "Reader for BMP images"
 msgstr ""
 
-#: plugins/image/iw_tga.c:140 plugins/image/iw_tga.c:143
+#: plugins/image/iw_tga.c:139 plugins/image/iw_tga.c:142
 #, c-format
 msgid "Cannot save %s: %s"
 msgstr ""
 
-#: plugins/image/iw_tga.c:160
+#: plugins/image/iw_tga.c:159
 msgid "Do RLE compression"
 msgstr ""
 
-#: plugins/image/iw_tga.c:192
+#: plugins/image/iw_tga.c:191
 msgid "TGA writer"
 msgstr ""
 
-#: plugins/image/iw_tga.c:193
+#: plugins/image/iw_tga.c:192
 msgid "Writer for TGA images"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:127
+#: plugins/image/ir_pnm.c:123
 msgid "Can't read File type"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:142
+#: plugins/image/ir_pnm.c:138
 msgid "File is no pnm"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:168 plugins/image/ir_pnm.c:241
+#: plugins/image/ir_pnm.c:164 plugins/image/ir_pnm.c:237
 #, c-format
 msgid "File is no pnm (%.1s%.1s%.1s)"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:185
+#: plugins/image/ir_pnm.c:181
 msgid "Cannot read width"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:198
+#: plugins/image/ir_pnm.c:194
 msgid "Cannot read height"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:211
+#: plugins/image/ir_pnm.c:207
 msgid "Cannot read maxval"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:235
+#: plugins/image/ir_pnm.c:231
 msgid "PAM format not suported"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:310
+#: plugins/image/ir_pnm.c:300
 msgid "PBMascii"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:344
+#: plugins/image/ir_pnm.c:334
 msgid "PBMbin"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:382
+#: plugins/image/ir_pnm.c:372
 msgid "PGMascii"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:409
+#: plugins/image/ir_pnm.c:399
 msgid "PGMascii_16"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:438
+#: plugins/image/ir_pnm.c:428
 msgid "PGMbin"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:461
+#: plugins/image/ir_pnm.c:451
 msgid "PGMbin_16"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:486
+#: plugins/image/ir_pnm.c:476
 msgid "PPMascii"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:529
+#: plugins/image/ir_pnm.c:519
 msgid "PPMascii_16"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:607
+#: plugins/image/ir_pnm.c:597
 msgid "PPMbin_16"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:655
+#: plugins/image/ir_pnm.c:638
 msgid "PNM reader"
 msgstr ""
 
-#: plugins/image/ir_pnm.c:656
+#: plugins/image/ir_pnm.c:639
 msgid "Reader for PBM/PGM/PPM images"
 msgstr ""
 
-#: plugins/image/iw_bmp.c:129 plugins/image/iw_pnm.c:115
+#: plugins/image/iw_bmp.c:129 plugins/image/iw_pnm.c:92
 #: plugins/oss/i_oss.c:202 plugins/oss/oa_oss.c:144 plugins/oss/oa_oss.c:154
-#: plugins/oss/oa_oss.c:164 plugins/png/pngwriter.c:56
-#: plugins/tiff/iw_tiff.c:98 plugins/jpeg/iw_jpeg.c:115
+#: plugins/oss/oa_oss.c:164 plugins/png/pngwriter.c:54
+#: plugins/tiff/iw_tiff.c:96 plugins/jpeg/iw_jpeg.c:114
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr ""
@@ -556,40 +552,40 @@
 msgid "Writer for BMP images"
 msgstr ""
 
-#: plugins/image/iw_pnm.c:197
+#: plugins/image/iw_pnm.c:169
 msgid "Binary"
 msgstr ""
 
-#: plugins/image/iw_pnm.c:197
+#: plugins/image/iw_pnm.c:169
 msgid "ASCII"
 msgstr ""
 
-#: plugins/image/iw_pnm.c:203 lib/metadata.c:101
+#: plugins/image/iw_pnm.c:175 lib/metadata.c:149
 msgid "Comment"
 msgstr ""
 
-#: plugins/image/iw_pnm.c:207
+#: plugins/image/iw_pnm.c:179
 msgid "Comment which will be written in front of every file"
 msgstr ""
 
-#: plugins/image/iw_pnm.c:243
-msgid "PPM/PGM writer"
+#: plugins/image/iw_pnm.c:218
+msgid "PPM writer"
 msgstr ""
 
-#: plugins/image/iw_pnm.c:244
-msgid "Writer for PPM/PGM images"
+#: plugins/image/iw_pnm.c:219
+msgid "Writer for PPM images"
 msgstr ""
 
-#: plugins/x11/ov_x11.c:551
+#: plugins/x11/ov_x11.c:549
 #, c-format
 msgid "Got window size: %d %d"
 msgstr ""
 
-#: plugins/x11/ov_x11.c:919 plugins/x11/i_x11.c:96
+#: plugins/x11/ov_x11.c:915 plugins/x11/i_x11.c:96
 msgid "X11"
 msgstr ""
 
-#: plugins/x11/ov_x11.c:920
+#: plugins/x11/ov_x11.c:916
 msgid ""
 "X11 display driver with support for XVideo, XImage and OpenGL. Shared memory "
 "(XShm) is used where available."
@@ -624,7 +620,7 @@
 msgid "Samplerate %f kHz not supported by device %s"
 msgstr ""
 
-#: plugins/oss/i_oss.c:282 plugins/oss/oa_oss.c:569
+#: plugins/oss/i_oss.c:282 plugins/oss/oa_oss.c:563
 msgid "OSS"
 msgstr ""
 
@@ -669,16 +665,11 @@
 msgid "Device %s supports no %d-channel sound"
 msgstr ""
 
-#: plugins/oss/oa_oss.c:462 plugins/oss/oa_oss.c:469 plugins/oss/oa_oss.c:477
-#, c-format
-msgid "Write failed: %s"
-msgstr ""
-
-#: plugins/oss/oa_oss.c:509
+#: plugins/oss/oa_oss.c:503
 msgid "SNDCTL_DSP_GETODELAY ioctl failed"
 msgstr ""
 
-#: plugins/oss/oa_oss.c:570
+#: plugins/oss/oa_oss.c:564
 msgid "OSS output driver"
 msgstr ""
 
@@ -690,11 +681,11 @@
 msgid "Scope plugin"
 msgstr ""
 
-#: plugins/audiofilters/fa_sampleformat.c:70 include/gmerlin/bggavl.h:640
+#: plugins/audiofilters/fa_sampleformat.c:70 include/gmerlin/bggavl.h:637
 msgid "Sampleformat"
 msgstr ""
 
-#: plugins/audiofilters/fa_sampleformat.c:200 include/gmerlin/bggavl.h:628
+#: plugins/audiofilters/fa_sampleformat.c:200 include/gmerlin/bggavl.h:625
 msgid "Force sampleformat"
 msgstr ""
 
@@ -748,11 +739,11 @@
 msgid "Unknown error"
 msgstr ""
 
-#: plugins/alsa/i_alsa.c:343 plugins/alsa/oa_alsa.c:472
+#: plugins/alsa/i_alsa.c:341 plugins/alsa/oa_alsa.c:471
 msgid "Alsa"
 msgstr ""
 
-#: plugins/alsa/i_alsa.c:344
+#: plugins/alsa/i_alsa.c:342
 msgid "Alsa recorder"
 msgstr ""
 
@@ -806,7 +797,7 @@
 msgid "snd_pcm_write returned %s"
 msgstr ""
 
-#: plugins/alsa/oa_alsa.c:473
+#: plugins/alsa/oa_alsa.c:472
 msgid "Alsa output plugin with support for channel configurations up to 5.1"
 msgstr ""
 
@@ -959,56 +950,56 @@
 msgid "Skip the 10 second pause before writing or simulating starts."
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:96
+#: plugins/postprocessors/e_pp_cdrdao.c:93
 msgid "Audio CD options"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:101
+#: plugins/postprocessors/e_pp_cdrdao.c:98
 msgid "TOC file"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:107
+#: plugins/postprocessors/e_pp_cdrdao.c:104
 msgid "Gap between tracks"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:110
+#: plugins/postprocessors/e_pp_cdrdao.c:107
 msgid ""
 "Pre gap of each track in CD frames (1/75 seconds). Default is 150 (2 sec)."
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:114
+#: plugins/postprocessors/e_pp_cdrdao.c:111
 msgid "Write CD-Text"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:243
+#: plugins/postprocessors/e_pp_cdrdao.c:240
 #, c-format
 msgid "Cannot get duration of file %s"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:290
+#: plugins/postprocessors/e_pp_cdrdao.c:282
 msgid "Skipping cdrdao run (no tracks)"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:433
+#: plugins/postprocessors/e_pp_cdrdao.c:410
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:443
-#: plugins/postprocessors/e_pp_cdrdao.c:447
+#: plugins/postprocessors/e_pp_cdrdao.c:420
+#: plugins/postprocessors/e_pp_cdrdao.c:424
 #: plugins/postprocessors/e_pp_vcdimager.c:365
 #: plugins/postprocessors/e_pp_vcdimager.c:369
 #: plugins/postprocessors/e_pp_vcdimager.c:376
-#: plugins/postprocessors/e_pp_vcdimager.c:378 lib/tree.c:1478 lib/ocr.c:265
+#: plugins/postprocessors/e_pp_vcdimager.c:378 lib/tree.c:1434
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:466
+#: plugins/postprocessors/e_pp_cdrdao.c:443
 msgid "Audio CD generator/burner"
 msgstr ""
 
-#: plugins/postprocessors/e_pp_cdrdao.c:467
+#: plugins/postprocessors/e_pp_cdrdao.c:444
 msgid ""
 "This is a frontend for generating audio CD images (optionally with CD-Text) "
 "for cdrdao (http://cdrdao.sourceforge.net). Optional burning is also "
@@ -1292,26 +1283,25 @@
 msgid "Both fields"
 msgstr ""
 
-#: plugins/videofilters/fv_deinterlace.c:510
+#: plugins/videofilters/fv_deinterlace.c:508
 msgid "Deinterlacer"
 msgstr ""
 
-#: plugins/videofilters/fv_deinterlace.c:511
+#: plugins/videofilters/fv_deinterlace.c:509
 msgid "Deinterlace with various algorithms"
 msgstr ""
 
 #: plugins/videofilters/fv_transform.c:166
-#: plugins/videofilters/fv_textlogo.c:86
-#: plugins/videofilters/fv_tcdisplay.c:81 plugins/cdaudio/i_cdaudio.c:541
-#: apps/player/cfgdialog.c:104 apps/transcoder/transcoder_window.c:1304
-#: apps/transcoder/transcoder_window.c:1331
-#: apps/transcoder/transcoder_window.c:1354 apps/transcoder/trackdialog.c:87
+#: plugins/videofilters/fv_tcdisplay.c:81 plugins/cdaudio/i_cdaudio.c:537
+#: apps/player/cfgdialog.c:104 apps/transcoder/transcoder_window.c:1301
+#: apps/transcoder/transcoder_window.c:1328
+#: apps/transcoder/transcoder_window.c:1351 apps/transcoder/trackdialog.c:87
 #: apps/transcoder/trackdialog.c:226 apps/transcoder/trackdialog.c:296
 #: apps/transcoder/trackdialog.c:382 apps/transcoder/trackdialog.c:450
 #: apps/visualizer/gmerlin_visualizer.c:890
-#: apps/recorder/recorder_window.c:724 apps/recorder/recorder_window.c:743
-#: lib/player_subtitle.c:117 lib/pluginregistry.c:2114
-#: lib/x11/x11_window.c:1112 lib/transcoder_track.c:1326
+#: apps/recorder/recorder_window.c:716 apps/recorder/recorder_window.c:735
+#: lib/pluginregistry.c:2037 lib/x11/x11_window.c:1107
+#: lib/transcoder_track.c:1314
 msgid "General"
 msgstr ""
 
@@ -1360,8 +1350,8 @@
 msgstr ""
 
 #: plugins/videofilters/fv_transform.c:201 plugins/videofilters/fv_zoom.c:160
-#: plugins/lqt/e_lqt.c:948 include/gmerlin/bggavl.h:367
-#: lib/x11/x11_window.c:1170 lib/ocr.c:152
+#: plugins/lqt/e_lqt.c:850 include/gmerlin/bggavl.h:377
+#: lib/x11/x11_window.c:1165
 msgid "Background color"
 msgstr ""
 
@@ -1459,8 +1449,6 @@
 msgstr ""
 
 #: plugins/videofilters/fv_transform.c:372
-#: plugins/videofilters/fv_textlogo.c:136
-#: plugins/videofilters/fv_textlogo.c:145
 #: plugins/videofilters/fv_tcdisplay.c:132
 #: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:98
 #: lib/textrenderer.c:107 lib/osd.c:121 lib/osd.c:129
@@ -1483,157 +1471,6 @@
 msgid "Transform the image with different methods"
 msgstr ""
 
-#: plugins/videofilters/fv_swapfields.c:137
-msgid "Unsupported interlace mode, need top-first or bottom-first"
-msgstr ""
-
-#: plugins/videofilters/fv_swapfields.c:258
-msgid "Swap fields"
-msgstr ""
-
-#: plugins/videofilters/fv_swapfields.c:259
-msgid "Swap field order"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:91
-msgid "Text"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:94
-msgid "Text to display"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:98
-#: plugins/videofilters/fv_tcdisplay.c:94 lib/textrenderer.c:60
-msgid "Render options"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:103
-#: plugins/videofilters/fv_tcdisplay.c:99 plugins/lqt/e_lqt.c:942
-#: lib/textrenderer.c:65
-msgid "Text color"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:110
-#: plugins/videofilters/fv_cropscale.c:317
-#: plugins/videofilters/fv_tcdisplay.c:106 lib/textrenderer.c:72 lib/osd.c:101
-msgid "Border color"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:116
-#: plugins/videofilters/fv_tcdisplay.c:112 lib/textrenderer.c:78 lib/osd.c:107
-msgid "Border width"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:126
-#: plugins/videofilters/fv_tcdisplay.c:122 apps/player/display.c:110
-#: apps/transcoder/transcoder_window.c:195 lib/textrenderer.c:88
-msgid "Font"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:132
-#: plugins/videofilters/fv_tcdisplay.c:128 lib/textrenderer.c:94 lib/osd.c:117
-msgid "Horizontal justify"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:136
-#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
-msgid "Left"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:136
-#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
-msgid "Right"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:141
-#: plugins/videofilters/fv_tcdisplay.c:137 lib/textrenderer.c:103
-#: lib/osd.c:125
-msgid "Vertical justify"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:145
-#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
-#: lib/osd.c:129
-msgid "Top"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:145
-#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
-#: lib/osd.c:129
-msgid "Bottom"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:149
-#: plugins/videofilters/fv_tcdisplay.c:145 lib/textrenderer.c:111
-msgid "Cache size"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:156
-#: plugins/videofilters/fv_tcdisplay.c:152 lib/textrenderer.c:117
-msgid ""
-"Specify, how many different characters are cached for faster rendering. For "
-"European languages, this never needs to be larger than 255."
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:160
-#: plugins/videofilters/fv_tcdisplay.c:156 lib/textrenderer.c:121
-#: lib/osd.c:133
-msgid "Left border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:165
-#: plugins/videofilters/fv_tcdisplay.c:161 lib/textrenderer.c:126
-#: lib/osd.c:138
-msgid "Distance from the left text border to the image border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:169
-#: plugins/videofilters/fv_tcdisplay.c:165 lib/textrenderer.c:130
-#: lib/osd.c:142
-msgid "Right border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:174
-#: plugins/videofilters/fv_tcdisplay.c:170 lib/textrenderer.c:135
-#: lib/osd.c:147
-msgid "Distance from the right text border to the image border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:178
-#: plugins/videofilters/fv_tcdisplay.c:174 lib/textrenderer.c:139
-#: lib/osd.c:151
-msgid "Top border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:183
-#: plugins/videofilters/fv_tcdisplay.c:179 lib/textrenderer.c:144
-#: lib/osd.c:156
-msgid "Distance from the top text border to the image border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:192
-#: plugins/videofilters/fv_tcdisplay.c:188 lib/textrenderer.c:153
-#: lib/osd.c:165
-msgid "Distance from the bottom text border to the image border"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:196
-#: plugins/videofilters/fv_textlogo.c:199
-#: plugins/videofilters/fv_tcdisplay.c:192
-#: plugins/videofilters/fv_tcdisplay.c:195 lib/textrenderer.c:157
-#: lib/textrenderer.c:159
-msgid "Ignore linebreaks"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:314
-msgid "Text logo"
-msgstr ""
-
-#: plugins/videofilters/fv_textlogo.c:315
-msgid "Burn a static text onto video frames"
-msgstr ""
-
 #: plugins/videofilters/colormatrix.c:1434
 #: plugins/videofilters/fv_colorbalance.c:610
 #: plugins/videofilters/fv_equalizer.c:729
@@ -1678,8 +1515,8 @@
 msgstr ""
 
 #: plugins/videofilters/fv_cropscale.c:189
-#: plugins/videofilters/fv_cropscale.c:194 include/gmerlin/bggavl.h:495
-#: include/gmerlin/bggavl.h:512
+#: plugins/videofilters/fv_cropscale.c:194 include/gmerlin/bggavl.h:492
+#: include/gmerlin/bggavl.h:509
 msgid "Image size"
 msgstr ""
 
@@ -1688,140 +1525,140 @@
 msgid "From Source"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:228 include/gmerlin/bggavl.h:465
+#: plugins/videofilters/fv_cropscale.c:228 include/gmerlin/bggavl.h:462
 msgid "PAL DVD D1 4:3 (720 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:229 include/gmerlin/bggavl.h:466
+#: plugins/videofilters/fv_cropscale.c:229 include/gmerlin/bggavl.h:463
 msgid "PAL DVD D1 16:9 (720 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:230 include/gmerlin/bggavl.h:467
+#: plugins/videofilters/fv_cropscale.c:230 include/gmerlin/bggavl.h:464
 msgid "PAL DV 4:3 (720 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:231 include/gmerlin/bggavl.h:468
+#: plugins/videofilters/fv_cropscale.c:231 include/gmerlin/bggavl.h:465
 msgid "PAL DV 16:9 (720 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:232 include/gmerlin/bggavl.h:469
+#: plugins/videofilters/fv_cropscale.c:232 include/gmerlin/bggavl.h:466
 msgid "PAL CVD (352 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:233 include/gmerlin/bggavl.h:470
+#: plugins/videofilters/fv_cropscale.c:233 include/gmerlin/bggavl.h:467
 msgid "PAL VCD (352 x 288)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:234 include/gmerlin/bggavl.h:471
+#: plugins/videofilters/fv_cropscale.c:234 include/gmerlin/bggavl.h:468
 msgid "PAL SVCD 4:3 (480 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:235 include/gmerlin/bggavl.h:472
+#: plugins/videofilters/fv_cropscale.c:235 include/gmerlin/bggavl.h:469
 msgid "PAL SVCD 16:9 (480 x 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:236 include/gmerlin/bggavl.h:473
+#: plugins/videofilters/fv_cropscale.c:236 include/gmerlin/bggavl.h:470
 msgid "NTSC DVD D1 4:3 (720 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:237 include/gmerlin/bggavl.h:474
+#: plugins/videofilters/fv_cropscale.c:237 include/gmerlin/bggavl.h:471
 msgid "NTSC DVD D1 16:9 (720 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:238 include/gmerlin/bggavl.h:475
+#: plugins/videofilters/fv_cropscale.c:238 include/gmerlin/bggavl.h:472
 msgid "NTSC DV 4:3 (720 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:239 include/gmerlin/bggavl.h:476
+#: plugins/videofilters/fv_cropscale.c:239 include/gmerlin/bggavl.h:473
 msgid "NTSC DV 16:9 (720 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:240 include/gmerlin/bggavl.h:477
+#: plugins/videofilters/fv_cropscale.c:240 include/gmerlin/bggavl.h:474
 msgid "NTSC CVD (352 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:241 include/gmerlin/bggavl.h:478
+#: plugins/videofilters/fv_cropscale.c:241 include/gmerlin/bggavl.h:475
 msgid "NTSC VCD (352 x 240)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:242 include/gmerlin/bggavl.h:479
+#: plugins/videofilters/fv_cropscale.c:242 include/gmerlin/bggavl.h:476
 msgid "NTSC SVCD 4:3 (480 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:243 include/gmerlin/bggavl.h:480
+#: plugins/videofilters/fv_cropscale.c:243 include/gmerlin/bggavl.h:477
 msgid "NTSC SVCD 16:9 (480 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:244 include/gmerlin/bggavl.h:481
+#: plugins/videofilters/fv_cropscale.c:244 include/gmerlin/bggavl.h:478
 msgid "HD 720p/i (1280x720)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:245 include/gmerlin/bggavl.h:482
+#: plugins/videofilters/fv_cropscale.c:245 include/gmerlin/bggavl.h:479
 msgid "HD 1080p/i (1920x1080)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:246 include/gmerlin/bggavl.h:483
+#: plugins/videofilters/fv_cropscale.c:246 include/gmerlin/bggavl.h:480
 msgid "VGA (640 x 480)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:247 include/gmerlin/bggavl.h:484
+#: plugins/videofilters/fv_cropscale.c:247 include/gmerlin/bggavl.h:481
 msgid "QVGA (320 x 240)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:248 include/gmerlin/bggavl.h:485
+#: plugins/videofilters/fv_cropscale.c:248 include/gmerlin/bggavl.h:482
 msgid "SQCIF (128 × 96)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:249 include/gmerlin/bggavl.h:486
+#: plugins/videofilters/fv_cropscale.c:249 include/gmerlin/bggavl.h:483
 msgid "QCIF (176 × 144)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:250 include/gmerlin/bggavl.h:487
+#: plugins/videofilters/fv_cropscale.c:250 include/gmerlin/bggavl.h:484
 msgid "CIF (352 × 288)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:251 include/gmerlin/bggavl.h:488
+#: plugins/videofilters/fv_cropscale.c:251 include/gmerlin/bggavl.h:485
 msgid "4CIF (704 × 576)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:252 include/gmerlin/bggavl.h:489
+#: plugins/videofilters/fv_cropscale.c:252 include/gmerlin/bggavl.h:486
 msgid "16CIF (1408 × 1152)"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:255 include/gmerlin/bggavl.h:505
-#: include/gmerlin/bggavl.h:524
+#: plugins/videofilters/fv_cropscale.c:255 include/gmerlin/bggavl.h:502
+#: include/gmerlin/bggavl.h:521
 msgid ""
 "Set the output image size. For a user defined size, you must specify the "
 "width and height as well as the pixel width and pixel height."
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:266 include/gmerlin/bggavl.h:397
+#: plugins/videofilters/fv_cropscale.c:266 include/gmerlin/bggavl.h:394
 msgid ""
 "User defined width in pixels. Only meaningful if you selected \"User defined"
 "\" for the image size."
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:277 include/gmerlin/bggavl.h:408
+#: plugins/videofilters/fv_cropscale.c:277 include/gmerlin/bggavl.h:405
 msgid ""
 "User defined height in pixels. Only meaningful if you selected \"User defined"
 "\" for the image size."
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:281 include/gmerlin/bggavl.h:412
+#: plugins/videofilters/fv_cropscale.c:281 include/gmerlin/bggavl.h:409
 msgid "User defined pixel width"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:288 include/gmerlin/bggavl.h:419
+#: plugins/videofilters/fv_cropscale.c:288 include/gmerlin/bggavl.h:416
 msgid ""
 "User defined pixel width. Only meaningful if you selected \"User defined\" "
 "for the image size."
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:292 include/gmerlin/bggavl.h:423
+#: plugins/videofilters/fv_cropscale.c:292 include/gmerlin/bggavl.h:420
 msgid "User defined pixel height"
 msgstr ""
 
-#: plugins/videofilters/fv_cropscale.c:299 include/gmerlin/bggavl.h:430
+#: plugins/videofilters/fv_cropscale.c:299 include/gmerlin/bggavl.h:427
 msgid ""
 "User defined pixel height. Only meaningful if you selected \"User defined\" "
 "for the image size."
@@ -1841,30 +1678,35 @@
 "additional borders."
 msgstr ""
 
+#: plugins/videofilters/fv_cropscale.c:317
+#: plugins/videofilters/fv_tcdisplay.c:106 lib/textrenderer.c:72 lib/osd.c:101
+msgid "Border color"
+msgstr ""
+
 #: plugins/videofilters/fv_cropscale.c:322
 msgid "Color of the image borders."
 msgstr ""
 
 #: plugins/videofilters/fv_cropscale.c:346
 #: plugins/videofilters/fv_cropscale.c:351 plugins/videofilters/fv_zoom.c:106
-#: include/gmerlin/bggavl.h:332 lib/x11/x11_window.c:1184
+#: include/gmerlin/bggavl.h:332 lib/x11/x11_window.c:1179
 msgid "Scale mode"
 msgstr ""
 
 #: plugins/videofilters/fv_cropscale.c:358 plugins/videofilters/fv_zoom.c:113
-#: include/gmerlin/bggavl.h:339 lib/x11/x11_window.c:1205
+#: include/gmerlin/bggavl.h:339 lib/x11/x11_window.c:1200
 msgid ""
 "Choose scaling method. Auto means to choose based on the conversion quality. "
 "Nearest is fastest, Sinc with Lanczos window is slowest."
 msgstr ""
 
 #: plugins/videofilters/fv_cropscale.c:362 plugins/videofilters/fv_zoom.c:117
-#: include/gmerlin/bggavl.h:343 lib/x11/x11_window.c:1209
+#: include/gmerlin/bggavl.h:343 lib/x11/x11_window.c:1204
 msgid "Scale order"
 msgstr ""
 
 #: plugins/videofilters/fv_cropscale.c:369 plugins/videofilters/fv_zoom.c:124
-#: include/gmerlin/bggavl.h:350 lib/x11/x11_window.c:1214
+#: include/gmerlin/bggavl.h:350 lib/x11/x11_window.c:1209
 msgid "Order for sinc scaling"
 msgstr ""
 
@@ -1971,11 +1813,131 @@
 msgid "Interpolate missing timecodes"
 msgstr ""
 
-#: plugins/videofilters/fv_tcdisplay.c:347
+#: plugins/videofilters/fv_tcdisplay.c:94 lib/textrenderer.c:60
+msgid "Render options"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:99 plugins/lqt/e_lqt.c:844
+#: lib/textrenderer.c:65
+msgid "Text color"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:112 lib/textrenderer.c:78 lib/osd.c:107
+msgid "Border width"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:122 apps/player/display.c:110
+#: apps/transcoder/transcoder_window.c:195 lib/textrenderer.c:88
+msgid "Font"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:128 lib/textrenderer.c:94 lib/osd.c:117
+msgid "Horizontal justify"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
+msgid "Left"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:132 lib/textrenderer.c:98 lib/osd.c:121
+msgid "Right"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:137 lib/textrenderer.c:103
+#: lib/osd.c:125
+msgid "Vertical justify"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
+#: lib/osd.c:129
+msgid "Top"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:141 lib/textrenderer.c:107
+#: lib/osd.c:129
+msgid "Bottom"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:145 lib/textrenderer.c:111
+msgid "Cache size"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:152 lib/textrenderer.c:117
+msgid ""
+"Specify, how many different characters are cached for faster rendering. For "
+"European languages, this never needs to be larger than 255."
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:156 lib/textrenderer.c:121
+#: lib/osd.c:133
+msgid "Left border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:161 lib/textrenderer.c:126
+#: lib/osd.c:138
+msgid "Distance from the left text border to the image border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:165 lib/textrenderer.c:130
+#: lib/osd.c:142
+msgid "Right border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:170 lib/textrenderer.c:135
+#: lib/osd.c:147
+msgid "Distance from the right text border to the image border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:174 lib/textrenderer.c:139
+#: lib/osd.c:151
+msgid "Top border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:179 lib/textrenderer.c:144
+#: lib/osd.c:156
+msgid "Distance from the top text border to the image border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:188 lib/textrenderer.c:153
+#: lib/osd.c:165
+msgid "Distance from the bottom text border to the image border"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:192
+#: plugins/videofilters/fv_tcdisplay.c:195 lib/textrenderer.c:157
+#: lib/textrenderer.c:159
+msgid "Ignore linebreaks"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:199 lib/textrenderer.c:168
+msgid "Default width"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:208 lib/textrenderer.c:176
+msgid "Default height"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:217 lib/textrenderer.c:184
+msgid "Default Colorspace"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:222 lib/textrenderer.c:188
+msgid "YCrCb"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:222 lib/textrenderer.c:188
+msgid "RGB"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:226 lib/textrenderer.c:192
+msgid "Default Framerate"
+msgstr ""
+
+#: plugins/videofilters/fv_tcdisplay.c:383
 msgid "Display timecodes"
 msgstr ""
 
-#: plugins/videofilters/fv_tcdisplay.c:348
+#: plugins/videofilters/fv_tcdisplay.c:384
 msgid "Burn timecodes into video frames"
 msgstr ""
 
@@ -1988,7 +1950,7 @@
 msgstr ""
 
 #: plugins/videofilters/fv_zoom.c:151 plugins/videofilters/fv_tlp.c:91
-#: plugins/jpeg/iw_jpeg.c:265
+#: plugins/jpeg/iw_jpeg.c:264
 msgid "Quality"
 msgstr ""
 
@@ -2077,11 +2039,11 @@
 msgid "Bottom first"
 msgstr ""
 
-#: plugins/videofilters/fv_interlace.c:246
+#: plugins/videofilters/fv_interlace.c:245
 msgid "Interlace"
 msgstr ""
 
-#: plugins/videofilters/fv_interlace.c:247
+#: plugins/videofilters/fv_interlace.c:246
 msgid "Interlace video images. Output has half the input framerate."
 msgstr ""
 
@@ -2304,11 +2266,11 @@
 msgid "Gauss"
 msgstr ""
 
-#: plugins/videofilters/fv_blur.c:236 include/gmerlin/bggavl.h:658
+#: plugins/videofilters/fv_blur.c:236 include/gmerlin/bggavl.h:655
 msgid "Triangular"
 msgstr ""
 
-#: plugins/videofilters/fv_blur.c:237 include/gmerlin/bggavl.h:657
+#: plugins/videofilters/fv_blur.c:237 include/gmerlin/bggavl.h:654
 msgid "Rectangular"
 msgstr ""
 
@@ -2397,61 +2359,61 @@
 msgid "Writer for GAVL images"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:125
+#: plugins/mikmod/i_mikmod.c:124
 msgid "Cannot find mikmod executable"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:204
+#: plugins/mikmod/i_mikmod.c:201
 msgid "Unrecognized fileformat"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:254 lib/gtk/infowindow.c:711
-#: lib/gtk/infowindow.c:730 lib/gtk/infowindow.c:749
+#: plugins/mikmod/i_mikmod.c:251 lib/gtk/infowindow.c:717
+#: lib/gtk/infowindow.c:735 lib/gtk/infowindow.c:753
 msgid "Output format"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Mono 8bit"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Stereo 8bit"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Mono 16bit"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:257
+#: plugins/mikmod/i_mikmod.c:254
 msgid "Stereo 16bit"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:263 include/gmerlin/bggavl.h:531
-#: include/gmerlin/bggavl.h:537
+#: plugins/mikmod/i_mikmod.c:260 include/gmerlin/bggavl.h:528
+#: include/gmerlin/bggavl.h:534
 msgid "Samplerate"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:272
+#: plugins/mikmod/i_mikmod.c:269
 msgid "Look for hidden patterns in module"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:278
+#: plugins/mikmod/i_mikmod.c:275
 msgid "Use surround mixing"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:284
+#: plugins/mikmod/i_mikmod.c:281
 msgid "Force volume fade at the end of module"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:290
+#: plugins/mikmod/i_mikmod.c:287
 msgid "Use interpolate mixing"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:345
+#: plugins/mikmod/i_mikmod.c:342
 msgid "mikmod input plugin"
 msgstr ""
 
-#: plugins/mikmod/i_mikmod.c:346
+#: plugins/mikmod/i_mikmod.c:343
 msgid "Simple wrapper, which calls the mikmod program"
 msgstr ""
 
@@ -2515,35 +2477,39 @@
 msgid "CD-ROM Drive (%s)"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:243
+#: plugins/cdaudio/i_cdaudio.c:217
+msgid "CD audio track"
+msgstr ""
+
+#: plugins/cdaudio/i_cdaudio.c:237
 msgid "Got metadata from CD-Text"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:260
+#: plugins/cdaudio/i_cdaudio.c:254
 #, c-format
 msgid "Got metadata from gmerlin cache (%s)"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:276
+#: plugins/cdaudio/i_cdaudio.c:270
 #, c-format
 msgid "Got metadata from musicbrainz (%s)"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:295
+#: plugins/cdaudio/i_cdaudio.c:289
 #, c-format
 msgid "Got metadata from CDDB (%s)"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:321
+#: plugins/cdaudio/i_cdaudio.c:315
 #, c-format
 msgid "Audio CD track %02d"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:546
+#: plugins/cdaudio/i_cdaudio.c:542
 msgid "Trackname template"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:549
+#: plugins/cdaudio/i_cdaudio.c:545
 msgid ""
 "Template for track name generation from metadata\n"
 "%p:    Artist\n"
@@ -2555,103 +2521,103 @@
 "%c:    Comment"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:560
+#: plugins/cdaudio/i_cdaudio.c:556
 msgid "Use CD-Text"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:563
+#: plugins/cdaudio/i_cdaudio.c:559
 msgid "Try to get CD metadata from CD-Text"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:567
+#: plugins/cdaudio/i_cdaudio.c:563
 msgid "Use locally saved metadata"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:570
+#: plugins/cdaudio/i_cdaudio.c:566
 msgid ""
 "Whenever we obtain CD metadata from the internet, we save them into $HOME/."
 "gmerlin/cdaudio_metadata. If you got wrong metadata for a CD, disabling this "
 "option will retrieve the metadata again and overwrite the saved data."
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:577
+#: plugins/cdaudio/i_cdaudio.c:573
 msgid "Musicbrainz"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:582
+#: plugins/cdaudio/i_cdaudio.c:578
 msgid "Use Musicbrainz"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:594 plugins/cdaudio/i_cdaudio.c:636
-#: lib/lcdproc.c:118
+#: plugins/cdaudio/i_cdaudio.c:590 plugins/cdaudio/i_cdaudio.c:632
+#: lib/lcdproc.c:115
 msgid "Port"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:602 plugins/cdaudio/i_cdaudio.c:650
+#: plugins/cdaudio/i_cdaudio.c:598 plugins/cdaudio/i_cdaudio.c:646
 msgid "Proxy"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:604 plugins/cdaudio/i_cdaudio.c:652
+#: plugins/cdaudio/i_cdaudio.c:600 plugins/cdaudio/i_cdaudio.c:648
 msgid "Proxy server (leave empty for direct connection)"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:608 plugins/cdaudio/i_cdaudio.c:613
-#: plugins/cdaudio/i_cdaudio.c:656 plugins/cdaudio/i_cdaudio.c:661
+#: plugins/cdaudio/i_cdaudio.c:604 plugins/cdaudio/i_cdaudio.c:609
+#: plugins/cdaudio/i_cdaudio.c:652 plugins/cdaudio/i_cdaudio.c:657
 msgid "Proxy port"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:619
+#: plugins/cdaudio/i_cdaudio.c:615
 msgid "Cddb"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:624
+#: plugins/cdaudio/i_cdaudio.c:620
 msgid "Use Cddb"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:644
+#: plugins/cdaudio/i_cdaudio.c:640
 msgid "Path"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:665
+#: plugins/cdaudio/i_cdaudio.c:661
 msgid "Proxy username"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:667
+#: plugins/cdaudio/i_cdaudio.c:663
 msgid ""
 "User name for proxy (leave empty for poxies, which don't require "
 "authentication)"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:671
+#: plugins/cdaudio/i_cdaudio.c:667
 msgid "Proxy password"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:673
+#: plugins/cdaudio/i_cdaudio.c:669
 msgid "Password for proxy"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:677
+#: plugins/cdaudio/i_cdaudio.c:673
 msgid "Timeout"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:682
+#: plugins/cdaudio/i_cdaudio.c:678
 msgid "Timeout (in seconds) for connections to the CDDB server"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:766
+#: plugins/cdaudio/i_cdaudio.c:762
 #, c-format
 msgid "Ejecting disk failed: %s"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:768
+#: plugins/cdaudio/i_cdaudio.c:764
 msgid "Ejecting disk failed"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:792
+#: plugins/cdaudio/i_cdaudio.c:788
 msgid "Audio CD player/ripper"
 msgstr ""
 
-#: plugins/cdaudio/i_cdaudio.c:793
+#: plugins/cdaudio/i_cdaudio.c:789
 msgid ""
 "Plugin for audio CDs. Supports both playing with direct connection from the "
 "CD-drive to the souncard and ripping with cdparanoia. Metadata are obtained "
@@ -2659,25 +2625,25 @@
 "cdaudio_metadata."
 msgstr ""
 
-#: plugins/png/e_spumux.c:224 plugins/png/iw_png.c:96
+#: plugins/png/e_spumux.c:222 plugins/png/iw_png.c:96
 msgid "Compression level"
 msgstr ""
 
-#: plugins/png/e_spumux.c:246
+#: plugins/png/e_spumux.c:244
 msgid "spumux overlay exporter"
 msgstr ""
 
-#: plugins/png/e_spumux.c:247
+#: plugins/png/e_spumux.c:245
 msgid ""
 "Exports overlay subtitles into the format used by spumux (http://dvdauthor."
 "sourceforge.net)"
 msgstr ""
 
-#: plugins/png/ir_png.c:311
+#: plugins/png/ir_png.c:299
 msgid "PNG reader"
 msgstr ""
 
-#: plugins/png/ir_png.c:312
+#: plugins/png/ir_png.c:300
 msgid "Reader for PNG images"
 msgstr ""
 
@@ -2698,224 +2664,146 @@
 msgid "Writer for PNG images"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:108 plugins/v4l2/i_v4l2.c:153
+#: plugins/v4l2/i_v4l2.c:245 plugins/v4l2/i_v4l2.c:254
+#: plugins/v4l2/i_v4l2.c:296 plugins/v4l2/i_v4l2.c:360
+#: plugins/v4l2/i_v4l2.c:372
 msgid "Out of memory"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:131 plugins/v4l2/ov_v4l2.c:254
+#: plugins/v4l2/i_v4l2.c:275
 #, c-format
 msgid "%s does not support memory mapping"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:137 plugins/v4l2/ov_v4l2.c:260
-#, c-format
-msgid "VIDIOC_REQBUFS failed: %s"
-msgstr ""
-
-#: plugins/v4l2/i_v4l2.c:144 plugins/v4l2/ov_v4l2.c:267
+#: plugins/v4l2/i_v4l2.c:287
 #, c-format
 msgid "Insufficient buffer memory on %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:169 plugins/v4l2/ov_v4l2.c:284
+#: plugins/v4l2/i_v4l2.c:346
 #, c-format
-msgid "VIDIOC_QUERYBUF failed: %s"
+msgid "%s does not support user pointer i/o"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:195 plugins/v4l2/i_v4l2.c:617
-#: plugins/v4l2/ov_v4l2.c:359
+#: plugins/v4l2/i_v4l2.c:433 apps/camelot/vloopback.c:494
 #, c-format
-msgid "VIDIOC_QBUF failed: %s"
+msgid "Opening %s failed: %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:206 plugins/v4l2/ov_v4l2.c:372
+#: plugins/v4l2/i_v4l2.c:441
 #, c-format
-msgid "VIDIOC_STREAMON failed: %s"
+msgid "%s is no V4L2 device"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:229 plugins/v4l2/ov_v4l2.c:192
+#: plugins/v4l2/i_v4l2.c:447
 #, c-format
-msgid "VIDIOC_ENUM_FMT failed: %s"
+msgid "VIDIOC_QUERYCAP failed: %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:261 plugins/v4l2/i_v4l2.c:370
-#: plugins/v4l2/i_v4l2.c:400
+#: plugins/v4l2/i_v4l2.c:459
 #, c-format
-msgid "VIDIOC_G_FMT failed: %s"
+msgid "Device name: %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:301 plugins/v4l2/ov_v4l2.c:453
+#: plugins/v4l2/i_v4l2.c:463
 #, c-format
-msgid "Device name: %s"
+msgid "%s is no video capture device"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:305 plugins/v4l2/ov_v4l2.c:458
+#: plugins/v4l2/i_v4l2.c:470
 msgid "Trying mmap i/o"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:310
+#: plugins/v4l2/i_v4l2.c:475
 msgid "Trying read i/o"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:348
+#: plugins/v4l2/i_v4l2.c:513
 msgid "Trying v4lconvert"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:356
+#: plugins/v4l2/i_v4l2.c:523
 msgid "Got no supported pixelformat"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:383 plugins/v4l2/ov_v4l2.c:485
+#: plugins/v4l2/i_v4l2.c:536 plugins/v4l2/i_v4l2.c:566
 #, c-format
-msgid "VIDIOC_S_FMT failed: %s"
-msgstr ""
-
-#: plugins/v4l2/i_v4l2.c:457 plugins/v4l2/ov_v4l2.c:322
-#, c-format
-msgid "VIDIOC_STREAMOFF failed: %s"
-msgstr ""
-
-#: plugins/v4l2/i_v4l2.c:537 plugins/v4l2/i_v4l2.c:549
-#, c-format
-msgid "read failed: %s"
-msgstr ""
-
-#: plugins/v4l2/i_v4l2.c:579 plugins/v4l2/ov_v4l2.c:539
-#, c-format
-msgid "VIDIOC_DQBUF failed: %s"
+msgid "VIDIOC_G_FMT failed: %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:651
+#: plugins/v4l2/i_v4l2.c:549
 #, c-format
-msgid "Select failed: %s"
+msgid "VIDIOC_S_FMT failed: %s"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:657
+#: plugins/v4l2/i_v4l2.c:872
 msgid "Select timeout"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:716 plugins/v4l2/ov_v4l2.c:105
+#: plugins/v4l2/i_v4l2.c:938
 msgid "V4L2 Device"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:722
-msgid "Force read"
-msgstr ""
-
-#: plugins/v4l2/i_v4l2.c:725 plugins/v4l2/ov_v4l2.c:114
-msgid "Don't use memory mapping"
+#: plugins/v4l2/i_v4l2.c:1190
+msgid "Failure"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:892 plugins/v4l2/ov_v4l2.c:613
+#: plugins/v4l2/i_v4l2.c:1204
 msgid "V4L2"
 msgstr ""
 
-#: plugins/v4l2/i_v4l2.c:893
+#: plugins/v4l2/i_v4l2.c:1205
 msgid ""
 "video4linux 2 recording plugin. Supports only video and no tuner decives."
 msgstr ""
 
-#: plugins/v4l2/convert.c:84
+#: plugins/v4l2/convert.c:81
 msgid "Initializing libv4lconvert failed"
 msgstr ""
 
-#: plugins/v4l2/convert.c:94
+#: plugins/v4l2/convert.c:91
 msgid "Initializing libv4lconvert failed (resolution not directly supported)"
 msgstr ""
 
-#: plugins/v4l2/ov_v4l2.c:111
-msgid "Force write"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:341
-#, c-format
-msgid "write failed: %s"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:431
-msgid "Forcing square pixels"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:463
-msgid "Trying write i/o"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:475
-#, c-format
-msgid "Using %s"
-msgstr ""
-
-#: plugins/v4l2/ov_v4l2.c:614
-msgid "V4L2 output driver"
-msgstr ""
-
-#: plugins/v4l2/v4l2_common.c:378
-msgid "VIDIOC_S_CTRL Failed"
-msgstr ""
-
-#: plugins/v4l2/v4l2_common.c:414
-msgid "VIDIOC_G_CTRL Failed"
-msgstr ""
-
-#: plugins/v4l2/v4l2_common.c:431 apps/camelot/vloopback.c:494
-#, c-format
-msgid "Opening %s failed: %s"
-msgstr ""
-
-#: plugins/v4l2/v4l2_common.c:440
-#, c-format
-msgid "%s is no V4L2 device"
-msgstr ""
-
-#: plugins/v4l2/v4l2_common.c:446
-#, c-format
-msgid "VIDIOC_QUERYCAP failed: %s"
-msgstr ""
-
-#: plugins/v4l2/v4l2_common.c:454
-#, c-format
-msgid "%s is no video %s device"
-msgstr ""
-
-#: plugins/lqt/i_lqt.c:46 apps/plugincfg/gmerlin_plugincfg.c:281
-#: apps/transcoder/trackdialog.c:217 apps/recorder/recorder_window.c:722
-#: lib/pluginregistry.c:2125 lib/pluginregistry.c:2609 lib/player_audio.c:181
-#: lib/gtk/infowindow.c:697
+#: plugins/lqt/i_lqt.c:44 apps/plugincfg/gmerlin_plugincfg.c:281
+#: apps/transcoder/trackdialog.c:217 apps/recorder/recorder_window.c:714
+#: lib/pluginregistry.c:2048 lib/pluginregistry.c:2520 lib/player_audio.c:181
+#: lib/gtk/infowindow.c:704
 msgid "Audio"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:52
+#: plugins/lqt/i_lqt.c:50
 msgid "Audio Codecs"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:53
+#: plugins/lqt/i_lqt.c:51
 msgid "Sort and configure audio codecs"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:57 apps/transcoder/trackdialog.c:288
-#: apps/recorder/recorder_window.c:740 lib/player_video.c:134
-#: lib/pluginregistry.c:2136 lib/pluginregistry.c:2616
-#: lib/gtk/infowindow.c:716
+#: plugins/lqt/i_lqt.c:55 apps/transcoder/trackdialog.c:288
+#: apps/recorder/recorder_window.c:732 lib/player_video.c:134
+#: lib/pluginregistry.c:2059 lib/pluginregistry.c:2527
+#: lib/gtk/infowindow.c:722
 msgid "Video"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:63
+#: plugins/lqt/i_lqt.c:61
 msgid "Video Codecs"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:64
+#: plugins/lqt/i_lqt.c:62
 msgid "Sort and configure video codecs"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:281
+#: plugins/lqt/i_lqt.c:248
 msgid "More than one chapter track found, using first one"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:572
+#: plugins/lqt/i_lqt.c:518
 msgid "libquicktime input plugin"
 msgstr ""
 
-#: plugins/lqt/i_lqt.c:573
+#: plugins/lqt/i_lqt.c:519
 msgid "Input plugin based on libquicktime"
 msgstr ""
 
@@ -2924,100 +2812,100 @@
 msgid "%s Compatible with"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:41
+#: plugins/lqt/e_lqt.c:40
 msgid "Codec"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:183
+#: plugins/lqt/e_lqt.c:182
 #, c-format
 msgid "Cannot open file %s"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:478
+#: plugins/lqt/e_lqt.c:421
 #, c-format
 msgid "Audio codec %s cannot be written to AVI files"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:542
+#: plugins/lqt/e_lqt.c:472
 msgid "AVI subtitles not supported"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:590
+#: plugins/lqt/e_lqt.c:520
 #, c-format
 msgid "Omitting chapter %d: time (%f) > duration (%f)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:629
+#: plugins/lqt/e_lqt.c:559
 msgid "Making streamable...."
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:631
+#: plugins/lqt/e_lqt.c:561
 msgid "Making streamable....done"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:706
+#: plugins/lqt/e_lqt.c:636
 msgid "Quicktime"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:706
+#: plugins/lqt/e_lqt.c:636
 msgid "AVI"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:706
+#: plugins/lqt/e_lqt.c:636
 msgid "AVI (Opendml)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:707
+#: plugins/lqt/e_lqt.c:637
 msgid "MP4"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:707
+#: plugins/lqt/e_lqt.c:637
 msgid "M4A"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:707
+#: plugins/lqt/e_lqt.c:637
 msgid "3GP"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:712
+#: plugins/lqt/e_lqt.c:642
 msgid "Make streamable"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:714
+#: plugins/lqt/e_lqt.c:644
 msgid "Make the file streamable afterwards (uses twice the diskspace)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:718
+#: plugins/lqt/e_lqt.c:648
 msgid "Maximum RIFF size"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:723
+#: plugins/lqt/e_lqt.c:653
 msgid ""
 "Maximum RIFF size (in MB) for OpenDML AVIs. The default (1GB) is reasonable "
 "and should only be changed by people who know what they do."
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:914
+#: plugins/lqt/e_lqt.c:816
 msgid "Text box (top)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:921
+#: plugins/lqt/e_lqt.c:823
 msgid "Text box (left)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:928
+#: plugins/lqt/e_lqt.c:830
 msgid "Text box (bottom)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:935
+#: plugins/lqt/e_lqt.c:837
 msgid "Text box (right)"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:999
+#: plugins/lqt/e_lqt.c:901
 msgid "Quicktime encoder"
 msgstr ""
 
-#: plugins/lqt/e_lqt.c:1000
+#: plugins/lqt/e_lqt.c:902
 msgid ""
 "Encoder based on libquicktime (http://libquicktime.sourceforge.net) Writes "
 "Quicktime, AVI (optionally ODML), MP4, M4A and 3GPP. Supported codecs range "
@@ -3026,140 +2914,140 @@
 "supported are chapters and text subtitles"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:101 apps/cmdlineplayer/gmerlin_play.c:543
+#: plugins/tiff/iw_tiff.c:99 apps/cmdlineplayer/gmerlin_play.c:544
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:192
 #: tests/gmerlin_visualize.c:478
 #, c-format
 msgid "Cannot open %s"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:191
+#: plugins/tiff/iw_tiff.c:167
 msgid "Packbits"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:191
+#: plugins/tiff/iw_tiff.c:167
 msgid "Deflate"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:191
+#: plugins/tiff/iw_tiff.c:167
 msgid "JPEG"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:198
+#: plugins/tiff/iw_tiff.c:174
 msgid "JPEG quality"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:206
+#: plugins/tiff/iw_tiff.c:182
 msgid "Deflate compression level"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:253
+#: plugins/tiff/iw_tiff.c:229
 msgid "TIFF writer"
 msgstr ""
 
-#: plugins/tiff/iw_tiff.c:254
+#: plugins/tiff/iw_tiff.c:230
 msgid "Writer for TIFF images"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:106
+#: plugins/tiff/ir_tiff.c:100
 msgid "Seeked beyond buffer."
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:616
+#: plugins/tiff/ir_tiff.c:610
 msgid "Unsupported compression for LOGL/LOGLUV"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:660 plugins/tiff/ir_tiff.c:690
-#: plugins/tiff/ir_tiff.c:722
+#: plugins/tiff/ir_tiff.c:654 plugins/tiff/ir_tiff.c:684
+#: plugins/tiff/ir_tiff.c:716
 msgid "Unsupported samples per pixel"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:696
+#: plugins/tiff/ir_tiff.c:690
 #, c-format
 msgid "Unsupported bits per sample (%d) for UINT"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:703
+#: plugins/tiff/ir_tiff.c:697
 msgid "Didn't get max sample value"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:706
+#: plugins/tiff/ir_tiff.c:700
 msgid "Didn't get min sample value"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:728
+#: plugins/tiff/ir_tiff.c:722
 #, c-format
 msgid "Unsupported depth %d for IEEE float"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:738
+#: plugins/tiff/ir_tiff.c:732
 msgid "Unsupported sampleformat"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:743
+#: plugins/tiff/ir_tiff.c:737
 #, c-format
 msgid "Unknown sampleformat %d"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:869
+#: plugins/tiff/ir_tiff.c:862
 msgid "BUG!!! convert_func == 0x0"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:905
+#: plugins/tiff/ir_tiff.c:892
 msgid "TIFF reader"
 msgstr ""
 
-#: plugins/tiff/ir_tiff.c:906
+#: plugins/tiff/ir_tiff.c:893
 msgid "Reader for TIFF images"
 msgstr ""
 
-#: plugins/jpeg/iw_jpeg.c:186
+#: plugins/jpeg/iw_jpeg.c:185
 #, c-format
 msgid "Illegal pixelformat: %s"
 msgstr ""
 
-#: plugins/jpeg/iw_jpeg.c:273
+#: plugins/jpeg/iw_jpeg.c:272
 msgid "Chroma sampling"
 msgstr ""
 
-#: plugins/jpeg/iw_jpeg.c:325
+#: plugins/jpeg/iw_jpeg.c:324
 msgid "JPEG writer"
 msgstr ""
 
-#: plugins/jpeg/iw_jpeg.c:326
+#: plugins/jpeg/iw_jpeg.c:325
 msgid "Writer for JPEG images"
 msgstr ""
 
-#: plugins/jpeg/ir_jpeg.c:274
+#: plugins/jpeg/ir_jpeg.c:245
 msgid "Illegal pixelformat"
 msgstr ""
 
-#: plugins/jpeg/ir_jpeg.c:295
+#: plugins/jpeg/ir_jpeg.c:266
 msgid "JPEG reader"
 msgstr ""
 
-#: plugins/jpeg/ir_jpeg.c:296
+#: plugins/jpeg/ir_jpeg.c:267
 msgid "Reader for JPEG images"
 msgstr ""
 
-#: plugins/wavwrite/e_wav.c:317
+#: plugins/wavwrite/e_wav.c:315
 msgid "Bits per sample"
 msgstr ""
 
-#: plugins/wavwrite/e_wav.c:329
+#: plugins/wavwrite/e_wav.c:327
 msgid "Write info chunk"
 msgstr ""
 
-#: plugins/wavwrite/e_wav.c:472
+#: plugins/wavwrite/e_wav.c:470
 #, c-format
 msgid "Cannot open output file: %s"
 msgstr ""
 
-#: plugins/wavwrite/e_wav.c:643
+#: plugins/wavwrite/e_wav.c:640
 msgid "Wave writer"
 msgstr ""
 
-#: plugins/wavwrite/e_wav.c:644
+#: plugins/wavwrite/e_wav.c:641
 msgid "Simple writer for wave files, supports 8, 16, 24 and 32 bit PCM"
 msgstr ""
 
@@ -3183,7 +3071,7 @@
 "speed. Values above 3 enable slow high quality calculations."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:142 lib/singlepic.c:76
+#: include/gmerlin/bggavl.h:142 lib/singlepic.c:75
 msgid "Timescale"
 msgstr ""
 
@@ -3193,7 +3081,7 @@
 "duration)."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:151 lib/singlepic.c:84
+#: include/gmerlin/bggavl.h:151 lib/singlepic.c:83
 msgid "Frame duration"
 msgstr ""
 
@@ -3245,9 +3133,9 @@
 msgid "Deinterlace mode"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:229 include/gmerlin/bggavl.h:589
-#: apps/transcoder/tracklist.c:1269 lib/gtk/albumwidget.c:1508
-#: lib/gtk/albumwidget.c:2906
+#: include/gmerlin/bggavl.h:229 include/gmerlin/bggavl.h:586
+#: apps/transcoder/tracklist.c:1028 lib/gtk/albumwidget.c:1504
+#: lib/gtk/albumwidget.c:2902
 msgid "Copy"
 msgstr ""
 
@@ -3314,34 +3202,34 @@
 msgstr ""
 
 #: include/gmerlin/bggavl.h:290 include/gmerlin/bggavl.h:309
-#: lib/x11/x11_window.c:1196
+#: lib/x11/x11_window.c:1191
 msgid "Nearest"
 msgstr ""
 
 #: include/gmerlin/bggavl.h:291 include/gmerlin/bggavl.h:310
-#: lib/x11/x11_window.c:1197
+#: lib/x11/x11_window.c:1192
 msgid "Bilinear"
 msgstr ""
 
 #: include/gmerlin/bggavl.h:292 include/gmerlin/bggavl.h:311
-#: lib/x11/x11_window.c:1198
+#: lib/x11/x11_window.c:1193
 msgid "Quadratic"
 msgstr ""
 
 #: include/gmerlin/bggavl.h:293 include/gmerlin/bggavl.h:312
-#: lib/x11/x11_window.c:1199
+#: lib/x11/x11_window.c:1194
 msgid "Cubic B-Spline"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:294 lib/x11/x11_window.c:1200
+#: include/gmerlin/bggavl.h:294 lib/x11/x11_window.c:1195
 msgid "Cubic Mitchell-Netravali"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:295 lib/x11/x11_window.c:1201
+#: include/gmerlin/bggavl.h:295 lib/x11/x11_window.c:1196
 msgid "Cubic Catmull-Rom"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:296 lib/x11/x11_window.c:1202
+#: include/gmerlin/bggavl.h:296 lib/x11/x11_window.c:1197
 msgid "Sinc with Lanczos window"
 msgstr ""
 
@@ -3363,182 +3251,182 @@
 "placements are different. Usually, this is only done for qualities above 3."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:371
-msgid ""
-"Background color to use, when alpha mode above is \"Blend background color\"."
-msgstr ""
-
-#: include/gmerlin/bggavl.h:377
+#: include/gmerlin/bggavl.h:367
 msgid "Alpha mode"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:382
+#: include/gmerlin/bggavl.h:372
 msgid "Ignore"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:382
+#: include/gmerlin/bggavl.h:372
 msgid "Blend background color"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:383
+#: include/gmerlin/bggavl.h:373
 msgid ""
 "This option is used if the source has an alpha (=transparency) channel, but "
 "the output supports no transparency. Either, the transparency is ignored, or "
 "the background color you specify below is blended in."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:520
+#: include/gmerlin/bggavl.h:381
+msgid ""
+"Background color to use, when alpha mode above is \"Blend background color\"."
+msgstr ""
+
+#: include/gmerlin/bggavl.h:517
 msgid "From source"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:544
+#: include/gmerlin/bggavl.h:541
 msgid "Fixed samplerate"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:548
+#: include/gmerlin/bggavl.h:545
 msgid ""
 "If disabled, the output samplerate is taken from the source. If enabled, the "
 "samplerate you specify below us used."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:555
+#: include/gmerlin/bggavl.h:552
 msgid "Front channels"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:564
+#: include/gmerlin/bggavl.h:561
 msgid "Rear channels"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:573 lib/formats.c:195
+#: include/gmerlin/bggavl.h:570 lib/formats.c:195
 msgid "LFE"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:580
+#: include/gmerlin/bggavl.h:577
 msgid "Front to rear mode"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:588
+#: include/gmerlin/bggavl.h:585
 msgid "Mute"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:590
+#: include/gmerlin/bggavl.h:587
 msgid "Diff"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:592
+#: include/gmerlin/bggavl.h:589
 msgid ""
 "Mix mode when the output format has rear channels, but the source doesn't."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:597
+#: include/gmerlin/bggavl.h:594
 msgid "Stereo to mono mode"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:605
+#: include/gmerlin/bggavl.h:602
 msgid "Choose left"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:606
+#: include/gmerlin/bggavl.h:603
 msgid "Choose right"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:607
+#: include/gmerlin/bggavl.h:604
 msgid "Mix"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:609
+#: include/gmerlin/bggavl.h:606
 msgid "Mix mode when downmixing Stereo to Mono."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:616
+#: include/gmerlin/bggavl.h:613
 msgid "Fixed channel setup"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:620
+#: include/gmerlin/bggavl.h:617
 msgid ""
 "If disabled, the output channel configuration is taken from the source. If "
 "enabled, the setup you specify below us used."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:633
+#: include/gmerlin/bggavl.h:630
 msgid "8 bit"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "16 bit"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "32 bit"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "Float"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:633 include/gmerlin/bggavl.h:645
+#: include/gmerlin/bggavl.h:630 include/gmerlin/bggavl.h:642
 msgid "Double"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:634
+#: include/gmerlin/bggavl.h:631
 msgid ""
 "Force a sampleformat to be used for processing. None means to take the input "
 "format."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:646
+#: include/gmerlin/bggavl.h:643
 msgid "Sampleformat to be used for processing."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:652
+#: include/gmerlin/bggavl.h:649
 msgid "Dither mode"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:658
+#: include/gmerlin/bggavl.h:655
 msgid "Shaped"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:659
+#: include/gmerlin/bggavl.h:656
 msgid ""
 "Dither mode. Auto means to use the quality level. Subsequent options are "
 "ordered by increasing quality (i.e. decreasing speed)."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:665
+#: include/gmerlin/bggavl.h:662
 msgid "Resample mode"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:670
+#: include/gmerlin/bggavl.h:667
 msgid "Zero order hold"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:670
+#: include/gmerlin/bggavl.h:667
 msgid "Linear"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:671
+#: include/gmerlin/bggavl.h:668
 msgid "Sinc fast"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:671
+#: include/gmerlin/bggavl.h:668
 msgid "Sinc medium"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:671
+#: include/gmerlin/bggavl.h:668
 msgid "Sinc best"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:672
+#: include/gmerlin/bggavl.h:669
 msgid ""
 "Resample mode. Auto means to use the quality level. Subsequent options are "
 "ordered by increasing quality (i.e. decreasing speed)."
 msgstr ""
 
-#: include/gmerlin/bggavl.h:678
+#: include/gmerlin/bggavl.h:675
 msgid "Number of threads"
 msgstr ""
 
-#: include/gmerlin/bggavl.h:683
+#: include/gmerlin/bggavl.h:680
 msgid ""
 "Threads to launch for processing operations. Changing this requires program "
 "restart"
@@ -3572,7 +3460,7 @@
 "failed"
 msgstr ""
 
-#: apps/player/skinbrowser.c:406
+#: apps/player/skinbrowser.c:405
 msgid "Skin browser"
 msgstr ""
 
@@ -3580,39 +3468,39 @@
 msgid "Gmerlin player"
 msgstr ""
 
-#: apps/player/gmerlin.c:711
+#: apps/player/gmerlin.c:703
 msgid "General Options"
 msgstr ""
 
-#: apps/player/gmerlin.c:717
+#: apps/player/gmerlin.c:709
 msgid "Skip error tracks"
 msgstr ""
 
-#: apps/player/gmerlin.c:720
+#: apps/player/gmerlin.c:712
 msgid "If a track cannot be opened, switch to the next one"
 msgstr ""
 
-#: apps/player/gmerlin.c:724
+#: apps/player/gmerlin.c:716
 msgid "Don't advance"
 msgstr ""
 
-#: apps/player/gmerlin.c:730
+#: apps/player/gmerlin.c:722
 msgid "Shuffle mode"
 msgstr ""
 
-#: apps/player/gmerlin.c:736 apps/player/mainmenu.c:751
+#: apps/player/gmerlin.c:728 apps/player/mainmenu.c:748
 msgid "Off"
 msgstr ""
 
-#: apps/player/gmerlin.c:737
+#: apps/player/gmerlin.c:729
 msgid "Current album"
 msgstr ""
 
-#: apps/player/gmerlin.c:738
+#: apps/player/gmerlin.c:730
 msgid "All open albums"
 msgstr ""
 
-#: apps/player/gmerlin.c:744
+#: apps/player/gmerlin.c:736
 msgid "Show tooltips"
 msgstr ""
 
@@ -3624,13 +3512,12 @@
 msgid "Gmerlin GUI Player"
 msgstr ""
 
-#: apps/player/main.c:58 apps/player/gmerlin_remote.c:567
-#: apps/transcoder/main.c:74 apps/transcoder/gmerlin_transcoder_remote.c:179
+#: apps/player/main.c:58 apps/player/gmerlin_remote.c:476
+#: apps/transcoder/main.c:74 apps/transcoder/gmerlin_transcoder_remote.c:189
 msgid "Default port for the remote control"
 msgstr ""
 
-#: apps/player/main.c:63 apps/cmdlinerecorder/gmerlin-record.c:321
-#: apps/cmdlineplayer/gmerlin_play.c:842 apps/nmjedit/gmerlin-nmjedit.c:174
+#: apps/player/main.c:63 apps/cmdlineplayer/gmerlin_play.c:852
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:98 tests/fvtest.c:179
 msgid "Cache of the plugin registry (shared by all applicatons)"
 msgstr ""
@@ -3672,13 +3559,13 @@
 msgid "Visualization"
 msgstr ""
 
-#: apps/player/cfgdialog.c:86 lib/pluginregistry.c:2158
-#: lib/pluginregistry.c:2623
+#: apps/player/cfgdialog.c:86 lib/pluginregistry.c:2081
+#: lib/pluginregistry.c:2534
 msgid "Text subtitles"
 msgstr ""
 
 #: apps/player/cfgdialog.c:89 apps/transcoder/trackdialog.c:374
-#: apps/transcoder/trackdialog.c:442 lib/gtk/infowindow.c:735
+#: apps/transcoder/trackdialog.c:442 lib/gtk/infowindow.c:740
 msgid "Subtitles"
 msgstr ""
 
@@ -3692,12 +3579,12 @@
 msgstr ""
 
 #: apps/player/cfgdialog.c:122 apps/plugincfg/gmerlin_plugincfg.c:273
-#: apps/transcoder/transcoder_window.c:1391
+#: apps/transcoder/transcoder_window.c:1388
 msgid "Input plugins"
 msgstr ""
 
 #: apps/player/cfgdialog.c:130 apps/plugincfg/gmerlin_plugincfg.c:574
-#: apps/transcoder/transcoder_window.c:1399
+#: apps/transcoder/transcoder_window.c:1396
 msgid "Image readers"
 msgstr ""
 
@@ -3709,7 +3596,7 @@
 msgid "Display"
 msgstr ""
 
-#: apps/player/cfgdialog.c:161 apps/player/mainmenu.c:1009
+#: apps/player/cfgdialog.c:161 apps/player/mainmenu.c:1028
 msgid "Media Tree"
 msgstr ""
 
@@ -3717,10 +3604,10 @@
 msgid "Remote control"
 msgstr ""
 
-#: apps/player/cfgdialog.c:181 apps/player/mainmenu.c:1015
-#: apps/camelot/webcam_window.c:803 apps/transcoder/transcoder_window.c:1432
+#: apps/player/cfgdialog.c:181 apps/player/mainmenu.c:1034
+#: apps/camelot/webcam_window.c:803 apps/transcoder/transcoder_window.c:1429
 #: apps/visualizer/gmerlin_visualizer.c:908
-#: apps/recorder/recorder_window.c:803
+#: apps/recorder/recorder_window.c:795
 msgid "Log window"
 msgstr ""
 
@@ -3728,158 +3615,170 @@
 msgid "LCDproc"
 msgstr ""
 
-#: apps/player/mainmenu.c:765 apps/player/mainmenu.c:802
-#: apps/player/mainmenu.c:1192
+#: apps/player/mainmenu.c:762 apps/player/mainmenu.c:799
+#: apps/player/mainmenu.c:1211
 msgid "Options..."
 msgstr ""
 
-#: apps/player/mainmenu.c:769
+#: apps/player/mainmenu.c:766
 msgid "Filters..."
 msgstr ""
 
-#: apps/player/mainmenu.c:772
+#: apps/player/mainmenu.c:769
 msgid "Output plugin..."
 msgstr ""
 
-#: apps/player/mainmenu.c:797
+#: apps/player/mainmenu.c:794
 msgid "Enable visualizations"
 msgstr ""
 
-#: apps/player/mainmenu.c:806 lib/gtk/treewidget.c:1412
+#: apps/player/mainmenu.c:803 lib/gtk/treewidget.c:1408
 msgid "Plugin..."
 msgstr ""
 
-#: apps/player/mainmenu.c:941
+#: apps/player/mainmenu.c:950
 #, c-format
 msgid "Chapter %d [%s]"
 msgstr ""
 
-#: apps/player/mainmenu.c:1012
+#: apps/player/mainmenu.c:984 apps/player/mainmenu.c:1007
+#: lib/stringutils.c:587
+#, c-format
+msgid "Stream %d [%s]"
+msgstr ""
+
+#: apps/player/mainmenu.c:987 apps/player/mainmenu.c:1010
+#: lib/stringutils.c:589
+#, c-format
+msgid "Stream %d"
+msgstr ""
+
+#: apps/player/mainmenu.c:1031
 msgid "Info window"
 msgstr ""
 
-#: apps/player/mainmenu.c:1022 apps/transcoder/transcoder_window.c:862
+#: apps/player/mainmenu.c:1041 apps/transcoder/transcoder_window.c:862
 msgid "About..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1024 apps/transcoder/transcoder_window.c:863
+#: apps/player/mainmenu.c:1043 apps/transcoder/transcoder_window.c:863
 msgid "Userguide"
 msgstr ""
 
-#: apps/player/mainmenu.c:1045 apps/transcoder/transcoder_window.c:847
+#: apps/player/mainmenu.c:1064 apps/transcoder/transcoder_window.c:847
 msgid "Preferences..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1052
+#: apps/player/mainmenu.c:1071
 msgid "Skins..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1056
+#: apps/player/mainmenu.c:1075
 msgid "Multimedia keys..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1062
+#: apps/player/mainmenu.c:1081
 msgid "Seek forward"
 msgstr ""
 
-#: apps/player/mainmenu.c:1069
+#: apps/player/mainmenu.c:1088
 msgid "Seek backward"
 msgstr ""
 
-#: apps/player/mainmenu.c:1076
+#: apps/player/mainmenu.c:1095
 msgid "Increase volume"
 msgstr ""
 
-#: apps/player/mainmenu.c:1083
+#: apps/player/mainmenu.c:1102
 msgid "Decrease volume"
 msgstr ""
 
-#: apps/player/mainmenu.c:1089 apps/player/gmerlin_remote.c:414
+#: apps/player/mainmenu.c:1108 apps/player/gmerlin_remote.c:337
 msgid "Toggle mute"
 msgstr ""
 
-#: apps/player/mainmenu.c:1095
+#: apps/player/mainmenu.c:1114
 msgid "Next track"
 msgstr ""
 
-#: apps/player/mainmenu.c:1100
+#: apps/player/mainmenu.c:1119
 msgid "Previous track"
 msgstr ""
 
-#: apps/player/mainmenu.c:1105
+#: apps/player/mainmenu.c:1124
 msgid "Next chapter"
 msgstr ""
 
-#: apps/player/mainmenu.c:1111
+#: apps/player/mainmenu.c:1130
 msgid "Previous chapter"
 msgstr ""
 
-#: apps/player/mainmenu.c:1116 lib/gtk/treewidget.c:1336
-#: lib/gtk/treewidget.c:2046
+#: apps/player/mainmenu.c:1135 lib/gtk/treewidget.c:1332
+#: lib/gtk/treewidget.c:2042
 msgid "Goto current track"
 msgstr ""
 
-#: apps/player/mainmenu.c:1123
+#: apps/player/mainmenu.c:1142
 msgid "Copy current track to favourites"
 msgstr ""
 
-#: apps/player/mainmenu.c:1131
+#: apps/player/mainmenu.c:1150
 msgid "Seek to start"
 msgstr ""
 
-#: apps/player/mainmenu.c:1136 lib/player.c:331
+#: apps/player/mainmenu.c:1155 lib/player.c:331
 msgid "Pause"
 msgstr ""
 
-#: apps/player/mainmenu.c:1141
+#: apps/player/mainmenu.c:1160
 msgid "Quit gmerlin"
 msgstr ""
 
-#: apps/player/mainmenu.c:1152
+#: apps/player/mainmenu.c:1171
 msgid "Transcoder"
 msgstr ""
 
-#: apps/player/mainmenu.c:1156 apps/visualizer/gmerlin_visualizer.c:899
+#: apps/player/mainmenu.c:1175 apps/visualizer/gmerlin_visualizer.c:899
 msgid "Visualizer"
 msgstr ""
 
-#: apps/player/mainmenu.c:1160
+#: apps/player/mainmenu.c:1179
 msgid "Mixer"
 msgstr ""
 
-#: apps/player/mainmenu.c:1167
+#: apps/player/mainmenu.c:1186
 msgid "Audio..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1171
+#: apps/player/mainmenu.c:1190
 msgid "Video..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1175
+#: apps/player/mainmenu.c:1194
 msgid "Subtitles..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1179
+#: apps/player/mainmenu.c:1198
 msgid "Chapters..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1184
+#: apps/player/mainmenu.c:1203
 msgid "Visualization..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1188
+#: apps/player/mainmenu.c:1207
 msgid "Windows..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1196
+#: apps/player/mainmenu.c:1215
 msgid "Commands..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1200
+#: apps/player/mainmenu.c:1219
 msgid "Accessories..."
 msgstr ""
 
-#: apps/player/mainmenu.c:1204
+#: apps/player/mainmenu.c:1223
 msgid "Help..."
 msgstr ""
 
@@ -3912,162 +3811,150 @@
 msgid "Repeat mode"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:201
+#: apps/player/gmerlin_remote.c:124
 msgid "Option -addplay requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:223
+#: apps/player/gmerlin_remote.c:146
 msgid "Option -add requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:246
+#: apps/player/gmerlin_remote.c:169
 msgid "Option -openplay requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:268
+#: apps/player/gmerlin_remote.c:191
 msgid "Option -open requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:291
+#: apps/player/gmerlin_remote.c:214
 msgid "Option -volume requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:314
+#: apps/player/gmerlin_remote.c:237
 msgid "Option -volume_rel requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:339
+#: apps/player/gmerlin_remote.c:262
 msgid "Option -seek_rel requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:364
+#: apps/player/gmerlin_remote.c:287
 msgid "Option -chapter requires an argument\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:389
+#: apps/player/gmerlin_remote.c:312
 msgid "Play current track"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:394
+#: apps/player/gmerlin_remote.c:317
 msgid "Switch to next track"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:399
+#: apps/player/gmerlin_remote.c:322
 msgid "Switch to previous track"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:404
+#: apps/player/gmerlin_remote.c:327
 msgid "Stop playback"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:409
+#: apps/player/gmerlin_remote.c:332
 msgid "Pause playback"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:419 apps/player/gmerlin_remote.c:425
+#: apps/player/gmerlin_remote.c:342 apps/player/gmerlin_remote.c:348
 msgid "<gml>"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:420
+#: apps/player/gmerlin_remote.c:343
 msgid "Add <gml> to the incoming album"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:426
+#: apps/player/gmerlin_remote.c:349
 msgid "Add <gml> to the incoming album and play it"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:431 apps/player/gmerlin_remote.c:437
+#: apps/player/gmerlin_remote.c:354 apps/player/gmerlin_remote.c:360
 msgid "<device>"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:432
+#: apps/player/gmerlin_remote.c:355
 msgid "Open album for <device>. Device must be a GML (e.g. dvd:///dev/hdd)."
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:438
+#: apps/player/gmerlin_remote.c:361
 msgid ""
 "Open album for <device> and play first track. Device must be a GML (e.g. "
 "dvd:///dev/hdd)."
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:443
+#: apps/player/gmerlin_remote.c:366
 msgid "<volume>"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:444
+#: apps/player/gmerlin_remote.c:367
 msgid "Set player volume. <volume> is in dB, 0.0 is max"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:449 apps/player/gmerlin_remote.c:455
+#: apps/player/gmerlin_remote.c:372 apps/player/gmerlin_remote.c:378
 msgid "<diff>"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:450
+#: apps/player/gmerlin_remote.c:373
 msgid "In- or decrease player volume. <diff> is in dB"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:456
+#: apps/player/gmerlin_remote.c:379
 msgid "Seek relative. <diff> is in seconds."
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:462
+#: apps/player/gmerlin_remote.c:385
 msgid ""
 "Go to the specified chapter. Use '+' and '-' to go to the next or previous "
 "chapter respectively"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:467
-msgid "Print name of the current track"
-msgstr ""
-
-#: apps/player/gmerlin_remote.c:472
-msgid "Print metadata of the current track"
-msgstr ""
-
-#: apps/player/gmerlin_remote.c:477
-msgid "Print time of the current track"
-msgstr ""
-
-#: apps/player/gmerlin_remote.c:492
+#: apps/player/gmerlin_remote.c:401
 msgid "Option -host requires an argument"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:504
+#: apps/player/gmerlin_remote.c:413
 msgid "Option -port requires an argument"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:522
+#: apps/player/gmerlin_remote.c:431
 msgid "Host to connect to, default is localhost"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:528
+#: apps/player/gmerlin_remote.c:437
 msgid "Port to connect to"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:533
+#: apps/player/gmerlin_remote.c:442
 msgid "Launch new player if necessary"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:560
-#: apps/transcoder/gmerlin_transcoder_remote.c:172
+#: apps/player/gmerlin_remote.c:469
+#: apps/transcoder/gmerlin_transcoder_remote.c:182
 msgid "[options] command\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:561
+#: apps/player/gmerlin_remote.c:470
 msgid "Remote control command for the Gmerlin GUI Player\n"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:562
-#: apps/transcoder/gmerlin_transcoder_remote.c:174
+#: apps/player/gmerlin_remote.c:471
+#: apps/transcoder/gmerlin_transcoder_remote.c:184
 msgid "Global options"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:563
-#: apps/transcoder/gmerlin_transcoder_remote.c:175
+#: apps/player/gmerlin_remote.c:472
+#: apps/transcoder/gmerlin_transcoder_remote.c:185
 msgid "Commands"
 msgstr ""
 
-#: apps/player/gmerlin_remote.c:605
+#: apps/player/gmerlin_remote.c:514
 msgid "Cannot launch gmerlin process"
 msgstr ""
 
@@ -4100,8 +3987,8 @@
 msgstr ""
 
 #: apps/plugincfg/gmerlin_plugincfg.c:536
-#: apps/transcoder/transcoder_window.c:1383
-#: apps/recorder/recorder_window.c:777
+#: apps/transcoder/transcoder_window.c:1380
+#: apps/recorder/recorder_window.c:769
 msgid "Encoders"
 msgstr ""
 
@@ -4113,32 +4000,6 @@
 msgid "Image writers"
 msgstr ""
 
-#: apps/cmdlinerecorder/gmerlin-record.c:315 apps/transcoder/main.c:68
-#: apps/nmjedit/gmerlin-nmjedit.c:168
-msgid "[options]\n"
-msgstr ""
-
-#: apps/cmdlinerecorder/gmerlin-record.c:316
-msgid "Commandline recorder\n"
-msgstr ""
-
-#: apps/cmdlinerecorder/gmerlin-record.c:317
-#: apps/transcoder/transcoder_window.c:1006 apps/transcoder/main.c:70
-#: apps/cmdlineplayer/gmerlin_play.c:838 apps/nmjedit/gmerlin-nmjedit.c:170
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:94 tests/imgconvert.c:97
-#: tests/fvtest.c:175 tests/cfgtest.c:624 tests/visualization.c:78
-#: tests/gmerlin_visualize.c:344
-msgid "Options"
-msgstr ""
-
-#: apps/cmdlinerecorder/gmerlin-record.c:323
-#: apps/cmdlineplayer/gmerlin_play.c:844 apps/nmjedit/gmerlin-nmjedit.c:176
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:100 tests/fvtest.c:181
-msgid ""
-"Default plugin parameters are read from there. Use gmerlin_plugincfg to "
-"change them."
-msgstr ""
-
 #: apps/camelot/webcam.c:52 apps/camelot/webcam.c:561
 msgid "read_frame failed"
 msgstr ""
@@ -4161,7 +4022,7 @@
 msgid "Initializing %s failed, check settings"
 msgstr ""
 
-#: apps/camelot/webcam.c:683 lib/player_video.c:249
+#: apps/camelot/webcam.c:683 lib/player_video.c:251
 msgid "Restarting playback due to changed video filters"
 msgstr ""
 
@@ -4361,15 +4222,15 @@
 msgid "Pixelformat for write mode"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:309 apps/recorder/recorder_window.c:441
+#: apps/camelot/webcam_window.c:309 apps/recorder/recorder_window.c:440
 #, c-format
 msgid "Framerate: %.2f fps"
 msgstr ""
 
 #: apps/camelot/webcam_window.c:434 apps/camelot/webcam_window.c:456
-#: apps/camelot/webcam_window.c:494 lib/recorder_video.c:160
-#: lib/recorder_video.c:284 lib/recorder_video.c:388 lib/singlepic.c:755
-#: lib/transcoder_track.c:182 lib/recorder_audio.c:93 lib/ovl2text.c:157
+#: apps/camelot/webcam_window.c:494 lib/recorder_video.c:140
+#: lib/recorder_video.c:247 lib/recorder_video.c:352 lib/singlepic.c:722
+#: lib/transcoder_track.c:173 lib/recorder_audio.c:72
 msgid "Plugin"
 msgstr ""
 
@@ -4401,10 +4262,10 @@
 msgid "Set"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:567 apps/transcoder/transcoder_window.c:1315
-#: apps/transcoder/transcoder_window.c:1341 apps/transcoder/trackdialog.c:234
-#: apps/transcoder/trackdialog.c:304 apps/recorder/recorder_window.c:732
-#: apps/recorder/recorder_window.c:751
+#: apps/camelot/webcam_window.c:567 apps/transcoder/transcoder_window.c:1312
+#: apps/transcoder/transcoder_window.c:1338 apps/transcoder/trackdialog.c:234
+#: apps/transcoder/trackdialog.c:304 apps/recorder/recorder_window.c:724
+#: apps/recorder/recorder_window.c:743
 msgid "Filters"
 msgstr ""
 
@@ -4424,7 +4285,7 @@
 msgid "Directory"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:684 lib/recorder.c:520
+#: apps/camelot/webcam_window.c:684 lib/recorder.c:475
 msgid ""
 "Extension is appended by the plugin\n"
 "%t    Inserts time\n"
@@ -4440,21 +4301,21 @@
 msgid "Frame counter"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:721 apps/recorder/recorder_window.c:787
+#: apps/camelot/webcam_window.c:721 apps/recorder/recorder_window.c:779
 msgid "Output files"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:737 apps/recorder/recorder_window.c:614
+#: apps/camelot/webcam_window.c:737 apps/recorder/recorder_window.c:606
 #: lib/gtk/aboutwindow.c:126
 msgid "About"
 msgstr ""
 
 #: apps/camelot/webcam_window.c:738 apps/transcoder/transcoder_window.c:858
-#: apps/recorder/recorder_window.c:616
+#: apps/recorder/recorder_window.c:608
 msgid "Log messages"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:739 apps/recorder/recorder_window.c:618
+#: apps/camelot/webcam_window.c:739 apps/recorder/recorder_window.c:610
 msgid "Preferences"
 msgstr ""
 
@@ -4486,7 +4347,7 @@
 msgid "Capture interval (in seconds)"
 msgstr ""
 
-#: apps/camelot/webcam_window.c:860 lib/recorder.c:496
+#: apps/camelot/webcam_window.c:860 lib/recorder.c:451
 msgid "Output directory"
 msgstr ""
 
@@ -4585,6 +4446,14 @@
 msgid "File"
 msgstr ""
 
+#: apps/transcoder/transcoder_window.c:1006 apps/transcoder/main.c:70
+#: apps/cmdlineplayer/gmerlin_play.c:848
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:94 tests/imgconvert.c:97
+#: tests/fvtest.c:175 tests/cfgtest.c:624 tests/visualization.c:78
+#: tests/gmerlin_visualize.c:344
+msgid "Options"
+msgstr ""
+
 #: apps/transcoder/transcoder_window.c:1011
 msgid "Actions"
 msgstr ""
@@ -4602,46 +4471,50 @@
 msgid "Help"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1274
+#: apps/transcoder/transcoder_window.c:1271
 msgid "Transcoder configuration"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1279
+#: apps/transcoder/transcoder_window.c:1276
 msgid "Output options"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1290
+#: apps/transcoder/transcoder_window.c:1287
 msgid "Track defaults"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1299
+#: apps/transcoder/transcoder_window.c:1296
 msgid "Audio defaults"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1328
+#: apps/transcoder/transcoder_window.c:1325
 msgid "Video defaults"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1349
+#: apps/transcoder/transcoder_window.c:1346
 msgid "Text subtitle defaults"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1364 apps/transcoder/trackdialog.c:390
+#: apps/transcoder/transcoder_window.c:1361 apps/transcoder/trackdialog.c:390
 msgid "Textrenderer"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1375
+#: apps/transcoder/transcoder_window.c:1372
 msgid "Overlay subtitle defaults"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1410
+#: apps/transcoder/transcoder_window.c:1407
 msgid "Window"
 msgstr ""
 
-#: apps/transcoder/transcoder_window.c:1421
+#: apps/transcoder/transcoder_window.c:1418
 msgid "Remote"
 msgstr ""
 
+#: apps/transcoder/main.c:68
+msgid "[options]\n"
+msgstr ""
+
 #: apps/transcoder/main.c:69
 msgid "GTK multimedia transcoder\n"
 msgstr ""
@@ -4650,170 +4523,127 @@
 msgid "Postprocessing"
 msgstr ""
 
-#: apps/transcoder/gmerlin_transcoder_remote.c:173
+#: apps/transcoder/gmerlin_transcoder_remote.c:183
 msgid "Remote control command for the Gmerlin GUI transcoder\n"
 msgstr ""
 
-#: apps/transcoder/gmerlin_transcoder_remote.c:214
+#: apps/transcoder/gmerlin_transcoder_remote.c:224
 msgid "Cannot launch transcoder process"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:832
+#: apps/transcoder/tracklist.c:821
 msgid "Encoder configuration"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:891
-msgid ""
-"Use \"-\" to clear this field for all tracks. Empty string means to leave it "
-"unchanged for all tracks"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:902
-msgid "Mass tag"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:951 lib/tree.c:1176
-msgid "Format for track names"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:953 lib/tree.c:1179
-msgid ""
-"Format specifier for tracknames from\n"
-"metadata\n"
-"%p:    Artist\n"
-"%a:    Album\n"
-"%g:    Genre\n"
-"%t:    Track name\n"
-"%<d>n: Track number with <d> digits\n"
-"%y:    Year\n"
-"%c:    Comment"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:1007
-msgid "Auto rename"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:1096 lib/gtk/albumwidget.c:2899
+#: apps/transcoder/tracklist.c:875 lib/gtk/albumwidget.c:2895
 msgid "Add files"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1229 lib/gtk/albumwidget.c:1453
+#: apps/transcoder/tracklist.c:994 lib/gtk/albumwidget.c:1449
 msgid "Files..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1231
+#: apps/transcoder/tracklist.c:996
 msgid "Urls..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1233
+#: apps/transcoder/tracklist.c:998
 msgid "Drives..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1241
+#: apps/transcoder/tracklist.c:1006
 msgid "Move Up"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1243
+#: apps/transcoder/tracklist.c:1008
 msgid "Move Down"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1245 lib/gtk/treewidget.c:1386
-#: lib/gtk/albumwidget.c:1494
+#: apps/transcoder/tracklist.c:1010 lib/gtk/treewidget.c:1382
+#: lib/gtk/albumwidget.c:1490
 msgid "Remove"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1247
+#: apps/transcoder/tracklist.c:1012
 msgid "Configure..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1249
+#: apps/transcoder/tracklist.c:1014
 msgid "Edit chapters..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1251
-msgid "Mass tag..."
-msgstr ""
-
-#: apps/transcoder/tracklist.c:1253
-msgid "Auto numbering"
-msgstr ""
-
-#: apps/transcoder/tracklist.c:1255
-msgid "Auto rename..."
-msgstr ""
-
-#: apps/transcoder/tracklist.c:1257
+#: apps/transcoder/tracklist.c:1016
 msgid "Change encoders..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1264 lib/gtk/albumwidget.c:1501
-#: lib/gtk/albumwidget.c:2904
+#: apps/transcoder/tracklist.c:1023 lib/gtk/albumwidget.c:1497
+#: lib/gtk/albumwidget.c:2900
 msgid "Cut"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1273 lib/gtk/albumwidget.c:1515
-#: lib/gtk/albumwidget.c:2908
+#: apps/transcoder/tracklist.c:1032 lib/gtk/albumwidget.c:1511
+#: lib/gtk/albumwidget.c:2904
 msgid "Paste"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1284 lib/gtk/albumwidget.c:1581
+#: apps/transcoder/tracklist.c:1043 lib/gtk/albumwidget.c:1577
 #: lib/gtk/cfg_device.c:339
 msgid "Add..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1290 lib/gtk/albumwidget.c:1595
+#: apps/transcoder/tracklist.c:1049 lib/gtk/albumwidget.c:1591
 msgid "Selected..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1296 lib/gtk/albumwidget.c:1588
+#: apps/transcoder/tracklist.c:1055 lib/gtk/albumwidget.c:1584
 msgid "Edit..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1302
+#: apps/transcoder/tracklist.c:1061
 msgid "Postprocess..."
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1517 lib/gtk/albumwidget.c:2934
+#: apps/transcoder/tracklist.c:1272 lib/gtk/albumwidget.c:2930
 msgid "Total playback time"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1526
+#: apps/transcoder/tracklist.c:1281
 msgid "Append files to the task list"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1531
+#: apps/transcoder/tracklist.c:1286
 msgid "Append URLs to the task list"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1536
+#: apps/transcoder/tracklist.c:1291
 msgid "Append removable media to the task list"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1541
+#: apps/transcoder/tracklist.c:1296
 msgid "Delete selected tracks"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1546
+#: apps/transcoder/tracklist.c:1301
 msgid "Configure selected track"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1551 lib/gtk/chapterdialog.c:343
+#: apps/transcoder/tracklist.c:1306 lib/gtk/chapterdialog.c:341
 msgid "Edit chapters"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1556
+#: apps/transcoder/tracklist.c:1311
 msgid "Change encoder plugins for selected tracks"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1561
+#: apps/transcoder/tracklist.c:1316
 msgid "Copy selected tracks to clipboard"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1565
+#: apps/transcoder/tracklist.c:1320
 msgid "Cut selected tracks to clipboard"
 msgstr ""
 
-#: apps/transcoder/tracklist.c:1570
+#: apps/transcoder/tracklist.c:1325
 msgid "Paste tracks from clipboard"
 msgstr ""
 
@@ -4821,9 +4651,8 @@
 msgid "Track options"
 msgstr ""
 
-#: apps/transcoder/trackdialog.c:96 apps/recorder/recorder_window.c:795
-#: lib/gtk/infowindow.c:692 lib/gtk/infowindow.c:701 lib/gtk/infowindow.c:720
-#: lib/gtk/infowindow.c:739
+#: apps/transcoder/trackdialog.c:96 apps/recorder/recorder_window.c:787
+#: lib/gtk/infowindow.c:699
 msgid "Metadata"
 msgstr ""
 
@@ -4929,12 +4758,12 @@
 msgstr ""
 
 #: apps/visualizer/gmerlin_visualizer.c:1052
-#: apps/recorder/recorder_window.c:627
+#: apps/recorder/recorder_window.c:619
 msgid "Fullscreen mode"
 msgstr ""
 
 #: apps/visualizer/gmerlin_visualizer.c:1054
-#: apps/recorder/recorder_window.c:629
+#: apps/recorder/recorder_window.c:621
 msgid "Leave fullscreen mode"
 msgstr ""
 
@@ -4950,37 +4779,37 @@
 msgid "Launch help in a webwroswer"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:558
+#: apps/cmdlineplayer/gmerlin_play.c:559
 #, c-format
 msgid "No such track %d"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:600
+#: apps/cmdlineplayer/gmerlin_play.c:601
 #, c-format
 msgid "Got redirector %s (%d/%d)"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:687
+#: apps/cmdlineplayer/gmerlin_play.c:703
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:695
+#: apps/cmdlineplayer/gmerlin_play.c:710
 #, c-format
 msgid "Audio streams %d"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:700
+#: apps/cmdlineplayer/gmerlin_play.c:715
 #, c-format
 msgid "Video streams %d"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:705
+#: apps/cmdlineplayer/gmerlin_play.c:720
 #, c-format
 msgid "Subtitle streams %d"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:717
+#: apps/cmdlineplayer/gmerlin_play.c:732
 #, c-format
 msgid ""
 "Playing audio stream %d\n"
@@ -4990,7 +4819,7 @@
 "%s"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:732
+#: apps/cmdlineplayer/gmerlin_play.c:747
 #, c-format
 msgid ""
 "Playing video stream %d\n"
@@ -5000,45 +4829,72 @@
 "%s"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:759
+#: apps/cmdlineplayer/gmerlin_play.c:754
+#, c-format
+msgid "Format: %s"
+msgstr ""
+
+#: apps/cmdlineplayer/gmerlin_play.c:758
+#, c-format
+msgid "Audio stream: %s"
+msgstr ""
+
+#: apps/cmdlineplayer/gmerlin_play.c:762
+#, c-format
+msgid "Video stream: %s"
+msgstr ""
+
+#: apps/cmdlineplayer/gmerlin_play.c:766
+#, c-format
+msgid "Subtitle stream: %s"
+msgstr ""
+
+#: apps/cmdlineplayer/gmerlin_play.c:771
 msgid "Player cleaned up"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:776
+#: apps/cmdlineplayer/gmerlin_play.c:786
 msgid "Player now playing"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:780
+#: apps/cmdlineplayer/gmerlin_play.c:790
 msgid "Player now seeking"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:784
+#: apps/cmdlineplayer/gmerlin_play.c:794
 msgid "Player now changing"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:836
+#: apps/cmdlineplayer/gmerlin_play.c:846
 msgid "[options] gml...\n"
 msgstr ""
 
-#: apps/cmdlineplayer/gmerlin_play.c:837
+#: apps/cmdlineplayer/gmerlin_play.c:847
 msgid "Commandline Multimedia player\n"
 msgstr ""
 
-#: apps/kbd/kbd_daemon.c:97
+#: apps/cmdlineplayer/gmerlin_play.c:854
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:100 tests/fvtest.c:181
+msgid ""
+"Default plugin parameters are read from there. Use gmerlin_plugincfg to "
+"change them."
+msgstr ""
+
+#: apps/kbd/kbd_daemon.c:147
 #, c-format
 msgid "Grabbing key (Code: %d, modifiers: %s) failed"
 msgstr ""
 
-#: apps/kbd/kbd_daemon.c:132
+#: apps/kbd/kbd_daemon.c:182
 msgid "Exiting"
 msgstr ""
 
-#: apps/kbd/kbd_daemon.c:200
+#: apps/kbd/kbd_daemon.c:253
 #, c-format
 msgid "State %02x -> %02x\n"
 msgstr ""
 
-#: apps/kbd/kbd_daemon.c:239
+#: apps/kbd/kbd_daemon.c:292
 msgid "Reloaded keys"
 msgstr ""
 
@@ -5076,7 +4932,7 @@
 
 #: apps/kbd/kbd_config.c:619
 msgid ""
-"Switch deamon on and off. If you want to start the daemon with each start of "
+"Switch daemon on and off. If you want to start the daemon with each start of "
 "X, add \"gmerlin_kbd\" to your startup programs"
 msgstr ""
 
@@ -5088,11 +4944,11 @@
 msgid "Delete key"
 msgstr ""
 
-#: apps/alsamixer/g_card.c:637
+#: apps/alsamixer/g_card.c:639
 msgid "Card controls"
 msgstr ""
 
-#: apps/alsamixer/g_card.c:642
+#: apps/alsamixer/g_card.c:644
 #, c-format
 msgid "Controls for %s"
 msgstr ""
@@ -5131,196 +4987,52 @@
 msgid "Unknown"
 msgstr ""
 
-#: apps/alsamixer/g_control.c:863
+#: apps/alsamixer/g_control.c:867
 msgid "Tone"
 msgstr ""
 
-#: apps/alsamixer/g_control.c:894
+#: apps/alsamixer/g_control.c:898
 msgid "Treble"
 msgstr ""
 
-#: apps/alsamixer/g_control.c:924
+#: apps/alsamixer/g_control.c:928
 msgid "Bass"
 msgstr ""
 
-#: apps/alsamixer/g_control.c:1011
+#: apps/alsamixer/g_control.c:1015
 msgid "Rec"
 msgstr ""
 
-#: apps/alsamixer/g_control.c:1057
+#: apps/alsamixer/g_control.c:1061
 msgid "Play"
 msgstr ""
 
-#: apps/alsamixer/g_control.c:1405
+#: apps/alsamixer/g_control.c:1412
 #, c-format
 msgid "Type %s not handled for %s"
 msgstr ""
 
-#: apps/nmjedit/file.c:59
-#, c-format
-msgid "Opening directory %s failed: %s"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:51 tests/album2pls.c:75 lib/mediafiledevice.c:229
-#, c-format
-msgid "Album file %s could not be opened"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:60 tests/album2pls.c:85 lib/mediafiledevice.c:238
-#, c-format
-msgid "Album file %s contains no entries"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:71
-#, c-format
-msgid "No directory found for location %s"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:93
-#, c-format
-msgid "Clearing existent playlist %s"
-msgstr ""
-
-#: apps/nmjedit/bgalbum.c:149
-#, c-format
-msgid "Song %s not found"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:47
-#, c-format
-msgid "SQL query: \"%s\" failed: %s"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:431
-#, c-format
-msgid "Adding %s"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:437 apps/nmjedit/nmjedit.c:488
-#, c-format
-msgid "Scanned %d files"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:484
-#, c-format
-msgid "Updating %s"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:500
-#, c-format
-msgid "Found %d files in database"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:571
-#, c-format
-msgid "Directory %s exists"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:576 apps/nmjedit/nmjedit.c:601
-#, c-format
-msgid "Directory %s doesn't exist"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:697 apps/thumbnailer/gmerlin-video-thumbnailer.c:266
-#, c-format
-msgid "No plugin for %s"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:705 apps/thumbnailer/gmerlin-video-thumbnailer.c:274
-#: lib/tree.c:1120 lib/transcoder_track.c:820 lib/transcoder_track.c:831
-#: lib/album.c:2270
-#, c-format
-msgid "Loading %s failed"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:714 apps/thumbnailer/gmerlin-video-thumbnailer.c:375
-msgid "Writing image header failed"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:729 apps/nmjedit/nmjedit.c:738
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:393
-#: apps/thumbnailer/gmerlin-video-thumbnailer.c:403
-msgid "Writing image failed"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:863
-#, c-format
-msgid "Removing empty genre %s"
-msgstr ""
-
-#: apps/nmjedit/nmjedit.c:898
-#, c-format
-msgid "Removing empty person %s"
-msgstr ""
-
-#: apps/nmjedit/dir.c:115
-msgid "Either ID or path must be set in directory\n"
-msgstr ""
-
-#: apps/nmjedit/song.c:150
-msgid "Either ID or path must be set in directory"
-msgstr ""
-
-#: apps/nmjedit/song.c:286
-#, c-format
-msgid "Adding song %s"
-msgstr ""
-
-#: apps/nmjedit/song.c:442
-#, c-format
-msgid "Deleting song %s"
-msgstr ""
-
-#: apps/nmjedit/album.c:129
-#, c-format
-msgid "Adding album %s"
-msgstr ""
-
-#: apps/nmjedit/album.c:205
-#, c-format
-msgid "Using thumbnail %s"
-msgstr ""
-
-#: apps/nmjedit/album.c:302
-#, c-format
-msgid "Removing empty album %s"
-msgstr ""
-
-#: apps/nmjedit/album.c:318
-#, c-format
-msgid "Removing thumbnail %s"
-msgstr ""
-
-#: apps/nmjedit/album.c:325
-#, c-format
-msgid "Removing poster %s"
-msgstr ""
-
-#: apps/nmjedit/gmerlin-nmjedit.c:169
-msgid "Editor for NMJ2 databases\n"
-msgstr ""
-
-#: apps/recorder/recorder_window.c:502
+#: apps/recorder/recorder_window.c:501
 msgid "Error, check messages and settings"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:620
+#: apps/recorder/recorder_window.c:612
 msgid "Reopen inputs"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:624
+#: apps/recorder/recorder_window.c:616
 msgid "Make snapshot"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:631
+#: apps/recorder/recorder_window.c:623
 msgid "Hide controls"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:717
+#: apps/recorder/recorder_window.c:709
 msgid "Recorder configuration"
 msgstr ""
 
-#: apps/recorder/recorder_window.c:767
+#: apps/recorder/recorder_window.c:759
 msgid "Snapshots"
 msgstr ""
 
@@ -5359,6 +5071,17 @@
 msgid "File %s has no video"
 msgstr ""
 
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:266
+#, c-format
+msgid "No plugin for %s"
+msgstr ""
+
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:274 lib/tree.c:1114
+#: lib/transcoder_track.c:830 lib/album.c:2119
+#, c-format
+msgid "Loading %s failed"
+msgstr ""
+
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:317
 msgid "Cannot reset stream after failed seek"
 msgstr ""
@@ -5367,6 +5090,15 @@
 msgid "Couldn't read frame"
 msgstr ""
 
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:375
+msgid "Writing image header failed"
+msgstr ""
+
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:393
+#: apps/thumbnailer/gmerlin-video-thumbnailer.c:403
+msgid "Writing image failed"
+msgstr ""
+
 #: apps/thumbnailer/gmerlin-video-thumbnailer.c:416
 #, c-format
 msgid "Successfully saved %s"
@@ -5470,59 +5202,41 @@
 msgid "Saving snapshot %s"
 msgstr ""
 
-#: lib/recorder_video.c:154
+#: lib/recorder_video.c:134
 msgid "Record video"
 msgstr ""
 
-#: lib/recorder_video.c:166
-msgid "Limit fps"
-msgstr ""
-
-#: lib/recorder_video.c:170
-msgid ""
-"Limit frames per second. By default, the maximum possible framerate will be "
-"used."
-msgstr ""
-
-#: lib/recorder_video.c:175
+#: lib/recorder_video.c:146
 msgid "fps limit"
 msgstr ""
 
-#: lib/recorder_video.c:181
+#: lib/recorder_video.c:152
 msgid ""
 "Specify the maximum framerate for input plugins, which can capture images "
 "really fast"
 msgstr ""
 
-#: lib/recorder_video.c:278
+#: lib/recorder_video.c:241
 msgid "Enable monitor"
 msgstr ""
 
-#: lib/recorder_video.c:369
+#: lib/recorder_video.c:333
 msgid "Automatic"
 msgstr ""
 
-#: lib/recorder_video.c:374
+#: lib/recorder_video.c:338
 msgid "Snapshot interval"
 msgstr ""
 
-#: lib/recorder_video.c:383
+#: lib/recorder_video.c:347
 msgid "Overwrite existing files"
 msgstr ""
 
-#: lib/recorder_video.c:710 lib/recorder_audio.c:236
-msgid "Read failed (device unplugged?)"
-msgstr ""
-
 #: lib/bggavl.c:393 lib/bggavl.c:411
 #, c-format
 msgid "Unknown scale mode %s\n"
 msgstr ""
 
-#: lib/player_subtitle.c:122 lib/transcoder_track.c:324
-msgid "Time offset"
-msgstr ""
-
 #: lib/transcoder_pp.c:209
 #, c-format
 msgid "Not adding %s: Unsupported filename"
@@ -5549,7 +5263,7 @@
 msgid "Restarting playback due to changed video options"
 msgstr ""
 
-#: lib/player_video.c:278 lib/player_loop.c:1123 lib/player_audio.c:320
+#: lib/player_video.c:280 lib/player_loop.c:1164 lib/player_audio.c:322
 msgid "Detected EOF"
 msgstr ""
 
@@ -5594,118 +5308,113 @@
 msgid "Remixing to stereo for filter \"%s\""
 msgstr ""
 
-#: lib/searchpath.c:154
+#: lib/searchpath.c:142
 #, c-format
 msgid "Creating directory %s failed: %s"
 msgstr ""
 
-#: lib/searchpath.c:160 lib/transcoder.c:1882
+#: lib/searchpath.c:148 lib/transcoder.c:1838
 #, c-format
 msgid "Created directory %s"
 msgstr ""
 
-#: lib/pluginregistry.c:626 lib/pluginregistry.c:1571
+#: lib/pluginregistry.c:557 lib/pluginregistry.c:1499
 #, c-format
 msgid "Plugin %s has no or wrong version"
 msgstr ""
 
-#: lib/pluginregistry.c:632
+#: lib/pluginregistry.c:564
 #, c-format
 msgid "No symbol the_plugin in %s"
 msgstr ""
 
-#: lib/pluginregistry.c:636
+#: lib/pluginregistry.c:569
 #, c-format
 msgid "Plugin %s has zero priority"
 msgstr ""
 
-#: lib/pluginregistry.c:647
+#: lib/pluginregistry.c:579
 #, c-format
 msgid "Not loading %s (blacklisted)"
 msgstr ""
 
-#: lib/pluginregistry.c:749 lib/pluginregistry.c:1560
+#: lib/pluginregistry.c:683 lib/pluginregistry.c:1488
 #, c-format
 msgid "dlopen failed for %s: %s"
 msgstr ""
 
-#: lib/pluginregistry.c:1343
+#: lib/pluginregistry.c:1273
 #, c-format
 msgid "bg_plugin_ref %s: %d"
 msgstr ""
 
-#: lib/pluginregistry.c:1407
+#: lib/pluginregistry.c:1337
 #, c-format
 msgid "bg_plugin_unref_nolock %s: %d"
 msgstr ""
 
-#: lib/pluginregistry.c:1418
+#: lib/pluginregistry.c:1348
 #, c-format
 msgid "bg_plugin_unref %s: %d"
 msgstr ""
 
-#: lib/pluginregistry.c:1443 lib/pluginregistry.c:1497
+#: lib/pluginregistry.c:1372 lib/pluginregistry.c:1425
 #, c-format
 msgid "No plugin found for image %s"
 msgstr ""
 
-#: lib/pluginregistry.c:1578
-#, c-format
-msgid "dlsym failed for %s: %s"
-msgstr ""
-
-#: lib/pluginregistry.c:1666
+#: lib/pluginregistry.c:1593
 msgid "Invalid plugin type for video output"
 msgstr ""
 
-#: lib/pluginregistry.c:1673
+#: lib/pluginregistry.c:1599
 #, c-format
 msgid "Plugin %s doesn't support embedded windows"
 msgstr ""
 
-#: lib/pluginregistry.c:1921
+#: lib/pluginregistry.c:1846
 #, c-format
 msgid "Loading plugin \"%s\" failed"
 msgstr ""
 
-#: lib/pluginregistry.c:1933 lib/pluginregistry.c:1970
+#: lib/pluginregistry.c:1858 lib/pluginregistry.c:1895
 #, c-format
 msgid "Opening %s with \"%s\" failed"
 msgstr ""
 
-#: lib/pluginregistry.c:2147 lib/pluginregistry.c:2630
+#: lib/pluginregistry.c:2070 lib/pluginregistry.c:2541
 msgid "Overlay subtitles"
 msgstr ""
 
-#: lib/pluginregistry.c:2302
+#: lib/pluginregistry.c:2222
 msgid "Registry settings"
 msgstr ""
 
-#: lib/pluginregistry.c:2309
+#: lib/pluginregistry.c:2229
 msgid "Plugin settings"
 msgstr ""
 
-#: lib/pluginregistry.c:2316 lib/gtk/plugin_multi.c:402
+#: lib/pluginregistry.c:2236 lib/gtk/plugin_multi.c:402
 msgid "Extensions"
 msgstr ""
 
-#: lib/pluginregistry.c:2323 lib/gtk/plugin_multi.c:394
+#: lib/pluginregistry.c:2243 lib/gtk/plugin_multi.c:394
 msgid "Protocols"
 msgstr ""
 
-#: lib/pluginregistry.c:2330 lib/gtk/plugin_multi.c:384
+#: lib/pluginregistry.c:2250 lib/gtk/plugin_multi.c:384
 msgid "Priority"
 msgstr ""
 
-#: lib/pluginregistry.c:2588
+#: lib/pluginregistry.c:2499
 msgid "Write audio stream to video file if possible"
 msgstr ""
 
-#: lib/pluginregistry.c:2595
+#: lib/pluginregistry.c:2506
 msgid "Write text subtitles to video file if possible"
 msgstr ""
 
-#: lib/pluginregistry.c:2602
+#: lib/pluginregistry.c:2513
 msgid "Write overlay subtitles to video file if possible"
 msgstr ""
 
@@ -5737,15 +5446,15 @@
 msgid "No plugin given"
 msgstr ""
 
-#: lib/visualize_slave.c:674
+#: lib/visualize_slave.c:680
 msgid "Joined thread"
 msgstr ""
 
-#: lib/visualize_slave.c:693
+#: lib/visualize_slave.c:699
 msgid "Started thread"
 msgstr ""
 
-#: lib/visualize_slave.c:929
+#: lib/visualize_slave.c:940
 msgid "Starting visualization failed"
 msgstr ""
 
@@ -5788,12 +5497,12 @@
 msgid "Got visualization plugin %s"
 msgstr ""
 
-#: lib/thumbnail.c:134 lib/bgxml.c:77
+#: lib/thumbnail.c:140 lib/bgxml.c:77
 #, c-format
 msgid "Cannot stat %s: %s"
 msgstr ""
 
-#: lib/thumbnail.c:143
+#: lib/thumbnail.c:149
 msgid "Cannot get home directory"
 msgstr ""
 
@@ -6211,467 +5920,423 @@
 msgid "@item Files\n"
 msgstr ""
 
-#: lib/cmdline.c:697
+#: lib/cmdline.c:699
 msgid ""
 "Supported options:\n"
 "\n"
 msgstr ""
 
-#: lib/cmdline.c:777
+#: lib/cmdline.c:779
 #, c-format
 msgid "[1|0] (default: %d)"
 msgstr ""
 
-#: lib/cmdline.c:786 lib/cmdline.c:800
+#: lib/cmdline.c:788 lib/cmdline.c:802
 msgid "<number> ("
 msgstr ""
 
-#: lib/cmdline.c:792
+#: lib/cmdline.c:794
 #, c-format
 msgid "default: %d)"
 msgstr ""
 
-#: lib/cmdline.c:811
+#: lib/cmdline.c:813
 #, c-format
 msgid "default: %%.%df)"
 msgstr ""
 
-#: lib/cmdline.c:827 lib/cmdline.c:840 lib/cmdline.c:847
+#: lib/cmdline.c:829 lib/cmdline.c:842 lib/cmdline.c:849
 msgid "<string>"
 msgstr ""
 
-#: lib/cmdline.c:830
+#: lib/cmdline.c:832
 #, c-format
 msgid " (Default: %s)"
 msgstr ""
 
-#: lib/cmdline.c:857
+#: lib/cmdline.c:859
 msgid "Supported strings: "
 msgstr ""
 
-#: lib/cmdline.c:879 lib/cmdline.c:960
+#: lib/cmdline.c:881 lib/cmdline.c:956
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
-#: lib/cmdline.c:886
+#: lib/cmdline.c:888
 #, c-format
 msgid "<r>,<g>,<b> (default: %.3f,%.3f,%.3f)"
 msgstr ""
 
-#: lib/cmdline.c:897 lib/cmdline.c:1029
+#: lib/cmdline.c:899 lib/cmdline.c:1025
 msgid "<r>, <g> and <b> are in the range 0.0..1.0"
 msgstr ""
 
-#: lib/cmdline.c:904
+#: lib/cmdline.c:906
 #, c-format
 msgid "<r>,<g>,<b>,<a> (default: %.3f,%.3f,%.3f,%.3f)"
 msgstr ""
 
-#: lib/cmdline.c:916
+#: lib/cmdline.c:918
 msgid "<r>, <g>, <b> and <a> are in the range 0.0..1.0"
 msgstr ""
 
-#: lib/cmdline.c:923
+#: lib/cmdline.c:925
 msgid "option[{suboptions}]"
 msgstr ""
 
-#: lib/cmdline.c:932 lib/cmdline.c:978
+#: lib/cmdline.c:934 lib/cmdline.c:974
 msgid "Supported options: "
 msgstr ""
 
-#: lib/cmdline.c:954
-msgid "<None>"
-msgstr ""
-
-#: lib/cmdline.c:966
+#: lib/cmdline.c:962
 msgid "{option[{suboptions}][:option[{suboptions}]...]}"
 msgstr ""
 
-#: lib/cmdline.c:998
+#: lib/cmdline.c:994
 msgid "{[[HH:]MM:]SS} ("
 msgstr ""
 
-#: lib/cmdline.c:1008
+#: lib/cmdline.c:1004
 #, c-format
 msgid "default: %s)"
 msgstr ""
 
-#: lib/cmdline.c:1016
+#: lib/cmdline.c:1012
 msgid "Seconds can be fractional (i.e. with decimal point)\n"
 msgstr ""
 
-#: lib/cmdline.c:1019
+#: lib/cmdline.c:1015
 #, c-format
 msgid "<x>,<y> (default: %.3f,%.3f)"
 msgstr ""
 
-#: lib/cmdline.c:1068 lib/cmdline.c:1071
+#: lib/cmdline.c:1064 lib/cmdline.c:1067
 #, c-format
 msgid "Suboptions for %s=%s"
 msgstr ""
 
-#: lib/cmdline.c:1076
+#: lib/cmdline.c:1072
 #, c-format
 msgid "Suboptions for %s"
 msgstr ""
 
-#: lib/ov.c:181
-#, c-format
-msgid "Using hardeware overlay for stream %d"
-msgstr ""
-
-#: lib/ov.c:190
-#, c-format
-msgid "Using software overlay for stream %d"
-msgstr ""
-
-#: lib/converters.c:331 lib/converters.c:338
+#: lib/converters.c:329 lib/converters.c:336
 msgid "variable"
 msgstr ""
 
-#: lib/converters.c:344
+#: lib/converters.c:342
 #, c-format
 msgid "Doing framerate conversion %s -> %s"
 msgstr ""
 
-#: lib/converters.c:373
+#: lib/converters.c:371
 #, c-format
 msgid "Initialized video converter, %d steps"
 msgstr ""
 
-#: lib/mediafiledevice.c:116 lib/metadata.c:59
-msgid "Album"
-msgstr ""
-
-#: lib/mediafiledevice.c:121
-msgid "Shuffle"
-msgstr ""
-
-#: lib/mediafiledevice.c:222
-msgid "No album file given"
-msgstr ""
-
-#: lib/mediafiledevice.c:259
-#, c-format
-msgid "Album file %s contains no usable entries"
-msgstr ""
-
-#: lib/mediafiledevice.c:295
-msgid "Reloading album (file changed)"
-msgstr ""
-
-#: lib/mediafiledevice.c:488
-msgid "Audiofile recorder"
-msgstr ""
-
-#: lib/mediafiledevice.c:489
-msgid ""
-"Take a bunch of audio file and make them available as a recording device"
-msgstr ""
-
-#: lib/lcdproc.c:106
+#: lib/lcdproc.c:103
 msgid "Enable LCDproc"
 msgstr ""
 
-#: lib/lcdproc.c:112
+#: lib/lcdproc.c:109
 msgid "Hostname"
 msgstr ""
 
-#: lib/lcdproc.c:126
+#: lib/lcdproc.c:123
 msgid "Display track name and time"
 msgstr ""
 
-#: lib/lcdproc.c:132
+#: lib/lcdproc.c:129
 msgid "Display audio/video formats"
 msgstr ""
 
-#: lib/lcdproc.c:138
+#: lib/lcdproc.c:135
 msgid "Display audio/video descriptions"
 msgstr ""
 
-#: lib/lcdproc.c:165 lib/lcdproc.c:170
+#: lib/lcdproc.c:162 lib/lcdproc.c:167
 msgid "Sending command failed"
 msgstr ""
 
-#: lib/lcdproc.c:193
+#: lib/lcdproc.c:190
 #, c-format
 msgid "Command \"%s\" not unserstood by server"
 msgstr ""
 
-#: lib/lcdproc.c:214
+#: lib/lcdproc.c:211
 #, c-format
-msgid "Could not resolve adress for: %s"
+msgid "Could not resolve address for: %s"
 msgstr ""
 
-#: lib/lcdproc.c:221
+#: lib/lcdproc.c:218
 #, c-format
 msgid "Could not connect to server at %s:%d"
 msgstr ""
 
-#: lib/lcdproc.c:231
+#: lib/lcdproc.c:228
 msgid "Could not send hello message"
 msgstr ""
 
-#: lib/lcdproc.c:237
+#: lib/lcdproc.c:234
 msgid "Could not get server welcome line"
 msgstr ""
 
-#: lib/lcdproc.c:246
+#: lib/lcdproc.c:243
 #, c-format
 msgid "Invalid answer: %s"
 msgstr ""
 
-#: lib/lcdproc.c:278
+#: lib/lcdproc.c:275
 #, c-format
 msgid "Connection to server established, display size: %dx%d"
 msgstr ""
 
-#: lib/lcdproc.c:290 lib/lcdproc.c:837
+#: lib/lcdproc.c:287 lib/lcdproc.c:792
 msgid "Connection to server closed due to error"
 msgstr ""
 
-#: lib/lcdproc.c:931
+#: lib/lcdproc.c:886
 msgid "Server connection closed"
 msgstr ""
 
-#: lib/player_loop.c:291
+#: lib/player_loop.c:314
 msgid "Cannot pause live stream"
 msgstr ""
 
-#: lib/player_loop.c:1200
+#: lib/player_loop.c:1241
 msgid "Ignoring command while playback is interrupted"
 msgstr ""
 
-#: lib/charset.c:97
+#: lib/charset.c:96
 msgid "Invalid Multibyte sequence"
 msgstr ""
 
-#: lib/charset.c:101
+#: lib/charset.c:99
 msgid "Incomplete Multibyte sequence"
 msgstr ""
 
-#: lib/transcoder.c:507
+#: lib/transcoder.c:486
 #, c-format
 msgid "Transcoding took %s (%.2f %% of realtime duration)"
 msgstr ""
 
-#: lib/transcoder.c:517
+#: lib/transcoder.c:496
 msgid "Output Directory"
 msgstr ""
 
-#: lib/transcoder.c:523
+#: lib/transcoder.c:502
 msgid "Delete incomplete output files"
 msgstr ""
 
-#: lib/transcoder.c:526
+#: lib/transcoder.c:505
 msgid ""
 "Delete the encoded files if you hit the stop button. This option will "
 "automatically be disabled, when the track is an URL"
 msgstr ""
 
-#: lib/transcoder.c:531
+#: lib/transcoder.c:510
 msgid "Clean up after postprocessing"
 msgstr ""
 
-#: lib/transcoder.c:533
+#: lib/transcoder.c:512
 msgid "Clean up all encoded files, which were postprocessed"
 msgstr ""
 
-#: lib/transcoder.c:537
+#: lib/transcoder.c:516
 msgid "Send finished files to player"
 msgstr ""
 
-#: lib/transcoder.c:1212
+#: lib/transcoder.c:1185
 #, c-format
 msgid "Using statistics file: %s"
 msgstr ""
 
-#: lib/transcoder.c:1347
+#: lib/transcoder.c:1315
 msgid "Encoding audio failed"
 msgstr ""
 
-#: lib/transcoder.c:1666
+#: lib/transcoder.c:1630
 msgid "Encoding video failed"
 msgstr ""
 
-#: lib/transcoder.c:1756 lib/transcoder.c:1809
+#: lib/transcoder.c:1715 lib/transcoder.c:1765
 msgid "Encoding subtitles failed"
 msgstr ""
 
-#: lib/transcoder.c:1876
+#: lib/transcoder.c:1832
 #, c-format
 msgid "Cannot create directory %s: %s, using default"
 msgstr ""
 
-#: lib/transcoder.c:1933
+#: lib/transcoder.c:1889
 #, c-format
 msgid "Postprocessing %s"
 msgstr ""
 
-#: lib/transcoder.c:1937 lib/transcoder.c:3184
+#: lib/transcoder.c:1893 lib/transcoder.c:3127
 #, c-format
 msgid "Transcoding %s [Track %d, Pass %d/%d]"
 msgstr ""
 
-#: lib/transcoder.c:1942
+#: lib/transcoder.c:1898
 #, c-format
 msgid "Transcoding %s [Track %d]"
 msgstr ""
 
-#: lib/transcoder.c:1953
+#: lib/transcoder.c:1909
 #, c-format
 msgid ""
 "Metadata:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:1970
+#: lib/transcoder.c:1926
 #, c-format
 msgid ""
 "Audio stream %d input format:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:1976
+#: lib/transcoder.c:1932
 #, c-format
 msgid ""
 "Audio stream %d output format:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:1984
+#: lib/transcoder.c:1940
 #, c-format
 msgid ""
 "Audio stream %d format:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:1999
+#: lib/transcoder.c:1955
 #, c-format
 msgid ""
 "Video stream %d input format:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:2004
+#: lib/transcoder.c:1960
 #, c-format
 msgid ""
 "Video stream %d output format:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:2011
+#: lib/transcoder.c:1967
 #, c-format
 msgid ""
 "Video stream %d format:\n"
 "%s"
 msgstr ""
 
-#: lib/transcoder.c:2023
+#: lib/transcoder.c:1979 lib/transcoder.c:1998
 #, c-format
 msgid "Text subtitle stream %d: Blending onto video stream %d"
 msgstr ""
 
-#: lib/transcoder.c:2028
+#: lib/transcoder.c:1984 lib/transcoder.c:2003
 #, c-format
 msgid "Text subtitle stream %d: Exporting to file"
 msgstr ""
 
-#: lib/transcoder.c:2042
+#: lib/transcoder.c:2048
 #, c-format
-msgid "Overlay subtitle stream %d: Blending onto video stream %d"
+msgid "Cannot find plugin %s"
 msgstr ""
 
-#: lib/transcoder.c:2047
+#: lib/transcoder.c:2055
 #, c-format
-msgid "Overlay subtitle stream %d: Exporting to file"
+msgid "Cannot open plugin %s"
 msgstr ""
 
-#: lib/transcoder.c:2093
+#: lib/transcoder.c:2072
 #, c-format
-msgid "Cannot find plugin %s"
+msgid "Cannot open %s with plugin %s"
 msgstr ""
 
-#: lib/transcoder.c:2124
+#: lib/transcoder.c:2088
 #, c-format
 msgid "Invalid track number %d"
 msgstr ""
 
-#: lib/transcoder.c:2154
+#: lib/transcoder.c:2118
 #, c-format
 msgid "Audio stream %d cannot be read compressed"
 msgstr ""
 
-#: lib/transcoder.c:2164
+#: lib/transcoder.c:2128
 #, c-format
 msgid "Audio stream %d cannot be written compressed"
 msgstr ""
 
-#: lib/transcoder.c:2169
+#: lib/transcoder.c:2133
 #, c-format
 msgid "Copying compressed audio stream %d"
 msgstr ""
 
-#: lib/transcoder.c:2183
+#: lib/transcoder.c:2147
 #, c-format
 msgid "Video stream %d cannot be read compressed"
 msgstr ""
 
-#: lib/transcoder.c:2195 lib/transcoder.c:2210
+#: lib/transcoder.c:2159 lib/transcoder.c:2174
 #, c-format
 msgid "Not copying video stream %d: Will blend subtitles"
 msgstr ""
 
-#: lib/transcoder.c:2223
+#: lib/transcoder.c:2187
 #, c-format
 msgid "Video stream %d cannot be written compressed"
 msgstr ""
 
-#: lib/transcoder.c:2228
+#: lib/transcoder.c:2192
 #, c-format
 msgid "Copying compressed video stream %d"
 msgstr ""
 
-#: lib/transcoder.c:2351 lib/player_input.c:219
+#: lib/transcoder.c:2315 lib/player_input.c:219
 msgid "Starting input plugin failed"
 msgstr ""
 
-#: lib/transcoder.c:2361 lib/transcoder.c:2370
+#: lib/transcoder.c:2325 lib/transcoder.c:2334
 msgid "Cannot seek to start point"
 msgstr ""
 
-#: lib/transcoder.c:2381
+#: lib/transcoder.c:2345
 msgid "End time if before start time"
 msgstr ""
 
-#: lib/transcoder.c:2543 lib/transcoder.c:2591
+#: lib/transcoder.c:2507 lib/transcoder.c:2555
 msgid "Subtitle stream cannot be handled"
 msgstr ""
 
-#: lib/transcoder.c:2612
+#: lib/transcoder.c:2576
 msgid "Input and output are the same file"
 msgstr ""
 
-#: lib/transcoder.c:2924
+#: lib/transcoder.c:2871
 msgid "Zero peaks detected (silent file?). Disabling normalization."
 msgstr ""
 
-#: lib/transcoder.c:2930
+#: lib/transcoder.c:2877
 #, c-format
 msgid "Correcting volume by %.2f dB"
 msgstr ""
 
-#: lib/transcoder.c:2989
+#: lib/transcoder.c:2936
 msgid "No stream to encode"
 msgstr ""
 
-#: lib/transcoder.c:3393
+#: lib/transcoder.c:3331
 #, c-format
 msgid "Video stream %d: Transcoded %s frames"
 msgstr ""
 
-#: lib/transcoder.c:3404
+#: lib/transcoder.c:3342
 #, c-format
 msgid "Audio stream %d: Transcoded %s samples"
 msgstr ""
@@ -6717,62 +6382,62 @@
 msgid "Could not find free port"
 msgstr ""
 
-#: lib/x11/x11_video.c:233
+#: lib/x11/x11_video.c:232
 #, c-format
 msgid "Trying %s driver"
 msgstr ""
 
-#: lib/x11/x11_video.c:237
+#: lib/x11/x11_video.c:236
 #, c-format
 msgid "Opening %s driver failed"
 msgstr ""
 
-#: lib/x11/x11_video.c:245
+#: lib/x11/x11_video.c:244
 #, c-format
 msgid "Opening %s driver succeeded"
 msgstr ""
 
-#: lib/x11/x11_window.c:1116
+#: lib/x11/x11_window.c:1111
 msgid "Auto resize window"
 msgstr ""
 
-#: lib/x11/x11_window.c:1150
+#: lib/x11/x11_window.c:1145
 msgid "Disable Screensaver for normal playback"
 msgstr ""
 
-#: lib/x11/x11_window.c:1156
+#: lib/x11/x11_window.c:1151
 msgid "Disable Screensaver for fullscreen playback"
 msgstr ""
 
-#: lib/x11/x11_window.c:1162
+#: lib/x11/x11_window.c:1157
 msgid "Force hardware scaling"
 msgstr ""
 
-#: lib/x11/x11_window.c:1164
+#: lib/x11/x11_window.c:1159
 msgid ""
 "Use hardware scaling even if it involves more CPU intensive pixelformat "
 "conversions"
 msgstr ""
 
-#: lib/x11/x11_window.c:1173
+#: lib/x11/x11_window.c:1168
 msgid ""
 "Specify the background color for videos with alpha channel. This is only "
 "used by the OpenGL driver."
 msgstr ""
 
-#: lib/x11/x11_window.c:1179
+#: lib/x11/x11_window.c:1174
 msgid "Software scaler"
 msgstr ""
 
-#: lib/x11/x11_window.c:1218 lib/x11/x11_window.c:1223
+#: lib/x11/x11_window.c:1213 lib/x11/x11_window.c:1218
 msgid "Scale quality"
 msgstr ""
 
-#: lib/x11/x11_window.c:1389
+#: lib/x11/x11_window.c:1384
 msgid "Could not get GL Visual"
 msgstr ""
 
-#: lib/x11/x11_window.c:1404
+#: lib/x11/x11_window.c:1399
 #, c-format
 msgid "Got Visual 0x%lx depth %d"
 msgstr ""
@@ -6819,34 +6484,34 @@
 msgid "Disable screensaver and energy saving mode"
 msgstr ""
 
-#: lib/x11/grab.c:602
+#: lib/x11/grab.c:601
 #, c-format
 msgid "Window geometry: %dx%d+%d+%d"
 msgstr ""
 
-#: lib/x11/grab.c:673
+#: lib/x11/grab.c:672
 msgid "Couldn't get shared memory segment"
 msgstr ""
 
-#: lib/x11/grab.c:681
+#: lib/x11/grab.c:680
 msgid "Couldn't attach shared memory segment"
 msgstr ""
 
-#: lib/x11/grab.c:687
+#: lib/x11/grab.c:686
 msgid "Using shared memory for grabbing"
 msgstr ""
 
-#: lib/x11/grab.c:776
+#: lib/x11/grab.c:775
 #, c-format
 msgid "Cursor too wide, increase MAX_CURSOR_SIZE in grab.c to %d"
 msgstr ""
 
-#: lib/x11/grab.c:783
+#: lib/x11/grab.c:782
 #, c-format
 msgid "Cursor too high, increase MAX_CURSOR_SIZE in grab.c to %d"
 msgstr ""
 
-#: lib/x11/grab.c:903
+#: lib/x11/grab.c:902
 msgid "XShmGetImage failed"
 msgstr ""
 
@@ -6858,30 +6523,6 @@
 msgid "Default format"
 msgstr ""
 
-#: lib/textrenderer.c:168
-msgid "Default width"
-msgstr ""
-
-#: lib/textrenderer.c:176
-msgid "Default height"
-msgstr ""
-
-#: lib/textrenderer.c:184
-msgid "Default Colorspace"
-msgstr ""
-
-#: lib/textrenderer.c:188
-msgid "YCrCb"
-msgstr ""
-
-#: lib/textrenderer.c:188
-msgid "RGB"
-msgstr ""
-
-#: lib/textrenderer.c:192
-msgid "Default Framerate"
-msgstr ""
-
 #: lib/tree.c:252 lib/tree.c:435
 msgid "Incoming"
 msgstr ""
@@ -6890,311 +6531,372 @@
 msgid "Favourites"
 msgstr ""
 
-#: lib/tree.c:1086
+#: lib/tree.c:1080
 msgid "Doubleclick on a track first"
 msgstr ""
 
-#: lib/tree.c:1107
+#: lib/tree.c:1101
 #, c-format
 msgid "Cannot open %s: no plugin found"
 msgstr ""
 
-#: lib/tree.c:1111
+#: lib/tree.c:1105
 #, c-format
 msgid "Loading %s (plugin: %s)"
 msgstr ""
 
-#: lib/tree.c:1130
+#: lib/tree.c:1124
 #, c-format
 msgid "Selecting track %d for %s failed"
 msgstr ""
 
-#: lib/tree.c:1169
+#: lib/tree.c:1162
 msgid "Use metadata for track names"
 msgstr ""
 
-#: lib/tree.c:1172
+#: lib/tree.c:1165
 msgid "If disabled, track name will be taken from filename"
 msgstr ""
 
-#: lib/tree.c:1192
+#: lib/tree.c:1169
+msgid "Format for track names"
+msgstr ""
+
+#: lib/tree.c:1172
+msgid ""
+"Format specifier for tracknames from\n"
+"metadata\n"
+"%p:    Artist\n"
+"%a:    Album\n"
+"%g:    Genre\n"
+"%t:    Track name\n"
+"%<d>n: Track number with <d> digits\n"
+"%y:    Year\n"
+"%c:    Comment"
+msgstr ""
+
+#: lib/tree.c:1185
 msgid "Purge directory on exit"
 msgstr ""
 
-#: lib/tree.c:1195
+#: lib/tree.c:1188
 msgid ""
 "Purge directory (i.e. delete\n"
 "unused album files) at program exit"
 msgstr ""
 
-#: lib/tree.c:1200
-msgid "Blacklisted extensions"
+#: lib/tree.c:1193 lib/transcoder_track.c:179
+msgid "Prefer EDL"
 msgstr ""
 
-#: lib/tree.c:1203
-msgid "File extensions, which are never loaded automatically"
+#: lib/tree.c:1196
+msgid ""
+"For files, which contain edit decision lists and raw streams, this option "
+"selects which one to decode. This setting is saved in the album once the "
+"file is loaded."
 msgstr ""
 
-#: lib/tree.c:1207
-msgid "Blacklisted filenames"
+#: lib/tree.c:1200
+msgid "Blacklist"
 msgstr ""
 
-#: lib/tree.c:1209
-msgid "Filenames, which are never loaded automatically"
+#: lib/tree.c:1203
+msgid "File extensions, which are never loaded automatically"
 msgstr ""
 
-#: lib/tree.c:1463
+#: lib/tree.c:1419
 #, c-format
 msgid "Purging %s"
 msgstr ""
 
-#: lib/tree.c:1580
+#: lib/tree.c:1536
 msgid "No current track for copying to favourites"
 msgstr ""
 
-#: lib/singlepic.c:97
+#: lib/singlepic.c:96
 msgid "Display time"
 msgstr ""
 
-#: lib/singlepic.c:102
+#: lib/singlepic.c:101
 msgid "Time to pass until the next track will be selected. 0 means infinite."
 msgstr ""
 
-#: lib/singlepic.c:327
-#, c-format
-msgid "Plugin %s could not be loaded"
-msgstr ""
-
-#: lib/singlepic.c:594
+#: lib/singlepic.c:548
 msgid "Image video input plugin"
 msgstr ""
 
-#: lib/singlepic.c:595
+#: lib/singlepic.c:549
 msgid ""
 "This plugin reads series of images as a video. It uses the installed image "
 "readers."
 msgstr ""
 
-#: lib/singlepic.c:641
+#: lib/singlepic.c:595
 msgid ""
 "This plugin reads images as stills. It uses the installed image readers."
 msgstr ""
 
-#: lib/singlepic.c:760
+#: lib/singlepic.c:727
 msgid "Framenumber digits"
 msgstr ""
 
-#: lib/singlepic.c:768
+#: lib/singlepic.c:735
 msgid "Framenumber offset"
 msgstr ""
 
-#: lib/singlepic.c:1037
+#: lib/singlepic.c:1000
 #, c-format
 msgid "Couldn't write data to %s: %s"
 msgstr ""
 
-#: lib/singlepic.c:1098
+#: lib/singlepic.c:1061
 msgid ""
 "This plugin encodes a video as a series of images. It uses the installed "
 "image writers."
 msgstr ""
 
-#: lib/metadata.c:38
+#: lib/metadata.c:108
 msgid "Artist"
 msgstr ""
 
-#: lib/metadata.c:45
-msgid "Album artist"
+#: lib/metadata.c:113
+msgid "Title"
 msgstr ""
 
-#: lib/metadata.c:52
-msgid "Title"
+#: lib/metadata.c:118
+msgid "Album"
 msgstr ""
 
-#: lib/metadata.c:66 lib/transcoder_track.c:194 lib/gtk/infowindow.c:782
+#: lib/metadata.c:123 lib/transcoder_track.c:185 lib/gtk/infowindow.c:786
 msgid "Track"
 msgstr ""
 
-#: lib/metadata.c:73
+#: lib/metadata.c:128
 msgid "Genre"
 msgstr ""
 
-#: lib/metadata.c:80
+#: lib/metadata.c:133
 msgid "Author"
 msgstr ""
 
-#: lib/metadata.c:87
+#: lib/metadata.c:138
 msgid "Copyright"
 msgstr ""
 
-#: lib/metadata.c:94
-msgid "Year"
+#: lib/metadata.c:143
+msgid "Date"
+msgstr ""
+
+#: lib/metadata.c:145
+msgid "Complete date or year only"
+msgstr ""
+
+#: lib/metadata.c:426
+#, c-format
+msgid "Author:\t %s\n"
 msgstr ""
 
-#: lib/metadata.c:448
+#: lib/metadata.c:431
 #, c-format
-msgid "%s%s%s\n"
+msgid "Artist:\t %s\n"
+msgstr ""
+
+#: lib/metadata.c:436
+#, c-format
+msgid "Title:\t %s\n"
+msgstr ""
+
+#: lib/metadata.c:441
+#, c-format
+msgid "Album:\t %s\n"
+msgstr ""
+
+#: lib/metadata.c:446
+#, c-format
+msgid "Copyright:\t %s\n"
+msgstr ""
+
+#: lib/metadata.c:451
+#, c-format
+msgid "Genre:\t %s\n"
+msgstr ""
+
+#: lib/metadata.c:456
+#, c-format
+msgid "Date:\t %s\n"
+msgstr ""
+
+#: lib/metadata.c:461
+#, c-format
+msgid "Track:\t %d\n"
+msgstr ""
+
+#: lib/metadata.c:466
+#, c-format
+msgid "Comment:\t %s\n"
 msgstr ""
 
 #: lib/player_audio.c:246
 msgid "Restarting playback due to changed audio options"
 msgstr ""
 
-#: lib/player_audio.c:288
+#: lib/player_audio.c:290
 msgid "Restarting playback due to changed audio filters"
 msgstr ""
 
-#: lib/transcoder_track.c:170 lib/gtk/infowindow.c:767
-#: lib/gtk/treewidget.c:1123 lib/gtk/chapterdialog.c:185
+#: lib/transcoder_track.c:161 lib/gtk/infowindow.c:771
+#: lib/gtk/treewidget.c:1119 lib/gtk/chapterdialog.c:184
 #: lib/gtk/presetmenu.c:181
 msgid "Name"
 msgstr ""
 
-#: lib/transcoder_track.c:176 lib/gtk/infowindow.c:777
+#: lib/transcoder_track.c:167 lib/gtk/infowindow.c:781
 msgid "Location"
 msgstr ""
 
-#: lib/transcoder_track.c:188 lib/gtk/fileselect.c:269
-msgid "Prefer EDL"
+#: lib/transcoder_track.c:181
+msgid ""
+"For files, which contain edit decision lists and raw streams, this option "
+"selects which one to decode."
 msgstr ""
 
-#: lib/transcoder_track.c:200
+#: lib/transcoder_track.c:191
 msgid "Subdirectory"
 msgstr ""
 
-#: lib/transcoder_track.c:202
+#: lib/transcoder_track.c:193
 msgid "Subdirectory, where this track will be written to"
 msgstr ""
 
-#: lib/transcoder_track.c:242
+#: lib/transcoder_track.c:233
 msgid "Postprocess only"
 msgstr ""
 
-#: lib/transcoder_track.c:244
+#: lib/transcoder_track.c:235
 msgid ""
 "Skip transcoding of this track and send the file directly to the "
 "postprocessor."
 msgstr ""
 
-#: lib/transcoder_track.c:248
+#: lib/transcoder_track.c:239
 msgid "Set start time"
 msgstr ""
 
-#: lib/transcoder_track.c:252
+#: lib/transcoder_track.c:243
 msgid ""
 "Specify a start time below. This time will be slightly wrong if the input "
 "format doesn't support sample accurate seeking."
 msgstr ""
 
-#: lib/transcoder_track.c:257
+#: lib/transcoder_track.c:248
 msgid "Start time"
 msgstr ""
 
-#: lib/transcoder_track.c:264
+#: lib/transcoder_track.c:255
 msgid "Set end time"
 msgstr ""
 
-#: lib/transcoder_track.c:268
+#: lib/transcoder_track.c:259
 msgid "Specify an end time below."
 msgstr ""
 
-#: lib/transcoder_track.c:272
+#: lib/transcoder_track.c:263
 msgid "End time"
 msgstr ""
 
-#: lib/transcoder_track.c:286 lib/transcoder_track.c:351
-#: lib/transcoder_track.c:1331 lib/transcoder_track.c:1360
+#: lib/transcoder_track.c:277 lib/transcoder_track.c:333
+#: lib/transcoder_track.c:1319 lib/transcoder_track.c:1348
 msgid "Action"
 msgstr ""
 
-#: lib/transcoder_track.c:294 lib/transcoder_track.c:357
-#: lib/transcoder_track.c:1336 lib/transcoder_track.c:1366
+#: lib/transcoder_track.c:285 lib/transcoder_track.c:339
+#: lib/transcoder_track.c:1324 lib/transcoder_track.c:1354
 msgid "Forget"
 msgstr ""
 
-#: lib/transcoder_track.c:295
+#: lib/transcoder_track.c:286
 msgid "Transcode as text"
 msgstr ""
 
-#: lib/transcoder_track.c:296
+#: lib/transcoder_track.c:287
 msgid "Transcode as overlay"
 msgstr ""
 
-#: lib/transcoder_track.c:297 lib/transcoder_track.c:359
+#: lib/transcoder_track.c:288 lib/transcoder_track.c:341
 msgid "Blend onto video"
 msgstr ""
 
-#: lib/transcoder_track.c:299
+#: lib/transcoder_track.c:290
 msgid "Select action for this subtitle stream."
 msgstr ""
 
-#: lib/transcoder_track.c:303 lib/transcoder_track.c:365
-#: lib/transcoder_track.c:1372
+#: lib/transcoder_track.c:294 lib/transcoder_track.c:347
+#: lib/transcoder_track.c:1360
 msgid "Input Language"
 msgstr ""
 
-#: lib/transcoder_track.c:309 lib/transcoder_track.c:371
-#: lib/transcoder_track.c:1378 lib/recorder_audio.c:99
+#: lib/transcoder_track.c:300 lib/transcoder_track.c:353
+#: lib/transcoder_track.c:1366 lib/recorder_audio.c:78
 msgid "Language"
 msgstr ""
 
-#: lib/transcoder_track.c:317 lib/transcoder_track.c:379
-#: lib/transcoder_track.c:1386
+#: lib/transcoder_track.c:308 lib/transcoder_track.c:361
+#: lib/transcoder_track.c:1374
 msgid "Force language"
 msgstr ""
 
-#: lib/transcoder_track.c:320 lib/transcoder_track.c:382
-#: lib/transcoder_track.c:1389
+#: lib/transcoder_track.c:311 lib/transcoder_track.c:364
+#: lib/transcoder_track.c:1377
 msgid ""
 "Force the given language even if the input has the language set differently."
 msgstr ""
 
-#: lib/transcoder_track.c:333
+#: lib/transcoder_track.c:315
 msgid "Video stream"
 msgstr ""
 
-#: lib/transcoder_track.c:338
+#: lib/transcoder_track.c:320
 msgid ""
 "Attach subtitle stream to this video stream. For blending, this video stream "
 "will get the subtitles. For encoding, take frame dimensions and framerate "
 "from this video stream as they are sometimes needed by subtitle encoders."
 msgstr ""
 
-#: lib/transcoder_track.c:358 lib/transcoder_track.c:1334
-#: lib/transcoder_track.c:1364 lib/gtk/albumwidget.c:1543
+#: lib/transcoder_track.c:340 lib/transcoder_track.c:1322
+#: lib/transcoder_track.c:1352 lib/gtk/albumwidget.c:1539
 msgid "Transcode"
 msgstr ""
 
-#: lib/transcoder_track.c:386
+#: lib/transcoder_track.c:368
 msgid "Video stream to blend onto"
 msgstr ""
 
-#: lib/transcoder_track.c:1335 lib/transcoder_track.c:1365
+#: lib/transcoder_track.c:1323 lib/transcoder_track.c:1353
 msgid "Copy (if possible)"
 msgstr ""
 
-#: lib/transcoder_track.c:1338 lib/transcoder_track.c:1368
+#: lib/transcoder_track.c:1326 lib/transcoder_track.c:1356
 msgid ""
 "Choose the desired action for the stream. If copying is not possible, the "
 "stream will be transcoded"
 msgstr ""
 
-#: lib/transcoder_track.c:1343
+#: lib/transcoder_track.c:1331
 msgid "Enable 2-pass encoding"
 msgstr ""
 
-#: lib/transcoder_track.c:1345
+#: lib/transcoder_track.c:1333
 msgid ""
 "Encode this stream in 2 passes, i.e. analyze it first and do the final "
 "transcoding in the second pass. This enables higher quality within the given "
 "bitrate constraints but roughly doubles the video encoding time."
 msgstr ""
 
-#: lib/transcoder_track.c:1393
+#: lib/transcoder_track.c:1381
 msgid "Normalize audio"
 msgstr ""
 
-#: lib/transcoder_track.c:1395
+#: lib/transcoder_track.c:1383
 msgid ""
 "This will enable 2 pass transcoding. In the first pass, the peak volume is "
 "detected. In the second pass, the stream is transcoded with normalized "
@@ -7227,48 +6929,48 @@
 msgid "Duration (milliseconds)"
 msgstr ""
 
-#: lib/remote.c:102
+#: lib/remote.c:101
 msgid "Setting up socket failed, this instance won't be reachable via remote"
 msgstr ""
 
-#: lib/remote.c:107
+#: lib/remote.c:106
 #, c-format
 msgid "Remote socket listening at port %d"
 msgstr ""
 
-#: lib/remote.c:127
+#: lib/remote.c:126
 msgid "Reading hello line failed"
 msgstr ""
 
-#: lib/remote.c:136 lib/remote.c:457
+#: lib/remote.c:135 lib/remote.c:433
 msgid "Protocol mismatch"
 msgstr ""
 
-#: lib/remote.c:187
+#: lib/remote.c:186
 msgid "Client connection closed"
 msgstr ""
 
-#: lib/remote.c:211
+#: lib/remote.c:210
 msgid "New client connection"
 msgstr ""
 
-#: lib/remote.c:321
+#: lib/remote.c:299
 msgid "Allow connections from other machines"
 msgstr ""
 
-#: lib/remote.c:327
+#: lib/remote.c:305
 msgid "Maximum number of connections"
 msgstr ""
 
-#: lib/remote.c:427
+#: lib/remote.c:405
 msgid "Connecting failed"
 msgstr ""
 
-#: lib/remote.c:439
+#: lib/remote.c:416
 msgid "Sending initialization string failed"
 msgstr ""
 
-#: lib/remote.c:448
+#: lib/remote.c:424
 msgid "Reading welcome line failed"
 msgstr ""
 
@@ -7307,49 +7009,11 @@
 msgid "Chapter %d"
 msgstr ""
 
-#: lib/stringutils.c:181
+#: lib/stringutils.c:179
 #, c-format
 msgid "Cannot open file \"%s\" for writing"
 msgstr ""
 
-#: lib/stringutils.c:595
-#, c-format
-msgid "Stream %d [%s]"
-msgstr ""
-
-#: lib/stringutils.c:597
-#, c-format
-msgid "Stream %d"
-msgstr ""
-
-#: lib/ocr.c:88
-#, c-format
-msgid "Writing image file %s"
-msgstr ""
-
-#: lib/ocr.c:129
-msgid "No engine found"
-msgstr ""
-
-#: lib/ocr.c:155
-msgid ""
-"Background color to use, when converting formats with transparency to "
-"grayscale"
-msgstr ""
-
-#: lib/ocr.c:159
-msgid "Temporary directory"
-msgstr ""
-
-#: lib/ocr.c:162
-msgid "Temporary directory for image files"
-msgstr ""
-
-#: lib/ocr.c:257
-#, c-format
-msgid "OCR failed, keeping %s"
-msgstr ""
-
 #: lib/socket.c:149
 #, c-format
 msgid "Cannot resolve address of %s: %s"
@@ -7424,77 +7088,91 @@
 msgid "Got initial audio timestamp: %s"
 msgstr ""
 
-#: lib/album_xml.c:226
+#: lib/album_xml.c:232
 #, c-format
 msgid "Couldn't open album file %s"
 msgstr ""
 
-#: lib/encoder.c:183
+#: lib/encoder.c:177
 #, c-format
 msgid "Created output file %s"
 msgstr ""
 
-#: lib/encoder.c:199
+#: lib/encoder.c:193
 #, c-format
 msgid "Created temp file %s\n"
 msgstr ""
 
-#: lib/encoder.c:651
+#: lib/encoder.c:615
 msgid "Multipass encoding not supported by encoder plugin"
 msgstr ""
 
-#: lib/gtk/infowindow.c:516
+#: lib/gtk/infowindow.c:520
 #, c-format
 msgid "Name:\t%s"
 msgstr ""
 
-#: lib/gtk/infowindow.c:526
+#: lib/gtk/infowindow.c:530
 #, c-format
 msgid "Input plugin:\t%s"
 msgstr ""
 
-#: lib/gtk/infowindow.c:535
+#: lib/gtk/infowindow.c:539
 #, c-format
 msgid "Location:\t%s"
 msgstr ""
 
-#: lib/gtk/infowindow.c:543
+#: lib/gtk/infowindow.c:547
 #, c-format
 msgid "Track:\t%d"
 msgstr ""
 
-#: lib/gtk/infowindow.c:590
+#: lib/gtk/infowindow.c:565
+#, c-format
+msgid "Format:\t%s"
+msgstr ""
+
+#: lib/gtk/infowindow.c:576 lib/gtk/infowindow.c:586
+#, c-format
+msgid "Stream type:\t%s"
+msgstr ""
+
+#: lib/gtk/infowindow.c:594
 #, c-format
 msgid "Audio stream %d/%d"
 msgstr ""
 
-#: lib/gtk/infowindow.c:605
+#: lib/gtk/infowindow.c:609
 #, c-format
 msgid "Subtitle stream %d/%d [%s]"
 msgstr ""
 
-#: lib/gtk/infowindow.c:620
+#: lib/gtk/infowindow.c:624
 #, c-format
 msgid "Video stream %d/%d"
 msgstr ""
 
-#: lib/gtk/infowindow.c:706 lib/gtk/infowindow.c:725 lib/gtk/infowindow.c:744
+#: lib/gtk/infowindow.c:708 lib/gtk/infowindow.c:726 lib/gtk/infowindow.c:744
+msgid "Stream type"
+msgstr ""
+
+#: lib/gtk/infowindow.c:712 lib/gtk/infowindow.c:730 lib/gtk/infowindow.c:748
 msgid "Input format"
 msgstr ""
 
-#: lib/gtk/infowindow.c:772
+#: lib/gtk/infowindow.c:776
 msgid "Input plugin"
 msgstr ""
 
-#: lib/gtk/infowindow.c:1040
+#: lib/gtk/infowindow.c:1048
 msgid "Copy selected"
 msgstr ""
 
-#: lib/gtk/infowindow.c:1042
+#: lib/gtk/infowindow.c:1050
 msgid "Copy all"
 msgstr ""
 
-#: lib/gtk/infowindow.c:1090
+#: lib/gtk/infowindow.c:1098
 msgid "Gmerlin Track Info"
 msgstr ""
 
@@ -7502,71 +7180,71 @@
 msgid "Album name"
 msgstr ""
 
-#: lib/gtk/treewidget.c:966 lib/gtk/treewidget.c:2043
+#: lib/gtk/treewidget.c:966 lib/gtk/treewidget.c:2039
 msgid "Rename album"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1130
+#: lib/gtk/treewidget.c:1126
 msgid "Add device"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1344
+#: lib/gtk/treewidget.c:1340
 msgid "Expand all"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1348
+#: lib/gtk/treewidget.c:1344
 msgid "Collapse all"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1352
+#: lib/gtk/treewidget.c:1348
 msgid "Tabbed mode"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1356
+#: lib/gtk/treewidget.c:1352
 msgid "Windowed mode"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1366
+#: lib/gtk/treewidget.c:1362
 msgid "Open"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1370
+#: lib/gtk/treewidget.c:1366
 msgid "Close"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1374
+#: lib/gtk/treewidget.c:1370
 msgid "New..."
 msgstr ""
 
-#: lib/gtk/treewidget.c:1378
+#: lib/gtk/treewidget.c:1374
 msgid "New from directory..."
 msgstr ""
 
-#: lib/gtk/treewidget.c:1382 lib/gtk/albumwidget.c:1533
+#: lib/gtk/treewidget.c:1378 lib/gtk/albumwidget.c:1529
 msgid "Rename..."
 msgstr ""
 
-#: lib/gtk/treewidget.c:1395
+#: lib/gtk/treewidget.c:1391
 msgid "Scan for devices"
 msgstr ""
 
-#: lib/gtk/treewidget.c:1399
+#: lib/gtk/treewidget.c:1395
 msgid "Add device..."
 msgstr ""
 
-#: lib/gtk/treewidget.c:1406 lib/gtk/albumwidget.c:1601
+#: lib/gtk/treewidget.c:1402 lib/gtk/albumwidget.c:1597
 msgid "Album..."
 msgstr ""
 
-#: lib/gtk/treewidget.c:1419
+#: lib/gtk/treewidget.c:1415
 msgid "Tree..."
 msgstr ""
 
-#: lib/gtk/treewidget.c:2041
+#: lib/gtk/treewidget.c:2037
 msgid "Delete album"
 msgstr ""
 
-#: lib/gtk/treewidget.c:2050
+#: lib/gtk/treewidget.c:2046
 msgid "New album"
 msgstr ""
 
@@ -7639,31 +7317,31 @@
 msgid "Plugin options"
 msgstr ""
 
-#: lib/gtk/fileselect.c:232
+#: lib/gtk/fileselect.c:225
 msgid "Recursive"
 msgstr ""
 
-#: lib/gtk/fileselect.c:240
+#: lib/gtk/fileselect.c:233
 msgid "Add subdirectories as subalbums"
 msgstr ""
 
-#: lib/gtk/fileselect.c:245
+#: lib/gtk/fileselect.c:238
 msgid "Watch directories"
 msgstr ""
 
-#: lib/gtk/chapterdialog.c:194
+#: lib/gtk/chapterdialog.c:193
 msgid "Time"
 msgstr ""
 
-#: lib/gtk/chapterdialog.c:222 lib/gtk/chapterdialog.c:362
+#: lib/gtk/chapterdialog.c:221 lib/gtk/chapterdialog.c:360
 msgid "Edit chapter"
 msgstr ""
 
-#: lib/gtk/chapterdialog.c:360
+#: lib/gtk/chapterdialog.c:358
 msgid "Add new chapter"
 msgstr ""
 
-#: lib/gtk/chapterdialog.c:364
+#: lib/gtk/chapterdialog.c:362
 msgid "Delete chapter"
 msgstr ""
 
@@ -7731,158 +7409,158 @@
 msgid "Save preset"
 msgstr ""
 
-#: lib/gtk/presetmenu.c:323
+#: lib/gtk/presetmenu.c:319
 msgid "Save new..."
 msgstr ""
 
-#: lib/gtk/presetmenu.c:326
+#: lib/gtk/presetmenu.c:322
 msgid "Load..."
 msgstr ""
 
-#: lib/gtk/presetmenu.c:332
+#: lib/gtk/presetmenu.c:328
 msgid "Save to..."
 msgstr ""
 
-#: lib/gtk/presetmenu.c:338
+#: lib/gtk/presetmenu.c:334
 msgid "Delete..."
 msgstr ""
 
-#: lib/gtk/presetmenu.c:349
+#: lib/gtk/presetmenu.c:345
 msgid "Preset"
 msgstr ""
 
-#: lib/gtk/urlselect.c:179
+#: lib/gtk/urlselect.c:177
 msgid "URL:"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1130
+#: lib/gtk/albumwidget.c:1126
 msgid "Track name"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1141
+#: lib/gtk/albumwidget.c:1137
 msgid "Rename entry"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1153
+#: lib/gtk/albumwidget.c:1149
 #, c-format
 msgid "Add files to album %s"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1179
+#: lib/gtk/albumwidget.c:1175
 #, c-format
 msgid "Add URLS to album %s"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1263
+#: lib/gtk/albumwidget.c:1259
 #, c-format
 msgid "Add albums to %s"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1455
+#: lib/gtk/albumwidget.c:1451
 msgid "URLs..."
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1457
+#: lib/gtk/albumwidget.c:1453
 msgid "Albums..."
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1469
+#: lib/gtk/albumwidget.c:1465
 msgid "Copy to favourites"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1478
+#: lib/gtk/albumwidget.c:1474
 msgid "Move to top"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1486
+#: lib/gtk/albumwidget.c:1482
 msgid "Move to bottom"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1522
+#: lib/gtk/albumwidget.c:1518
 msgid "Find..."
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1536
+#: lib/gtk/albumwidget.c:1532
 msgid "Info..."
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1550
+#: lib/gtk/albumwidget.c:1546
 msgid "Refresh"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1553
+#: lib/gtk/albumwidget.c:1549
 msgid "Export as EDL"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1566
+#: lib/gtk/albumwidget.c:1562
 msgid "Save as..."
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1570
+#: lib/gtk/albumwidget.c:1566
 msgid "Sort"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1607
+#: lib/gtk/albumwidget.c:1603
 msgid "Select error tracks"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:1610
+#: lib/gtk/albumwidget.c:1606
 msgid "Show toolbar"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:2901
+#: lib/gtk/albumwidget.c:2897
 msgid "Add URLs"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:2914
+#: lib/gtk/albumwidget.c:2910
 msgid "Close album and eject disc"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:2920
+#: lib/gtk/albumwidget.c:2916
 msgid "Copy selected tracks to favourites"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:2923
+#: lib/gtk/albumwidget.c:2919
 msgid "Rename selected track"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:2926
+#: lib/gtk/albumwidget.c:2922
 msgid "Show track info"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:2929
+#: lib/gtk/albumwidget.c:2925
 msgid "Find tracks"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3130
+#: lib/gtk/albumwidget.c:3126
 msgid "Backward search hit top, continuing at bottom"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3139
+#: lib/gtk/albumwidget.c:3135
 msgid "Backward search: No tracks found"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3158
+#: lib/gtk/albumwidget.c:3154
 msgid "Forward search hit bottom, continuing at top"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3167
+#: lib/gtk/albumwidget.c:3163
 msgid "Forward search: No tracks found"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3291
+#: lib/gtk/albumwidget.c:3287
 msgid "Exact match"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3292
+#: lib/gtk/albumwidget.c:3288
 msgid "String is an exact substring"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3296
+#: lib/gtk/albumwidget.c:3292
 msgid "Match case"
 msgstr ""
 
-#: lib/gtk/albumwidget.c:3297
+#: lib/gtk/albumwidget.c:3293
 msgid "Match upper and lower case"
 msgstr ""
 
@@ -7928,15 +7606,15 @@
 msgid "Not available"
 msgstr ""
 
-#: lib/gtk/driveselect.c:225
+#: lib/gtk/driveselect.c:224
 msgid "Drive:"
 msgstr ""
 
-#: lib/gtk/cfg_dialog.c:502
+#: lib/gtk/cfg_dialog.c:497
 msgid "No options here, choose subcategory"
 msgstr ""
 
-#: lib/gtk/cfg_dialog.c:682
+#: lib/gtk/cfg_dialog.c:676
 msgid "No options available"
 msgstr ""
 
@@ -8076,51 +7754,25 @@
 msgid "Message"
 msgstr ""
 
-#: lib/recorder.c:52
-#, c-format
-msgid "New track: %s"
-msgstr ""
-
-#: lib/recorder.c:502
+#: lib/recorder.c:457
 msgid "Output filename mask"
 msgstr ""
 
-#: lib/recorder.c:505
+#: lib/recorder.c:460
 msgid ""
 "Extension is appended by the plugin\n"
 "For the date and time formatting, consult the documentation\n"
 "of the strftime(3) function"
 msgstr ""
 
-#: lib/recorder.c:511
+#: lib/recorder.c:466
 msgid "Snapshot directory"
 msgstr ""
 
-#: lib/recorder.c:517
+#: lib/recorder.c:472
 msgid "Snapshot filename mask"
 msgstr ""
 
-#: lib/recorder.c:562
-msgid "Metadata mode"
-msgstr ""
-
-#: lib/recorder.c:568
-msgid "Static"
-msgstr ""
-
-#: lib/recorder.c:569
-msgid "From input"
-msgstr ""
-
-#: lib/recorder.c:570
-msgid "From player"
-msgstr ""
-
-#: lib/recorder.c:731
-#, c-format
-msgid "New track %s"
-msgstr ""
-
 #: lib/subprocess.c:168
 #, c-format
 msgid "Created process: %s [%d]"
@@ -8168,7 +7820,7 @@
 msgid "Change"
 msgstr ""
 
-#: lib/recorder_audio.c:87
+#: lib/recorder_audio.c:66
 msgid "Record audio"
 msgstr ""
 
@@ -8186,131 +7838,105 @@
 "%s"
 msgstr ""
 
-#: lib/album.c:499 lib/album.c:545
-msgid "Not exporting empty album"
-msgstr ""
-
-#: lib/album.c:506 lib/album.c:552
-#, c-format
-msgid "Could not open %s: %s"
-msgstr ""
-
-#: lib/album.c:610
+#: lib/album.c:486
 msgid "Unnamed disc"
 msgstr ""
 
-#: lib/album.c:713
+#: lib/album.c:588
 #, c-format
 msgid "%s disappeared, updating album"
 msgstr ""
 
-#: lib/album.c:723
+#: lib/album.c:598
 #, c-format
 msgid "%s appeared, updating album"
 msgstr ""
 
-#: lib/album.c:825
+#: lib/album.c:700
 #, c-format
 msgid "Album %s already open"
 msgstr ""
 
-#: lib/album.c:830
+#: lib/album.c:705
 #, c-format
 msgid "Opening album %s"
 msgstr ""
 
-#: lib/album.c:975
+#: lib/album.c:850
 #, c-format
 msgid "Not closing album %s (open_count > 0)"
 msgstr ""
 
-#: lib/album.c:978
+#: lib/album.c:853
 #, c-format
 msgid "Closing album %s"
 msgstr ""
 
-#: lib/album.c:2210
+#: lib/album.c:2097
 #, c-format
 msgid "Not loading %s (blacklisted extension)"
 msgstr ""
 
-#: lib/album.c:2221
-#, c-format
-msgid "Not loading %s (blacklisted filename)"
-msgstr ""
-
-#: lib/album.c:2251
+#: lib/album.c:2101
 #, c-format
 msgid "Loading %s"
 msgstr ""
 
-#: lib/album.c:2295
+#: lib/album.c:2144
 #, c-format
 msgid "Loaded %s (track %d of %d)"
 msgstr ""
 
-#: lib/album.c:2497
+#: lib/album.c:2346
 msgid "Ejecting disc failed"
 msgstr ""
 
-#: lib/album.c:2615
+#: lib/album.c:2464
 msgid "Invalid selection range given"
 msgstr ""
 
-#: lib/ovl2text.c:159
-msgid "Plugin for writing the text subtitles"
-msgstr ""
-
-#: lib/ovl2text.c:233
-msgid "Overlay to text converter"
-msgstr ""
-
-#: lib/ovl2text.c:234
-msgid "Exports overlay subtitles to a text format by performing an OCR."
-msgstr ""
-
-#: lib/edldec.c:642
+#: lib/edldec.c:640
 msgid "EDL only works with seekable sources"
 msgstr ""
 
-#: lib/edldec.c:1018
+#: lib/edldec.c:1016
 msgid "Unexpected EOF, clearing frame"
 msgstr ""
 
-#: lib/edldec.c:1185
+#: lib/edldec.c:1183
 msgid "Seeked audio out of range"
 msgstr ""
 
-#: lib/edldec.c:1205
+#: lib/edldec.c:1203
 msgid "Seeked video out of range"
 msgstr ""
 
-#: lib/edldec.c:1227 lib/edldec.c:1248
+#: lib/edldec.c:1225 lib/edldec.c:1246
 msgid "Seeked text subtitles out of range"
 msgstr ""
 
-#: lib/edldec.c:1372
+#: lib/edldec.c:1370
 msgid "EDL decoder"
 msgstr ""
 
-#: lib/edldec.c:1373
-msgid "This metaplugin decodes an EDL as if it was a single file."
+#: lib/edldec.c:1371
+msgid "This metaplugin decodes and EDL as if it was a single file."
 msgstr ""
 
-#: lib/filters.c:193
+#: lib/filters.c:197
 msgid "Audio Filters"
 msgstr ""
 
-#: lib/filters.c:353
+#: lib/filters.c:350
 #, c-format
 msgid "Initialized audio filter %s"
 msgstr ""
 
-#: lib/filters.c:623
+#: lib/filters.c:625
 msgid "Video Filters"
 msgstr ""
 
-#: lib/filters.c:778
+#: lib/filters.c:771
 #, c-format
 msgid "Initialized video filter %s"
 msgstr ""

gmerlin-1.2.0.tar.gz/tests/Makefile.am -> gmerlin-4256.tar.gz/tests/Makefile.am Changed

@@ -1,5 +1,5 @@
 plugindir=$(pkglibdir)/plugins
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 AM_CFLAGS = \
 @GTK_CFLAGS@ \
@@ -9,6 +9,7 @@
 -DDOC_DIR=\"$(docdir)\" \
 -DDATA_DIR=\"$(pkgdatadir)\"
 
+AM_LDFLAGS = @GMERLIN_EXE_LDFLAGS@
 
 if HAVE_GTK
 gtk_programs = \
@@ -24,12 +25,6 @@
 gtk_programs =
 endif
 
-if HAVE_V4L
-v4l_programs = v4ltest \
-v4ldump
-else
-v4l_programs =
-endif
 
 noinst_PROGRAMS = audioplayer1 \
 videoplayer1 \
@@ -44,15 +39,21 @@
 textrenderer \
 ladspa \
 thumbnail \
+makethumbnail \
 visualization \
-$(v4l_programs) \
+ssdp \
+soap \
+upnpdesc \
 $(gtk_programs)
 
 bin_PROGRAMS = gmerlin_imgconvert \
 album2m3u \
 album2pls \
+gmerlin-upnp-discover \
 gmerlin_imgdiff \
+gmerlin_imgsplit \
 gmerlin_psnr \
+gmerlin-savemeta \
 gmerlin_ssim \
 gmerlin_vanalyze \
 gmerlin_vpsnr \
@@ -72,6 +73,22 @@
 ocrtest_SOURCES = ocrtest.c
 ocrtest_LDADD = ../lib/libgmerlin.la -ldl
 
+gmerlin_savemeta_SOURCES = gmerlin-savemeta.c
+gmerlin_savemeta_LDADD = ../lib/libgmerlin.la -ldl
+
+
+ssdp_SOURCES = ssdp.c
+ssdp_LDADD = ../lib/libgmerlin.la -ldl
+
+soap_SOURCES = soap.c
+soap_LDADD = ../lib/libgmerlin.la -ldl @XML2_LIBS@
+
+gmerlin_upnp_discover_LDADD = ../lib/libgmerlin.la -ldl
+
+upnpdesc_SOURCES = upnpdesc.c
+upnpdesc_LDADD = ../lib/libgmerlin.la -ldl @UUID_LIBS@ @XML2_LIBS@
+
+
 extractchannel_SOURCES = extractchannel.c
 extractchannel_LDADD = ../lib/libgmerlin.la -ldl
 
@@ -88,9 +105,16 @@
 thumbnail_SOURCES = thumbnail.c
 thumbnail_LDADD = ../lib/libgmerlin.la -ldl
 
+makethumbnail_SOURCES = makethumbnail.c
+makethumbnail_LDADD = ../lib/libgmerlin.la -ldl
+
 gmerlin_imgconvert_SOURCES = imgconvert.c
 gmerlin_imgconvert_LDADD = ../lib/libgmerlin.la -ldl
 
+gmerlin_imgsplit_SOURCES = gmerlin_imgsplit.c
+gmerlin_imgsplit_LDADD = ../lib/libgmerlin.la -ldl
+
+
 gmerlin_psnr_SOURCES = gmerlin_psnr.c
 gmerlin_psnr_LDADD = ../lib/libgmerlin.la -ldl
 
@@ -115,7 +139,6 @@
 textrenderer_SOURCES = textrenderer.c
 textrenderer_LDADD = ../lib/libgmerlin.la -ldl
 
-
 videoplayer1_SOURCES = videoplayer1.c
 videoplayer1_LDADD = ../lib/libgmerlin.la -ldl
 
@@ -130,20 +153,13 @@
 chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 
 vumeter_SOURCES = vumeter.c
-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
-
-
-v4ltest_SOURCES = v4ltest.c
-v4ltest_LDADD = ../lib/libgmerlin.la
-
-v4ldump_SOURCES = v4ldump.c
-v4ldump_LDADD = ../lib/libgmerlin.la
+vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 
 visualization_SOURCES = visualization.c
 visualization_LDADD = ../lib/libgmerlin.la
 
 scrolltext_SOURCES = scrolltext.c
-scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 
 question_SOURCES = question.c
 question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
@@ -155,7 +171,7 @@
 message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 
 playtree_SOURCES = playtree.c
-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 
 server_SOURCES = server.c
 server_LDADD = ../lib/libgmerlin.la

gmerlin-1.2.0.tar.gz/tests/album2m3u.c -> gmerlin-4256.tar.gz/tests/album2m3u.c Changed

gmerlin-1.2.0.tar.gz/tests/album2pls.c -> gmerlin-4256.tar.gz/tests/album2pls.c Changed

gmerlin-1.2.0.tar.gz/tests/audioplayer1.c -> gmerlin-4256.tar.gz/tests/audioplayer1.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -30,28 +30,15 @@
 #include <gmerlin/pluginregistry.h>
 #include <gmerlin/utils.h>
 
-#if 0
-static void dump_format(gavl_audio_format_t * format)
-  {
-  fprintf(stderr, "Channels: %d\nSamplerate: %d\nSamples per frame: %d\nSample format: %s\nInterleave Mode: %s\nChannel Setup: %s\n",
-          format->num_channels,
-          format->samplerate,
-          format->samples_per_frame,
-          gavl_sample_format_to_string(format->sample_format),
-          gavl_interleave_mode_to_string(format->interleave_mode),
-          gavl_channel_setup_to_string(format->channel_setup));
-  
-  }
-
-#endif
-
 int main(int argc, char ** argv)
   {
   bg_track_info_t * info;
   char * tmp_path;
   const bg_plugin_info_t * plugin_info;
   bg_cfg_section_t * cfg_section;
-  int do_convert;
+  
+  gavl_audio_connector_t * conn;
+  
   bg_plugin_registry_t * plugin_reg;
   bg_cfg_registry_t    * cfg_reg;
   
@@ -66,15 +53,6 @@
   /* Output format */
   
   gavl_audio_format_t audio_format;
-
-  /* Frames */
-  
-  gavl_audio_frame_t * input_frame;
-  gavl_audio_frame_t * output_frame = NULL;
-
-  /* Converter */
-
-  gavl_audio_converter_t * audio_converter;
   
   if(argc == 1)
     fprintf(stderr, "Usage: %s <filename>\n", argv[0]);
@@ -92,21 +70,24 @@
 
   /* Load input plugin */
 
-  plugin_info = bg_plugin_find_by_name(plugin_reg,
-                                       "i_avdec");
-  if(!plugin_info)
-    {
-    fprintf(stderr, "Input plugin not found\n");
+  if(!bg_input_plugin_load(plugin_reg,
+                           argv[1],
+                           NULL, // const bg_plugin_info_t * info,
+                           &input_handle, // bg_plugin_handle_t ** ret,
+                           NULL, // bg_input_callbacks_t * callbacks,
+                           0 // int prefer_edl
+                           ))
     return -1;
-    }
-  input_handle = bg_plugin_load(plugin_reg, plugin_info);
+  
   input_plugin = (bg_input_plugin_t*)(input_handle->plugin);
-
+  
   /* Load output plugin */
   
-  plugin_info = bg_plugin_registry_get_default(plugin_reg,
-                                               BG_PLUGIN_OUTPUT_AUDIO, BG_PLUGIN_PLAYBACK);
-
+  plugin_info =
+    bg_plugin_registry_get_default(plugin_reg,
+                                   BG_PLUGIN_OUTPUT_AUDIO,
+                                   BG_PLUGIN_PLAYBACK);
+  
   if(!plugin_info)
     {
     fprintf(stderr, "Output plugin not found\n");
@@ -114,15 +95,7 @@
     }
   output_handle = bg_plugin_load(plugin_reg, plugin_info);
   output_plugin = (bg_oa_plugin_t*)(output_handle->plugin);
-    
-  /* Open the input */
   
-  if(!input_plugin->open(input_handle->priv, argv[1]))
-    {
-    fprintf(stderr, "Cannot open %s\n", argv[1]);
-    return -1;
-    }
-
   /* Select the first track */
   
   if(input_plugin->set_track)
@@ -142,8 +115,11 @@
                                  BG_STREAM_ACTION_DECODE);
   
   /* Start playback */
-  if(input_plugin->start)
-    input_plugin->start(input_handle->priv);
+  if(input_plugin->start && !input_plugin->start(input_handle->priv))
+    {
+    fprintf(stderr, "Starting %s failed\n", argv[1]);
+    return -1;
+    }
   
   /* Get audio format */
 
@@ -153,65 +129,20 @@
   
   output_plugin->open(output_handle->priv, &audio_format);
 
-  /* Initialize audio converter */
-
-  audio_converter = gavl_audio_converter_create();
-
-
-  fprintf(stderr, "gavl_audio_converter_init...");
-  
-  do_convert = gavl_audio_converter_init(audio_converter,
-                                         &info->audio_streams[0].format,
-                                         &audio_format);
-  fprintf(stderr, "done\n");
-  
-  /* Dump formats */
+  /* Create connector */
+  conn =
+    gavl_audio_connector_create(input_plugin->get_audio_source(input_handle->priv, 0));
 
-  /*
-  
-  fprintf(stderr, "Input format:\n");
-  dump_format(&info->audio_streams[0].format);
-  fprintf(stderr, "Output format:\n");
-  dump_format(&audio_format);
-  
-  */
-  
-  /* Allocate frames */
+  gavl_audio_connector_connect(conn,
+                               output_plugin->get_sink(output_handle->priv));
 
-  info->audio_streams[0].format.samples_per_frame = audio_format.samples_per_frame;
+  gavl_audio_connector_start(conn);
   
-  input_frame = gavl_audio_frame_create(&info->audio_streams[0].format);
-
-  if(do_convert)
-    output_frame = gavl_audio_frame_create(&audio_format);
-  
-  /* Playback until we are done */
-
-  
-  while(1)
-    {
-    //    fprintf(stderr, "Read audio %d\n", audio_format.samples_per_frame);
-    if(!input_plugin->read_audio(input_handle->priv,
-                                 input_frame, 0,
-                                 audio_format.samples_per_frame))
-      break;
-    
-    if(do_convert)
-      {
-      gavl_audio_convert(audio_converter, input_frame, output_frame);
-      output_plugin->write_audio(output_handle->priv, output_frame);
-      }
-    else
-      output_plugin->write_audio(output_handle->priv, input_frame);
-    }
+  while(gavl_audio_connector_process(conn))
+    ;
   
   /* Clean up */
-
-  gavl_audio_converter_destroy(audio_converter);
-  gavl_audio_frame_destroy(input_frame);
-  if(output_frame)
-    gavl_audio_frame_destroy(output_frame);
-
+  
   if(input_plugin->stop)
     input_plugin->stop(input_handle->priv);
 
@@ -223,7 +154,8 @@
     
   bg_plugin_registry_destroy(plugin_reg);
   bg_cfg_registry_destroy(cfg_reg);
-  
+
+  gavl_audio_connector_destroy(conn);
   
   return 0;
   }

gmerlin-1.2.0.tar.gz/tests/auth.c -> gmerlin-4256.tar.gz/tests/auth.c Changed

gmerlin-1.2.0.tar.gz/tests/cfgtest.c -> gmerlin-4256.tar.gz/tests/cfgtest.c Changed

gmerlin-1.2.0.tar.gz/tests/chapter.c -> gmerlin-4256.tar.gz/tests/chapter.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -29,16 +29,16 @@
 #include <gui_gtk/chapterdialog.h>
 #include <gui_gtk/gtkutils.h>
 
-static bg_chapter_list_t * create_chapter_list()
+static gavl_chapter_list_t * create_chapter_list()
   {
   int i;
-  bg_chapter_list_t * ret;
+  gavl_chapter_list_t * ret;
 
   ret = bg_chapter_list_load("chapters.xml");
   if(ret)
     return ret;
 
-  ret = bg_chapter_list_create(6);
+  ret = gavl_chapter_list_create(6);
 
   for(i = 0; i < ret->num_chapters; i++)
     {
@@ -51,7 +51,7 @@
 
 int main(int argc, char ** argv)
   {
-  bg_chapter_list_t * cl;
+  gavl_chapter_list_t * cl;
   gavl_time_t duration = 3600;
   duration *= GAVL_TIME_SCALE;
 
@@ -63,7 +63,7 @@
   if(cl)
     {
     bg_chapter_list_save(cl, "chapters.xml");
-    bg_chapter_list_destroy(cl);
+    gavl_chapter_list_destroy(cl);
     }
   else
     remove("chapters.xml");

gmerlin-1.2.0.tar.gz/tests/client.c -> gmerlin-4256.tar.gz/tests/client.c Changed

gmerlin-1.2.0.tar.gz/tests/dump_plugins.c -> gmerlin-4256.tar.gz/tests/dump_plugins.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -47,8 +47,8 @@
     { BG_PLUGIN_RECORDER_VIDEO, "Video recorder", "plugin_rv"  },
     { BG_PLUGIN_ENCODER_AUDIO, "Encoders for audio", "plugin_ea"  },
     { BG_PLUGIN_ENCODER_VIDEO, "Encoders for video", "plugin_ev"  },
-    { BG_PLUGIN_ENCODER_SUBTITLE_TEXT, "Encoders for text subtitles", "plugin_est"  },
-    { BG_PLUGIN_ENCODER_SUBTITLE_OVERLAY, "Encoders for overlay subtitles", "plugin_eso"  },
+    { BG_PLUGIN_ENCODER_TEXT, "Encoders for text subtitles", "plugin_est"  },
+    { BG_PLUGIN_ENCODER_OVERLAY, "Encoders for overlay subtitles", "plugin_eso"  },
     { BG_PLUGIN_ENCODER, "Encoders for multiple stream types", "plugin_e"  },
     { BG_PLUGIN_ENCODER_PP, "Encoder postprocessors", "plugin_epp"  },
     { BG_PLUGIN_IMAGE_READER, "Image readers", "plugin_ir"  },

gmerlin-1.2.0.tar.gz/tests/extractchannel.c -> gmerlin-4256.tar.gz/tests/extractchannel.c Changed

gmerlin-1.2.0.tar.gz/tests/fvtest.c -> gmerlin-4256.tar.gz/tests/fvtest.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -176,7 +176,7 @@
                                        {  } },
     .files = (bg_cmdline_ext_doc_t[])
     { { "~/.gmerlin/plugins.xml",
-        TRS("Cache of the plugin registry (shared by all applicatons)") },
+        TRS("Cache of the plugin registry (shared by all applications)") },
       { "~/.gmerlin/generic/config.xml",
         TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
       { /* End */ }
@@ -209,10 +209,9 @@
   /* Create registries */
   
   char ** gmls = NULL;
+  
+  gavl_video_source_t * src;
 
-  bg_read_video_func_t read_func;
-  void * read_priv;
-  int read_stream;
   gavl_timer_t * timer = gavl_timer_create();
   
   cfg_reg = bg_cfg_registry_create();
@@ -293,32 +292,18 @@
   
   /* Initialize filter chain */
 
-  read_func = input_plugin->read_video;
-  read_priv = input_handle->priv;
-  read_stream = 0;
-  
-  bg_video_filter_chain_connect_input(fc,
-                                      input_plugin->read_video,
-                                      input_handle->priv,
-                                      0);
+  src = input_plugin->get_video_source(input_handle->priv, 0);
 
-  if(bg_video_filter_chain_init(fc, &in_format, &out_format))
-    {
-    read_func = bg_video_filter_chain_read;
-    read_priv = fc;
-    read_stream = 0;
-    }
-  else
-    gavl_video_format_copy(&out_format, &in_format);
-
-  frame = gavl_video_frame_create(&out_format);
+  src = bg_video_filter_chain_connect(fc, src);
+  
   
   if(frameno >= 0)
     {
+    frame = NULL;
     gavl_timer_start(timer);
     for(i = 0; i < frameno+1; i++)
       {
-      if(!read_func(read_priv, frame, read_stream))
+      if(gavl_video_source_read_frame(src, &frame) != GAVL_SOURCE_OK)
         {
         fprintf(stderr, "Unexpected EOF\n");
         return -1;
@@ -328,10 +313,11 @@
     }
   else
     {
+    frame = NULL;
     gavl_timer_start(timer);
     while(1)
       {
-      if(!read_func(read_priv, frame, read_stream))
+      if(gavl_video_source_read_frame(src, &frame) != GAVL_SOURCE_OK)
         {
         break;
         }
@@ -349,7 +335,6 @@
   bg_gavl_video_options_free(&opt);
   bg_plugin_registry_destroy(plugin_reg);
   bg_cfg_registry_destroy(cfg_reg);
-  gavl_video_frame_destroy(frame);
   gavl_timer_destroy(timer);
   return 0;
   }

gmerlin-4256.tar.gz/tests/gmerlin-savemeta.c Added

@@ -0,0 +1,124 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+
+#include <config.h>
+
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/utils.h>
+#include <gmerlin/cmdline.h>
+#include <gmerlin/translation.h>
+
+const bg_plugin_info_t * plugin_info = NULL;
+bg_plugin_registry_t * plugin_reg = NULL;
+
+static void opt_plugin(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -p requires an argument\n");
+    exit(-1);
+    }
+
+  if(plugin_reg)
+    plugin_info = bg_plugin_find_by_name(plugin_reg, (*_argv)[arg]);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-p",
+      .help_arg =    "<plugin>",
+      .help_string = "Use this input plugin",
+      .callback =    opt_plugin,
+    },
+    { /* */ },
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gmerlin-savemeta",
+    .long_name = TRS("Save metadata to an xml file"),
+    .synopsis = TRS("[options] file ...\n"),
+    .help_before = TRS("Metadata saver\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+    .files = (bg_cmdline_ext_doc_t[])
+    { { "~/.gmerlin/plugins.xml",
+        TRS("Cache of the plugin registry (shared by all applications)") },
+      { "~/.gmerlin/generic/config.xml",
+        TRS("Default plugin parameters are read from there. Use gmerlin_plugincfg to change them.") },
+      { /* End */ }
+    },
+    
+  };
+
+int main(int argc, char ** argv)
+  {
+  bg_cfg_registry_t * cfg_reg;
+  bg_cfg_section_t * cfg_section;
+  char * tmp_path;
+  char ** files;
+  int i, j, k;
+  bg_plugin_handle_t * h = NULL;
+  
+  /* Create registries */
+  
+  cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+
+  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(cfg_section);
+
+  /* Handle commandline options */
+
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+  
+  files = bg_cmdline_get_locations_from_args(&argc, &argv);
+  if(!files)
+    return -1;
+  i = 0;
+  
+  while(files[i])
+    {
+    if(!bg_input_plugin_load(plugin_reg, files[i], plugin_info, &h, NULL, 0))
+      {
+      i++;
+      continue;
+      }
+
+    /* Save metadata */
+    bg_plugin_save_metadata(h);
+    bg_plugin_unref(h);
+    
+    i++;
+    }
+  
+  return 0;
+  }

gmerlin-4256.tar.gz/tests/gmerlin-upnp-discover.c Added

@@ -0,0 +1,213 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <config.h>
+
+#include <gavl/gavl.h>
+#include <gavl/metadata.h>
+#include <gavl/utils.h>
+
+#include <gmerlin/translation.h>
+
+
+#include <gmerlin/parameter.h>
+#include <gmerlin/cfg_registry.h>
+
+#include <gmerlin/cmdline.h>
+
+#include <gmerlin/upnp/ssdp.h>
+
+typedef struct
+  {
+  char * type;
+  int version;
+  char * desc_url;
+  } desc_t;
+
+static desc_t * desc = NULL;
+static int num_desc = 0;
+static int desc_alloc = 0;
+static gavl_time_t timeout = 5 * GAVL_TIME_SCALE;
+
+static char * type = NULL;
+static int version = -1;
+
+static void opt_t(void * data, int * argc, char *** _argv, int arg)
+  {
+  float to;
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -t requires an argument\n");
+    exit(-1);
+    }
+
+  to = strtod((*_argv)[arg], NULL);
+  timeout = gavl_seconds_to_time(to);
+  
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_type(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -type requires an argument\n");
+    exit(-1);
+    }
+  type = (*_argv)[arg];
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static void opt_version(void * data, int * argc, char *** _argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -vers requires an argument\n");
+    exit(-1);
+    }
+  version = atoi((*_argv)[arg]);
+  bg_cmdline_remove_arg(argc, _argv, arg);
+  }
+
+static bg_cmdline_arg_t global_options[] =
+  {
+    {
+      .arg =         "-t",
+      .help_arg =    "<timeout>",
+      .help_string = "Set timeout in seconds",
+      .callback =    opt_t,
+    },
+    {
+      .arg =         "-type",
+      .help_arg =    "<type>",
+      .help_string = "Specify the Upnp device type (e.g. MediaRenderer)",
+      .callback =    opt_type,
+    },
+    {
+      .arg =         "-vers",
+      .help_arg =    "<version>",
+      .help_string = "Specify the Upnp device version",
+      .callback =    opt_version,
+    },
+    {
+      /* End */
+    }
+  };
+
+const bg_cmdline_app_data_t app_data =
+  {
+    .package =  PACKAGE,
+    .version =  VERSION,
+    .name =     "gmerlin-upnp-discover",
+    .long_name = TRS("Discover Upnp devices in the local network"),
+    .synopsis = TRS("[options]\n"),
+    .help_before = TRS("gavf info\n"),
+    .args = (bg_cmdline_arg_array_t[]) { { TRS("Options"), global_options },
+                                       {  } },
+  };
+
+
+static void ssdp_callback(void * priv, int add, const char * type1,
+                          int version1, const char * desc_url)
+  {
+  if(add)
+    {
+    if(type && strcmp(type, type1))
+      return;
+    if((version >= 0) && (version1 < version))
+      return;
+    
+    if(num_desc + 1 > desc_alloc)
+      {
+      desc_alloc += 16;
+      desc = realloc(desc, desc_alloc * sizeof(*desc));
+      memset(desc + num_desc, 0,
+             (desc_alloc - num_desc) * sizeof(*desc));
+      }
+    
+    desc[num_desc].type = gavl_strdup(type1);
+    desc[num_desc].version = version1;
+    desc[num_desc].desc_url = gavl_strdup(desc_url);
+    num_desc++;
+    }
+  else
+    {
+    int i;
+
+    for(i = 0; i < num_desc; i++)
+      {
+      if(!strcmp(desc[i].desc_url, desc_url))
+        {
+        free(desc[i].desc_url);
+        free(desc[i].type);
+        if(i < num_desc - 1)
+          memmove(desc + i, desc + i + 1, (num_desc - 1 - i) * sizeof(*desc));
+        num_desc--;
+        return;
+        }
+      }
+    
+    }
+
+#if 0    
+    fprintf(stderr, "Added device:   ");
+  else
+    fprintf(stderr, "Removed device: ");
+  fprintf(stderr, "%s.%d [%s]\n", type, version, desc_url);
+#endif
+  }
+
+int main(int argc, char ** argv)
+  {
+  int i;
+  gavl_timer_t * timer = gavl_timer_create();
+  gavl_time_t delay_time = GAVL_TIME_SCALE / 100;
+  bg_ssdp_t * s = bg_ssdp_create(NULL, 1, NULL);
+
+  /* Handle commandline options */
+  bg_cmdline_init(&app_data);
+  bg_cmdline_parse(global_options, &argc, &argv, NULL);
+  
+  bg_ssdp_set_callback(s, ssdp_callback, NULL);
+
+  gavl_timer_start(timer);
+
+  while(1)
+    {
+    if(gavl_timer_get(timer) >= timeout)
+      break;
+    
+    bg_ssdp_update(s);
+    gavl_time_delay(&delay_time);
+    }
+
+  for(i = 0; i < num_desc; i++)
+    {
+    printf("%s.%d %s\n", desc[i].type, desc[i].version, desc[i].desc_url);
+    }
+  
+  gavl_timer_destroy(timer);
+  return 0;
+  }

gmerlin-1.2.0.tar.gz/tests/gmerlin_imgdiff.c -> gmerlin-4256.tar.gz/tests/gmerlin_imgdiff.c Changed

gmerlin-4256.tar.gz/tests/gmerlin_imgsplit.c Added

@@ -0,0 +1,132 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <string.h>
+#include <gmerlin/pluginregistry.h>
+#include <gmerlin/utils.h>
+
+static struct
+  {
+  gavl_color_channel_t ch;
+  char c;
+  }
+channel_names[] =
+  {
+    { GAVL_CCH_RED,   'r' },
+    { GAVL_CCH_GREEN, 'g' },
+    { GAVL_CCH_BLUE,  'b' },
+    { GAVL_CCH_Y,     'y' },
+    { GAVL_CCH_CB,    'u' },
+    { GAVL_CCH_CR,    'v' },
+    { GAVL_CCH_ALPHA, 'a' },
+  };
+
+static char get_channel_name(gavl_color_channel_t ch)
+  {
+  int i;
+  for(i = 0; i < sizeof(channel_names)/sizeof(channel_names[0]); i++)
+    {
+    if(ch == channel_names[i].ch)
+      return channel_names[i].c;
+    }
+  return 0x00;
+  }
+
+int main(int argc, char ** argv)
+  {
+  int num_channels;
+  gavl_color_channel_t ch;
+  int i;
+  
+  gavl_video_format_t format_1;
+  gavl_video_format_t format_2;
+
+  gavl_video_frame_t * frame_1;
+  gavl_video_frame_t * frame_2;
+  gavl_metadata_t m;
+
+  bg_cfg_registry_t * cfg_reg;
+  bg_cfg_section_t * cfg_section;
+  bg_plugin_registry_t * plugin_reg;
+  char * tmp_path;
+  char * filename;
+  
+  memset(&format_1, 0, sizeof(format_1));
+  memset(&format_2, 0, sizeof(format_2));
+  memset(&m, 0, sizeof(m));
+
+  if(argc < 4)
+    {
+    fprintf(stderr, "Usage: %s <image1> <output_prefix> <output_extension>\n", argv[0]);
+    return -1;
+    }
+
+  cfg_reg = bg_cfg_registry_create();
+  tmp_path =  bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  if(tmp_path)
+    free(tmp_path);
+
+  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(cfg_section);
+
+  frame_1 =
+    bg_plugin_registry_load_image(plugin_reg, argv[1], &format_1, NULL);  
+  if(!frame_1)
+    {
+    fprintf(stderr, "Cannot open %s\n", argv[1]);
+    return -1;
+    }
+
+  num_channels = gavl_pixelformat_num_channels(format_1.pixelformat);
+  
+  for(i = 0; i < num_channels; i++)
+    {
+    ch = gavl_pixelformat_get_channel(format_1.pixelformat, i);
+
+    if(!gavl_get_color_channel_format(&format_1, &format_2, ch))
+      {
+      fprintf(stderr, "Invalid channel\n");
+      return -1;
+      }
+
+    frame_2 = gavl_video_frame_create(&format_2);
+    
+    if(!gavl_video_frame_extract_channel(&format_1, ch, frame_1, frame_2))
+      {
+      fprintf(stderr, "Cannot extract channel\n");
+      return -1;
+      }
+
+    filename = bg_sprintf("%s_%c.%s", argv[2], get_channel_name(ch), argv[3]);
+    
+    bg_plugin_registry_save_image(plugin_reg,
+                                  filename,
+                                  frame_2,
+                                  &format_2, &m);
+    
+    fprintf(stderr, "Saved %s\n", filename);
+    
+    gavl_video_frame_destroy(frame_2);
+    free(filename);
+    }
+  return 0;
+  }

gmerlin-1.2.0.tar.gz/tests/gmerlin_psnr.c -> gmerlin-4256.tar.gz/tests/gmerlin_psnr.c Changed

gmerlin-1.2.0.tar.gz/tests/gmerlin_ssim.c -> gmerlin-4256.tar.gz/tests/gmerlin_ssim.c Changed

gmerlin-1.2.0.tar.gz/tests/gmerlin_vanalyze.c -> gmerlin-4256.tar.gz/tests/gmerlin_vanalyze.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -30,8 +30,8 @@
 static int load_file(bg_plugin_registry_t * plugin_reg,
                      bg_plugin_handle_t ** input_handle,
                      bg_input_plugin_t ** input_plugin,
-                     const char * file,
-                     gavl_video_format_t * format)
+                     gavl_video_source_t ** src,
+                     const char * file)
   {
   bg_track_info_t * ti;
   *input_handle = NULL;
@@ -66,8 +66,7 @@
   
   /* Get video format */
 
-  gavl_video_format_copy(format,
-                         &ti->video_streams[0].format);
+  *src = (*input_plugin)->get_video_source((*input_handle)->priv, 0);
   
   return 1;
   }
@@ -77,7 +76,7 @@
                                 bg_input_plugin_t ** input_plugin,
                                 const char * file,
                                 gavl_video_format_t * format,
-                                gavl_compression_info_t * ci)
+                                gavl_compression_info_t * ci, gavl_packet_source_t ** src)
   {
   bg_track_info_t * ti;
   *input_handle = NULL;
@@ -126,7 +125,9 @@
   
   gavl_video_format_copy(format,
                          &ti->video_streams[0].format);
-  
+
+  *src = (*input_plugin)->get_video_packet_source((*input_handle)->priv, 0);
+
   return 1;
   }
 
@@ -140,15 +141,8 @@
 
   gavl_video_frame_t * frame_o;
   gavl_video_frame_t * frame_c;
-  gavl_video_frame_t * frame_ssim_o = NULL;
-  gavl_video_frame_t * frame_ssim_c = NULL;
   gavl_video_frame_t * frame_ssim_res;
   
-  gavl_video_frame_t * frame_1;
-  gavl_video_frame_t * frame_2;
-  
-  gavl_video_converter_t * cnv;
-  
   bg_cfg_registry_t * cfg_reg;
   bg_cfg_section_t * cfg_section;
   bg_plugin_registry_t * plugin_reg;
@@ -167,7 +161,6 @@
   gavl_packet_t packet;
   gavl_compression_info_t ci;
   int frame = 0;
-  int do_convert;
   float * ssim_ptr;
 
   int64_t duration = 0;
@@ -188,9 +181,12 @@
   int64_t frame_bytes_sum = 0;
   double psnr_sum = 0.0;
   double ssim_sum = 0.0;
-
   int found_packet = 0;
   
+  gavl_video_source_t * src_c;
+  gavl_video_source_t * src_o;
+  gavl_packet_source_t * src_p;
+  
   memset(&format_o, 0, sizeof(format_o));
   memset(&format_c, 0, sizeof(format_c));
   memset(&packet, 0, sizeof(packet));
@@ -218,8 +214,8 @@
   if(!load_file(plugin_reg,
                 &input_handle_o,
                 &input_plugin_o,
-                argv[1],
-                &format_o))
+                &src_o,
+                argv[1]))
     {
     fprintf(stderr, "Cannot open %s\n", argv[1]);
     return -1;
@@ -228,18 +224,21 @@
   if(!load_file(plugin_reg,
                 &input_handle_c,
                 &input_plugin_c,
-                argv[2],
-                &format_c))
+                &src_c,
+                argv[2]))
     {
     fprintf(stderr, "Cannot open %s\n", argv[2]);
     return -1;
     }
 
+  gavl_video_format_copy(&format_o, gavl_video_source_get_src_format(src_o));
+  gavl_video_format_copy(&format_c, gavl_video_source_get_src_format(src_c));
+  
   if(!load_file_compressed(plugin_reg,
                            &input_handle_cmp,
                            &input_plugin_cmp,
                            argv[2],
-                           &format_cmp, &ci))
+                           &format_cmp, &ci, &src_p))
     {
     fprintf(stderr, "Cannot open %s\n", argv[2]);
     return -1;
@@ -255,52 +254,32 @@
 
   gavl_video_format_copy(&format_ssim, &format_o);
   format_ssim.pixelformat = GAVL_GRAY_FLOAT;
-  
-  cnv = gavl_video_converter_create();
-  do_convert =
-    gavl_video_converter_init(cnv, &format_o, &format_ssim);
-  
-  frame_o = gavl_video_frame_create(&format_o);
-  frame_c = gavl_video_frame_create(&format_c);
 
-  if(do_convert)
-    {
-    frame_ssim_o = gavl_video_frame_create(&format_ssim);
-    frame_ssim_c = gavl_video_frame_create(&format_ssim);
-    }
+  gavl_video_source_set_dst(src_o, 0, &format_ssim);
+  gavl_video_source_set_dst(src_c, 0, &format_ssim);
+  
 
   frame_ssim_res = gavl_video_frame_create(&format_ssim);
   
   while(1)
     {
-    if(!input_plugin_o->read_video(input_handle_o->priv,
-                                  frame_o, 0))
-      break;
-    if(!input_plugin_c->read_video(input_handle_c->priv,
-                                   frame_c, 0))
+    frame_o = NULL;
+    frame_c = NULL;
+
+    if(gavl_video_source_read_frame(src_o, &frame_o) != GAVL_SOURCE_OK)
       break;
 
+    if(gavl_video_source_read_frame(src_c, &frame_c) != GAVL_SOURCE_OK)
+      break;
+    
     duration += frame_c->duration;
     
-    if(do_convert)
-      {
-      gavl_video_convert(cnv, frame_o, frame_ssim_o);
-      gavl_video_convert(cnv, frame_c, frame_ssim_c);
-      frame_1 = frame_ssim_o;
-      frame_2 = frame_ssim_c;
-      }
-    else
-      {
-      frame_1 = frame_o;
-      frame_2 = frame_c;
-      }
-
     /* Get PSNR */
-    gavl_video_frame_psnr(psnr, frame_1, frame_2, &format_ssim);
+    gavl_video_frame_psnr(psnr, frame_c, frame_o, &format_ssim);
 
     /* Get SSIM */
 #if 1
-    gavl_video_frame_ssim(frame_1, frame_2, frame_ssim_res, &format_ssim);
+    gavl_video_frame_ssim(frame_c, frame_o, frame_ssim_res, &format_ssim);
     ssim = 0.0;
     for(i = 0; i < format_ssim.image_height; i++)
       {
@@ -315,8 +294,8 @@
 
     while(packet_cache_size < PACKET_CACHE_MAX)
       {
-      if(!input_plugin_cmp->read_video_packet(input_handle_cmp->priv,
-                                              0, &packet))
+      gavl_packet_t * p = &packet;
+      if(gavl_packet_source_read_packet(src_p, &p) == GAVL_SOURCE_EOF)
         break;
 #ifdef DUMP_COMPRESSED
       gavl_packet_dump(&packet);

gmerlin-1.2.0.tar.gz/tests/gmerlin_visualize.c -> gmerlin-4256.tar.gz/tests/gmerlin_visualize.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -68,15 +68,20 @@
 gavl_audio_format_t afmt_i, afmt_e, afmt_v;
 gavl_video_format_t vfmt_v, vfmt_e;
 
+gavl_audio_source_t * src_i;
+
 gavl_time_t track_duration;
 gavl_time_t start_duration = 0;
 gavl_time_t end_duration = 0;
 
+gavl_audio_sink_t * asink = NULL;
+gavl_video_sink_t * vsink = NULL;
+
 static int load_input_file(bg_plugin_registry_t * plugin_reg,
                            bg_plugin_handle_t ** input_handle,
                            bg_input_plugin_t ** input_plugin,
-                           const char * file,
-                           gavl_audio_format_t * format)
+                           gavl_audio_source_t ** src,
+                           const char * file)
   {
   bg_track_info_t * ti;
   *input_handle = NULL;
@@ -101,7 +106,7 @@
     return 0;
     }
   
-  track_duration = ti->duration;
+  track_duration = bg_track_info_get_duration(ti);
   
   /* Select first stream */
   (*input_plugin)->set_audio_stream((*input_handle)->priv, 0,
@@ -113,8 +118,7 @@
   
   /* Get video format */
 
-  gavl_audio_format_copy(format,
-                         &ti->audio_streams[0].format);
+  *src = (*input_plugin)->get_audio_source((*input_handle)->priv, 0);
   
   return 1;
   }
@@ -208,12 +212,13 @@
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Starting %s failed", info->name);
     return 0;
     }
-
+  
   if((*plugin)->add_audio_stream)
-    (*plugin)->get_audio_format((*handle)->priv, audio_index, audio_format);
-
-  (*plugin)->get_video_format((*handle)->priv, video_index, video_format);
+    asink = (*plugin)->get_audio_sink((*handle)->priv, audio_index);
+  else
+    asink = NULL;
   
+  vsink = (*plugin)->get_video_sink((*handle)->priv, video_index);
   return 1;
   }
 
@@ -352,8 +357,6 @@
   {
   float percentage;
   bg_visualization_plugin_t * vis_plugin;
-  bg_encoder_plugin_t * enc_plugin = (bg_encoder_plugin_t*)enc_handle->plugin;
-  
   vis_plugin = (bg_visualization_plugin_t*)vis_handle->plugin;
   
   /* Update visualization */
@@ -376,11 +379,11 @@
     if(convert_audio_e)
       {
       gavl_audio_convert(audio_cnv_e, frame, aframe_e);
-      enc_plugin->write_audio_frame(enc_handle->priv, aframe_e, audio_index);
+      gavl_audio_sink_put_frame(asink, aframe_e);
       }
     else
       {
-      enc_plugin->write_audio_frame(enc_handle->priv, frame, audio_index);
+      gavl_audio_sink_put_frame(asink, frame);
       }
     }
   
@@ -396,13 +399,13 @@
       gavl_video_convert(video_cnv_e, vframe_v, vframe_e);
       vframe_e->timestamp = next_frame_time;
       vframe_e->duration = vfmt_e.frame_duration;
-      enc_plugin->write_video_frame(enc_handle->priv, vframe_e, video_index);
+      gavl_video_sink_put_frame(vsink, vframe_e);
       }
     else
       {
       vframe_v->timestamp = next_frame_time;
       vframe_v->duration = vfmt_v.frame_duration;
-      enc_plugin->write_video_frame(enc_handle->priv, vframe_v, video_index);
+      gavl_video_sink_put_frame(vsink, vframe_v);
       }
     next_frame_time += vfmt_e.frame_duration;
     }
@@ -472,12 +475,16 @@
   if(!load_input_file(plugin_reg,
                       &input_handle,
                       &input_plugin,
-                      files[0],
-                      &afmt_i))
+                      &src_i,
+                      files[0]))
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot open %s", files[0]);
     return -1;
     }
+
+  gavl_audio_format_copy(&afmt_i, gavl_audio_source_get_src_format(src_i));
+
+
   bg_log(BG_LOG_INFO, LOG_DOMAIN, "Opened %s", files[0]);
   // gavl_audio_format_dump(&afmt_i);
 
@@ -541,7 +548,6 @@
   afmt_e.samples_per_frame = afmt_v.samples_per_frame;
   afmt_i.samples_per_frame = afmt_v.samples_per_frame;
 
-  aframe_i = gavl_audio_frame_create(&afmt_i);
   
   if(convert_audio_v)
     aframe_v = gavl_audio_frame_create(&afmt_v);
@@ -555,8 +561,8 @@
   
   while(1)
     {
-    if(!input_plugin->read_audio(input_handle->priv,
-                                 aframe_i, 0, afmt_i.samples_per_frame))
+    aframe_i = NULL;
+    if(gavl_audio_source_read_frame(src_i, &aframe_i) != GAVL_SOURCE_OK)
       break;
     
     iteration(aframe_i);

gmerlin-1.2.0.tar.gz/tests/gmerlin_vpsnr.c -> gmerlin-4256.tar.gz/tests/gmerlin_vpsnr.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -26,8 +26,8 @@
 static int load_file(bg_plugin_registry_t * plugin_reg,
                      bg_plugin_handle_t ** input_handle,
                      bg_input_plugin_t ** input_plugin,
-                     const char * file,
-                     gavl_video_format_t * format)
+                     gavl_video_source_t ** src,
+                     const char * file)
   {
   bg_track_info_t * ti;
   *input_handle = NULL;
@@ -60,10 +60,8 @@
   if((*input_plugin)->start)
     (*input_plugin)->start((*input_handle)->priv);
   
-  /* Get video format */
-
-  gavl_video_format_copy(format,
-                         &ti->video_streams[0].format);
+  /* Get video source */
+  *src =   (*input_plugin)->get_video_source((*input_handle)->priv, 0);
   
   return 1;
   }
@@ -91,6 +89,9 @@
   bg_input_plugin_t * input_plugin_2;
 
   int frame = 0;
+
+  gavl_video_source_t * src_1;
+  gavl_video_source_t * src_2;
   
   memset(&format_1, 0, sizeof(format_1));
   memset(&format_2, 0, sizeof(format_2));
@@ -114,11 +115,12 @@
 
   /* Load inputs */
 
+
   if(!load_file(plugin_reg,
                 &input_handle_1,
                 &input_plugin_1,
-                argv[1],
-                &format_1))
+                &src_1,
+                argv[1]))
     {
     fprintf(stderr, "Cannot open %s\n", argv[1]);
     return -1;
@@ -127,13 +129,16 @@
   if(!load_file(plugin_reg,
                 &input_handle_2,
                 &input_plugin_2,
-                argv[2],
-                &format_2))
+                &src_2,
+                argv[2]))
     {
     fprintf(stderr, "Cannot open %s\n", argv[2]);
     return -1;
     }
 
+  gavl_video_format_copy(&format_1, gavl_video_source_get_src_format(src_1));
+  gavl_video_format_copy(&format_2, gavl_video_source_get_src_format(src_2));
+
   if((format_1.image_width != format_2.image_width) ||
      (format_1.image_height != format_2.image_height) ||
      (format_1.pixelformat != format_2.pixelformat))
@@ -142,17 +147,17 @@
     return -1;
     }
   
-  frame_1 = gavl_video_frame_create(&format_1);
-  frame_2 = gavl_video_frame_create(&format_2);
-
   while(1)
     {
-    if(!input_plugin_1->read_video(input_handle_1->priv,
-                                  frame_1, 0))
+    frame_1 = NULL;
+    frame_2 = NULL;
+
+    if(gavl_video_source_read_frame(src_1, &frame_1) != GAVL_SOURCE_OK)
       break;
-    if(!input_plugin_2->read_video(input_handle_2->priv,
-                                   frame_2, 0))
+
+    if(gavl_video_source_read_frame(src_2, &frame_2) != GAVL_SOURCE_OK)
       break;
+
     gavl_video_frame_psnr(psnr, frame_1, frame_2, &format_1);
 
     printf("%d ", frame++);

gmerlin-1.2.0.tar.gz/tests/imgconvert.c -> gmerlin-4256.tar.gz/tests/imgconvert.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -40,6 +40,8 @@
 bg_cfg_section_t * conversion_section = NULL;
 bg_gavl_video_options_t vopt;
 
+gavl_pixelformat_t force_pixelformat = GAVL_PIXELFORMAT_NONE;
+
 static void set_video_parameter(void * data, const char * name,
                                 const bg_parameter_value_t * v)
   {
@@ -73,6 +75,31 @@
   bg_cmdline_remove_arg(argc, argv, arg);
   }
 
+static void opt_pfmt(void * data, int * argc, char *** argv, int arg)
+  {
+  if(arg >= *argc)
+    {
+    fprintf(stderr, "Option -pfmt requires an argument\n");
+    exit(-1);
+    }
+  force_pixelformat = gavl_short_string_to_pixelformat((*argv)[arg]);
+
+  if(force_pixelformat == GAVL_PIXELFORMAT_NONE)
+    {
+    int i, num;
+    fprintf(stderr, "Invalid pixelformat, allowed values are\n");
+    num = gavl_num_pixelformats();
+    for(i = 0; i < num; i++)
+      {
+      fprintf(stderr, "%s\n",
+              gavl_pixelformat_to_short_string(gavl_get_pixelformat(i)));
+      }
+    exit(-1);
+    }
+
+  bg_cmdline_remove_arg(argc, argv, arg);
+  }
+
 //static void opt_help(void * data, int * argc, char *** argv, int arg);
 
 static bg_cmdline_arg_t global_options[] =
@@ -84,6 +111,12 @@
       .callback =    opt_video_options,
       .parameters =  conversion_parameters,
     },
+    {
+      .arg =         "-pfmt",
+      .help_arg =    "<format>",
+      .help_string = "Force pixelformat",
+      .callback =    opt_pfmt,
+    },
     { /* End of options */ }
   };
 
@@ -183,6 +216,9 @@
   
   gavl_video_format_copy(&out_format, &in_format);
 
+  if(force_pixelformat != GAVL_PIXELFORMAT_NONE)
+    out_format.pixelformat = force_pixelformat;
+  
   bg_gavl_video_options_set_format(&vopt, &in_format, &out_format);
   
   output_plugin->write_header(output_handle->priv, files[1], &out_format, &metadata);

gmerlin-1.2.0.tar.gz/tests/insertchannel.c -> gmerlin-4256.tar.gz/tests/insertchannel.c Changed

gmerlin-1.2.0.tar.gz/tests/ladspa.c -> gmerlin-4256.tar.gz/tests/ladspa.c Changed

gmerlin-4256.tar.gz/tests/makethumbnail.c Added

@@ -0,0 +1,105 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ * 
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <gmerlin/utils.h>
+#include <gmerlin/pluginregistry.h>
+
+int main(int argc, char ** argv)
+  {
+  bg_cfg_registry_t    * cfg_reg;
+  bg_plugin_registry_t * plugin_reg;
+
+  char * tmp_path;
+  bg_cfg_section_t * cfg_section;
+
+  gavl_video_format_t input_format;
+  gavl_video_frame_t * input_frame;
+  
+  char * in_file;
+  char * out_base;
+  char * mimetype;
+  int max_width;
+  int max_height;
+  char * path_abs;
+  
+  if(argc != 6)
+    {
+    fprintf(stderr, "Usage: %s file max_width max_height output_base mimetype\n",
+            argv[0]);
+    return -1;
+    }
+
+  in_file = argv[1];
+  max_width =  atoi(argv[2]);
+  max_height = atoi(argv[3]);
+  out_base = argv[4];
+  mimetype = argv[5];
+  
+  /* Create registries */
+  cfg_reg = bg_cfg_registry_create();
+
+  tmp_path = bg_search_file_read("generic", "config.xml");
+  bg_cfg_registry_load(cfg_reg, tmp_path);
+  
+  if(tmp_path)
+    free(tmp_path);
+
+  cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
+  plugin_reg = bg_plugin_registry_create(cfg_section);
+
+  /* Load image */
+
+  memset(&input_format, 0, sizeof(input_format));
+  
+  input_frame = bg_plugin_registry_load_image(plugin_reg,
+                                              in_file,
+                                              &input_format, NULL);
+
+  if(!input_frame)
+    return -1;
+
+  fprintf(stderr, "Loaded %s\n", in_file);
+  gavl_video_format_dump(&input_format);
+  
+  /* Save image */
+  
+  path_abs = bg_make_thumbnail(plugin_reg, input_frame, &input_format,
+                               max_width, max_height,
+                               out_base, mimetype);
+  if(!path_abs)
+    return -1;
+
+  fprintf(stderr, "Saved %s\n", path_abs);
+  
+  gavl_video_frame_destroy(input_frame);
+  free(path_abs);
+  
+  bg_plugin_registry_destroy(plugin_reg);
+  bg_cfg_registry_destroy(cfg_reg);
+  
+  return 0;
+  }
+
+

gmerlin-1.2.0.tar.gz/tests/message.c -> gmerlin-4256.tar.gz/tests/message.c Changed

gmerlin-1.2.0.tar.gz/tests/msgtest.c -> gmerlin-4256.tar.gz/tests/msgtest.c Changed

gmerlin-1.2.0.tar.gz/tests/ocrtest.c -> gmerlin-4256.tar.gz/tests/ocrtest.c Changed

gmerlin-1.2.0.tar.gz/tests/playtree.c -> gmerlin-4256.tar.gz/tests/playtree.c Changed

gmerlin-1.2.0.tar.gz/tests/question.c -> gmerlin-4256.tar.gz/tests/question.c Changed

gmerlin-1.2.0.tar.gz/tests/scrolltext.c -> gmerlin-4256.tar.gz/tests/scrolltext.c Changed

gmerlin-1.2.0.tar.gz/tests/server.c -> gmerlin-4256.tar.gz/tests/server.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -90,7 +90,8 @@
   
   /* Create unix listener */
 
-  tcp_socket = bg_listen_socket_create_inet(1122, 10, INADDR_LOOPBACK);
+  tcp_socket = bg_listen_socket_create_inet(NULL,
+                                            1122, 10, INADDR_LOOPBACK);
   if(tcp_socket == -1)
     fprintf(stderr, "Cannot create TCP Socket\n");
 
@@ -100,14 +101,14 @@
 
   while(keep_going)
     {
-    if((new_fd = bg_listen_socket_accept(tcp_socket)) != -1)
+    if((new_fd = bg_listen_socket_accept(tcp_socket, 0, NULL)) != -1)
       {
       fprintf(stderr, "TCP Connection coming in: %d\n", new_fd);
       connections = add_connection(connections, new_fd);
       num_connections++;
       }
 
-    if((new_fd = bg_listen_socket_accept(unix_socket)) != -1)
+    if((new_fd = bg_listen_socket_accept(unix_socket, 0, NULL)) != -1)
       {
       fprintf(stderr, "Local connection coming in: %d\n", new_fd);
       connections = add_connection(connections, new_fd);

gmerlin-4256.tar.gz/tests/soap.c Added

@@ -0,0 +1,34 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/upnp/soap.h>
+
+int main(int argc, char ** argv)
+  {
+  xmlDocPtr doc = bg_soap_create_request("myfunction", "myservice", 1);
+
+  bg_soap_request_add_argument(doc, "myarg1", "& <my val>");
+
+  bg_xml_save_FILE(doc, stdout);
+  xmlFreeDoc(doc);
+  return 0;
+  }
+

gmerlin-4256.tar.gz/tests/ssdp.c Added

@@ -0,0 +1,50 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <gavl/gavl.h>
+#include <gavl/metadata.h>
+#include <gmerlin/upnp/ssdp.h>
+
+static void ssdp_callback(void * priv, int add, const char * type,
+                          int version, const char * desc_url)
+  {
+  if(add)
+    fprintf(stderr, "Added device:   ");
+  else
+    fprintf(stderr, "Removed device: ");
+  fprintf(stderr, "%s.%d [%s]\n", type, version, desc_url);
+  
+  }
+
+int main(int argc, char ** argv)
+  {
+  gavl_time_t delay_time = GAVL_TIME_SCALE / 100;
+  bg_ssdp_t * s = bg_ssdp_create(NULL, 1, NULL);
+  bg_ssdp_set_callback(s, ssdp_callback, NULL);
+  while(1)
+    {
+    bg_ssdp_update(s);
+    gavl_time_delay(&delay_time);
+    }
+  }

gmerlin-1.2.0.tar.gz/tests/textrenderer.c -> gmerlin-4256.tar.gz/tests/textrenderer.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -36,7 +36,7 @@
   bg_cfg_section_t     * cfg_section;
   bg_plugin_registry_t * plugin_reg;
   
-  gavl_overlay_t ovl;
+  gavl_overlay_t * ovl;
   
   bg_parameter_value_t val;
   bg_text_renderer_t * r;
@@ -91,11 +91,11 @@
   
   bg_text_renderer_init(r, &frame_format, &ovl_format);
 
-  ovl.frame = gavl_video_frame_create(&ovl_format);
+  ovl = gavl_video_frame_create(&ovl_format);
   
   /* Render */
 
-  bg_text_renderer_render(r, argv[2], &ovl);
+  bg_text_renderer_render(r, argv[2], ovl);
   
   /* Save png */
 
@@ -109,13 +109,13 @@
   cfg_section = bg_cfg_registry_find_section(cfg_reg, "plugins");
   plugin_reg = bg_plugin_registry_create(cfg_section);
 
-  bg_plugin_registry_save_image(plugin_reg, "text.png", ovl.frame,
+  bg_plugin_registry_save_image(plugin_reg, "text.png", ovl,
                                 &ovl_format, NULL);
   
   bg_plugin_registry_destroy(plugin_reg);
   bg_cfg_registry_destroy(cfg_reg);
 
-  gavl_video_frame_destroy(ovl.frame);
+  gavl_video_frame_destroy(ovl);
   
   /* Cleanup */

gmerlin-1.2.0.tar.gz/tests/thumbnail.c -> gmerlin-4256.tar.gz/tests/thumbnail.c Changed

gmerlin-4256.tar.gz/tests/upnpdesc.c Added

@@ -0,0 +1,96 @@
+/*****************************************************************
+ * gmerlin - a general purpose multimedia framework and applications
+ *
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
+ * gmerlin-general@lists.sourceforge.net
+ * http://gmerlin.sourceforge.net
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * *****************************************************************/
+
+#include <gmerlin/upnp/device.h>
+#include <gmerlin/upnp/devicedesc.h>
+#include <gmerlin/upnp/servicedesc.h>
+
+#include <config.h>
+
+static void test_device_desc()
+  {
+  uuid_t uuid;
+  xmlDocPtr doc;
+
+
+  doc = bg_upnp_device_description_create("127.0.0.1:5555", "MediaServer", 1);
+  uuid_clear(uuid);
+  uuid_generate(uuid);
+  
+  bg_upnp_device_description_set_name(doc, "Gmerlin Server");
+  bg_upnp_device_description_set_manufacturer(doc, "Gmerlin Project");
+  bg_upnp_device_description_set_manufacturer_url(doc, "http://gmerlin.sourceforge.net");
+  bg_upnp_device_description_set_model_description(doc, "Amazing media server");
+  bg_upnp_device_description_set_model_name(doc, "Gmerlin Mediaserver");
+  bg_upnp_device_description_set_model_number(doc, VERSION);
+  bg_upnp_device_description_set_model_url(doc, "http://gmerlin.sourceforge.net");
+  bg_upnp_device_description_set_serial_number(doc, "1");
+  bg_upnp_device_description_set_uuid(doc, uuid);
+
+  bg_upnp_device_description_add_icon(doc, "image/png", 48, 48, 24, "/static/icons/server.png");
+    
+  bg_upnp_device_description_add_service(doc, "ContentDirectory", 1, "cd");
+  bg_upnp_device_description_add_service(doc, "ConnectionManager", 1, "cm");
+
+
+  
+  // bg_upnp_device_description_set_upc(doc, "UPC");
+  
+  bg_xml_save_FILE(doc, stdout);
+  xmlFreeDoc(doc);
+  }
+
+#if 0
+static void test_service_desc()
+  {
+  xmlNodePtr node;
+  xmlDocPtr doc = bg_upnp_service_description_create();
+
+  node = bg_upnp_service_description_add_action(doc, "Browse");
+  bg_upnp_service_action_add_argument(node, "ObjectID", 0, 0, "A_ARG_TYPE_ObjectID");
+  bg_upnp_service_action_add_argument(node, "BrowseFlag", 0, 0, "A_ARG_TYPE_BrowseFlag");
+  bg_upnp_service_action_add_argument(node, "Filter", 0, 0, "A_ARG_TYPE_Filter");
+  bg_upnp_service_action_add_argument(node, "StartingIndex", 0, 0, "A_ARG_TYPE_Index");
+  bg_upnp_service_action_add_argument(node, "RequestedCount", 0, 0, "A_ARG_TYPE_Count");
+  bg_upnp_service_action_add_argument(node, "SortCriteria", 0, 0, "A_ARG_TYPE_SortCriteria");
+  bg_upnp_service_action_add_argument(node, "Result", 1, 0, "A_ARG_TYPE_Result");
+  bg_upnp_service_action_add_argument(node, "NumberReturned", 1, 0, "A_ARG_TYPE_Count");
+  bg_upnp_service_action_add_argument(node, "TotalMatches", 1, 0, "A_ARG_TYPE_Count");
+  bg_upnp_service_action_add_argument(node, "UpdateID", 1, 0, "A_ARG_TYPE_UpdateID");
+
+  node = bg_upnp_service_description_add_statevar(doc, "A_ARG_TYPE_BrowseFlag", 0, "string");
+  bg_upnp_service_statevar_add_allowed_value(node, "BrowseMetadata");
+  bg_upnp_service_statevar_add_allowed_value(node, "BrowseDirectChildren");
+  
+  bg_xml_save_FILE(doc, stdout);
+  xmlFreeDoc(doc);
+  
+  }
+#endif
+
+int main(int argc, char ** argv)
+  {
+  test_device_desc();
+  
+  //  test_service_desc();
+  return 0; 
+  }
+

gmerlin-1.2.0.tar.gz/tests/videoplayer1.c -> gmerlin-4256.tar.gz/tests/videoplayer1.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -32,7 +32,23 @@
 #include <gmerlin/utils.h>
 #include <gmerlin/log.h>
 
-static char * output_plugin_name = "ov_x11";
+typedef struct
+  {
+  gavl_timer_t * timer;
+  const gavl_video_format_t * fmt;
+  } process_data_t;
+
+static void process_frame(void * priv, gavl_video_frame_t * frame)
+  {
+  gavl_time_t diff_time;
+  process_data_t * d = priv;
+  
+  diff_time = gavl_time_unscale(d->fmt->timescale, frame->timestamp) - gavl_timer_get(d->timer);
+
+  if(diff_time > 0)
+    gavl_time_delay(&diff_time);
+  
+  }
 
 int main(int argc, char ** argv)
   {
@@ -41,18 +57,14 @@
   bg_ov_plugin_t * output_plugin;
   const bg_plugin_info_t * plugin_info;
   bg_track_info_t * info;
-  int do_convert;
   char * tmp_path;
-
-
-  gavl_timer_t * timer;
-  int64_t frames_written;
-  gavl_time_t diff_time;
-
+  
   bg_cfg_registry_t * cfg_reg;
   bg_cfg_section_t * cfg_section;
   bg_plugin_registry_t * plugin_reg;
 
+  gavl_video_connector_t * conn;
+  
   /* Plugin handles */
   
   bg_plugin_handle_t * input_handle = NULL;
@@ -61,16 +73,9 @@
   /* Output format */
   
   gavl_video_format_t video_format;
-
-  /* Frames */
   
-  gavl_video_frame_t * input_frame = NULL;
-  gavl_video_frame_t * output_frame = NULL;
-
-  /* Converter */
-
-  gavl_video_converter_t * video_converter;
-
+  process_data_t d;
+  
   bg_log_set_verbose(BG_LOG_DEBUG|BG_LOG_WARNING|BG_LOG_ERROR|BG_LOG_INFO);
   if(argc == 1)
     {
@@ -103,11 +108,15 @@
   input_plugin = (bg_input_plugin_t*)(input_handle->plugin);
 
   /* Load output plugin */
-    
-  plugin_info = bg_plugin_find_by_name(plugin_reg, output_plugin_name);
+
+  plugin_info =
+    bg_plugin_registry_get_default(plugin_reg,
+                                   BG_PLUGIN_OUTPUT_VIDEO,
+                                   BG_PLUGIN_PLAYBACK);
+  
   if(!plugin_info)
     {
-    fprintf(stderr, "Output plugin %s not found\n", output_plugin_name);
+    fprintf(stderr, "Output plugin not found\n");
     return -1;
     }
   output_handle = bg_plugin_load(plugin_reg, plugin_info);
@@ -135,9 +144,8 @@
   
   /* Get video format */
 
-  memcpy(&video_format, &info->video_streams[0].format,
-         sizeof(gavl_video_format_t));
-
+  gavl_video_format_copy(&video_format, &info->video_streams[0].format);
+  
   /* Initialize output plugin */
     
   if(!output_plugin->open(output_handle->priv, &video_format, 1))
@@ -149,84 +157,35 @@
   output_plugin->show_window(output_handle->priv, 1);
   output_plugin->set_window_title(output_handle->priv, "Video output");
   
-  /* Initialize video converter */
-
-  video_converter = gavl_video_converter_create();
+  /* Initialize video connector */
 
+  conn =
+    gavl_video_connector_create(input_plugin->get_video_source(input_handle->priv, 0));
   
-  do_convert = gavl_video_converter_init(video_converter,
-                                         &info->video_streams[0].format,
-                                         &video_format);
-  
-  if(do_convert)
-    fprintf(stderr, "Doing Video Conversion\n");
-  else
-    fprintf(stderr, "No Video conversion\n");
-
-  fprintf(stderr, "Input format:\n");
-  gavl_video_format_dump(&info->video_streams[0].format);
-  fprintf(stderr, "Output format:\n");
-  gavl_video_format_dump(&video_format);
-  
-  /* Allocate frames */
+  gavl_video_connector_connect(conn,
+                               output_plugin->get_sink(output_handle->priv));
 
-  if(do_convert)
-    input_frame = gavl_video_frame_create(&info->video_streams[0].format);
+  gavl_video_connector_start(conn);
   
   /* Allocate timer */
 
-  timer = gavl_timer_create();
+  d.timer = gavl_timer_create();
+  d.fmt = gavl_video_connector_get_process_format(conn);
+
+  gavl_video_connector_set_process_func(conn, process_frame, &d);
   
   /* Playback until we are done */
 
-  frames_written = 0;
-
-  gavl_timer_start(timer);
+  gavl_timer_start(d.timer);
   
-  if(do_convert)
+  while(gavl_video_connector_process(conn))
     {
-    while(1)
-      {
-      output_frame = output_plugin->get_frame(output_handle->priv);
-      
-      if(!input_plugin->read_video(input_handle->priv, input_frame, 0))
-        break;
-      gavl_video_convert(video_converter, input_frame, output_frame);
-            
-      diff_time = gavl_time_unscale(info->video_streams[0].format.timescale, output_frame->timestamp) - gavl_timer_get(timer);
-
-      if(diff_time > 0)
-        {
-        gavl_time_delay(&diff_time);
-        }
-      
-      output_plugin->put_video(output_handle->priv, output_frame);
+    if(output_plugin->handle_events)
       output_plugin->handle_events(output_handle->priv);
-      frames_written++;
-      }
     }
-  else
-    {
-    while(1)
-      {
-      if(!input_plugin->read_video(input_handle->priv, output_frame, 0))
-        break;
-            
-      diff_time = gavl_time_unscale(info->video_streams[0].format.timescale, output_frame->timestamp) - gavl_timer_get(timer);
-      if(diff_time > 0)
-        gavl_time_delay(&diff_time);
-      output_plugin->put_video(output_handle->priv, output_frame);
-      frames_written++;
-      }
-    }
-  
-  /* Clean up */
-
-  gavl_video_converter_destroy(video_converter);
-
-  if(do_convert)
-    gavl_video_frame_destroy(input_frame);
     
+  /* Clean up */
+  
   if(input_plugin->stop)
     input_plugin->stop(input_handle->priv);
 
@@ -239,7 +198,8 @@
   bg_plugin_registry_destroy(plugin_reg);
   bg_cfg_registry_destroy(cfg_reg);
   
-  gavl_timer_destroy(timer);
-    
+  gavl_timer_destroy(d.timer);
+  gavl_video_connector_destroy(conn);
+  
   return 0;
   }

gmerlin-1.2.0.tar.gz/tests/visualization.c -> gmerlin-4256.tar.gz/tests/visualization.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************
  * gmerlin - a general purpose multimedia framework and applications
  *
- * Copyright (c) 2001 - 2011 Members of the Gmerlin project
+ * Copyright (c) 2001 - 2012 Members of the Gmerlin project
  * gmerlin-general@lists.sourceforge.net
  * http://gmerlin.sourceforge.net
  *
@@ -87,6 +87,7 @@
   bg_cfg_section_t * cfg_section;
   bg_plugin_registry_t * plugin_reg;
   char * tmp_path;
+  gavl_metadata_t m;
   
   gavl_audio_format_t format;
   gavl_audio_frame_t * frame;
@@ -155,7 +156,8 @@
   /* Open input */
 
   memset(&format, 0, sizeof(format));
-
+  memset(&m, 0, sizeof(m));
+  
   format.samplerate = 44100;
   format.sample_format = GAVL_SAMPLE_S16;
   format.samples_per_frame = 2048;
@@ -163,7 +165,7 @@
   format.num_channels   = 2;
   gavl_set_channel_setup(&format);
 
-  if(!input_plugin->open(input_handle->priv, &format, NULL))
+  if(!input_plugin->open(input_handle->priv, &format, NULL, &m))
     {
     bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Opening input plugin failed");
     return -1;

gmerlin-1.2.0.tar.gz/tests/vumeter.c -> gmerlin-4256.tar.gz/tests/vumeter.c Changed

gmerlin-4256.tar.gz/update_copyright.sh Added

Overview

Request 1681 (accepted)

Request History